fix(draw): use isLineHitRectangle to verify selection is hit geometry…

… and image element
worktile · Dec 27, 2024 · 8c449f4 · 8c449f4
1 parent 4036ede
commit 8c449f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/core/src/utils/math.ts b/packages/core/src/utils/math.ts
@@ -179,36 +179,36 @@ export const isLineHitLine = (a: Point, b: Point, c: Point, d: Point): boolean =
     return crossProduct(ab, ac) * crossProduct(ab, ad) <= 0 && crossProduct(cd, ca) * crossProduct(cd, cb) <= 0;
 };
 
-export const isPolylineHitRectangle = (points: Point[], rectangle: RectangleClient, isClose: boolean = true) => {
+export const isLineHitRectangle = (points: Point[], rectangle: RectangleClient, isClose: boolean = true) => {
     const rectanglePoints = RectangleClient.getCornerPoints(rectangle);
     const len = points.length;
     for (let i = 0; i < len; i++) {
         if (i === len - 1 && !isClose) continue;
         const p1 = points[i];
         const p2 = points[(i + 1) % len];
-        const isHit = isLineHitRectangleEdge(p1, p2, rectangle);
+        const isHit = isSingleLineHitRectangleEdge(p1, p2, rectangle);
         if (isHit || isPointInPolygon(p1, rectanglePoints) || isPointInPolygon(p2, rectanglePoints)) {
             return true;
         }
     }
     return false;
 };
 
-export const isPolylineHitRectangleEdge = (points: Point[], rectangle: RectangleClient, isClose: boolean = true) => {
+export const isLineHitRectangleEdge = (points: Point[], rectangle: RectangleClient, isClose: boolean = true) => {
     const len = points.length;
     for (let i = 0; i < len; i++) {
         if (i === len - 1 && !isClose) continue;
         const p1 = points[i];
         const p2 = points[(i + 1) % len];
-        const isHit = isLineHitRectangleEdge(p1, p2, rectangle);
+        const isHit = isSingleLineHitRectangleEdge(p1, p2, rectangle);
         if (isHit) {
             return true;
         }
     }
     return false;
 };
 
-export const isLineHitRectangleEdge = (p1: Point, p2: Point, rectangle: RectangleClient) => {
+export const isSingleLineHitRectangleEdge = (p1: Point, p2: Point, rectangle: RectangleClient) => {
     const rectanglePoints = RectangleClient.getCornerPoints(rectangle);
     return (
         isLineHitLine(p1, p2, rectanglePoints[0], rectanglePoints[1]) ||

diff --git a/packages/draw/src/plugins/with-table.ts b/packages/draw/src/plugins/with-table.ts
@@ -6,7 +6,7 @@ import {
     PlaitElement,
     RectangleClient,
     Selection,
-    isPolylineHitRectangle,
+    isLineHitRectangle,
     toViewBoxPoint,
     toHostPoint,
     getHitElementByPoint,
@@ -59,7 +59,7 @@ export const withTable = (board: PlaitBoard) => {
     tableBoard.isRectangleHit = (element: PlaitElement, selection: Selection) => {
         if (PlaitDrawElement.isElementByTable(element)) {
             const rangeRectangle = RectangleClient.getRectangleByPoints([selection.anchor, selection.focus]);
-            return isPolylineHitRectangle(element.points, rangeRectangle);
+            return isLineHitRectangle(element.points, rangeRectangle);
         }
         return isRectangleHit(element, selection);
     };

diff --git a/packages/draw/src/utils/hit.ts b/packages/draw/src/utils/hit.ts
@@ -3,7 +3,7 @@ import {
     RectangleClient,
     Selection,
     PlaitBoard,
-    isPolylineHitRectangle,
+    isLineHitRectangle,
     Point,
     distanceBetweenPointAndSegments,
     distanceBetweenPointAndPoint,
@@ -12,7 +12,7 @@ import {
     rotateAntiPointsByElement,
     isPointInPolygon,
     rotatePointsByAngle,
-    isPolylineHitRectangleEdge
+    isLineHitRectangleEdge
 } from '@plait/core';
 import {
     PlaitArrowLine,
@@ -116,12 +116,12 @@ export const isRectangleHitDrawElement = (board: PlaitBoard, element: PlaitEleme
 
     if (PlaitDrawElement.isArrowLine(element)) {
         const points = getArrowLinePoints(board, element);
-        return isPolylineHitRectangle(points, rangeRectangle);
+        return isLineHitRectangle(points, rangeRectangle);
     }
 
     if (PlaitDrawElement.isVectorLine(element)) {
         const points = getVectorLinePoints(board, element)!;
-        return isPolylineHitRectangle(points, rangeRectangle, false);
+        return isLineHitRectangle(points, rangeRectangle, false);
     }
 
     return null;
@@ -138,7 +138,7 @@ export const isRectangleHitRotatedElement = (
 
 export const isRectangleHitRotatedPoints = (rectangle: RectangleClient, points: Point[], angle: number | undefined) => {
     let rotatedPoints = rotatePointsByAngle(points, angle) || points;
-    return isPolylineHitRectangleEdge(rotatedPoints, rectangle);
+    return isLineHitRectangle(rotatedPoints, rectangle);
 };
 
 export const getHitDrawElement = (board: PlaitBoard, elements: (PlaitDrawElement | PlaitCustomGeometry)[]) => {