开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
fix(board): bump plait into 0.69.1 deselect when text editing end refactor popup toolbar placement
pubuzhixing8aef6d23c41a2
diff --git a/package-lock.json b/package-lock.jsonindex 1f50d80..ef3a67a 100644--- a/package-lock.json+++ b/package-lock.json@@ -10,12 +10,12 @@"license": "MIT","dependencies": {"@floating-ui/react": "^0.26.24",- "@plait/common": "^0.69.0",- "@plait/core": "^0.69.0",- "@plait/draw": "^0.69.0",- "@plait/layouts": "^0.69.0",- "@plait/mind": "^0.69.0",- "@plait/text-plugins": "^0.69.0",+ "@plait/common": "^0.69.1",+ "@plait/core": "^0.69.1",+ "@plait/draw": "^0.69.1",+ "@plait/layouts": "^0.69.1",+ "@plait/mind": "^0.69.1",+ "@plait/text-plugins": "^0.69.1","ahooks": "^3.8.0","browser-fs-access": "^0.35.0","classnames": "^2.5.1",@@ -3901,17 +3901,17 @@}},"node_modules/@plait/common": {- "version": "0.69.0",- "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.69.0.tgz",- "integrity": "sha512-gU4157ckzT6FKEZEx/DfEiiEQeE/ifMf9Is+o+jNvhUUcL7gdUfmwGHtCIg3+TzAmoRBaCH8q/aB+biU/bl1/Q==",+ "version": "0.69.1",+ "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.69.1.tgz",+ "integrity": "sha512-c7lTI8Urr9xf6wpcnlbjK7my9yUBbkwbOgsljEfjuF+6EL7mHRVGKvadP7zx8fl8ZMd9xKZ2aKvclP31r+5hQA==","dependencies": {"tslib": "^2.3.0"}},"node_modules/@plait/core": {- "version": "0.69.0",- "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.69.0.tgz",- "integrity": "sha512-q/shATeRHh6JZcsmrD3dht7mE31sIzrJxvYhs037Hgx21ESycTS6IjKPdWAPNh/1wgdj06EDEF8EzKpMZKROBA==",+ "version": "0.69.1",+ "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.69.1.tgz",+ "integrity": "sha512-75J2MBOZw2rSrvw0KWBm42Q0K+P8e3YrvZqbzhRRb0+YCYUemMlk/d7HWCFMX4FbWbd6steA8BZMk/ql6Orc0w==","dependencies": {"tslib": "^2.3.0"},@@ -3924,33 +3924,33 @@}},"node_modules/@plait/draw": {- "version": "0.69.0",- "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.69.0.tgz",- "integrity": "sha512-zcHcxspd7PK1LT0sQAtFOwiLev4OVr2UkduNXCalgJQhkJ+1wAwB1dZlLzxKjZXPORSVBrUYM4OeYE9FeAh1Gg==",+ "version": "0.69.1",+ "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.69.1.tgz",+ "integrity": "sha512-+/nl1cTflkSZ3bqneA6nkamUAw40/jSYMdq7p0YiEr4ui3+amLmiCMIkPHFtbUcxZGDNsbJXXFk04qQ+N2u1UA==","dependencies": {"tslib": "^2.3.0"}},"node_modules/@plait/layouts": {- "version": "0.69.0",- "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.69.0.tgz",- "integrity": "sha512-C/5VwcktWx0dTSdF6WB4RKnBGcQJ+C+apRCiCX6UzXgGlvCEwAIaFVdIRf4dUPDl35erz4VU6Tmq9T3Nj9MUPQ==",+ "version": "0.69.1",+ "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.69.1.tgz",+ "integrity": "sha512-c+NK/1M60UlaOsAdY5hUiNZ5MHJsOu5Sa0PvNZG0Y+HImrJ+H3QUT9PBMn+hfUeDGt1BhWb57H8X7rqotd/wAg==","dependencies": {"tslib": "^2.3.0"}},"node_modules/@plait/mind": {- "version": "0.69.0",- "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.69.0.tgz",- "integrity": "sha512-YI9d6alZXpND+TOK8uAvJzkzA/yN2KdG3lT6+OtMSvK4O6BDJTp0LbaJcypCcHfGbxR0kYY7atGo6WcAQ02wAA==",+ "version": "0.69.1",+ "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.69.1.tgz",+ "integrity": "sha512-LmDIFkeez4H0pIwzfkEjqBZs25zHrCOvKzQI1Q5ZJiG22JGgLaKSGS4TkQ0SFSEbXhfpHj0nkeCN7FaFJ0NFuA==","dependencies": {"tslib": "^2.3.0"}},"node_modules/@plait/text-plugins": {- "version": "0.69.0",- "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.69.0.tgz",- "integrity": "sha512-Upf9elKcbs4RIgl1cWsm+kTTeJ4zTFz81VrZ7MzxyGXUvVu9wfCt+S4nwcfmBy3QzZDHuOzcWhNbWjxb4dbdyg==",+ "version": "0.69.1",+ "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.69.1.tgz",+ "integrity": "sha512-WOvokNJ8XoHXpucQlVTkjWXCQyOdqj3sOACojFoQIiLQe5bsqDj3BoBClgh5kwD3QJlvuGxAfxBvDpRRb4+Gyw==","dependencies": {"tslib": "^2.3.0"}diff --git a/package.json b/package.jsonindex 8dc691b..94bbcd8 100644--- a/package.json+++ b/package.json@@ -10,12 +10,12 @@"private": true,"dependencies": {"@floating-ui/react": "^0.26.24",- "@plait/common": "^0.69.0",- "@plait/core": "^0.69.0",- "@plait/draw": "^0.69.0",- "@plait/layouts": "^0.69.0",- "@plait/mind": "^0.69.0",- "@plait/text-plugins": "^0.69.0",+ "@plait/common": "^0.69.1",+ "@plait/core": "^0.69.1",+ "@plait/draw": "^0.69.1",+ "@plait/layouts": "^0.69.1",+ "@plait/mind": "^0.69.1",+ "@plait/text-plugins": "^0.69.1","ahooks": "^3.8.0","browser-fs-access": "^0.35.0","classnames": "^2.5.1",diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/fill-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/fill-button.tsxindex 912535a..8a5e7b4 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/fill-button.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/fill-button.tsx@@ -37,6 +37,7 @@ export const PopupFillButton: React.FC<PopupFillButtonProps> = ({onOpenChange={(open) => {setIsFillPropertyOpen(open);}}+ placement={'top'}><PopoverTrigger asChild><ToolButtondiff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/font-color-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/font-color-button.tsxindex af49eda..dee75d9 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/font-color-button.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/font-color-button.tsx@@ -32,6 +32,7 @@ export const PopupFontColorButton: React.FC<PopupFontColorButtonProps> = ({onOpenChange={(open) => {setIsFontColorPropertyOpen(open);}}+ placement={'top'}><PopoverTrigger asChild><ToolButtondiff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsxindex f6d49be..0eed4c1 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx@@ -51,7 +51,7 @@ export const PopupToolbar: React.FC<PopupToolbarProps> = ({}) => {const open = selectedElements.length > 0 && !isSelectionMoving(board);const { viewport, selection, children } = board;const { refs, floatingStyles } = useFloating({- placement: 'top',+ placement: 'right-start',middleware: [offset(32), flip()],});let state: {@@ -60,18 +60,25 @@ export const PopupToolbar: React.FC<PopupToolbarProps> = ({}) => {hasFill?: boolean;fontColor?: string;hasFontColor?: boolean;+ hasStroke?: boolean;marks?: Omit<CustomText, 'text'>;} = {fill: 'red',};if (open && !movingOrDragging) {- const hasFill = selectedElements.some((value) =>- hasFillProperty(board, value)- );+ const hasFill =+ selectedElements.some((value) => hasFillProperty(board, value)) &&+ !PlaitBoard.hasBeenTextEditing(board);const hasText = selectedElements.some((value) =>hasTextProperty(board, value));- state = { ...getElementState(board), hasFill, hasFontColor: hasText };+ const hasStroke = !PlaitBoard.hasBeenTextEditing(board);+ state = {+ ...getElementState(board),+ hasFill,+ hasFontColor: hasText,+ hasStroke,+ };}useEffect(() => {if (open) {@@ -165,38 +172,40 @@ export const PopupToolbar: React.FC<PopupToolbarProps> = ({}) => {}}></PopupFontColorButton>)}- <PopupStrokeButton- board={board}- key={1}- currentColor={state.strokeColor}- title={`Stroke`}- onColorSelect={(selectedColor: string) => {- PropertyTransforms.setStrokeColor(- board,- getColorPropertyValue(selectedColor),- {- getMemorizeKey,- }- );- const selectedElements = getSelectedElements(board);+ {state.hasStroke && (+ <PopupStrokeButton+ board={board}+ key={1}+ currentColor={state.strokeColor}+ title={`Stroke`}+ onColorSelect={(selectedColor: string) => {+ PropertyTransforms.setStrokeColor(+ board,+ getColorPropertyValue(selectedColor),+ {+ getMemorizeKey,+ }+ );+ const selectedElements = getSelectedElements(board);- if (selectedElements.length) {- selectedElements.forEach((element) => {- const path = PlaitBoard.findPath(board, element);- Transforms.setNode(- board,- { branchColor: getColorPropertyValue(selectedColor) },- path- );- });- }- }}- >- <label- className={classNames('stroke-label', 'color-label')}- style={{ borderColor: state.strokeColor }}- ></label>- </PopupStrokeButton>+ if (selectedElements.length) {+ selectedElements.forEach((element) => {+ const path = PlaitBoard.findPath(board, element);+ Transforms.setNode(+ board,+ { branchColor: getColorPropertyValue(selectedColor) },+ path+ );+ });+ }+ }}+ >+ <label+ className={classNames('stroke-label', 'color-label')}+ style={{ borderColor: state.strokeColor }}+ ></label>+ </PopupStrokeButton>+ )}{state.hasFill && (<PopupFillButtonboard={board}diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/stroke-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/stroke-button.tsxindex c3a1406..7a742c8 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/stroke-button.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/stroke-button.tsx@@ -41,6 +41,7 @@ export const PopupStrokeButton: React.FC<PopupStrokeButtonProps> = ({onOpenChange={(open) => {setIsStrokePropertyOpen(open);}}+ placement={'top'}><PopoverTrigger asChild><ToolButtondiff --git a/packages/drawnix/src/drawnix.tsx b/packages/drawnix/src/drawnix.tsxindex 3de8ae9..a02f6a7 100644--- a/packages/drawnix/src/drawnix.tsx+++ b/packages/drawnix/src/drawnix.tsx@@ -23,7 +23,6 @@ import { AppToolbar } from './components/toolbar/app-toolbar/app-toolbar';import classNames from 'classnames';import './styles/index.scss';-export type DrawnixProps = {value: PlaitElement[];viewport?: Viewport;@@ -81,15 +80,16 @@ export const Drawnix: React.FC<DrawnixProps> = ({onChange && onChange(data);}}>- <Board></Board>- <AppToolbar></AppToolbar>- <CreationToolbar- setPointer={(pointer: DrawnixPointerType) => {- setAppState({ ...appState, pointer });- }}- ></CreationToolbar>- <ZoomToolbar></ZoomToolbar>- <PopupToolbar></PopupToolbar>+ <Board>+ <AppToolbar></AppToolbar>+ <CreationToolbar+ setPointer={(pointer: DrawnixPointerType) => {+ setAppState({ ...appState, pointer });+ }}+ ></CreationToolbar>+ <ZoomToolbar></ZoomToolbar>+ <PopupToolbar></PopupToolbar>+ </Board></Wrapper></div>);diff --git a/packages/react-board/src/board.tsx b/packages/react-board/src/board.tsxindex 1bd9dad..b73ad7f 100644--- a/packages/react-board/src/board.tsx+++ b/packages/react-board/src/board.tsx@@ -30,9 +30,14 @@ import { useBoard, useListRender } from './hooks/use-board';export type PlaitBoardProps = {style?: React.CSSProperties;className?: string;+ children?: React.ReactNode;};-export const Board: React.FC<PlaitBoardProps> = ({ style, className }) => {+export const Board: React.FC<PlaitBoardProps> = ({+ style,+ className,+ children,+}) => {const hostRef = useRef<SVGSVGElement>(null);const elementLowerHostRef = useRef<SVGGElement>(null);const elementHostRef = useRef<SVGGElement>(null);@@ -126,6 +131,7 @@ export const Board: React.FC<PlaitBoardProps> = ({ style, className }) => {<g className="element-upper-host" ref={elementUpperHostRef}></g><g className="element-active-host" ref={elementActiveHostRef}></g></svg>+ {children}</div></div>);diff --git a/packages/react-board/src/plugins/with-react.tsx b/packages/react-board/src/plugins/with-react.tsxindex af30e24..0898486 100644--- a/packages/react-board/src/plugins/with-react.tsx+++ b/packages/react-board/src/plugins/with-react.tsx@@ -1,7 +1,7 @@import {type PlaitTextBoard,type RenderComponentRef,- type TextProps+ type TextProps,} from '@plait/common';import type { PlaitBoard } from '@plait/core';import { createRoot } from 'react-dom/client';@@ -36,7 +36,14 @@ export const withReact = (board: PlaitBoard & PlaitTextBoard) => {}, 0);},update: (updatedProps: Partial<TextProps>) => {- const hasUpdated = updatedProps && newProps && !Object.keys(updatedProps).every((key) => updatedProps[key as keyof TextProps] === newProps[key as keyof TextProps]);+ const hasUpdated =+ updatedProps &&+ newProps &&+ !Object.keys(updatedProps).every(+ (key) =>+ updatedProps[key as keyof TextProps] ===+ newProps[key as keyof TextProps]+ );if (!hasUpdated) {return;}@@ -50,8 +57,9 @@ export const withReact = (board: PlaitBoard & PlaitTextBoard) => {}, 0);} else if (readonly === false && newProps.readonly === true) {ReactEditor.blur(currentEditor);+ ReactEditor.deselect(currentEditor);}- }+ },};return ref;};