Skip to content

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

feat: handle text editing on touch device

pubuzhixing8e4a42d018173
diff --git a/apps/web/index.html b/apps/web/index.html
index 86104ea..f1f1955 100644
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -67,7 +67,7 @@
}
</script>
<base href="/" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no" />
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
<link rel="stylesheet" href="/src/styles.scss" />
<script defer src="https://cloud.umami.is/script.js" data-website-id="7083aa92-85b1-4a67-a6d4-03d52819ba3d"></script>
diff --git a/apps/web/src/app/app.tsx b/apps/web/src/app/app.tsx
index 486c367..19f9e69 100644
--- a/apps/web/src/app/app.tsx
+++ b/apps/web/src/app/app.tsx
@@ -54,14 +54,13 @@ export function App() {
tutorial={tutorial}
afterInit={(board) => {
console.log('board initialized');
- /*
+
console.log(
`add __drawnix__web__debug_log to window, so you can call add log anywhere, like: window.__drawnix__web__console('some thing')`
);
(window as any)['__drawnix__web__console'] = (value: string) => {
addDebugLog(board, value);
};
- */
}}
></Drawnix>
);
diff --git a/package-lock.json b/package-lock.json
index e0f4282..02699a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,12 +12,12 @@
"@floating-ui/react": "^0.26.24",
"@plait-board/markdown-to-drawnix": "^0.0.7",
"@plait-board/mermaid-to-drawnix": "^0.0.7",
- "@plait/common": "^0.86.1",
- "@plait/core": "^0.86.1",
- "@plait/draw": "^0.86.1",
- "@plait/layouts": "^0.86.1",
- "@plait/mind": "^0.86.1",
- "@plait/text-plugins": "^0.86.1",
+ "@plait/common": "^0.89.1",
+ "@plait/core": "^0.89.1",
+ "@plait/draw": "^0.89.1",
+ "@plait/layouts": "^0.89.1",
+ "@plait/mind": "^0.89.1",
+ "@plait/text-plugins": "^0.89.1",
"ahooks": "^3.8.0",
"browser-fs-access": "^0.35.0",
"classnames": "^2.5.1",
@@ -4849,17 +4849,17 @@
}
},
"node_modules/@plait/common": {
- "version": "0.86.1",
- "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.86.1.tgz",
- "integrity": "sha512-FzvsuKJidRIFTtPGrKpXTBZTSyW/M01wpbI5BDFW70rul1oQnMnjz3Kh/jL3pbs/OB0GapQUZWR2d/qId1tFug==",
+ "version": "0.89.1",
+ "resolved": "https://registry.npmjs.org/@plait/common/-/common-0.89.1.tgz",
+ "integrity": "sha512-Z9FwLTxf+BGhGhRNzvSjfFIRcJl4sIt1r7F7RjgVAbxewBRPtZndmwPBm7A5G3KPnxzWblf9nTMsVG5IDdA7Kg==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/core": {
- "version": "0.86.1",
- "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.86.1.tgz",
- "integrity": "sha512-CgGOn8INUmIB7AdiCF3UHanmUtmmQ6iGz68t/vOkWyOmbSErmHiwFDWYLuTBwgWypO3KBvKLcxWiRHmZykMGLQ==",
+ "version": "0.89.1",
+ "resolved": "https://registry.npmjs.org/@plait/core/-/core-0.89.1.tgz",
+ "integrity": "sha512-dLO4qiPkmMEKzOyVYkgVPJsB3R4+kBDSeKNzZqdZGlIbw0dPm7Fdn3JnAc3VFM92mjw0nQDRisDwVuWVkw1eCA==",
"dependencies": {
"points-on-curve": "^1.0.0",
"roughjs": "^4.5.2",
@@ -4871,33 +4871,33 @@
}
},
"node_modules/@plait/draw": {
- "version": "0.86.1",
- "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.86.1.tgz",
- "integrity": "sha512-Q004J0/yQi5I68ct8Bf0ZLbGxJG19oNBIyqUYuI0/H8fCjMqKFDdBYOlgfY9CVBkO0VT5b2HCf7LeA5urBMI0w==",
+ "version": "0.89.1",
+ "resolved": "https://registry.npmjs.org/@plait/draw/-/draw-0.89.1.tgz",
+ "integrity": "sha512-4jd1FFaEuFcg6/tTP2VpJBCEn2jbVasBliy8/hvGq8N7qHs9WipaGtT0Ud6NXX48sn76tqZSvOjEsEmnCBQG5A==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/layouts": {
- "version": "0.86.1",
- "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.86.1.tgz",
- "integrity": "sha512-+zjjfjNHBg3zZSz8uvJm9qnqguZghp968x4iOa8DVPwq3QOYVlJoc3NaAzZ7B01/ZVrPw5Bl0GRGWjkIKfCC5w==",
+ "version": "0.89.1",
+ "resolved": "https://registry.npmjs.org/@plait/layouts/-/layouts-0.89.1.tgz",
+ "integrity": "sha512-kmPFv3uhkTSK35IuigtnA/aoX4+TNMgxptjVbQkq5W3vdLeMncU7RrmjkZK9FqLHmjHMzUhzVWqTGZTjiEwiOg==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/mind": {
- "version": "0.86.1",
- "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.86.1.tgz",
- "integrity": "sha512-RIbs2FSq+/pMQnR2T9b/geMV9I0JZ070gbJd0eC3xtTN7l15oAblUk4iBdffRnPa95YYdaYqbhLhrYRoztCNZA==",
+ "version": "0.89.1",
+ "resolved": "https://registry.npmjs.org/@plait/mind/-/mind-0.89.1.tgz",
+ "integrity": "sha512-UUzrI768w29KlvjvXizqSfiwqFqoxOMPlmmalpv1B2rON2ha/kxH4HdIJd/yhaAfN9fVYyEjvhbSsqlylqsrQg==",
"dependencies": {
"tslib": "^2.3.0"
}
},
"node_modules/@plait/text-plugins": {
- "version": "0.86.1",
- "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.86.1.tgz",
- "integrity": "sha512-c0cwX/UqPWsZemBTJXqnicIpM25MovsbctyHDkKsIQhJc76CArrnT5E9TCXtqCfbK4kXuEmFTArkmOd18My1+w==",
+ "version": "0.89.1",
+ "resolved": "https://registry.npmjs.org/@plait/text-plugins/-/text-plugins-0.89.1.tgz",
+ "integrity": "sha512-O9CvQT3hTWn4KDBZMvIuI4Ca+efu4pAcYh08w5FzgttBabB1PsiJTQzX7m3YMWfV82o8c7+8Yc/Pp/uxZ12QmQ==",
"dependencies": {
"tslib": "^2.3.0"
}
diff --git a/package.json b/package.json
index c005595..88316e0 100644
--- a/package.json
+++ b/package.json
@@ -16,12 +16,12 @@
"@floating-ui/react": "^0.26.24",
"@plait-board/markdown-to-drawnix": "^0.0.7",
"@plait-board/mermaid-to-drawnix": "^0.0.7",
- "@plait/common": "^0.86.1",
- "@plait/core": "^0.86.1",
- "@plait/draw": "^0.86.1",
- "@plait/layouts": "^0.86.1",
- "@plait/mind": "^0.86.1",
- "@plait/text-plugins": "^0.86.1",
+ "@plait/common": "^0.89.1",
+ "@plait/core": "^0.89.1",
+ "@plait/draw": "^0.89.1",
+ "@plait/layouts": "^0.89.1",
+ "@plait/mind": "^0.89.1",
+ "@plait/text-plugins": "^0.89.1",
"ahooks": "^3.8.0",
"browser-fs-access": "^0.35.0",
"classnames": "^2.5.1",
diff --git a/packages/drawnix/src/plugins/freehand/with-freehand-create.ts b/packages/drawnix/src/plugins/freehand/with-freehand-create.ts
index 545cc5c..485ecb7 100644
--- a/packages/drawnix/src/plugins/freehand/with-freehand-create.ts
+++ b/packages/drawnix/src/plugins/freehand/with-freehand-create.ts
@@ -13,7 +13,8 @@ import { FreehandGenerator } from './freehand.generator';
import { FreehandSmoother } from './smoother';
export const withFreehandCreate = (board: PlaitBoard) => {
- const { pointerDown, pointerMove, pointerUp, globalPointerUp } = board;
+ const { pointerDown, pointerMove, pointerUp, globalPointerUp, touchStart } =
+ board;
let isDrawing = false;
@@ -50,6 +51,15 @@ export const withFreehandCreate = (board: PlaitBoard) => {
smoother.reset();
};
+ board.touchStart = (event: TouchEvent) => {
+ const freehandPointers = getFreehandPointers();
+ const isFreehandPointer = PlaitBoard.isInPointer(board, freehandPointers);
+ if (isFreehandPointer && isDrawingMode(board)) {
+ return event.preventDefault();
+ }
+ touchStart(event);
+ };
+
board.pointerDown = (event: PointerEvent) => {
const freehandPointers = getFreehandPointers();
const isFreehandPointer = PlaitBoard.isInPointer(board, freehandPointers);
diff --git a/packages/drawnix/src/plugins/freehand/with-freehand-erase.ts b/packages/drawnix/src/plugins/freehand/with-freehand-erase.ts
index b7302a9..d215052 100644
--- a/packages/drawnix/src/plugins/freehand/with-freehand-erase.ts
+++ b/packages/drawnix/src/plugins/freehand/with-freehand-erase.ts
@@ -1,10 +1,10 @@
import {
- PlaitBoard,
- PlaitElement,
- Point,
- throttleRAF,
- toHostPoint,
- toViewBoxPoint,
+ PlaitBoard,
+ PlaitElement,
+ Point,
+ throttleRAF,
+ toHostPoint,
+ toViewBoxPoint,
} from '@plait/core';
import { isDrawingMode } from '@plait/common';
import { isHitFreehand } from './utils';
@@ -13,93 +13,112 @@ import { CoreTransforms } from '@plait/core';
import { LaserPointer } from '../../utils/laser-pointer';
export const withFreehandErase = (board: PlaitBoard) => {
- const { pointerDown, pointerMove, pointerUp, globalPointerUp } = board;
-
- const laserPointer = new LaserPointer();
-
- let isErasing = false;
- const elementsToDelete = new Set<string>();
-
- const checkAndMarkFreehandElementsForDeletion = (point: Point) => {
- const viewBoxPoint = toViewBoxPoint(board, toHostPoint(board, point[0], point[1]));
-
- const freehandElements = board.children.filter((element) =>
- Freehand.isFreehand(element)
- ) as Freehand[];
-
- freehandElements.forEach((element) => {
- if (!elementsToDelete.has(element.id) && isHitFreehand(board, element, viewBoxPoint)) {
- PlaitElement.getElementG(element).style.opacity = '0.2';
- elementsToDelete.add(element.id);
- }
- });
- };
-
- const deleteMarkedElements = () => {
- if (elementsToDelete.size > 0) {
- const elementsToRemove = board.children.filter((element) =>
- elementsToDelete.has(element.id)
- );
-
- if (elementsToRemove.length > 0) {
- CoreTransforms.removeElements(board, elementsToRemove);
- }
- }
- };
-
- const complete = () => {
- if (isErasing) {
- deleteMarkedElements();
- isErasing = false;
- elementsToDelete.clear();
- laserPointer.destroy();
- }
- };
-
- board.pointerDown = (event: PointerEvent) => {
- const isEraserPointer = PlaitBoard.isInPointer(board, [FreehandShape.eraser]);
-
- if (isEraserPointer && isDrawingMode(board)) {
- isErasing = true;
- elementsToDelete.clear();
- const currentPoint: Point = [event.x, event.y];
- checkAndMarkFreehandElementsForDeletion(currentPoint);
- laserPointer.init(board);
- return;
- }
-
- pointerDown(event);
- };
-
- board.pointerMove = (event: PointerEvent) => {
- if (isErasing) {
- throttleRAF(board, 'with-freehand-erase', () => {
- const currentPoint: Point = [event.x, event.y];
- checkAndMarkFreehandElementsForDeletion(currentPoint);
- });
- return;
- }
-
- pointerMove(event);
- };
-
- board.pointerUp = (event: PointerEvent) => {
- if (isErasing) {
- complete();
- return;
- }
-
- pointerUp(event);
- };
-
- board.globalPointerUp = (event: PointerEvent) => {
- if (isErasing) {
- complete();
- return;
- }
-
- globalPointerUp(event);
- };
-
- return board;
-};
\ No newline at end of file
+ const { pointerDown, pointerMove, pointerUp, globalPointerUp, touchStart } =
+ board;
+
+ const laserPointer = new LaserPointer();
+
+ let isErasing = false;
+ const elementsToDelete = new Set<string>();
+
+ const checkAndMarkFreehandElementsForDeletion = (point: Point) => {
+ const viewBoxPoint = toViewBoxPoint(
+ board,
+ toHostPoint(board, point[0], point[1])
+ );
+
+ const freehandElements = board.children.filter((element) =>
+ Freehand.isFreehand(element)
+ ) as Freehand[];
+
+ freehandElements.forEach((element) => {
+ if (
+ !elementsToDelete.has(element.id) &&
+ isHitFreehand(board, element, viewBoxPoint)
+ ) {
+ PlaitElement.getElementG(element).style.opacity = '0.2';
+ elementsToDelete.add(element.id);
+ }
+ });
+ };
+
+ const deleteMarkedElements = () => {
+ if (elementsToDelete.size > 0) {
+ const elementsToRemove = board.children.filter((element) =>
+ elementsToDelete.has(element.id)
+ );
+
+ if (elementsToRemove.length > 0) {
+ CoreTransforms.removeElements(board, elementsToRemove);
+ }
+ }
+ };
+
+ const complete = () => {
+ if (isErasing) {
+ deleteMarkedElements();
+ isErasing = false;
+ elementsToDelete.clear();
+ laserPointer.destroy();
+ }
+ };
+
+ board.touchStart = (event: TouchEvent) => {
+ const isEraserPointer = PlaitBoard.isInPointer(board, [
+ FreehandShape.eraser,
+ ]);
+ if (isEraserPointer && isDrawingMode(board)) {
+ return event.preventDefault();
+ }
+ touchStart(event);
+ };
+
+ board.pointerDown = (event: PointerEvent) => {
+ const isEraserPointer = PlaitBoard.isInPointer(board, [
+ FreehandShape.eraser,
+ ]);
+
+ if (isEraserPointer && isDrawingMode(board)) {
+ isErasing = true;
+ elementsToDelete.clear();
+ const currentPoint: Point = [event.x, event.y];
+ checkAndMarkFreehandElementsForDeletion(currentPoint);
+ laserPointer.init(board);
+ return;
+ }
+
+ pointerDown(event);
+ };
+
+ board.pointerMove = (event: PointerEvent) => {
+ if (isErasing) {
+ throttleRAF(board, 'with-freehand-erase', () => {
+ const currentPoint: Point = [event.x, event.y];
+ checkAndMarkFreehandElementsForDeletion(currentPoint);
+ });
+ return;
+ }
+
+ pointerMove(event);
+ };
+
+ board.pointerUp = (event: PointerEvent) => {
+ if (isErasing) {
+ complete();
+ return;
+ }
+
+ pointerUp(event);
+ };
+
+ board.globalPointerUp = (event: PointerEvent) => {
+ if (isErasing) {
+ complete();
+ return;
+ }
+
+ globalPointerUp(event);
+ };
+
+ return board;
+};
diff --git a/packages/react-board/src/hooks/use-board-event.ts b/packages/react-board/src/hooks/use-board-event.ts
index 7980df6..1e8a90d 100644
--- a/packages/react-board/src/hooks/use-board-event.ts
+++ b/packages/react-board/src/hooks/use-board-event.ts
@@ -30,11 +30,11 @@ const useBoardEvent = (
);
useEventListener(
- 'touchstart',
+ 'contextmenu',
(event) => {
event.preventDefault();
},
- { target: viewportContainerRef, passive: false }
+ { target: viewportContainerRef }
);
useEventListener(
diff --git a/packages/react-board/src/hooks/use-plugin-event.tsx b/packages/react-board/src/hooks/use-plugin-event.tsx
index 85887fa..1a5a2f9 100644
--- a/packages/react-board/src/hooks/use-plugin-event.tsx
+++ b/packages/react-board/src/hooks/use-plugin-event.tsx
@@ -51,6 +51,30 @@ const useBoardPluginEvent = (
{ target: viewportContainerRef }
);
+ useEventListener(
+ 'touchstart',
+ (event) => {
+ board.touchStart(event);
+ },
+ { target: viewportContainerRef }
+ );
+
+ useEventListener(
+ 'touchmove',
+ (event) => {
+ board.touchMove(event);
+ },
+ { target: viewportContainerRef }
+ );
+
+ useEventListener(
+ 'touchend',
+ (event) => {
+ board.touchEnd(event);
+ },
+ { target: viewportContainerRef }
+ );
+
useEventListener(
'dblclick',
(event) => {
diff --git a/packages/react-board/src/plugins/with-pinch-zoom-plugin.ts b/packages/react-board/src/plugins/with-pinch-zoom-plugin.ts
index 6a6bea6..803fe31 100644
--- a/packages/react-board/src/plugins/with-pinch-zoom-plugin.ts
+++ b/packages/react-board/src/plugins/with-pinch-zoom-plugin.ts
@@ -17,14 +17,30 @@ interface PointerRecord {
}
export const withPinchZoom = (board: PlaitBoard) => {
- const { pointerDown, pointerMove, pointerUp, globalPointerUp } = board;
+ const {
+ pointerDown,
+ pointerMove,
+ pointerUp,
+ globalPointerUp,
+ touchStart,
+ touchMove,
+ } = board;
const pointerRecords: PointerRecord[] = [];
let initializeZoom = 0;
let isPinching = false;
+ board.touchStart = (event: TouchEvent) => {
+ if (event.touches.length >= 2) {
+ event.preventDefault();
+ return;
+ }
+ touchStart(event);
+ };
+
board.pointerDown = (event: PointerEvent) => {
const point: Point = [event.clientX, event.clientY];
+ (window as any)['__drawnix__web__console'](`pointerId${event.pointerId}`);
if (pointerRecords.length < 2) {
initializeZoom = board.viewport.zoom;
diff --git a/packages/react-board/src/wrapper.tsx b/packages/react-board/src/wrapper.tsx
index 72c07b0..f436fd3 100644
--- a/packages/react-board/src/wrapper.tsx
+++ b/packages/react-board/src/wrapper.tsx
@@ -237,6 +237,7 @@ const initializeBoard = (
plugins.forEach((plugin: any) => {
board = plugin(board);
});
+
withPinchZoom(board);
if (viewport) {