Skip to content

开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.

feat: support sub menu and export jpg (#132)

pubuzhixing8adc32e5a896a
diff --git a/packages/drawnix/src/components/menu/common.ts b/packages/drawnix/src/components/menu/common.ts
index 128a931..9b09e33 100644
--- a/packages/drawnix/src/components/menu/common.ts
+++ b/packages/drawnix/src/components/menu/common.ts
@@ -8,10 +8,10 @@ export const MenuContentPropsContext = React.createContext<{
export const getMenuItemClassName = (
className = '',
- selected = false
+ active = false,
) => {
return `menu-item menu-item-base ${className} ${
- selected ? 'menu-item--selected' : ''
+ active ? 'menu-item--active' : ''
}`.trim();
};
@@ -21,7 +21,7 @@ export const useHandleMenuItemClick = (
| undefined,
onSelect: ((event: Event) => void) | undefined
) => {
- const MenuContentProps = useContext(MenuContentPropsContext);
+ const menuContentProps = useContext(MenuContentPropsContext);
return composeEventHandlers(origOnClick, (event) => {
const itemSelectEvent = new CustomEvent(EVENT.MENU_ITEM_SELECT, {
@@ -30,7 +30,7 @@ export const useHandleMenuItemClick = (
});
onSelect?.(itemSelectEvent);
if (!itemSelectEvent.defaultPrevented) {
- MenuContentProps.onSelect?.(itemSelectEvent);
+ menuContentProps.onSelect?.(itemSelectEvent);
}
});
};
diff --git a/packages/drawnix/src/components/menu/menu-item.tsx b/packages/drawnix/src/components/menu/menu-item.tsx
index cdfbec7..52e81a3 100644
--- a/packages/drawnix/src/components/menu/menu-item.tsx
+++ b/packages/drawnix/src/components/menu/menu-item.tsx
@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { useState, useRef } from 'react';
import {
getMenuItemClassName,
useHandleMenuItemClick,
} from './common';
import MenuItemContent from './menu-item-content';
+import { Popover, PopoverContent, PopoverTrigger } from '../popover/popover';
const MenuItem = ({
icon,
@@ -12,6 +13,7 @@ const MenuItem = ({
shortcut,
className,
selected,
+ submenu,
...rest
}: {
icon?: React.ReactNode;
@@ -20,8 +22,57 @@ const MenuItem = ({
shortcut?: string;
selected?: boolean;
className?: string;
+ submenu?: React.ReactNode;
} & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'onSelect'>) => {
+ const [isOpen, setIsOpen] = useState(false);
+ const closeTimeoutRef = useRef<number>();
const handleClick = useHandleMenuItemClick(rest.onClick, onSelect);
+
+ const menuItemContent = (
+ <MenuItemContent icon={icon} shortcut={shortcut}>
+ {children}
+ </MenuItemContent>
+ );
+
+ const handleMouseEnter = () => {
+ if (closeTimeoutRef.current) {
+ window.clearTimeout(closeTimeoutRef.current);
+ }
+ setIsOpen(true);
+ };
+
+ const handleMouseLeave = () => {
+ closeTimeoutRef.current = window.setTimeout(() => {
+ setIsOpen(false);
+ }, 100);
+ };
+
+ if (submenu) {
+ return (
+ <Popover
+ open={isOpen}
+ onOpenChange={setIsOpen}
+ placement="right-start"
+ >
+ <PopoverTrigger asChild>
+ <button
+ {...rest}
+ type="button"
+ className={getMenuItemClassName(className, selected || isOpen)}
+ title={rest.title ?? rest['aria-label']}
+ onClick={handleClick}
+ onMouseEnter={handleMouseEnter}
+ onMouseLeave={handleMouseLeave}
+ >
+ {menuItemContent}
+ </button>
+ </PopoverTrigger>
+ <PopoverContent onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
+ {submenu}
+ </PopoverContent>
+ </Popover>
+ );
+ }
return (
<button
@@ -31,9 +82,7 @@ const MenuItem = ({
className={getMenuItemClassName(className, selected)}
title={rest.title ?? rest['aria-label']}
>
- <MenuItemContent icon={icon} shortcut={shortcut}>
- {children}
- </MenuItemContent>
+ {menuItemContent}
</button>
);
};
diff --git a/packages/drawnix/src/components/menu/menu.scss b/packages/drawnix/src/components/menu/menu.scss
index cfdc36c..cc199ce 100644
--- a/packages/drawnix/src/components/menu/menu.scss
+++ b/packages/drawnix/src/components/menu/menu.scss
@@ -52,9 +52,9 @@
height: 2.25rem;
}
- &--selected {
- background: var(--color-primary-light);
- --icon-fill-color: var(--color-primary-darker);
+ &--active {
+ background-color: var(--color-surface-primary-container);
+ text-decoration: none;
}
&__text {
diff --git a/packages/drawnix/src/components/toolbar/app-toolbar/app-menu-items.tsx b/packages/drawnix/src/components/toolbar/app-toolbar/app-menu-items.tsx
index 3a0d9f3..ccdcb6e 100644
--- a/packages/drawnix/src/components/toolbar/app-toolbar/app-menu-items.tsx
+++ b/packages/drawnix/src/components/toolbar/app-toolbar/app-menu-items.tsx
@@ -17,8 +17,12 @@ import {
import { loadFromJSON, saveAsJSON } from '../../../data/json';
import MenuItem from '../../menu/menu-item';
import MenuItemLink from '../../menu/menu-item-link';
-import { saveAsPNG } from '../../../utils/image';
+import { saveAsImage } from '../../../utils/image';
import { useDrawnix } from '../../../hooks/use-drawnix';
+import Menu from '../../menu/menu';
+import { useContext } from 'react';
+import { MenuContentPropsContext } from '../../menu/common';
+import { EVENT } from '../../../constants';
export const SaveToFile = () => {
const board = useBoard();
@@ -71,13 +75,40 @@ OpenFile.displayName = 'OpenFile';
export const SaveAsImage = () => {
const board = useBoard();
+ const menuContentProps = useContext(MenuContentPropsContext);
return (
<MenuItem
icon={ExportImageIcon}
data-testid="image-export-button"
onSelect={() => {
- saveAsPNG(board);
+ saveAsImage(board, true);
}}
+ submenu={
+ <Menu onSelect={() => {
+ const itemSelectEvent = new CustomEvent(EVENT.MENU_ITEM_SELECT, {
+ bubbles: true,
+ cancelable: true,
+ });
+ menuContentProps.onSelect?.(itemSelectEvent);
+ }}>
+ <MenuItem
+ onSelect={() => {
+ saveAsImage(board, true);
+ }}
+ aria-label={'透明背景'}
+ >
+ PNG
+ </MenuItem>
+ <MenuItem
+ onSelect={() => {
+ saveAsImage(board, false);
+ }}
+ aria-label={'白色背景'}
+ >
+ JPG
+ </MenuItem>
+ </Menu>
+ }
shortcut={`Cmd+Shift+E`}
aria-label={''}
>
@@ -96,8 +127,8 @@ export const CleanBoard = () => {
onSelect={() => {
setAppState({
...appState,
- openCleanConfirm: true
- })
+ openCleanConfirm: true,
+ });
}}
shortcut={`Cmd+Backspace`}
aria-label={'清除画布'}
@@ -111,12 +142,12 @@ CleanBoard.displayName = 'CleanBoard';
export const Socials = () => {
return (
<MenuItemLink
- icon={GithubIcon}
- href="https://github.com/plait-board/drawnix"
- aria-label="GitHub"
- >
- GitHub
- </MenuItemLink>
+ icon={GithubIcon}
+ href="https://github.com/plait-board/drawnix"
+ aria-label="GitHub"
+ >
+ GitHub
+ </MenuItemLink>
);
};
Socials.displayName = 'Socials';
diff --git a/packages/drawnix/src/plugins/with-hotkey.ts b/packages/drawnix/src/plugins/with-hotkey.ts
index d5e833b..4f47697 100644
--- a/packages/drawnix/src/plugins/with-hotkey.ts
+++ b/packages/drawnix/src/plugins/with-hotkey.ts
@@ -1,6 +1,6 @@
import { PlaitBoard } from '@plait/core';
import { isHotkey } from 'is-hotkey';
-import { saveAsPNG } from '../utils/image';
+import { saveAsImage } from '../utils/image';
import { saveAsJSON } from '../data/json';
import { DrawnixState } from '../hooks/use-drawnix';
@@ -16,7 +16,7 @@ export const buildDrawnixHotkeyPlugin = (
PlaitBoard.isMovingPointInBoard(board)
) {
if (isHotkey(['mod+shift+e'], { byKey: true })(event)) {
- saveAsPNG(board);
+ saveAsImage(board, true);
event.preventDefault();
return;
}
diff --git a/packages/drawnix/src/utils/image.ts b/packages/drawnix/src/utils/image.ts
index 4010b24..19954cc 100644
--- a/packages/drawnix/src/utils/image.ts
+++ b/packages/drawnix/src/utils/image.ts
@@ -1,14 +1,16 @@
import { getSelectedElements, PlaitBoard } from '@plait/core';
import { base64ToBlob, boardToImage, download } from './common';
-export const saveAsPNG = (board: PlaitBoard) => {
+export const saveAsImage = (board: PlaitBoard, isTransparent: boolean) => {
const selectedElements = getSelectedElements(board);
boardToImage(board, {
elements: selectedElements.length > 0 ? selectedElements : undefined,
+ fillStyle: isTransparent ? 'transparent' : 'white',
}).then((image) => {
if (image) {
+ const ext = isTransparent ? 'png' : 'jpg';
const pngImage = base64ToBlob(image);
- const imageName = `drawnix-${new Date().getTime()}.png`;
+ const imageName = `drawnix-${new Date().getTime()}.${ext}`;
download(pngImage, imageName);
}
});