@plait/core 0.89.1 → 0.90.0

package/fesm2022/plait-core.mjs

@@ -5739,10 +5739,6 @@ function withBoard(board) {
     return board;
 }
 
-const isSmartHand = (board, event) => {
-    return PlaitBoard.isPointer(board, PlaitPointerType.selection) && isMobileDeviceEvent(event);
-};
-
 const ShortcutKey = 'Space';
 const SECONDARY_POINTER_MOVE_THRESHOLD = 5;
 const IS_HAND_MODE = new WeakMap();
@@ -5759,12 +5755,7 @@ function withHandPointer(board) {
     let beingPressedShortcutKey = false;
     board.pointerDown = (event) => {
         const options = board.getPluginOptions(PlaitPluginKey.withHand);
-        const point = toViewBoxPoint(board, toHostPoint(board, event.x, event.y));
-        const isHitTarget = isHitElement(board, point);
-        const canEnterHandMode = options?.isHandMode(board, event) ||
-            PlaitBoard.isPointer(board, PlaitPointerType.hand) ||
-            (isSmartHand(board, event) && !isHitTarget) ||
-            beingPressedShortcutKey;
+        const canEnterHandMode = options?.isHandMode(board, event) || PlaitBoard.isPointer(board, PlaitPointerType.hand) || beingPressedShortcutKey;
         if (canEnterHandMode && isMainPointer(event)) {
             movingPoint = {
                 x: event.x,
@@ -5813,7 +5804,6 @@ function withHandPointer(board) {
         }
         const canEnterHandMode = options?.isHandMode(board, event) ||
             PlaitBoard.isPointer(board, PlaitPointerType.hand) ||
-            isSmartHand(board, event) ||
             hasWheelPressed ||
             hasSecondaryPressed ||
             beingPressedShortcutKey;
@@ -6265,6 +6255,7 @@ function withMoving(board) {
     let hitTargetElement = undefined;
     let isHitSelectedTarget = undefined;
     let pendingNodesG = null;
+    let pointerId = null;
     board.globalKeyDown = (event) => {
         if (!PlaitBoard.isReadonly(board)) {
             if (isKeyHotkey('option', event)) {
@@ -6303,11 +6294,13 @@ function withMoving(board) {
         isHitSelectedTarget = hitTargetElement && selectedTargetElements.includes(hitTargetElement);
         if (hitTargetElement && isHitSelectedTarget) {
             startPoint = point;
+            pointerId = event.pointerId;
             activeElements = selectedTargetElements;
             activeElementsRectangle = getRectangleByElements(board, activeElements, true);
         }
         else if (hitTargetElement) {
             startPoint = point;
+            pointerId = event.pointerId;
             const relatedElements = board.getRelatedFragment([], [hitTargetElement]);
             activeElements = [...getElementsInGroupByElement(board, hitTargetElement), ...relatedElements];
             activeElementsRectangle = getRectangleByElements(board, activeElements, true);
@@ -6319,6 +6312,7 @@ function withMoving(board) {
             const isHitInTargetRectangle = targetRectangle && RectangleClient.isPointInRectangle(targetRectangle, point);
             if (isHitInTargetRectangle) {
                 startPoint = point;
+                pointerId = event.pointerId;
                 activeElements = selectedTargetElements;
                 activeElementsRectangle = targetRectangle;
             }
@@ -6333,7 +6327,7 @@ function withMoving(board) {
         touchMove(event);
     };
     board.pointerMove = (event) => {
-        if (startPoint && activeElements.length && !PlaitBoard.hasBeenTextEditing(board)) {
+        if (startPoint && activeElements.length && !PlaitBoard.hasBeenTextEditing(board) && pointerId === event.pointerId) {
             if (!isPreventDefault) {
                 isPreventDefault = true;
             }
@@ -6412,6 +6406,7 @@ function withMoving(board) {
         snapG?.remove();
         pendingNodesG?.remove();
         startPoint = null;
+        pointerId = null;
         activeElementsRectangle = null;
         offsetX = 0;
         offsetY = 0;
@@ -6590,10 +6585,14 @@ function withSelection(board) {
             options.isMultipleSelection &&
             !options.isDisabledSelection) {
             if (isMobileDeviceEvent(event)) {
+                if (timerId) {
+                    clearTimeout(timerId);
+                    timerId = null;
+                }
                 timerId = setTimeout(() => {
                     screenStart = [event.x, event.y];
                     timerId = null;
-                }, 120);
+                }, 400);
             }
             else {
                 screenStart = [event.x, event.y];
@@ -6603,6 +6602,10 @@ function withSelection(board) {
         pointerDown(event);
     };
     board.touchMove = (event) => {
+        if (screenStart && event.touches.length > 1) {
+            screenStart = null;
+            selectionMovingG?.remove();
+        }
         if (screenStart) {
             event.preventDefault();
             return;