Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

feat: Use dialog component for clear canvas instead of window confirm (#4075)

Aakansha Doshi0f0244224d62
diff --git a/src/actions/actionCanvas.tsx b/src/actions/actionCanvas.tsx
index 375fabcc6f..e29a3d8483 100644
--- a/src/actions/actionCanvas.tsx
+++ b/src/actions/actionCanvas.tsx
@@ -1,14 +1,11 @@
-import { getDefaultAppState } from "../appState";
import { ColorPicker } from "../components/ColorPicker";
-import { trash, zoomIn, zoomOut } from "../components/icons";
+import { zoomIn, zoomOut } from "../components/icons";
import { ToolButton } from "../components/ToolButton";
import { DarkModeToggle } from "../components/DarkModeToggle";
import { THEME, ZOOM_STEP } from "../constants";
import { getCommonBounds, getNonDeletedElements } from "../element";
-import { newElementWith } from "../element/mutateElement";
import { ExcalidrawElement } from "../element/types";
import { t } from "../i18n";
-import { useIsMobile } from "../components/App";
import { CODES, KEYS } from "../keys";
import { getNormalizedZoom, getSelectedElements } from "../scene";
import { centerScrollOn } from "../scene/scroll";
@@ -17,6 +14,9 @@ import { AppState, NormalizedZoomValue } from "../types";
import { getShortcutKey } from "../utils";
import { register } from "./register";
import { Tooltip } from "../components/Tooltip";
+import { newElementWith } from "../element/mutateElement";
+import { getDefaultAppState } from "../appState";
+import ClearCanvas from "../components/ClearCanvas";
export const actionChangeViewBackgroundColor = register({
name: "changeViewBackgroundColor",
@@ -47,7 +47,7 @@ export const actionChangeViewBackgroundColor = register({
export const actionClearCanvas = register({
name: "clearCanvas",
- perform: (elements, appState: AppState) => {
+ perform: (elements, appState) => {
return {
elements: elements.map((element) =>
newElementWith(element, { isDeleted: true }),
@@ -65,21 +65,8 @@ export const actionClearCanvas = register({
commitToHistory: true,
};
},
- PanelComponent: ({ updateData }) => (
- <ToolButton
- type="button"
- icon={trash}
- title={t("buttons.clearReset")}
- aria-label={t("buttons.clearReset")}
- showAriaLabel={useIsMobile()}
- onClick={() => {
- if (window.confirm(t("alerts.clearReset"))) {
- updateData(null);
- }
- }}
- data-testid="clear-canvas-button"
- />
- ),
+
+ PanelComponent: ({ updateData }) => <ClearCanvas onConfirm={updateData} />,
});
export const actionZoomIn = register({
diff --git a/src/components/ClearCanvas.scss b/src/components/ClearCanvas.scss
new file mode 100644
index 0000000000..3a74761f16
--- /dev/null
+++ b/src/components/ClearCanvas.scss
@@ -0,0 +1,42 @@
+@import "../css/variables.module";
+
+.excalidraw {
+ .clear-canvas {
+ &-buttons {
+ display: flex;
+ padding: 0.2rem 0;
+ justify-content: flex-end;
+
+ .ToolIcon__icon {
+ min-width: 2.5rem;
+ width: auto;
+ font-size: 1rem;
+ }
+
+ .ToolIcon_type_button {
+ margin-left: 1.5rem;
+ padding: 0 0.5rem;
+ }
+ }
+
+ &__content {
+ font-size: 1rem;
+ }
+
+ &--confirm.ToolIcon_type_button {
+ background-color: $oc-red-6;
+
+ &:hover {
+ background-color: $oc-red-8;
+ }
+
+ .ToolIcon__icon {
+ color: $oc-white;
+ }
+ }
+
+ &--cancel.ToolIcon_type_button {
+ background-color: $oc-gray-2;
+ }
+ }
+}
diff --git a/src/components/ClearCanvas.tsx b/src/components/ClearCanvas.tsx
new file mode 100644
index 0000000000..abd2240922
--- /dev/null
+++ b/src/components/ClearCanvas.tsx
@@ -0,0 +1,67 @@
+import { useState } from "react";
+import { t } from "../i18n";
+import { useIsMobile } from "./App";
+import { Dialog } from "./Dialog";
+import { trash } from "./icons";
+import { ToolButton } from "./ToolButton";
+
+import "./ClearCanvas.scss";
+
+const ClearCanvas = ({ onConfirm }: { onConfirm: () => void }) => {
+ const [showDialog, setShowDialog] = useState(false);
+ const toggleDialog = () => {
+ setShowDialog(!showDialog);
+ };
+
+ return (
+ <>
+ <ToolButton
+ type="button"
+ icon={trash}
+ title={t("buttons.clearReset")}
+ aria-label={t("buttons.clearReset")}
+ showAriaLabel={useIsMobile()}
+ onClick={toggleDialog}
+ data-testid="clear-canvas-button"
+ />
+
+ {showDialog && (
+ <Dialog
+ onCloseRequest={toggleDialog}
+ title={t("clearCanvasDialog.title")}
+ className="clear-canvas"
+ small={true}
+ >
+ <>
+ <p className="clear-canvas__content"> {t("alerts.clearReset")}</p>
+ <div className="clear-canvas-buttons">
+ <ToolButton
+ type="button"
+ title={t("buttons.clear")}
+ aria-label={t("buttons.clear")}
+ label={t("buttons.clear")}
+ onClick={() => {
+ onConfirm();
+ toggleDialog();
+ }}
+ data-testid="confirm-clear-canvas-button"
+ className="clear-canvas--confirm"
+ />
+ <ToolButton
+ type="button"
+ title={t("buttons.cancel")}
+ aria-label={t("buttons.cancel")}
+ label={t("buttons.cancel")}
+ onClick={toggleDialog}
+ data-testid="cancel-clear-canvas-button"
+ className="clear-canvas--cancel"
+ />
+ </div>
+ </>
+ </Dialog>
+ )}
+ </>
+ );
+};
+
+export default ClearCanvas;
diff --git a/src/components/LayerUI.tsx b/src/components/LayerUI.tsx
index f08c76200e..ec07e08ad6 100644
--- a/src/components/LayerUI.tsx
+++ b/src/components/LayerUI.tsx
@@ -468,6 +468,7 @@ const LayerUI = ({
</Section>
);
};
+
const renderCanvasActions = () => (
<Section
heading="canvasActions"
diff --git a/src/locales/en.json b/src/locales/en.json
index 17ec527a3e..bb2bcbc5e0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -136,7 +136,9 @@
"darkMode": "Dark mode",
"lightMode": "Light mode",
"zenMode": "Zen mode",
- "exitZenMode": "Exit zen mode"
+ "exitZenMode": "Exit zen mode",
+ "cancel": "Cancel",
+ "clear": "Clear"
},
"alerts": {
"clearReset": "This will clear the whole canvas. Are you sure?",
@@ -256,6 +258,9 @@
"zoomToFit": "Zoom to fit all elements",
"zoomToSelection": "Zoom to selection"
},
+ "clearCanvasDialog": {
+ "title": "Clear Canvas"
+ },
"encrypted": {
"tooltip": "Your drawings are end-to-end encrypted so Excalidraw's servers will never see them.",
"link": "Blog post on end-to-end encryption in Excalidraw"