Skip to content

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

fix(creation-toolbar): use pointerUp set basic pointer cause onChange do not fire on mobile bind pointermove/pointerup to viewportContainerRef to implement dnd on mobile #20

pubuzhixing854b036b9bba5
diff --git a/package-lock.json b/package-lock.json
index ef3a67a..46c459b 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.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",
+ "@plait/common": "^0.69.2",
+ "@plait/core": "^0.69.2",
+ "@plait/draw": "^0.69.2",
+ "@plait/layouts": "^0.69.2",
+ "@plait/mind": "^0.69.2",
+ "@plait/text-plugins": "^0.69.2",
"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.1",
- "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.69.1.tgz",
- "integrity": "sha512-c7lTI8Urr9xf6wpcnlbjK7my9yUBbkwbOgsljEfjuF+6EL7mHRVGKvadP7zx8fl8ZMd9xKZ2aKvclP31r+5hQA==",
+ "version": "0.69.2",
+ "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.69.2.tgz",
+ "integrity": "sha512-DBbGIgYnBVUmJhExGc/4F/cGLXJQvmZuO124Kw1hwmNTTZDk9ATBO0I5XhL1gbapZDOSWqB++DgDC9LxIXGjew==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/core": {
- "version": "0.69.1",
- "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.69.1.tgz",
- "integrity": "sha512-75J2MBOZw2rSrvw0KWBm42Q0K+P8e3YrvZqbzhRRb0+YCYUemMlk/d7HWCFMX4FbWbd6steA8BZMk/ql6Orc0w==",
+ "version": "0.69.2",
+ "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.69.2.tgz",
+ "integrity": "sha512-KqD91A9E9NF7qOgYx/yGZ2FibIFBdbJaC3qk/KDHAypBL1OjJXAmjrKggQcYDzKwbWZzRn9BQHhiA+nSU6IbFw==",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -3924,33 +3924,33 @@
}
},
"node_modules/@plait/draw": {
- "version": "0.69.1",
- "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.69.1.tgz",
- "integrity": "sha512-+/nl1cTflkSZ3bqneA6nkamUAw40/jSYMdq7p0YiEr4ui3+amLmiCMIkPHFtbUcxZGDNsbJXXFk04qQ+N2u1UA==",
+ "version": "0.69.2",
+ "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.69.2.tgz",
+ "integrity": "sha512-QFdt3oTmjo8mZ6HHgHt2TUgQRhO9hLubBpuHsOP8okG3jyzs9ax5SwwUQHmCUmaqyNxavk/8PPHb0Meaocs8Eg==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/layouts": {
- "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==",
+ "version": "0.69.2",
+ "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.69.2.tgz",
+ "integrity": "sha512-psG395l/kUFiq69+njCOkM4zP81T2M7Ighp2TjsMmzTRytOtfeJ+KwujikVLud17gULqcyVD0J3yoxbwX4I0bg==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/mind": {
- "version": "0.69.1",
- "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.69.1.tgz",
- "integrity": "sha512-LmDIFkeez4H0pIwzfkEjqBZs25zHrCOvKzQI1Q5ZJiG22JGgLaKSGS4TkQ0SFSEbXhfpHj0nkeCN7FaFJ0NFuA==",
+ "version": "0.69.2",
+ "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.69.2.tgz",
+ "integrity": "sha512-AZTcFJCjGM6AuIG+POX/wnY6en8oc7mPMPThlVcqFffINGl8MstqFn2ln0Sg0apl4JTScF7Hv1dtBvFL2OeKwA==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/text-plugins": {
- "version": "0.69.1",
- "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.69.1.tgz",
- "integrity": "sha512-WOvokNJ8XoHXpucQlVTkjWXCQyOdqj3sOACojFoQIiLQe5bsqDj3BoBClgh5kwD3QJlvuGxAfxBvDpRRb4+Gyw==",
+ "version": "0.69.2",
+ "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.69.2.tgz",
+ "integrity": "sha512-cowv3V2+80OgnJogXsUrfb0HGd9OfsUxKAiBd6rD4We8u6lIpXw52LGBKvGqPa3npp169SRlNSp9fvUwCR3P3w==",
"dependencies": {
"tslib": "^2.3.0"
}
diff --git a/package.json b/package.json
index 94bbcd8..d8f086e 100644
--- a/package.json
+++ b/package.json
@@ -10,12 +10,12 @@
"private": true,
"dependencies": {
"@floating-ui/react": "^0.26.24",
- "@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",
+ "@plait/common": "^0.69.2",
+ "@plait/core": "^0.69.2",
+ "@plait/draw": "^0.69.2",
+ "@plait/layouts": "^0.69.2",
+ "@plait/mind": "^0.69.2",
+ "@plait/text-plugins": "^0.69.2",
"ahooks": "^3.8.0",
"browser-fs-access": "^0.35.0",
"classnames": "^2.5.1",
diff --git a/packages/drawnix/src/components/toolbar/creation-toolbar.tsx b/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
index f47e359..0f5c6a5 100644
--- a/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
+++ b/packages/drawnix/src/components/toolbar/creation-toolbar.tsx
@@ -93,7 +93,9 @@ export const isShapePointer = (board: PlaitBoard) => {
return Object.keys(BasicShapes).includes(board.pointer);
};
-export const CreationToolbar: React.FC<CreationToolbarProps> = ({ setPointer }) => {
+export const CreationToolbar: React.FC<CreationToolbarProps> = ({
+ setPointer,
+}) => {
const board = useBoard();
const container = PlaitBoard.getBoardContainer(board);
@@ -101,11 +103,6 @@ export const CreationToolbar: React.FC<CreationToolbarProps> = ({ setPointer })
const [shapeOpen, setShapeOpen] = useState(false);
- const onChange = (pointer: DrawnixPointerType) => {
- BoardTransforms.updatePointerType(board, pointer);
- setPointer(pointer);
- };
-
const onPointerDown = (pointer: DrawnixPointerType) => {
setCreationMode(board, BoardCreationMode.dnd);
BoardTransforms.updatePointerType(board, pointer);
@@ -221,11 +218,6 @@ export const CreationToolbar: React.FC<CreationToolbarProps> = ({ setPointer })
checked={isChecked(button)}
title={`${button.title}`}
aria-label={`${button.title}`}
- onChange={() => {
- if (button.pointer && isBasicPointer(button.pointer)) {
- onChange(button.pointer);
- }
- }}
onPointerDown={() => {
if (button.pointer && !isBasicPointer(button.pointer)) {
onPointerDown(button.pointer);
@@ -234,6 +226,9 @@ export const CreationToolbar: React.FC<CreationToolbarProps> = ({ setPointer })
onPointerUp={() => {
if (button.pointer && !isBasicPointer(button.pointer)) {
onPointerUp();
+ } else if (button.pointer && isBasicPointer(button.pointer)) {
+ BoardTransforms.updatePointerType(board, button.pointer);
+ setPointer(button.pointer);
}
}}
/>
diff --git a/packages/react-board/src/board.tsx b/packages/react-board/src/board.tsx
index b73ad7f..e9dcf37 100644
--- a/packages/react-board/src/board.tsx
+++ b/packages/react-board/src/board.tsx
@@ -92,7 +92,7 @@ export const Board: React.FC<PlaitBoardProps> = ({
};
}, []);
- useBoardPluginEvent(board, hostRef);
+ useBoardPluginEvent(board, viewportContainerRef, hostRef);
useBoardEvent(board, viewportContainerRef);
return (
diff --git a/packages/react-board/src/hooks/use-plugin-event.tsx b/packages/react-board/src/hooks/use-plugin-event.tsx
index a43c51d..29026e5 100644
--- a/packages/react-board/src/hooks/use-plugin-event.tsx
+++ b/packages/react-board/src/hooks/use-plugin-event.tsx
@@ -8,22 +8,15 @@ import {
hasInputOrTextareaTarget,
setFragment,
toHostPoint,
- toViewBoxPoint
+ toViewBoxPoint,
} from '@plait/core';
import { useEventListener } from 'ahooks';
const useBoardPluginEvent = (
board: PlaitBoard,
+ viewportContainerRef: React.RefObject<HTMLDivElement>,
hostRef: React.RefObject<SVGSVGElement>
) => {
- useEventListener(
- 'mousedown',
- (event) => {
- board.mousedown(event);
- },
- { target: hostRef }
- );
-
useEventListener(
'pointerdown',
(event) => {
@@ -32,31 +25,13 @@ const useBoardPluginEvent = (
{ target: hostRef }
);
- useEventListener(
- 'mousemove',
- (event) => {
- BOARD_TO_MOVING_POINT_IN_BOARD.set(board, [event.x, event.y]);
- board.mousemove(event);
- },
- { target: hostRef }
- );
-
useEventListener(
'pointermove',
(event) => {
BOARD_TO_MOVING_POINT_IN_BOARD.set(board, [event.x, event.y]);
board.pointerMove(event);
},
- { target: hostRef }
- );
-
- useEventListener(
- 'mouseleave',
- (event) => {
- BOARD_TO_MOVING_POINT_IN_BOARD.delete(board);
- board.mouseleave(event);
- },
- { target: hostRef }
+ { target: viewportContainerRef }
);
useEventListener(
@@ -65,15 +40,7 @@ const useBoardPluginEvent = (
BOARD_TO_MOVING_POINT_IN_BOARD.delete(board);
board.pointerLeave(event);
},
- { target: hostRef }
- );
-
- useEventListener(
- 'mouseup',
- (event) => {
- board.mouseup(event);
- },
- { target: hostRef }
+ { target: viewportContainerRef }
);
useEventListener(
@@ -81,7 +48,7 @@ const useBoardPluginEvent = (
(event) => {
board.pointerUp(event);
},
- { target: hostRef }
+ { target: viewportContainerRef }
);
useEventListener(
@@ -94,11 +61,6 @@ const useBoardPluginEvent = (
{ target: hostRef }
);
- useEventListener('mousemove', (event) => {
- BOARD_TO_MOVING_POINT.set(board, [event.x, event.y]);
- board.globalMousemove(event);
- });
-
useEventListener('pointermove', (event) => {
BOARD_TO_MOVING_POINT.set(board, [event.x, event.y]);
board.globalPointerMove(event);