开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
refactor: dropdown-menu to menu
pubuzhixing8fee7fcc01e9e
diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenu.tsx b/packages/drawnix/src/components/dropdown-menu/DropdownMenu.tsxdeleted file mode 100644index 5052e0d..0000000--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenu.tsx+++ /dev/null@@ -1,44 +0,0 @@-// Credits to excalidraw-import React from 'react';-import DropdownMenuTrigger from './DropdownMenuTrigger';-import DropdownMenuItem from './DropdownMenuItem';-import MenuSeparator from './DropdownMenuSeparator';-import DropdownMenuGroup from './DropdownMenuGroup';-import DropdownMenuContent from './DropdownMenuContent';-import DropdownMenuItemLink from './DropdownMenuItemLink';-import DropdownMenuItemCustom from './DropdownMenuItemCustom';-import {- getMenuContentComponent,- getMenuTriggerComponent,-} from './dropdownMenuUtils';--import './dropdown-menu.scss';--const DropdownMenu = ({- children,- open,-}: {- children?: React.ReactNode;- open: boolean;-}) => {- const MenuTriggerComp = getMenuTriggerComponent(children);- const MenuContentComp = getMenuContentComponent(children);- return (- <>- {MenuTriggerComp}- {open && MenuContentComp}- </>- );-};--DropdownMenu.Trigger = DropdownMenuTrigger;-DropdownMenu.Content = DropdownMenuContent;-DropdownMenu.Item = DropdownMenuItem;-DropdownMenu.ItemLink = DropdownMenuItemLink;-DropdownMenu.ItemCustom = DropdownMenuItemCustom;-DropdownMenu.Group = DropdownMenuGroup;-DropdownMenu.Separator = MenuSeparator;--export default DropdownMenu;--DropdownMenu.displayName = 'DropdownMenu';diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuContent.tsx b/packages/drawnix/src/components/dropdown-menu/DropdownMenuContent.tsxdeleted file mode 100644index f1c063b..0000000--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuContent.tsx+++ /dev/null@@ -1,79 +0,0 @@-import { Island } from '../island';-import React, { useEffect, useRef } from 'react';-import { DropdownMenuContentPropsContext } from './common';-import { useOutsideClick } from '../../hooks/use-outside-click';-import { EVENT } from '../../constants';-import { useStable } from '../../hooks/use-stable';-import classNames from 'classnames';-import { KEYS } from '../../keys';--const MenuContent = ({- children,- onClickOutside,- className = '',- onSelect,- style,-}: {- children?: React.ReactNode;- onClickOutside?: () => void;- className?: string;- /**- * Called when any menu item is selected (clicked on).- */- onSelect?: (event: Event) => void;- style?: React.CSSProperties;-}) => {- const menuRef = useRef<HTMLDivElement>(null);-- const callbacksRef = useStable({ onClickOutside });-- useOutsideClick(menuRef, () => {- callbacksRef.onClickOutside?.();- });-- useEffect(() => {- const onKeyDown = (event: KeyboardEvent) => {- if (event.key === KEYS.ESCAPE) {- event.stopImmediatePropagation();- callbacksRef.onClickOutside?.();- }- };-- const option = {- // so that we can stop propagation of the event before it reaches- // event handlers that were bound before this one- capture: true,- };-- document.addEventListener(EVENT.KEYDOWN, onKeyDown, option);- return () => {- document.removeEventListener(EVENT.KEYDOWN, onKeyDown, option);- };- }, [callbacksRef]);-- const newClassName = classNames(`dropdown-menu ${className}`).trim();-- return (- <DropdownMenuContentPropsContext.Provider value={{ onSelect }}>- <div- ref={menuRef}- className={newClassName}- style={style}- data-testid="dropdown-menu"- >- {- <Island- className="dropdown-menu-container"- padding={2}- style={{ zIndex: 2 }}- >- {children}- </Island>- }- </div>- </DropdownMenuContentPropsContext.Provider>- );-};-MenuContent.displayName = 'DropdownMenuContent';--export default MenuContent;diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuTrigger.tsx b/packages/drawnix/src/components/dropdown-menu/DropdownMenuTrigger.tsxdeleted file mode 100644index 1a8423b..0000000--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuTrigger.tsx+++ /dev/null@@ -1,34 +0,0 @@-import classNames from 'classnames';--const MenuTrigger = ({- className = '',- children,- onToggle,- title,- ...rest-}: {- className?: string;- children: React.ReactNode;- onToggle: () => void;- title?: string;-} & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'onSelect'>) => {- return (- <button- data-prevent-outside-click- className={classNames(- `dropdown-menu-button ${className}`,- 'zen-mode-transition'- ).trim()}- onClick={onToggle}- type="button"- data-testid="dropdown-menu-button"- title={title}- {...rest}- >- {children}- </button>- );-};--export default MenuTrigger;-MenuTrigger.displayName = 'DropdownMenuTrigger';diff --git a/packages/drawnix/src/components/dropdown-menu/common.ts b/packages/drawnix/src/components/dropdown-menu/common.tsdeleted file mode 100644index 237a753..0000000--- a/packages/drawnix/src/components/dropdown-menu/common.ts+++ /dev/null@@ -1,36 +0,0 @@-import React, { useContext } from "react";-import { EVENT } from "../../constants";-import { composeEventHandlers } from "../../utils/common";--export const DropdownMenuContentPropsContext = React.createContext<{- onSelect?: (event: Event) => void;-}>({});--export const getDropdownMenuItemClassName = (- className = "",- selected = false,-) => {- return `dropdown-menu-item dropdown-menu-item-base ${className} ${- selected ? "dropdown-menu-item--selected" : ""- }`.trim();-};--export const useHandleDropdownMenuItemClick = (- origOnClick:- | React.MouseEventHandler<HTMLAnchorElement | HTMLButtonElement>- | undefined,- onSelect: ((event: Event) => void) | undefined,-) => {- const DropdownMenuContentProps = useContext(DropdownMenuContentPropsContext);-- return composeEventHandlers(origOnClick, (event) => {- const itemSelectEvent = new CustomEvent(EVENT.MENU_ITEM_SELECT, {- bubbles: true,- cancelable: true,- });- onSelect?.(itemSelectEvent);- if (!itemSelectEvent.defaultPrevented) {- DropdownMenuContentProps.onSelect?.(itemSelectEvent);- }- });-};diff --git a/packages/drawnix/src/components/dropdown-menu/dropdownMenuUtils.ts b/packages/drawnix/src/components/dropdown-menu/dropdownMenuUtils.tsdeleted file mode 100644index bd44e2d..0000000--- a/packages/drawnix/src/components/dropdown-menu/dropdownMenuUtils.ts+++ /dev/null@@ -1,35 +0,0 @@-import React from 'react';--export const getMenuTriggerComponent = (children: React.ReactNode) => {- const comp = React.Children.toArray(children).find(- (child) =>- React.isValidElement(child) &&- typeof child.type !== 'string' &&- //@ts-ignore- child?.type.displayName &&- //@ts-ignore- child.type.displayName === 'DropdownMenuTrigger'- );- if (!comp) {- return null;- }- //@ts-ignore- return comp;-};--export const getMenuContentComponent = (children: React.ReactNode) => {- const comp = React.Children.toArray(children).find(- (child) =>- React.isValidElement(child) &&- typeof child.type !== 'string' &&- //@ts-ignore- child?.type.displayName &&- //@ts-ignore- child.type.displayName === 'DropdownMenuContent'- );- if (!comp) {- return null;- }- //@ts-ignore- return comp;-};diff --git a/packages/drawnix/src/components/main-menu/default-items.scss b/packages/drawnix/src/components/main-menu/default-items.scssdeleted file mode 100644index f2ff66b..0000000--- a/packages/drawnix/src/components/main-menu/default-items.scss+++ /dev/null@@ -1,21 +0,0 @@-.drawnix {- .ActiveFile {- .ActiveFile__fileName {- display: flex;- align-items: center;-- span {- text-overflow: ellipsis;- overflow: hidden;- white-space: nowrap;- width: 9.3em;- }-- svg {- width: 1.15em;- margin-inline-end: 0.3em;- transform: scaleY(0.9);- }- }- }-}diff --git a/packages/drawnix/src/components/main-menu/main-menu.tsx b/packages/drawnix/src/components/main-menu/main-menu.tsxdeleted file mode 100644index 5c4a013..0000000--- a/packages/drawnix/src/components/main-menu/main-menu.tsx+++ /dev/null@@ -1,49 +0,0 @@-import React, { useState } from 'react';-import classNames from 'classnames';-import { ATTACHED_ELEMENT_CLASS_NAME } from '@plait/core';-import DropdownMenu from '../dropdown-menu/DropdownMenu';-import { MenuIcon } from '../icons';-import { composeEventHandlers } from '../../utils/common';-import { OpenFile, SaveAsImage, SaveToFile, Socials } from './default-items';-import { Island } from '../island';--type MainMenuProps = {- children?: React.ReactNode;- /**- * Called when any menu item is selected (clicked on).- */- onSelect?: (event: Event) => void;-};--export const MainMenu: React.FC<MainMenuProps> = ({ onSelect, children }) => {- const [mainMenuOpen, setMainMenuOpen] = useState(false);- return (- <Island className={classNames('main-menu', ATTACHED_ELEMENT_CLASS_NAME)}>- <DropdownMenu open={mainMenuOpen}>- <DropdownMenu.Trigger- onToggle={() => {- setMainMenuOpen(!mainMenuOpen);- }}- data-testid="main-menu-trigger"- className={classNames("main-menu-trigger", { 'active': mainMenuOpen })}- >- {MenuIcon}- </DropdownMenu.Trigger>- <DropdownMenu.Content- onClickOutside={() => {- setMainMenuOpen(false);- }}- onSelect={composeEventHandlers(onSelect, () => {- setMainMenuOpen(false);- })}- >- <OpenFile></OpenFile>- <SaveToFile></SaveToFile>- <SaveAsImage></SaveAsImage>- <DropdownMenu.Separator />- <Socials />- </DropdownMenu.Content>- </DropdownMenu>- </Island>- );-};diff --git a/packages/drawnix/src/components/menu/common.ts b/packages/drawnix/src/components/menu/common.tsnew file mode 100644index 0000000..128a931--- /dev/null+++ b/packages/drawnix/src/components/menu/common.ts@@ -0,0 +1,36 @@+import React, { useContext } from 'react';+import { EVENT } from '../../constants';+import { composeEventHandlers } from '../../utils/common';++export const MenuContentPropsContext = React.createContext<{+ onSelect?: (event: Event) => void;+}>({});++export const getMenuItemClassName = (+ className = '',+ selected = false+) => {+ return `menu-item menu-item-base ${className} ${+ selected ? 'menu-item--selected' : ''+ }`.trim();+};++export const useHandleMenuItemClick = (+ origOnClick:+ | React.MouseEventHandler<HTMLAnchorElement | HTMLButtonElement>+ | undefined,+ onSelect: ((event: Event) => void) | undefined+) => {+ const MenuContentProps = useContext(MenuContentPropsContext);++ return composeEventHandlers(origOnClick, (event) => {+ const itemSelectEvent = new CustomEvent(EVENT.MENU_ITEM_SELECT, {+ bubbles: true,+ cancelable: true,+ });+ onSelect?.(itemSelectEvent);+ if (!itemSelectEvent.defaultPrevented) {+ MenuContentProps.onSelect?.(itemSelectEvent);+ }+ });+};diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuGroup.tsx b/packages/drawnix/src/components/menu/menu-group.tsxsimilarity index 60%rename from packages/drawnix/src/components/dropdown-menu/DropdownMenuGroup.tsxrename to packages/drawnix/src/components/menu/menu-group.tsxindex a96061e..cf2f93b 100644--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuGroup.tsx+++ b/packages/drawnix/src/components/menu/menu-group.tsx@@ -12,12 +12,12 @@ const MenuGroup = ({title?: string;}) => {return (- <div className={`dropdown-menu-group ${className}`} style={style}>- {title && <p className="dropdown-menu-group-title">{title}</p>}+ <div className={`menu-group ${className}`} style={style}>+ {title && <p className="menu-group-title">{title}</p>}{children}</div>);};export default MenuGroup;-MenuGroup.displayName = 'DropdownMenuGroup';+MenuGroup.displayName = 'MenuGroup';diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItemContentRadio.tsx b/packages/drawnix/src/components/menu/menu-item-content-radio.tsxsimilarity index 61%rename from packages/drawnix/src/components/dropdown-menu/DropdownMenuItemContentRadio.tsxrename to packages/drawnix/src/components/menu/menu-item-content-radio.tsxindex 124933b..5dcd077 100644--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItemContentRadio.tsx+++ b/packages/drawnix/src/components/menu/menu-item-content-radio.tsx@@ -13,7 +13,7 @@ type Props<T> = {name: string;};-const DropdownMenuItemContentRadio = <T,>({+const MenuItemContentRadio = <T,>({value,shortcut,onChange,@@ -23,8 +23,8 @@ const DropdownMenuItemContentRadio = <T,>({}: Props<T>) => {return (<>- <div className="dropdown-menu-item-base dropdown-menu-item-bare">- <label className="dropdown-menu-item__text" htmlFor={name}>+ <div className="menu-item-base menu-item-bare">+ <label className="menu-item__text" htmlFor={name}>{children}</label><RadioGroup@@ -35,7 +35,7 @@ const DropdownMenuItemContentRadio = <T,>({/></div>{shortcut && (- <div className="dropdown-menu-item__shortcut dropdown-menu-item__shortcut--orphaned">+ <div className="menu-item__shortcut menu-item__shortcut--orphaned">{shortcut}</div>)}@@ -43,6 +43,6 @@ const DropdownMenuItemContentRadio = <T,>({);};-DropdownMenuItemContentRadio.displayName = 'DropdownMenuItemContentRadio';+MenuItemContentRadio.displayName = 'MenuItemContentRadio';-export default DropdownMenuItemContentRadio;+export default MenuItemContentRadio;diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItemContent.tsx b/packages/drawnix/src/components/menu/menu-item-content.tsxsimilarity index 56%rename from packages/drawnix/src/components/dropdown-menu/DropdownMenuItemContent.tsxrename to packages/drawnix/src/components/menu/menu-item-content.tsxindex 3c829a9..84760d8 100644--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItemContent.tsx+++ b/packages/drawnix/src/components/menu/menu-item-content.tsx@@ -11,10 +11,10 @@ const MenuItemContent = ({}) => {return (<>- {icon && <div className="dropdown-menu-item__icon">{icon}</div>}- <div className="dropdown-menu-item__text">{children}</div>+ {icon && <div className="menu-item__icon">{icon}</div>}+ <div className="menu-item__text">{children}</div>{shortcut && (- <div className="dropdown-menu-item__shortcut">{shortcut}</div>+ <div className="menu-item__shortcut">{shortcut}</div>)}</>);diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItemCustom.tsx b/packages/drawnix/src/components/menu/menu-item-custom.tsxsimilarity index 58%rename from packages/drawnix/src/components/dropdown-menu/DropdownMenuItemCustom.tsxrename to packages/drawnix/src/components/menu/menu-item-custom.tsxindex bcbec11..4c54906 100644--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItemCustom.tsx+++ b/packages/drawnix/src/components/menu/menu-item-custom.tsx@@ -1,6 +1,6 @@import React from 'react';-const DropdownMenuItemCustom = ({+const MenuItemCustom = ({children,className = '',selected,@@ -13,8 +13,8 @@ const DropdownMenuItemCustom = ({return (<div{...rest}- className={`dropdown-menu-item-base dropdown-menu-item-custom ${className} ${- selected ? `dropdown-menu-item--selected` : ``+ className={`menu-item-base menu-item-custom ${className} ${+ selected ? `menu-item--selected` : ``}`.trim()}>{children}@@ -22,4 +22,4 @@ const DropdownMenuItemCustom = ({);};-export default DropdownMenuItemCustom;+export default MenuItemCustom;diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItemLink.tsx b/packages/drawnix/src/components/menu/menu-item-link.tsxsimilarity index 60%rename from packages/drawnix/src/components/dropdown-menu/DropdownMenuItemLink.tsxrename to packages/drawnix/src/components/menu/menu-item-link.tsxindex e944f5d..a5cb324 100644--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItemLink.tsx+++ b/packages/drawnix/src/components/menu/menu-item-link.tsx@@ -1,11 +1,8 @@-import MenuItemContent from './DropdownMenuItemContent';import React from 'react';-import {- getDropdownMenuItemClassName,- useHandleDropdownMenuItemClick,-} from './common';+import { getMenuItemClassName, useHandleMenuItemClick } from './common';+import MenuItemContent from './menu-item-content';-const DropdownMenuItemLink = ({+const MenuItemLink = ({icon,shortcut,href,@@ -23,7 +20,7 @@ const DropdownMenuItemLink = ({selected?: boolean;onSelect?: (event: Event) => void;} & React.AnchorHTMLAttributes<HTMLAnchorElement>) => {- const handleClick = useHandleDropdownMenuItemClick(rest.onClick, onSelect);+ const handleClick = useHandleMenuItemClick(rest.onClick, onSelect);return (<a@@ -31,7 +28,7 @@ const DropdownMenuItemLink = ({href={href}target="_blank"rel="noreferrer"- className={getDropdownMenuItemClassName(className, selected)}+ className={getMenuItemClassName(className, selected)}title={rest.title ?? rest['aria-label']}onClick={handleClick}>@@ -42,5 +39,5 @@ const DropdownMenuItemLink = ({);};-export default DropdownMenuItemLink;-DropdownMenuItemLink.displayName = 'DropdownMenuItemLink';+export default MenuItemLink;+MenuItemLink.displayName = 'MenuItemLink';diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItem.tsx b/packages/drawnix/src/components/menu/menu-item.tsxsimilarity index 68%rename from packages/drawnix/src/components/dropdown-menu/DropdownMenuItem.tsxrename to packages/drawnix/src/components/menu/menu-item.tsxindex 6927843..cdfbec7 100644--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuItem.tsx+++ b/packages/drawnix/src/components/menu/menu-item.tsx@@ -1,11 +1,11 @@import React from 'react';import {- getDropdownMenuItemClassName,- useHandleDropdownMenuItemClick,+ getMenuItemClassName,+ useHandleMenuItemClick,} from './common';-import MenuItemContent from './DropdownMenuItemContent';+import MenuItemContent from './menu-item-content';-const DropdownMenuItem = ({+const MenuItem = ({icon,onSelect,children,@@ -21,14 +21,14 @@ const DropdownMenuItem = ({selected?: boolean;className?: string;} & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'onSelect'>) => {- const handleClick = useHandleDropdownMenuItemClick(rest.onClick, onSelect);+ const handleClick = useHandleMenuItemClick(rest.onClick, onSelect);return (<button{...rest}onClick={handleClick}type="button"- className={getDropdownMenuItemClassName(className, selected)}+ className={getMenuItemClassName(className, selected)}title={rest.title ?? rest['aria-label']}><MenuItemContent icon={icon} shortcut={shortcut}>@@ -37,7 +37,7 @@ const DropdownMenuItem = ({</button>);};-DropdownMenuItem.displayName = 'DropdownMenuItem';+MenuItem.displayName = 'MenuItem';export const DropDownMenuItemBadge = ({children,@@ -61,8 +61,8 @@ export const DropDownMenuItemBadge = ({</div>);};-DropDownMenuItemBadge.displayName = 'DropdownMenuItemBadge';+DropDownMenuItemBadge.displayName = 'MenuItemBadge';-DropdownMenuItem.Badge = DropDownMenuItemBadge;+MenuItem.Badge = DropDownMenuItemBadge;-export default DropdownMenuItem;+export default MenuItem;diff --git a/packages/drawnix/src/components/dropdown-menu/DropdownMenuSeparator.tsx b/packages/drawnix/src/components/menu/menu-separator.tsxsimilarity index 78%rename from packages/drawnix/src/components/dropdown-menu/DropdownMenuSeparator.tsxrename to packages/drawnix/src/components/menu/menu-separator.tsxindex 788e5ed..d8d1aa8 100644--- a/packages/drawnix/src/components/dropdown-menu/DropdownMenuSeparator.tsx+++ b/packages/drawnix/src/components/menu/menu-separator.tsx@@ -9,4 +9,4 @@ const MenuSeparator = () => ();export default MenuSeparator;-MenuSeparator.displayName = 'DropdownMenuSeparator';+MenuSeparator.displayName = 'MenuSeparator';diff --git a/packages/drawnix/src/components/dropdown-menu/dropdown-menu.scss b/packages/drawnix/src/components/menu/menu.scsssimilarity index 89%rename from packages/drawnix/src/components/dropdown-menu/dropdown-menu.scssrename to packages/drawnix/src/components/menu/menu.scssindex 577cfb1..cfdc36c 100644--- a/packages/drawnix/src/components/dropdown-menu/dropdown-menu.scss+++ b/packages/drawnix/src/components/menu/menu.scss@@ -1,18 +1,13 @@@import "../../styles/variables.module.scss";.drawnix {- .dropdown-menu {- position: absolute;- top: 100%;- margin-top: 0.25rem;- }- .dropdown-menu, .menu {+ .menu {&--mobile {left: 0;width: 100%;row-gap: 0.75rem;- .dropdown-menu-container {+ .menu-container {padding: 8px 8px;box-sizing: border-box;box-shadow: var(--shadow-island);@@ -26,14 +21,14 @@}}- .dropdown-menu-container {+ .menu-container {background-color: var(--island-bg-color);max-height: calc(100vh - 150px);overflow-y: auto;--gap: 2;}- .dropdown-menu-item-base {+ .menu-item-base {display: flex;padding: 0 0.625rem;column-gap: 0.625rem;@@ -45,7 +40,7 @@font-family: inherit;}- .dropdown-menu-item {+ .menu-item {background-color: transparent;border: 1px solid transparent;align-items: center;@@ -100,7 +95,7 @@}}- .dropdown-menu-item-bare {+ .menu-item-bare {align-items: center;height: 2rem;justify-content: space-between;@@ -116,11 +111,11 @@}}- .dropdown-menu-item-custom {+ .menu-item-custom {margin-top: 0.5rem;}- .dropdown-menu-group-title {+ .menu-group-title {font-size: 14px;text-align: left;margin: 10px 0;@@ -128,7 +123,7 @@}}- .dropdown-menu-button {+ .menu-button {@include outlineButtonStyles;width: var(--lg-button-size);height: var(--lg-button-size);diff --git a/packages/drawnix/src/components/menu/menu.tsx b/packages/drawnix/src/components/menu/menu.tsxnew file mode 100644index 0000000..c2c14d4--- /dev/null+++ b/packages/drawnix/src/components/menu/menu.tsx@@ -0,0 +1,37 @@+import { Island } from '../island';+import React from 'react';+import { MenuContentPropsContext } from './common';+import classNames from 'classnames';+import './menu.scss';++const Menu = ({+ children,+ className = '',+ onSelect,+ style,+}: {+ children?: React.ReactNode;+ className?: string;+ /**+ * Called when any menu item is selected (clicked on).+ */+ onSelect?: (event: Event) => void;+ style?: React.CSSProperties;+}) => {+ const newClassName = classNames(`menu ${className}`).trim();++ return (+ <MenuContentPropsContext.Provider value={{ onSelect }}>+ <div className={newClassName} style={style} data-testid="menu">+ {+ <Island className="menu-container" padding={2}>+ {children}+ </Island>+ }+ </div>+ </MenuContentPropsContext.Provider>+ );+};+Menu.displayName = 'Menu';++export default Menu;diff --git a/packages/drawnix/src/components/popover/popover.tsx b/packages/drawnix/src/components/popover/popover.tsxindex 32ea326..ccc7023 100644--- a/packages/drawnix/src/components/popover/popover.tsx+++ b/packages/drawnix/src/components/popover/popover.tsx@@ -13,7 +13,6 @@ import {Placement,FloatingPortal,FloatingFocusManager,- useId,} from '@floating-ui/react';interface PopoverOptions {diff --git a/packages/drawnix/src/components/main-menu/default-items.tsx b/packages/drawnix/src/components/toolbar/app-toolbar/app-menu-items.tsxsimilarity index 78%rename from packages/drawnix/src/components/main-menu/default-items.tsxrename to packages/drawnix/src/components/toolbar/app-toolbar/app-menu-items.tsxindex d6f4fa0..b2efddd 100644--- a/packages/drawnix/src/components/main-menu/default-items.tsx+++ b/packages/drawnix/src/components/toolbar/app-toolbar/app-menu-items.tsx@@ -3,38 +3,33 @@ import {GithubIcon,OpenFileIcon,SaveFileIcon,-} from '../icons';-import DropdownMenuItem from '../dropdown-menu/DropdownMenuItem';-import DropdownMenuItemLink from '../dropdown-menu/DropdownMenuItemLink';--import './default-items.scss';+} from '../../icons';import { useBoard, useListRender } from '@plait/react-board';import {BoardTransforms,getSelectedElements,- initializeViewBox,- initializeViewportContainer,PlaitBoard,PlaitElement,PlaitTheme,ThemeColorMode,- updateViewportOffset,Viewport,} from '@plait/core';-import { base64ToBlob, boardToImage, download } from '../../utils/common';-import { loadFromJSON, saveAsJSON } from '../../data/json';+import { base64ToBlob, boardToImage, download } from '../../../utils/common';+import { loadFromJSON, saveAsJSON } from '../../../data/json';+import MenuItem from '../../menu/menu-item';+import MenuItemLink from '../../menu/menu-item-link';export const SaveToFile = () => {const board = useBoard();return (- <DropdownMenuItem+ <MenuItemdata-testid="save-button"onSelect={() => {saveAsJSON(board);}}icon={SaveFileIcon}aria-label={`${`保存文件`}`}- >{`保存文件`}</DropdownMenuItem>+ >{`保存文件`}</MenuItem>);};SaveToFile.displayName = 'SaveToFile';@@ -58,7 +53,7 @@ export const OpenFile = () => {BoardTransforms.fitViewport(board);};return (- <DropdownMenuItem+ <MenuItemdata-testid="open-button"onSelect={() => {loadFromJSON(board).then((data) => {@@ -67,7 +62,7 @@ export const OpenFile = () => {}}icon={OpenFileIcon}aria-label={`${`打开`}`}- >{`打开`}</DropdownMenuItem>+ >{`打开`}</MenuItem>);};OpenFile.displayName = 'OpenFile';@@ -75,7 +70,7 @@ OpenFile.displayName = 'OpenFile';export const SaveAsImage = () => {const board = useBoard();return (- <DropdownMenuItem+ <MenuItemicon={ExportImageIcon}data-testid="image-export-button"onSelect={() => {@@ -94,7 +89,7 @@ export const SaveAsImage = () => {aria-label={''}>{'导出图片'}- </DropdownMenuItem>+ </MenuItem>);};SaveAsImage.displayName = 'SaveAsImage';@@ -102,13 +97,13 @@ SaveAsImage.displayName = 'SaveAsImage';export const Socials = () => {return (<>- <DropdownMenuItemLink+ <MenuItemLinkicon={GithubIcon}href="https://github.com/plait-board/drawnix"aria-label="GitHub">GitHub- </DropdownMenuItemLink>+ </MenuItemLink></>);};diff --git a/packages/drawnix/src/components/toolbar/app-toolbar/app-toolbar.tsx b/packages/drawnix/src/components/toolbar/app-toolbar/app-toolbar.tsxnew file mode 100644index 0000000..a71a9b0--- /dev/null+++ b/packages/drawnix/src/components/toolbar/app-toolbar/app-toolbar.tsx@@ -0,0 +1,62 @@+import { useBoard } from '@plait/react-board';+import Stack from '../../stack';+import { ToolButton } from '../../tool-button';+import { MenuIcon } from '../../icons';+import classNames from 'classnames';+import { ATTACHED_ELEMENT_CLASS_NAME, PlaitBoard } from '@plait/core';+import { Island } from '../../island';+import { Popover, PopoverContent, PopoverTrigger } from '../../popover/popover';+import { useState } from 'react';+import { OpenFile, SaveAsImage, SaveToFile, Socials } from './app-menu-items';+import Menu from '../../menu/menu';+import MenuSeparator from '../../menu/menu-separator';++export const AppToolbar: React.FC<{}> = () => {+ const board = useBoard();+ const container = PlaitBoard.getBoardContainer(board);+ const [appMenuOpen, setAppMenuOpen] = useState(false);+ return (+ <Island+ padding={1}+ className={classNames('app-toolbar', ATTACHED_ELEMENT_CLASS_NAME)}+ >+ <Stack.Row>+ <Popover+ sideOffset={12}+ open={appMenuOpen}+ onOpenChange={(open) => {+ setAppMenuOpen(open);+ }}+ placement="bottom-start"+ >+ <PopoverTrigger asChild>+ <ToolButton+ type="icon"+ visible={true}+ selected={appMenuOpen}+ icon={MenuIcon}+ title={`App Menu`}+ aria-label={`App Menu`}+ onPointerDown={() => {+ setAppMenuOpen(!appMenuOpen);+ }}+ />+ </PopoverTrigger>+ <PopoverContent container={container}>+ <Menu+ onSelect={() => {+ setAppMenuOpen(false);+ }}+ >+ <OpenFile></OpenFile>+ <SaveToFile></SaveToFile>+ <SaveAsImage></SaveAsImage>+ <MenuSeparator />+ <Socials />+ </Menu>+ </PopoverContent>+ </Popover>+ </Stack.Row>+ </Island>+ );+};diff --git a/packages/drawnix/src/components/toolbar/zoom-toolbar.tsx b/packages/drawnix/src/components/toolbar/zoom-toolbar.tsxindex 8b1f12d..ad901f1 100644--- a/packages/drawnix/src/components/toolbar/zoom-toolbar.tsx+++ b/packages/drawnix/src/components/toolbar/zoom-toolbar.tsx@@ -10,8 +10,9 @@ import {} from '@plait/core';import { Island } from '../island';import { Popover, PopoverContent, PopoverTrigger } from '../popover/popover';-import DropdownMenuItem from '../dropdown-menu/DropdownMenuItem';import { useState } from 'react';+import Menu from '../menu/menu';+import MenuItem from '../menu/menu-item';export const ZoomToolbar: React.FC<{}> = () => {const board = useBoard();@@ -22,7 +23,7 @@ export const ZoomToolbar: React.FC<{}> = () => {padding={1}className={classNames('zoom-toolbar', ATTACHED_ELEMENT_CLASS_NAME)}>- <Stack.Row>+ <Stack.Row gap={1}><ToolButtonkey={0}type="button"@@ -60,30 +61,28 @@ export const ZoomToolbar: React.FC<{}> = () => {</div></PopoverTrigger><PopoverContent container={container}>- <Island- className="menu dropdown-menu-container custom-zoom-menu"- padding={2}- style={{ zIndex: 2, with: '160px' }}+ <Menu+ onSelect={() => {+ setZoomMenuOpen(false);+ }}>- <DropdownMenuItem+ <MenuItemdata-testid="open-button"onSelect={() => {BoardTransforms.fitViewport(board);- setZoomMenuOpen(false);}}aria-label={`${`自适应缩放`}`}shortcut={`Cmd+Shift+=`}- >{`自适应缩放`}</DropdownMenuItem>- <DropdownMenuItem+ >{`自适应缩放`}</MenuItem>+ <MenuItemdata-testid="open-button"onSelect={() => {BoardTransforms.updateZoom(board, 1);- setZoomMenuOpen(false);}}aria-label={`${`缩放至 100%`}`}shortcut={`Cmd+0`}- >{`缩放至 100%`}</DropdownMenuItem>- </Island>+ >{`缩放至 100%`}</MenuItem>+ </Menu></PopoverContent></Popover><ToolButtondiff --git a/packages/drawnix/src/drawnix.tsx b/packages/drawnix/src/drawnix.tsxindex cc33e5b..da93218 100644--- a/packages/drawnix/src/drawnix.tsx+++ b/packages/drawnix/src/drawnix.tsx@@ -18,9 +18,10 @@ import { withCommonPlugin } from './plugins/with-common';import { CreationToolbar } from './components/toolbar/creation-toolbar';import './styles/index.scss';-import { MainMenu } from './components/main-menu/main-menu';+import { MainMenu } from './components/app-menu/main-menu';import { ZoomToolbar } from './components/toolbar/zoom-toolbar';import { PopupToolbar } from './components/toolbar/popup-toolbar/popup-toolbar';+import { AppToolbar } from './components/toolbar/app-toolbar/app-toolbar';export type DrawnixProps = {value: PlaitElement[];@@ -74,7 +75,7 @@ export const Drawnix: React.FC<DrawnixProps> = ({}}><Board></Board>- <MainMenu></MainMenu>+ <AppToolbar></AppToolbar><CreationToolbarsetPointer={(pointer: DrawnixPointerType) => {setAppState({ pointer });diff --git a/packages/drawnix/src/styles/index.scss b/packages/drawnix/src/styles/index.scssindex 987c29f..244fe7e 100644--- a/packages/drawnix/src/styles/index.scss+++ b/packages/drawnix/src/styles/index.scss@@ -12,12 +12,6 @@left: 50%;transform: translateX(-50%);}- .main-menu {- position: absolute;- top: 40px;- left: 36px;- border-radius: var(--border-radius-lg);- }.zoom-toolbar {cursor: default;position: absolute;@@ -48,6 +42,11 @@border-bottom-left-radius: 0 !important;}}+ .app-toolbar {+ position: absolute;+ top: 40px;+ left: 36px;+ }.drawnix-link, a {font-weight: 500;