Virtual whiteboard for sketching hand-drawn like diagrams
fix: mobile UI and other fixes (#10177)
David Luzar5fffc4743fec
diff --git a/packages/excalidraw/actions/actionMenu.tsx b/packages/excalidraw/actions/actionMenu.tsxindex 2c6a774456..4cb95c2f0f 100644--- a/packages/excalidraw/actions/actionMenu.tsx+++ b/packages/excalidraw/actions/actionMenu.tsx@@ -1,65 +1,11 @@import { KEYS } from "@excalidraw/common";-import { getNonDeletedElements } from "@excalidraw/element";--import { showSelectedShapeActions } from "@excalidraw/element";-import { CaptureUpdateAction } from "@excalidraw/element";-import { ToolButton } from "../components/ToolButton";-import { HamburgerMenuIcon, HelpIconThin, palette } from "../components/icons";-import { t } from "../i18n";+import { HelpIconThin } from "../components/icons";import { register } from "./register";-export const actionToggleCanvasMenu = register({- name: "toggleCanvasMenu",- label: "buttons.menu",- trackEvent: { category: "menu" },- perform: (_, appState) => ({- appState: {- ...appState,- openMenu: appState.openMenu === "canvas" ? null : "canvas",- },- captureUpdate: CaptureUpdateAction.EVENTUALLY,- }),- PanelComponent: ({ appState, updateData }) => (- <ToolButton- type="button"- icon={HamburgerMenuIcon}- aria-label={t("buttons.menu")}- onClick={updateData}- selected={appState.openMenu === "canvas"}- />- ),-});--export const actionToggleEditMenu = register({- name: "toggleEditMenu",- label: "buttons.edit",- trackEvent: { category: "menu" },- perform: (_elements, appState) => ({- appState: {- ...appState,- openMenu: appState.openMenu === "shape" ? null : "shape",- },- captureUpdate: CaptureUpdateAction.EVENTUALLY,- }),- PanelComponent: ({ elements, appState, updateData }) => (- <ToolButton- visible={showSelectedShapeActions(- appState,- getNonDeletedElements(elements),- )}- type="button"- icon={palette}- aria-label={t("buttons.edit")}- onClick={updateData}- selected={appState.openMenu === "shape"}- />- ),-});-export const actionShortcuts = register({name: "toggleShortcuts",label: "welcomeScreen.defaults.helpHint",@@ -79,6 +25,8 @@ export const actionShortcuts = register({: {name: "help",},+ openMenu: null,+ openPopup: null,},captureUpdate: CaptureUpdateAction.EVENTUALLY,};diff --git a/packages/excalidraw/actions/index.ts b/packages/excalidraw/actions/index.tsindex 2719a5d0a2..6b888e92d3 100644--- a/packages/excalidraw/actions/index.ts+++ b/packages/excalidraw/actions/index.ts@@ -44,11 +44,7 @@ export {} from "./actionExport";export { actionCopyStyles, actionPasteStyles } from "./actionStyles";-export {- actionToggleCanvasMenu,- actionToggleEditMenu,- actionShortcuts,-} from "./actionMenu";+export { actionShortcuts } from "./actionMenu";export { actionGroup, actionUngroup } from "./actionGroup";diff --git a/packages/excalidraw/actions/types.ts b/packages/excalidraw/actions/types.tsindex 302a76fb4e..d533294d39 100644--- a/packages/excalidraw/actions/types.ts+++ b/packages/excalidraw/actions/types.ts@@ -72,8 +72,6 @@ export type ActionName =| "changeArrowProperties"| "changeOpacity"| "changeFontSize"- | "toggleCanvasMenu"- | "toggleEditMenu"| "undo"| "redo"| "finalize"diff --git a/packages/excalidraw/components/Actions.tsx b/packages/excalidraw/components/Actions.tsxindex ec95d40c3e..48ec4dc9a2 100644--- a/packages/excalidraw/components/Actions.tsx+++ b/packages/excalidraw/components/Actions.tsx@@ -1178,7 +1178,10 @@ export const ShapesSwitcher = ({// on top of it(laserToolSelected && !app.props.isCollaborating),})}- onToggle={() => setIsExtraToolsMenuOpen(!isExtraToolsMenuOpen)}+ onToggle={() => {+ setIsExtraToolsMenuOpen(!isExtraToolsMenuOpen);+ setAppState({ openMenu: null, openPopup: null });+ }}title={t("toolBar.extraTools")}>{frameToolSelecteddiff --git a/packages/excalidraw/components/ColorPicker/ColorPicker.tsx b/packages/excalidraw/components/ColorPicker/ColorPicker.tsxindex 759ab9cad2..238960fa0b 100644--- a/packages/excalidraw/components/ColorPicker/ColorPicker.tsx+++ b/packages/excalidraw/components/ColorPicker/ColorPicker.tsx@@ -319,8 +319,9 @@ export const ColorPicker = ({openRef.current = appState.openPopup;}, [appState.openPopup]);const compactMode =- appState.stylesPanelMode === "compact" ||- appState.stylesPanelMode === "mobile";+ type !== "canvasBackground" &&+ (appState.stylesPanelMode === "compact" ||+ appState.stylesPanelMode === "mobile");return (<div>diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx b/packages/excalidraw/components/CommandPalette/CommandPalette.tsxindex 03f9c93cb8..e9f4c72d4c 100644--- a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx+++ b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx@@ -476,7 +476,6 @@ function CommandPaletteInner({},perform: () => {setAppState((prevState) => ({- openMenu: prevState.openMenu === "shape" ? null : "shape",openPopup: "elementStroke",}));},@@ -496,7 +495,6 @@ function CommandPaletteInner({},perform: () => {setAppState((prevState) => ({- openMenu: prevState.openMenu === "shape" ? null : "shape",openPopup: "elementBackground",}));},@@ -838,7 +836,12 @@ function CommandPaletteInner({let matchingCommands =commandSearch?.length > 1- ? [...allCommands, ...libraryCommands]+ ? [+ ...allCommands+ .filter(isCommandAvailable)+ .sort((a, b) => a.order - b.order),+ ...libraryCommands,+ ]: allCommands.filter(isCommandAvailable).sort((a, b) => a.order - b.order);diff --git a/packages/excalidraw/components/IconPicker.tsx b/packages/excalidraw/components/IconPicker.tsxindex 2d7f8a0ba5..031d181eb0 100644--- a/packages/excalidraw/components/IconPicker.tsx+++ b/packages/excalidraw/components/IconPicker.tsx@@ -159,7 +159,7 @@ function Picker<T>({side={isMobile ? "right" : "bottom"}align="start"sideOffset={isMobile ? 8 : 12}- style={{ zIndex: "var(--zIndex-popup)" }}+ style={{ zIndex: "var(--zIndex-ui-styles-popup)" }}onKeyDown={handleKeyDown}><divdiff --git a/packages/excalidraw/components/LibraryMenu.scss b/packages/excalidraw/components/LibraryMenu.scssindex b7ed46cb30..d0d33befd8 100644--- a/packages/excalidraw/components/LibraryMenu.scss+++ b/packages/excalidraw/components/LibraryMenu.scss@@ -133,6 +133,7 @@}.layer-ui__library .library-menu-dropdown-container {+ z-index: 1;position: relative;&--in-heading {margin-left: auto;diff --git a/packages/excalidraw/components/MobileToolBar.tsx b/packages/excalidraw/components/MobileToolBar.tsxindex 093cbd2630..bc52c01b71 100644--- a/packages/excalidraw/components/MobileToolBar.tsx+++ b/packages/excalidraw/components/MobileToolBar.tsx@@ -374,7 +374,10 @@ export const MobileToolBar = ({extraToolSelected || isOtherShapesMenuOpen,},)}- onToggle={() => setIsOtherShapesMenuOpen(!isOtherShapesMenuOpen)}+ onToggle={() => {+ setIsOtherShapesMenuOpen(!isOtherShapesMenuOpen);+ setAppState({ openMenu: null, openPopup: null });+ }}title={t("toolBar.extraTools")}style={{width: WIDTH,diff --git a/packages/excalidraw/components/PropertiesPopover.tsx b/packages/excalidraw/components/PropertiesPopover.tsxindex d4437b3858..3c03c35b99 100644--- a/packages/excalidraw/components/PropertiesPopover.tsx+++ b/packages/excalidraw/components/PropertiesPopover.tsx@@ -60,7 +60,8 @@ export const PropertiesPopover = React.forwardRef<alignOffset={-16}sideOffset={20}style={{- zIndex: "var(--zIndex-popup)",+ zIndex: "var(--zIndex-ui-styles-popup)",+ marginLeft: device.editor.isMobile ? "0.5rem" : undefined,}}onPointerLeave={onPointerLeave}onKeyDown={onKeyDown}diff --git a/packages/excalidraw/components/Sidebar/Sidebar.scss b/packages/excalidraw/components/Sidebar/Sidebar.scssindex c7776d1c69..2fba020ca9 100644--- a/packages/excalidraw/components/Sidebar/Sidebar.scss+++ b/packages/excalidraw/components/Sidebar/Sidebar.scss@@ -9,7 +9,7 @@top: 0;bottom: 0;right: 0;- z-index: 5;+ z-index: var(--zIndex-ui-library);margin: 0;padding: 0;box-sizing: border-box;diff --git a/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx b/packages/excalidraw/components/Sidebar/SidebarTrigger.tsxindex 6e8bf374ce..706a6abe52 100644--- a/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx+++ b/packages/excalidraw/components/Sidebar/SidebarTrigger.tsx@@ -30,7 +30,11 @@ export const SidebarTrigger = ({.querySelector(".layer-ui__wrapper")?.classList.remove("animate");const isOpen = event.target.checked;- setAppState({ openSidebar: isOpen ? { name, tab } : null });+ setAppState({+ openSidebar: isOpen ? { name, tab } : null,+ openMenu: null,+ openPopup: null,+ });onToggle?.(isOpen);}}checked={appState.openSidebar?.name === name}diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss b/packages/excalidraw/components/dropdownMenu/DropdownMenu.scssindex a0a230941d..f6c7d7dc24 100644--- a/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss@@ -5,6 +5,7 @@position: absolute;top: 2.5rem;margin-top: 0.5rem;+ max-width: 16rem;&--placement-top {top: auto;@@ -20,10 +21,8 @@// When main menu is in the top toolbar, position relative to trigger&.main-menu-dropdown {min-width: 232px;- max-width: calc(100vw - var(--editor-container-padding) * 2);margin-top: 0;margin-bottom: 0;- z-index: var(--zIndex-layerUI);@media screen and (orientation: landscape) {max-width: 232px;diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsxindex 291f857e80..5bbb41763b 100644--- a/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx@@ -74,7 +74,12 @@ const MenuContent = ({{/* the zIndex ensures this menu has higher stacking order,see https://github.com/excalidraw/excalidraw/pull/1445 */}{device.editor.isMobile ? (- <Stack.Col className="dropdown-menu-container">{children}</Stack.Col>+ <Stack.Col+ className="dropdown-menu-container"+ style={{ ["--gap" as any]: 1.25 }}+ >+ {children}+ </Stack.Col>) : (<IslandclassName="dropdown-menu-container"diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuSeparator.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenuSeparator.tsxindex ee41960735..1c6d19521d 100644--- a/packages/excalidraw/components/dropdownMenu/DropdownMenuSeparator.tsx+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenuSeparator.tsx@@ -6,6 +6,7 @@ const MenuSeparator = () => (height: "1px",backgroundColor: "var(--default-border-color)",margin: ".5rem 0",+ flex: "0 0 auto",}}/>);diff --git a/packages/excalidraw/components/main-menu/MainMenu.tsx b/packages/excalidraw/components/main-menu/MainMenu.tsxindex 8ce2a5d69b..0098ebe526 100644--- a/packages/excalidraw/components/main-menu/MainMenu.tsx+++ b/packages/excalidraw/components/main-menu/MainMenu.tsx@@ -30,9 +30,6 @@ const MainMenu = Object.assign(const device = useDevice();const appState = useUIAppState();const setAppState = useExcalidrawSetAppState();- const onClickOutside = device.editor.isMobile- ? undefined- : () => setAppState({ openMenu: null });return (<MainMenuTunnel.In>@@ -41,6 +38,8 @@ const MainMenu = Object.assign(onToggle={() => {setAppState({openMenu: appState.openMenu === "canvas" ? null : "canvas",+ openPopup: null,+ openDialog: null,});}}data-testid="main-menu-trigger"@@ -49,7 +48,7 @@ const MainMenu = Object.assign({HamburgerMenuIcon}</DropdownMenu.Trigger><DropdownMenu.Content- onClickOutside={onClickOutside}+ onClickOutside={() => setAppState({ openMenu: null })}onSelect={composeEventHandlers(onSelect, () => {setAppState({ openMenu: null });})}diff --git a/packages/excalidraw/css/styles.scss b/packages/excalidraw/css/styles.scssindex 679a5c4cd1..72890f206d 100644--- a/packages/excalidraw/css/styles.scss+++ b/packages/excalidraw/css/styles.scss@@ -12,6 +12,11 @@--zIndex-eyeDropperPreview: 6;--zIndex-hyperlinkContainer: 7;+ --zIndex-ui-styles-popup: 40;+ --zIndex-ui-bottom: 60;+ --zIndex-ui-library: 80;+ --zIndex-ui-top: 100;+--zIndex-modal: 1000;--zIndex-popup: 1001;--zIndex-toast: 999999;@@ -237,7 +242,7 @@ body.excalidraw-cursor-resize * {}.App-top-bar {- z-index: var(--zIndex-layerUI);+ z-index: var(--zIndex-ui-top);display: flex;flex-direction: column;}@@ -255,7 +260,7 @@ body.excalidraw-cursor-resize * {left: 50%;transform: translateX(-50%);--bar-padding: calc(4 * var(--space-factor));- z-index: var(--zIndex-layerUI);+ z-index: var(--zIndex-ui-bottom);display: flex;flex-direction: column;@@ -296,6 +301,12 @@ body.excalidraw-cursor-resize * {.App-toolbar-content {display: flex;flex-direction: column;++ pointer-events: none;++ & > * {+ pointer-events: var(--ui-pointerEvents);+ }}.App-mobile-menu {diff --git a/packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snapindex f1a65130ea..d1a1ef77e0 100644--- a/packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snap+++ b/packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snap@@ -414,7 +414,7 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende</div></button><div- style="height: 1px; margin: .5rem 0px;"+ style="height: 1px; margin: .5rem 0px; flex: 0 0 auto;"/><divclass="dropdown-menu-group "@@ -558,7 +558,7 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende</a></div><div- style="height: 1px; margin: .5rem 0px;"+ style="height: 1px; margin: .5rem 0px; flex: 0 0 auto;"/><buttonaria-label="Dark mode"diff --git a/packages/excalidraw/types.ts b/packages/excalidraw/types.tsindex 3b4d2eb478..2c81de4ef7 100644--- a/packages/excalidraw/types.ts+++ b/packages/excalidraw/types.ts@@ -350,7 +350,7 @@ export interface AppState {isResizing: boolean;isRotating: boolean;zoom: Zoom;- openMenu: "canvas" | "shape" | null;+ openMenu: "canvas" | null;openPopup:| "canvasBackground"| "elementBackground"