From 0c02b8a446341838a3a4bc81541ae8fe04f4adc3 Mon Sep 17 00:00:00 2001 From: dwelle <5153846+dwelle@users.noreply.github.com> Date: Wed, 30 Apr 2025 13:53:57 +0200 Subject: [PATCH] move constant to CLASSES --- packages/common/src/constants.ts | 1 + packages/excalidraw/components/App.tsx | 4 ++-- packages/excalidraw/components/ShapeSwitch.tsx | 9 +++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/common/src/constants.ts b/packages/common/src/constants.ts index cd3bd7a15..39cd3dcb9 100644 --- a/packages/common/src/constants.ts +++ b/packages/common/src/constants.ts @@ -119,6 +119,7 @@ export const CLASSES = { SHAPE_ACTIONS_MENU: "App-menu__left", ZOOM_ACTIONS: "zoom-actions", SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper", + SHAPE_SWITCH_PANEL_CLASSNAME: "ShapeSwitch__Panel", }; export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai"; diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx index 21c84b97e..d85476cc4 100644 --- a/packages/excalidraw/components/App.tsx +++ b/packages/excalidraw/components/App.tsx @@ -100,6 +100,7 @@ import { arrayToMap, type EXPORT_IMAGE_TYPES, randomInteger, + CLASSES, } from "@excalidraw/common"; import { @@ -469,7 +470,6 @@ import { EraserTrail } from "../eraser"; import ShapeSwitch, { getSwitchCategoryFromElements, - SHAPE_SWITCH_PANEL_CLASSNAME, shapeSwitchAtom, switchShapes, } from "./ShapeSwitch"; @@ -4183,7 +4183,7 @@ class App extends React.Component { event.key === KEYS.TAB && (document.activeElement === this.excalidrawContainerRef?.current || document.activeElement?.classList.contains( - SHAPE_SWITCH_PANEL_CLASSNAME, + CLASSES.SHAPE_SWITCH_PANEL_CLASSNAME, )) ) { event.preventDefault(); diff --git a/packages/excalidraw/components/ShapeSwitch.tsx b/packages/excalidraw/components/ShapeSwitch.tsx index 344090bba..7a3e6e5fb 100644 --- a/packages/excalidraw/components/ShapeSwitch.tsx +++ b/packages/excalidraw/components/ShapeSwitch.tsx @@ -28,7 +28,12 @@ import { import { wrapText } from "@excalidraw/element/textWrapping"; -import { getFontString, isDevEnv, updateActiveTool } from "@excalidraw/common"; +import { + CLASSES, + getFontString, + isDevEnv, + updateActiveTool, +} from "@excalidraw/common"; import { measureText } from "@excalidraw/element/textMeasurements"; @@ -301,7 +306,7 @@ const Panel = ({ left: `${panelPosition.x - app.state.offsetLeft - GAP_HORIZONTAL}px`, zIndex: 2, }} - className={SHAPE_SWITCH_PANEL_CLASSNAME} + className={CLASSES.SHAPE_SWITCH_PANEL_CLASSNAME} > {SHAPES.map(([type, icon]) => { const isSelected =