Virtual whiteboard for sketching hand-drawn like diagrams
fix: renamed folder MainMenu->main-menu and support rest props (#6103)
Aakansha Doshi9d04479f98fc
diff --git a/src/components/LayerUI.tsx b/src/components/LayerUI.tsxindex 5d4084a105..d75b8b413d 100644--- a/src/components/LayerUI.tsx+++ b/src/components/LayerUI.tsx@@ -50,7 +50,7 @@ import WelcomeScreen from "./welcome-screen/WelcomeScreen";import { hostSidebarCountersAtom } from "./Sidebar/Sidebar";import { jotaiScope } from "../jotai";import { useAtom } from "jotai";-import MainMenu from "./mainMenu/MainMenu";+import MainMenu from "./main-menu/MainMenu";interface LayerUIProps {actionManager: ActionManager;diff --git a/src/components/LibraryMenuHeaderContent.tsx b/src/components/LibraryMenuHeaderContent.tsxindex abf6c2a29e..beeb8dd172 100644--- a/src/components/LibraryMenuHeaderContent.tsx+++ b/src/components/LibraryMenuHeaderContent.tsx@@ -193,7 +193,7 @@ export const LibraryMenuHeader: React.FC<{<DropdownMenu.ItemonSelect={onLibraryImport}icon={LoadIcon}- dataTestId="lib-dropdown--load"+ data-testid="lib-dropdown--load">{t("buttons.load")}</DropdownMenu.Item>@@ -202,7 +202,7 @@ export const LibraryMenuHeader: React.FC<{<DropdownMenu.ItemonSelect={onLibraryExport}icon={ExportIcon}- dataTestId="lib-dropdown--export"+ data-testid="lib-dropdown--export">{t("buttons.export")}</DropdownMenu.Item>@@ -219,7 +219,7 @@ export const LibraryMenuHeader: React.FC<{<DropdownMenu.Itemicon={publishIcon}onSelect={() => setShowPublishLibraryDialog(true)}- dataTestId="lib-dropdown--remove"+ data-testid="lib-dropdown--remove">{t("buttons.publishLibrary")}</DropdownMenu.Item>diff --git a/src/components/dropdownMenu/DropdownMenuItem.tsx b/src/components/dropdownMenu/DropdownMenuItem.tsxindex 47e20166b6..4f8db982d7 100644--- a/src/components/dropdownMenu/DropdownMenuItem.tsx+++ b/src/components/dropdownMenu/DropdownMenuItem.tsx@@ -9,30 +9,23 @@ const DropdownMenuItem = ({icon,onSelect,children,- dataTestId,shortcut,className,- style,- ariaLabel,+ ...rest}: {icon?: JSX.Element;onSelect: () => void;children: React.ReactNode;- dataTestId?: string;shortcut?: string;className?: string;- style?: React.CSSProperties;- ariaLabel?: string;-}) => {+} & React.ButtonHTMLAttributes<HTMLButtonElement>) => {return (<button- aria-label={ariaLabel}+ {...rest}onClick={onSelect}- data-testid={dataTestId}- title={ariaLabel}type="button"className={getDrodownMenuItemClassName(className)}- style={style}+ title={rest.title ?? rest["aria-label"]}><MenuItemContent icon={icon} shortcut={shortcut}>{children}diff --git a/src/components/dropdownMenu/DropdownMenuItemCustom.tsx b/src/components/dropdownMenu/DropdownMenuItemCustom.tsxindex 5ed47c3b5e..323f310925 100644--- a/src/components/dropdownMenu/DropdownMenuItemCustom.tsx+++ b/src/components/dropdownMenu/DropdownMenuItemCustom.tsx@@ -1,19 +1,17 @@+import React from "react";+const DropdownMenuItemCustom = ({children,className = "",- style,- dataTestId,+ ...rest}: {children: React.ReactNode;className?: string;- style?: React.CSSProperties;- dataTestId?: string;-}) => {+} & React.HTMLAttributes<HTMLDivElement>) => {return (<div+ {...rest}className={`dropdown-menu-item-base dropdown-menu-item-custom ${className}`.trim()}- style={style}- data-testid={dataTestId}>{children}</div>diff --git a/src/components/dropdownMenu/DropdownMenuItemLink.tsx b/src/components/dropdownMenu/DropdownMenuItemLink.tsxindex 116610698d..18d3f2c701 100644--- a/src/components/dropdownMenu/DropdownMenuItemLink.tsx+++ b/src/components/dropdownMenu/DropdownMenuItemLink.tsx@@ -3,33 +3,26 @@ import React from "react";import { getDrodownMenuItemClassName } from "./DropdownMenuItem";const DropdownMenuItemLink = ({icon,- dataTestId,shortcut,href,children,className = "",- style,- ariaLabel,+ ...rest}: {icon?: JSX.Element;children: React.ReactNode;- dataTestId?: string;shortcut?: string;className?: string;href: string;- style?: React.CSSProperties;- ariaLabel?: string;-}) => {+} & React.AnchorHTMLAttributes<HTMLAnchorElement>) => {return (<a+ {...rest}href={href}target="_blank"rel="noreferrer"className={getDrodownMenuItemClassName(className)}- style={style}- data-testid={dataTestId}- title={ariaLabel}- aria-label={ariaLabel}+ title={rest.title ?? rest["aria-label"]}><MenuItemContent icon={icon} shortcut={shortcut}>{children}diff --git a/src/components/mainMenu/DefaultItems.scss b/src/components/main-menu/DefaultItems.scsssimilarity index 100%rename from src/components/mainMenu/DefaultItems.scssrename to src/components/main-menu/DefaultItems.scssdiff --git a/src/components/mainMenu/DefaultItems.tsx b/src/components/main-menu/DefaultItems.tsxsimilarity index 91%rename from src/components/mainMenu/DefaultItems.tsxrename to src/components/main-menu/DefaultItems.tsxindex 38f1047679..e35108be1b 100644--- a/src/components/mainMenu/DefaultItems.tsx+++ b/src/components/main-menu/DefaultItems.tsx@@ -46,9 +46,9 @@ export const LoadScene = () => {<DropdownMenuItemicon={LoadIcon}onSelect={() => actionManager.executeAction(actionLoadScene)}- dataTestId="load-button"+ data-testid="load-button"shortcut={getShortcutFromShortcutName("loadScene")}- ariaLabel={t("buttons.load")}+ aria-label={t("buttons.load")}>{t("buttons.load")}</DropdownMenuItem>@@ -69,10 +69,10 @@ export const SaveToActiveFile = () => {return (<DropdownMenuItemshortcut={getShortcutFromShortcutName("saveScene")}- dataTestId="save-button"+ data-testid="save-button"onSelect={() => actionManager.executeAction(actionSaveToActiveFile)}icon={save}- ariaLabel={`${t("buttons.save")}`}+ aria-label={`${t("buttons.save")}`}>{`${t("buttons.save")}`}</DropdownMenuItem>);};@@ -86,10 +86,10 @@ export const SaveAsImage = () => {return (<DropdownMenuItemicon={ExportImageIcon}- dataTestId="image-export-button"+ data-testid="image-export-button"onSelect={() => setAppState({ openDialog: "imageExport" })}shortcut={getShortcutFromShortcutName("imageExport")}- ariaLabel={t("buttons.exportImage")}+ aria-label={t("buttons.exportImage")}>{t("buttons.exportImage")}</DropdownMenuItem>@@ -106,11 +106,11 @@ export const Help = () => {return (<DropdownMenuItem- dataTestId="help-menu-item"+ data-testid="help-menu-item"icon={HelpIcon}onSelect={() => actionManager.executeAction(actionShortcuts)}shortcut="?"- ariaLabel={t("helpDialog.title")}+ aria-label={t("helpDialog.title")}>{t("helpDialog.title")}</DropdownMenuItem>@@ -136,8 +136,8 @@ export const ClearCanvas = () => {<DropdownMenuItemicon={TrashIcon}onSelect={toggleDialog}- dataTestId="clear-canvas-button"- ariaLabel={t("buttons.clearReset")}+ data-testid="clear-canvas-button"+ aria-label={t("buttons.clearReset")}>{t("buttons.clearReset")}</DropdownMenuItem>@@ -175,9 +175,9 @@ export const ToggleTheme = () => {return actionManager.executeAction(actionToggleTheme);}}icon={appState.theme === "dark" ? SunIcon : MoonIcon}- dataTestId="toggle-dark-mode"+ data-testid="toggle-dark-mode"shortcut={getShortcutFromShortcutName("toggleTheme")}- ariaLabel={+ aria-label={appState.theme === "dark"? t("buttons.lightMode"): t("buttons.darkMode")@@ -222,8 +222,8 @@ export const Export = () => {onSelect={() => {setAppState({ openDialog: "jsonExport" });}}- dataTestId="json-export-button"- ariaLabel={t("buttons.export")}+ data-testid="json-export-button"+ aria-label={t("buttons.export")}>{t("buttons.export")}</DropdownMenuItem>@@ -236,21 +236,21 @@ export const Socials = () => (<DropdownMenuItemLinkicon={GithubIcon}href="https://github.com/excalidraw/excalidraw"- ariaLabel="GitHub"+ aria-label="GitHub">GitHub</DropdownMenuItemLink><DropdownMenuItemLinkicon={DiscordIcon}href="https://discord.gg/UexuTaE"- ariaLabel="Discord"+ aria-label="Discord">Discord</DropdownMenuItemLink><DropdownMenuItemLinkicon={TwitterIcon}href="https://twitter.com/excalidraw"- ariaLabel="Twitter"+ aria-label="Twitter"></DropdownMenuItemLink>@@ -270,7 +270,7 @@ export const LiveCollaboration = ({const appState = useExcalidrawAppState();return (<DropdownMenuItem- dataTestId="collab-button"+ data-testid="collab-button"icon={UsersIcon}className={clsx({"active-collab": isCollaborating,diff --git a/src/components/mainMenu/MainMenu.tsx b/src/components/main-menu/MainMenu.tsxsimilarity index 100%rename from src/components/mainMenu/MainMenu.tsxrename to src/components/main-menu/MainMenu.tsxdiff --git a/src/packages/excalidraw/README.md b/src/packages/excalidraw/README.mdindex 5b9f30342b..5a8db7ed43 100644--- a/src/packages/excalidraw/README.md+++ b/src/packages/excalidraw/README.md@@ -479,14 +479,10 @@ Use this component to render a menu item.| Prop | Type | Required | Default | Description || --- | --- | --- | --- | --- |-| `onSelect` | `Function` | Yes | | The handler is triggered when the item is selected. |-| `children` | `React.ReactNode` | Yes | | The content of the menu item |-| `icon` | `JSX.Element` | No | | The icon used in the menu item |+| `onSelect` | `Function` | Yes | `undefined` | The handler is triggered when the item is selected. |+| `children` | `React.ReactNode` | Yes | `undefined` | The content of the menu item |+| `icon` | `JSX.Element` | No | `undefined` | The icon used in the menu item || `shortcut` | `string` | No | | The keyboard shortcut (label-only, does not affect behavior) |-| `className` | `string` | No | | The class names to be added to the menu item |-| `style` | `React.CSSProperties` | No | | The inline styles to be added to the menu item |-| `ariaLabel` | `string` | | No | The `aria-label` to be added to the item for accessibility |-| `dataTestId` | `string` | | No | The `data-testid` to be added to the item. |**MainMenu.ItemLink**@@ -510,14 +506,10 @@ const App = () => (| Prop | Type | Required | Default | Description || --- | --- | --- | --- | --- |-| `href` | `string` | Yes | | The `href` attribute to be added to the `anchor` element. |-| `children` | `React.ReactNode` | Yes | | The content of the menu item |-| `icon` | `JSX.Element` | No | | The icon used in the menu item |+| `href` | `string` | Yes | `undefined` | The `href` attribute to be added to the `anchor` element. |+| `children` | `React.ReactNode` | Yes | `undefined` | The content of the menu item |+| `icon` | `JSX.Element` | No | `undefined` | The icon used in the menu item || `shortcut` | `string` | No | | The keyboard shortcut (label-only, does not affect behavior) |-| `className` | `string` | No | "" | The class names to be added to the menu item |-| `style` | `React.CSSProperties` | No | | The inline styles to be added to the menu item |-| `ariaLabel` | `string` | No | | The `aria-label` to be added to the item for accessibility |-| `dataTestId` | `string` | No | | The `data-testid` to be added to the item. |**MainMenu.ItemCustom**@@ -547,9 +539,6 @@ const App = () => (| Prop | Type | Required | Default | Description || --- | --- | --- | --- | --- || `children` | `React.ReactNode` | Yes | `undefined` | The content of the menu item |-| `className` | `string` | No | "" | The class names to be added to the menu item |-| `style` | `React.CSSProperties` | No | `undefined` | The inline styles to be added to the menu item |-| `dataTestId` | `string` | No | `undefined` | The `data-testid` to be added to the item. |**MainMenu.DefaultItems**@@ -595,10 +584,7 @@ const App = () => (| Prop | Type | Required | Default | Description || --- | --- | --- | --- | --- |-| `children ` | `React.ReactNode` | Yes | `undefined` | The content of the `MenuItem Group` |-| `title` | `string` | No | `undefined` | The `title` for the grouped items |-| `className` | `string` | No | "" | The `classname` to be added to the group |-| `style` | `React.CSsSProperties` | No | `undefined` | The inline `styles` to be added to the group |+| `children ` | `React.ReactNode` | Yes | `undefined` | The content of the `MainMenu.Group` |### WelcomeScreendiff --git a/src/packages/excalidraw/index.tsx b/src/packages/excalidraw/index.tsxindex 9be20a99c9..d56bffb625 100644--- a/src/packages/excalidraw/index.tsx+++ b/src/packages/excalidraw/index.tsx@@ -12,7 +12,7 @@ import { DEFAULT_UI_OPTIONS } from "../../constants";import { Provider } from "jotai";import { jotaiScope, jotaiStore } from "../../jotai";import Footer from "../../components/footer/FooterCenter";-import MainMenu from "../../components/mainMenu/MainMenu";+import MainMenu from "../../components/main-menu/MainMenu";import WelcomeScreen from "../../components/welcome-screen/WelcomeScreen";const ExcalidrawBase = (props: ExcalidrawProps) => {