开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
feat(pinch-zoom): improve pinch zoom functionality and support hand moving (#75)
pubuzhixing80867aefedbb8
diff --git a/packages/react-board/src/plugins/with-pinch-zoom-plugin.ts b/packages/react-board/src/plugins/with-pinch-zoom-plugin.tsindex e7995f0..752bc03 100644--- a/packages/react-board/src/plugins/with-pinch-zoom-plugin.ts+++ b/packages/react-board/src/plugins/with-pinch-zoom-plugin.ts@@ -2,74 +2,149 @@ import {BoardTransforms,distanceBetweenPointAndPoint,getPointBetween,+ getViewportOrigination,MAX_ZOOM,MIN_ZOOM,PlaitBoard,Point,- throttleRAF,- toHostPoint,- toViewBoxPoint,} from '@plait/core';+interface PointerRecord {+ pointerId: number;+ lastPoint: Point;+ currentPoint: Point;+ hasMoved: boolean;+}+export const withPinchZoom = (board: PlaitBoard) => {const { pointerDown, pointerMove, pointerUp, globalPointerUp } = board;++ const pointerRecords: PointerRecord[] = [];+ let initializeZoom = 0;let isPinching = false;- let initialDistance = 0;- let initialZoom = 1;- let lastZoom = 1;- let touchPoints: {- [key: number]: [number, number];- } = {};- let pinchCenter: Point | null = null;board.pointerDown = (event: PointerEvent) => {- const point = [event.x, event.y] as Point;- touchPoints[event.pointerId] = point;- const touchPointsCount = Object.keys(touchPoints).length;- if (touchPointsCount === 2) {- isPinching = true;- const points = Object.values(touchPoints);- initialDistance = distanceBetweenPointAndPoint(- points[0][0],- points[0][1],- points[1][0],- points[1][1]- );- initialZoom = board.viewport.zoom;- lastZoom = initialZoom;- 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;+ const point: Point = [event.clientX, event.clientY];++ if (pointerRecords.length < 2) {+ initializeZoom = board.viewport.zoom;+ pointerRecords.push({+ pointerId: event.pointerId,+ lastPoint: point,+ currentPoint: point,+ hasMoved: false,+ });}+pointerDown(event);};board.pointerMove = (event: PointerEvent) => {- if (isPinching) {- const point = [event.x, event.y] as Point;- touchPoints[event.pointerId] = point;- const points = Object.values(touchPoints);- if (points.length === 2) {- const currentDistance = distanceBetweenPointAndPoint(- points[0][0],- points[0][1],- points[1][0],- points[1][1]- );- const scale = currentDistance / initialDistance;- const nextZoom = Math.min(- Math.max(initialZoom * scale, MIN_ZOOM),- MAX_ZOOM- );- throttleRAF(board, 'pinch-zoom', () => {- pinchCenter &&- BoardTransforms.updateZoom(board, nextZoom, pinchCenter);- });+ const point: Point = [event.clientX, event.clientY];++ if (pointerRecords.length >= 2) {+ const record = pointerRecords.find(+ (r) => r.pointerId === event.pointerId+ );+ if (record) {+ record.currentPoint = point;+ record.hasMoved = true;++ // 检查是否两个触控点都移动过+ if (+ pointerRecords.length === 2 &&+ pointerRecords.every((r) => r.hasMoved)+ ) {+ const [p1, p2] = pointerRecords;+ const pinchCenter = getPointBetween(+ ...p1.lastPoint,+ ...p2.lastPoint+ ) as Point;+ const newPinchCenter = getPointBetween(+ ...p1.currentPoint,+ ...p2.currentPoint+ ) as Point;+ const distanceOfCenter = distanceBetweenPointAndPoint(+ ...pinchCenter,+ ...newPinchCenter+ );+ const dx = newPinchCenter[0] - pinchCenter[0];+ const dy = newPinchCenter[1] - pinchCenter[1];++ // hand moving+ const boardContainerRect =+ PlaitBoard.getBoardContainer(board).getBoundingClientRect();+ const halfOfWidth = boardContainerRect.width / 2;+ const halfOfHeight = boardContainerRect.height / 2;+ const zoom = board.viewport.zoom;+ const origination = getViewportOrigination(board);+ let centerX = origination![0] + halfOfWidth / zoom - dx / zoom;+ let centerY = origination![1] + halfOfHeight / zoom - dy / zoom;+ let newOrigination = [+ centerX - boardContainerRect.width / 2 / zoom,+ centerY - boardContainerRect.height / 2 / zoom,+ ] as Point;++ let newZoom = zoom;+ const lastDistance = distanceBetweenPointAndPoint(+ ...p1.lastPoint,+ ...p2.lastPoint+ );+ const currentDistance = distanceBetweenPointAndPoint(+ ...p1.currentPoint,+ ...p2.currentPoint+ );+ const distanceDelta = Math.abs(lastDistance - currentDistance);++ // 计算两个触控点的移动向量+ const v1 = [+ p1.currentPoint[0] - p1.lastPoint[0],+ p1.currentPoint[1] - p1.lastPoint[1],+ ] as Point;+ const v2 = [+ p2.currentPoint[0] - p2.lastPoint[0],+ p2.currentPoint[1] - p2.lastPoint[1],+ ] as Point;++ // 计算向量的点积,判断两个触控点的移动是否同向+ const dotProduct = v1[0] * v2[0] + v1[1] * v2[1];+ const v1Magnitude = Math.sqrt(v1[0] * v1[0] + v1[1] * v1[1]);+ const v2Magnitude = Math.sqrt(v2[0] * v2[0] + v2[1] * v2[1]);++ // 计算向量夹角的余弦值+ const cosTheta = dotProduct / (v1Magnitude * v2Magnitude || 1);++ // 控制缩放+ const conditionOfPinching =+ distanceDelta >= 0.1 || distanceOfCenter <= 0.1;+ if (cosTheta < 0.7 || (isPinching && conditionOfPinching)) {+ isPinching = true;+ } else {+ isPinching = false;+ }+ if (isPinching) {+ const scale = currentDistance / lastDistance;+ newZoom = Math.min(+ Math.max(board.viewport.zoom * scale, MIN_ZOOM),+ MAX_ZOOM+ );+ const nativeElement = PlaitBoard.getBoardContainer(board);+ const nativeElementRect = nativeElement.getBoundingClientRect();+ const zoomCenterWidth = newPinchCenter[0] - nativeElementRect.x;+ const zoomCenterHeight = newPinchCenter[1] - nativeElementRect.y;+ centerX = newOrigination[0] + zoomCenterWidth / zoom;+ centerY = newOrigination[1] + zoomCenterHeight / zoom;+ newOrigination = [+ centerX - zoomCenterWidth / newZoom,+ centerY - zoomCenterHeight / newZoom,+ ] as Point;+ }+ BoardTransforms.updateViewport(board, newOrigination, newZoom);+ pointerRecords.forEach((r) => {+ r.lastPoint = r.currentPoint;+ r.hasMoved = false;+ });+ }}return;}@@ -78,22 +153,24 @@ export const withPinchZoom = (board: PlaitBoard) => {};board.pointerUp = (event: PointerEvent) => {- delete touchPoints[event.pointerId];- if (Object.keys(touchPoints).length < 2) {- isPinching = false;- initialDistance = 0;- initialZoom = 1;- lastZoom = 1;+ const index = pointerRecords.findIndex(+ (r) => r.pointerId === event.pointerId+ );+ if (index !== -1) {+ pointerRecords.splice(index, 1);}+pointerUp(event);};board.globalPointerUp = (event: PointerEvent) => {- touchPoints = {};- isPinching = false;- initialDistance = 0;- initialZoom = 1;- lastZoom = 1;+ const index = pointerRecords.findIndex(+ (r) => r.pointerId === event.pointerId+ );+ if (index !== -1) {+ pointerRecords.splice(index, 1);+ }+globalPointerUp(event);};