Skip to content

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

feat(draw): bump plait into 0.75.0-next.0 and support fine-grained selection (#69)

pubuzhixing8984e6431cb7b
diff --git a/package-lock.json b/package-lock.json
index aeea881..333f03e 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.74.0",
- "@plait/core": "^0.74.0",
- "@plait/draw": "^0.74.0",
- "@plait/layouts": "^0.74.0",
- "@plait/mind": "^0.74.0",
- "@plait/text-plugins": "^0.74.0",
+ "@plait/common": "^0.75.0-next.0",
+ "@plait/core": "^0.75.0-next.0",
+ "@plait/draw": "^0.75.0-next.0",
+ "@plait/layouts": "^0.75.0-next.0",
+ "@plait/mind": "^0.75.0-next.0",
+ "@plait/text-plugins": "^0.75.0-next.0",
"ahooks": "^3.8.0",
"browser-fs-access": "^0.35.0",
"classnames": "^2.5.1",
@@ -4345,17 +4345,17 @@
}
},
"node_modules/@plait/common": {
- "version": "0.74.0",
- "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.74.0.tgz",
- "integrity": "sha512-8MLiEfxMdginqzMcR25ksmqVAmXupbh9sxT3dUTqmVBzhSzMEA7j1qC2NuzyTetr8ydW+ahxsHccbK8HjqHlVA==",
+ "version": "0.75.0-next.0",
+ "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.75.0-next.0.tgz",
+ "integrity": "sha512-LLVp/wPbLvjSWCkqpsW4v4neuL1r0hvxAtFaHwMY9DZs++lmryrrRSmVyyEh6JvrltmeQ5a3QlP7CDlMNUpj7Q==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/core": {
- "version": "0.74.0",
- "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.74.0.tgz",
- "integrity": "sha512-zR6Pmm3spQxm18eFlbVkWs/WqzkdsdKb+MfdVyOmhFT8zgCe/TGBNp39XiZXcyltXwJ+TmacQohAm9XCDBW0Rw==",
+ "version": "0.75.0-next.0",
+ "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.75.0-next.0.tgz",
+ "integrity": "sha512-1MrtewRgVd50up6wJkYDSzMqJLgdXTrHggFsK/twPqscJyesA+nbN3vG/DmJ5jGtvGJbZdYLpM7JNVg0753xMg==",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4368,33 +4368,33 @@
}
},
"node_modules/@plait/draw": {
- "version": "0.74.0",
- "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.74.0.tgz",
- "integrity": "sha512-xtelytwxCbcwY4LAQiMSBN2J2uB0Q6TAPkKDeSGHms6w/HECsTwcYav7fIJFqc15JavrU0I5eLUyhrdeJV1ugg==",
+ "version": "0.75.0-next.0",
+ "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.75.0-next.0.tgz",
+ "integrity": "sha512-5Lb2J+jDC7R8zo2+QHGxLhkclsY+xLbJqN2GtyFzYqmzieCjSpgRpP4hTXtPjI/nYbJl/mwsI8xearVaWvLyfA==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/layouts": {
- "version": "0.74.0",
- "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.74.0.tgz",
- "integrity": "sha512-LDbgghN3rZTNHd/H3lPzOgADZ8WaokGkK0wyjmEZlDCRy6oE8WhmiSxgYJ4oHOeRDdqU/9s9hycl264eHVcxyg==",
+ "version": "0.75.0-next.0",
+ "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.75.0-next.0.tgz",
+ "integrity": "sha512-92uqu++zodcuEfM8eS97LFVck+cOxZbngwaUiBAxIq8Wfnn9VLT/Z5tTOg0a1gfgINPHusM0ASCzOTiwaJci5Q==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/mind": {
- "version": "0.74.0",
- "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.74.0.tgz",
- "integrity": "sha512-Q6NDuBrVUaTFtCfdSoVEPwV9WujtP4MwVvgiRlo8IhaUaNekJavpmLCSlxmN4kPuX4A4zYpZAmrR8FMx/Lbg/A==",
+ "version": "0.75.0-next.0",
+ "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.75.0-next.0.tgz",
+ "integrity": "sha512-a4HgZ2FIANZ1RIHuBtcVMKqBOoUAa1pu6AYwDyHDs1PJAunIW5qkyZonmF5S1g5N04LhEqxp26BBJaTGajEN/g==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/text-plugins": {
- "version": "0.74.0",
- "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.74.0.tgz",
- "integrity": "sha512-I9mp8VB0ttM/iP71yZZ4K//sAwMjw1Ao3/wyPcdA3wuzfyMhAiOAbbes/F0zfLKMVrIbgMMn7do9P9NRQxD01Q==",
+ "version": "0.75.0-next.0",
+ "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.75.0-next.0.tgz",
+ "integrity": "sha512-vAxrAq7KjkpjRk7fgYlYjkdANB0okdRzLkZkQ4v9jO1Olw6v9lIO5bKkHqlhbJt0xDsKv5fkYCMELnHZYJVexw==",
"dependencies": {
"tslib": "^2.3.0"
}
diff --git a/package.json b/package.json
index 382d279..fa29de1 100644
--- a/package.json
+++ b/package.json
@@ -10,12 +10,12 @@
"private": true,
"dependencies": {
"@floating-ui/react": "^0.26.24",
- "@plait/common": "^0.74.0",
- "@plait/core": "^0.74.0",
- "@plait/draw": "^0.74.0",
- "@plait/layouts": "^0.74.0",
- "@plait/mind": "^0.74.0",
- "@plait/text-plugins": "^0.74.0",
+ "@plait/common": "^0.75.0-next.0",
+ "@plait/core": "^0.75.0-next.0",
+ "@plait/draw": "^0.75.0-next.0",
+ "@plait/layouts": "^0.75.0-next.0",
+ "@plait/mind": "^0.75.0-next.0",
+ "@plait/text-plugins": "^0.75.0-next.0",
"ahooks": "^3.8.0",
"browser-fs-access": "^0.35.0",
"classnames": "^2.5.1",
diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx
index b1a03e5..d138d24 100644
--- a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx
+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx
@@ -23,8 +23,8 @@ import {
import './popup-toolbar.scss';
import {
getStrokeColorByElement as getStrokeColorByDrawElement,
- isCustomGeometryClosed,
- isDrawElementClosed,
+ isClosedCustomGeometry,
+ isClosedDrawElement,
isDrawElementsIncludeText,
PlaitDrawElement,
} from '@plait/draw';
@@ -238,7 +238,7 @@ export const hasFillProperty = (board: PlaitBoard, element: PlaitElement) => {
if (MindElement.isMindElement(board, element)) {
return true;
}
- if (isCustomGeometryClosed(board, element)) {
+ if (isClosedCustomGeometry(board, element)) {
return true;
}
if (PlaitDrawElement.isDrawElement(element)) {
@@ -246,7 +246,7 @@ export const hasFillProperty = (board: PlaitBoard, element: PlaitElement) => {
PlaitDrawElement.isShapeElement(element) &&
!PlaitDrawElement.isImage(element) &&
!PlaitDrawElement.isText(element) &&
- isDrawElementClosed(element)
+ isClosedDrawElement(element)
);
}
return false;
diff --git a/packages/drawnix/src/plugins/freehand/utils.ts b/packages/drawnix/src/plugins/freehand/utils.ts
index 84d4e69..98266b5 100644
--- a/packages/drawnix/src/plugins/freehand/utils.ts
+++ b/packages/drawnix/src/plugins/freehand/utils.ts
@@ -13,8 +13,8 @@ import {
import { Freehand, FreehandShape, FreehandThemeColors } from './type';
import {
DefaultDrawStyle,
+ isClosedCustomGeometry,
isClosedPoints,
- isCustomGeometryClosed,
isHitPolyLine,
isRectangleHitRotatedPoints,
} from '@plait/draw';
@@ -93,7 +93,7 @@ export const getStrokeColorByElement = (
export const getFillByElement = (board: PlaitBoard, element: PlaitElement) => {
const defaultFill =
- Freehand.isFreehand(element) && isCustomGeometryClosed(board, element)
+ Freehand.isFreehand(element) && isClosedCustomGeometry(board, element)
? getFreehandDefaultFill(board.theme.themeColorMode)
: DefaultDrawStyle.fill;
const fill = element.fill || defaultFill;
diff --git a/packages/drawnix/src/plugins/freehand/with-freehand.ts b/packages/drawnix/src/plugins/freehand/with-freehand.ts
index ccfad9f..0fd38d3 100644
--- a/packages/drawnix/src/plugins/freehand/with-freehand.ts
+++ b/packages/drawnix/src/plugins/freehand/with-freehand.ts
@@ -49,11 +49,11 @@ export const withFreehand = (board: PlaitBoard) => {
return isRectangleHit(element, selection);
};
- board.isHit = (element, point) => {
+ board.isHit = (element, point, isStrict?: boolean) => {
if (Freehand.isFreehand(element)) {
return isHitFreehand(board, element, point);
}
- return isHit(element, point);
+ return isHit(element, point, isStrict);
};
board.getOneHitElement = (elements) => {
diff --git a/packages/drawnix/src/utils/property.ts b/packages/drawnix/src/utils/property.ts
index 60c983d..4d52e4d 100644
--- a/packages/drawnix/src/utils/property.ts
+++ b/packages/drawnix/src/utils/property.ts
@@ -1,7 +1,7 @@
import { PlaitBoard, PlaitElement } from '@plait/core';
import {
- isCustomGeometryClosed,
- isDrawElementClosed,
+ isClosedCustomGeometry,
+ isClosedDrawElement,
PlaitDrawElement,
} from '@plait/draw';
import {
@@ -18,8 +18,8 @@ import { getTextMarksByElement } from '@plait/text-plugins';
export const isClosedElement = (board: PlaitBoard, element: PlaitElement) => {
return (
MindElement.isMindElement(board, element) ||
- (PlaitDrawElement.isDrawElement(element) && isDrawElementClosed(element)) ||
- isCustomGeometryClosed(board, element)
+ (PlaitDrawElement.isDrawElement(element) && isClosedDrawElement(element)) ||
+ isClosedCustomGeometry(board, element)
);
};
diff --git a/packages/react-board/src/hooks/with-pinch-zoom-plugin.ts b/packages/react-board/src/hooks/with-pinch-zoom-plugin.ts
index 4637e89..e7995f0 100644
--- a/packages/react-board/src/hooks/with-pinch-zoom-plugin.ts
+++ b/packages/react-board/src/hooks/with-pinch-zoom-plugin.ts
@@ -1,6 +1,7 @@
import {
BoardTransforms,
distanceBetweenPointAndPoint,
+ getPointBetween,
MAX_ZOOM,
MIN_ZOOM,
PlaitBoard,
@@ -19,14 +20,7 @@ export const withPinchZoom = (board: PlaitBoard) => {
let touchPoints: {
[key: number]: [number, number];
} = {};
- let pinchCenter: [number, number] | null = null;
-
- const getMidPoint = (
- p1: [number, number],
- p2: [number, number]
- ): [number, number] => {
- return [(p1[0] + p2[0]) / 2, (p1[1] + p2[1]) / 2];
- };
+ let pinchCenter: Point | null = null;
board.pointerDown = (event: PointerEvent) => {
const point = [event.x, event.y] as Point;
@@ -43,10 +37,13 @@ export const withPinchZoom = (board: PlaitBoard) => {
);
initialZoom = board.viewport.zoom;
lastZoom = initialZoom;
- pinchCenter = getMidPoint(
- toViewBoxPoint(board, toHostPoint(board, points[0][0], points[0][1])),
- toViewBoxPoint(board, toHostPoint(board, points[1][0], points[1][1]))
- );
+ pinchCenter = getPointBetween(
+ ...toViewBoxPoint(
+ board,
+ toHostPoint(board, points[0][0], points[0][1])
+ ),
+ ...toViewBoxPoint(board, toHostPoint(board, points[1][0], points[1][1]))
+ ) as Point;
return;
}
pointerDown(event);