fix: creating snap no work well when some graphics are selected

F-star · Jan 13, 2025 · 3b94d6b · 3b94d6b
1 parent b0ace07
commit 3b94d6b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/packages/core/src/ref_line.ts b/packages/core/src/ref_line.ts
@@ -51,13 +51,20 @@ export class RefLine {
   /**
    * cache reference line of graphics in viewport
    */
-  cacheGraphicsRefLines() {
+  cacheGraphicsRefLines(
+    options: {
+      excludeItems: SuikaGraphics[];
+    } = {
+      excludeItems: [],
+    },
+  ) {
     this.clear();
 
+    const excludeItems = options.excludeItems;
+
     const vRefLineMap = this.vRefLineMap;
     const hRefLineMap = this.hRefLineMap;
 
-    const selectIdSet = this.editor.selectedElements.getIdSet();
     const viewportBbox = this.editor.viewportManager.getBbox();
 
     const refGraphicsSet = new Set<SuikaGraphics>();
@@ -71,17 +78,17 @@ export class RefLine {
       refGraphicsSet.add(graphics);
     });
 
-    const selectedItems = this.editor.selectedElements.getItems();
-    for (const selectedItem of selectedItems) {
+    for (const selectedItem of excludeItems) {
       selectedItem.forEachVisibleChildNode((graphics) => {
         if (refGraphicsSet.has(graphics)) {
           refGraphicsSet.delete(graphics);
         }
       });
     }
 
+    const excludeIdSet = new Set(excludeItems.map((item) => item.attrs.id));
     for (const graphics of refGraphicsSet) {
-      if (selectIdSet.has(graphics.attrs.id)) {
+      if (excludeIdSet.has(graphics.attrs.id)) {
         continue;
       }
 

diff --git a/packages/core/src/tools/tool_draw_graphics.ts b/packages/core/src/tools/tool_draw_graphics.ts
@@ -60,7 +60,9 @@ export abstract class DrawGraphicsTool implements ITool {
         return;
       }
       if (this.isDragging) {
-        this.editor.refLine.cacheGraphicsRefLines();
+        this.editor.refLine.cacheGraphicsRefLines({
+          excludeItems: this.editor.selectedElements.getItems(),
+        });
       }
     };
     const updateRectWhenViewportTranslate = () => {

diff --git a/packages/core/src/tools/tool_select/tool_select_move.ts b/packages/core/src/tools/tool_select/tool_select_move.ts
@@ -86,7 +86,9 @@ export class SelectMoveTool implements IBaseTool {
       this.prevBBoxPos = { x: boundingRect.x, y: boundingRect.y };
     }
 
-    this.editor.refLine.cacheGraphicsRefLines();
+    this.editor.refLine.cacheGraphicsRefLines({
+      excludeItems: this.selectedItems,
+    });
   }
   onDrag(e: PointerEvent) {
     this.dragPoint = this.editor.getCursorXY(e);

diff --git a/packages/core/src/tools/tool_select/tool_select_resize.ts b/packages/core/src/tools/tool_select/tool_select_resize.ts
@@ -107,7 +107,9 @@ export class SelectResizeTool implements IBaseTool {
         this.editor.selectedElements.getItems()[0].getRotate() % HALF_PI === 0);
 
     if (!this.lastDragPoint) {
-      this.editor.refLine.cacheGraphicsRefLines();
+      this.editor.refLine.cacheGraphicsRefLines({
+        excludeItems: this.editor.selectedElements.getItems(),
+      });
     }
     this.lastDragPoint = this.editor.getSceneCursorXY(e);