Virtual whiteboard for sketching hand-drawn like diagrams
fix: ellipsify MainMenu and CommandPalette items (#9743)
David Luzar678dff25eddf
diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.scss b/packages/excalidraw/components/CommandPalette/CommandPalette.scssindex ebb7e4fa5e..90db95db69 100644--- a/packages/excalidraw/components/CommandPalette/CommandPalette.scss+++ b/packages/excalidraw/components/CommandPalette/CommandPalette.scss@@ -108,6 +108,7 @@ $verticalBreakpoint: 861px;display: flex;align-items: center;gap: 0.25rem;+ overflow: hidden;}}diff --git a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx b/packages/excalidraw/components/CommandPalette/CommandPalette.tsxindex 740fa01620..3c6f110d27 100644--- a/packages/excalidraw/components/CommandPalette/CommandPalette.tsx+++ b/packages/excalidraw/components/CommandPalette/CommandPalette.tsx@@ -59,6 +59,8 @@ import { useStableCallback } from "../../hooks/useStableCallback";import { activeConfirmDialogAtom } from "../ActiveConfirmDialog";import { useStable } from "../../hooks/useStable";+import { Ellipsify } from "../Ellipsify";+import * as defaultItems from "./defaultCommandPaletteItems";import "./CommandPalette.scss";@@ -964,7 +966,7 @@ const CommandItem = ({}/>)}- {command.label}+ <Ellipsify>{command.label}</Ellipsify></div>{showShortcut && command.shortcut && (<CommandShortcutHint shortcut={command.shortcut} />diff --git a/packages/excalidraw/components/Ellipsify.tsx b/packages/excalidraw/components/Ellipsify.tsxnew file mode 100644index 0000000000..dd21af6f15--- /dev/null+++ b/packages/excalidraw/components/Ellipsify.tsx@@ -0,0 +1,18 @@+export const Ellipsify = ({+ children,+ ...rest+}: { children: React.ReactNode } & React.HTMLAttributes<HTMLSpanElement>) => {+ return (+ <span+ {...rest}+ style={{+ textOverflow: "ellipsis",+ overflow: "hidden",+ whiteSpace: "nowrap",+ ...rest.style,+ }}+ >+ {children}+ </span>+ );+};diff --git a/packages/excalidraw/components/InlineIcon.tsx b/packages/excalidraw/components/InlineIcon.tsxindex 75cc29d08d..c80045e5e8 100644--- a/packages/excalidraw/components/InlineIcon.tsx+++ b/packages/excalidraw/components/InlineIcon.tsx@@ -7,6 +7,7 @@ export const InlineIcon = ({ icon }: { icon: React.ReactNode }) => {display: "inline-block",lineHeight: 0,verticalAlign: "middle",+ flex: "0 0 auto",}}>{icon}diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss b/packages/excalidraw/components/dropdownMenu/DropdownMenu.scssindex e48f6d71e7..95d258c46b 100644--- a/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenu.scss@@ -19,6 +19,8 @@border-radius: var(--border-radius-lg);position: relative;transition: box-shadow 0.5s ease-in-out;+ display: flex;+ flex-direction: column;&.zen-mode {box-shadow: none;@@ -100,6 +102,7 @@align-items: center;cursor: pointer;border-radius: var(--border-radius-md);+ flex: 1 0 auto;@media screen and (min-width: 1921px) {height: 2.25rem;diff --git a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx b/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsxindex b2f9e7e0a9..aea13230b8 100644--- a/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx+++ b/packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx@@ -1,5 +1,7 @@import { useDevice } from "../App";+import { Ellipsify } from "../Ellipsify";+import type { JSX } from "react";const MenuItemContent = ({@@ -18,7 +20,7 @@ const MenuItemContent = ({<>{icon && <div className="dropdown-menu-item__icon">{icon}</div>}<div style={textStyle} className="dropdown-menu-item__text">- {children}+ <Ellipsify>{children}</Ellipsify></div>{shortcut && !device.editor.isMobile && (<div className="dropdown-menu-item__shortcut">{shortcut}</div>diff --git a/packages/excalidraw/index.tsx b/packages/excalidraw/index.tsxindex 478ecc42f0..a592e2ea91 100644--- a/packages/excalidraw/index.tsx+++ b/packages/excalidraw/index.tsx@@ -281,6 +281,7 @@ export { Sidebar } from "./components/Sidebar/Sidebar";export { Button } from "./components/Button";export { Footer };export { MainMenu };+export { Ellipsify } from "./components/Ellipsify";export { useDevice } from "./components/App";export { WelcomeScreen };export { LiveCollaborationTrigger };diff --git a/packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snap b/packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snapindex bb87746c0d..ae4728e0c7 100644--- a/packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snap+++ b/packages/excalidraw/tests/__snapshots__/excalidraw.test.tsx.snap@@ -15,7 +15,11 @@ exports[`<Excalidraw/> > <MainMenu/> > should render main menu with host menu it<divclass="dropdown-menu-item__text">- Click me+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Click me+ </span></div></button><a@@ -27,7 +31,11 @@ exports[`<Excalidraw/> > <MainMenu/> > should render main menu with host menu it<divclass="dropdown-menu-item__text">- Excalidraw blog+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Excalidraw blog+ </span></div></a><div@@ -88,7 +96,11 @@ exports[`<Excalidraw/> > <MainMenu/> > should render main menu with host menu it<divclass="dropdown-menu-item__text">- Help+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Help+ </span></div><divclass="dropdown-menu-item__shortcut"@@ -138,7 +150,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Open+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Open+ </span></div><divclass="dropdown-menu-item__shortcut"@@ -175,7 +191,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Save to...+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Save to...+ </span></div></button><button@@ -231,7 +251,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Export image...+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Export image...+ </span></div><divclass="dropdown-menu-item__shortcut"@@ -280,7 +304,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Find on canvas+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Find on canvas+ </span></div><divclass="dropdown-menu-item__shortcut"@@ -337,7 +365,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Help+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Help+ </span></div><divclass="dropdown-menu-item__shortcut"@@ -374,7 +406,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Reset the canvas+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Reset the canvas+ </span></div></button><div@@ -419,7 +455,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- GitHub+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ GitHub+ </span></div></a><a@@ -465,7 +505,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Follow us+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Follow us+ </span></div></a><a@@ -505,7 +549,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Discord chat+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Discord chat+ </span></div></a></div>@@ -542,7 +590,11 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende<divclass="dropdown-menu-item__text">- Dark mode+ <span+ style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"+ >+ Dark mode+ </span></div><divclass="dropdown-menu-item__shortcut"