From 7757c89fccdeb9d571d669a8de9a9983cea0c3a0 Mon Sep 17 00:00:00 2001
From: draedful <aschetinin@yandex-team.ru>
Date: Mon, 6 Apr 2026 17:20:16 +0300
Subject: [PATCH 1/2] feat: support snapping in group

---
 src/components/canvas/groups/Group.ts | 90 ++++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 16 deletions(-)

diff --git a/src/components/canvas/groups/Group.ts b/src/components/canvas/groups/Group.ts
index 2a28c19d..197a302c 100644
--- a/src/components/canvas/groups/Group.ts
+++ b/src/components/canvas/groups/Group.ts
@@ -94,6 +94,12 @@ export class Group<T extends TGroup = TGroup> extends GraphComponent<TGroupProps
   /** Whether the group is highlighted (block is being dragged over it) */
   protected highlighted = false;
 
+  /** Whether the group is currently being dragged */
+  protected isDragging = false;
+
+  private dragStartRect: { x: number; y: number } | null = null;
+  private lastSnappedPos: { x: number; y: number } | null = null;
+
   constructor(props: TGroupProps, parent: BlockGroups) {
     super(props, parent);
 
@@ -179,34 +185,81 @@ export class Group<T extends TGroup = TGroup> extends GraphComponent<TGroupProps
   }
 
   /**
-   * Handle drag start - nothing special needed, DragService handles autopanning and cursor
+   * Override to apply snapping or other position transforms during drag.
+   * Called with the raw (pre-snap) target position computed from the drag start + cumulative diff.
+   * The default implementation returns the position unchanged (no snapping).
+   *
+   * @example
+   * ```typescript
+   * protected override snapPosition(x: number, y: number) {
+   *   const grid = 16;
+   *   return { x: Math.round(x / grid) * grid, y: Math.round(y / grid) * grid };
+   * }
+   * ```
+   */
+  protected snapPosition(x: number, y: number): { x: number; y: number } {
+    const gridSize = this.context.constants.block.SNAPPING_GRID_SIZE;
+    if (gridSize <= 1) {
+      return { x, y };
+    }
+    return {
+      x: Math.round(x / gridSize) * gridSize,
+      y: Math.round(y / gridSize) * gridSize,
+    };
+  }
+
+  /**
+   * Handle drag start - stores the initial rect position and sets isDragging flag.
+   * Subclasses that override this method should call super.handleDragStart() to preserve this behavior.
    */
   public override handleDragStart(_context: DragContext): void {
-    // DragService handles autopanning and cursor locking
+    this.isDragging = true;
+    this.dragStartRect = { x: this.state.rect.x, y: this.state.rect.y };
+    this.lastSnappedPos = { x: this.state.rect.x, y: this.state.rect.y };
   }
 
   /**
-   * Handle drag update - update group rect and notify via callback
+   * Handle drag update - moves the group rect and notifies via onDragUpdate.
+   * Uses the cumulative diff from drag start so that snapPosition always operates
+   * on the absolute target position (avoids error accumulation from per-frame deltas).
+   * onDragUpdate is called only when the position actually changes.
    */
   public override handleDrag(diff: DragDiff, _context: DragContext): void {
+    if (!this.dragStartRect || !this.lastSnappedPos) {
+      return;
+    }
+
+    const { x: newX, y: newY } = this.snapPosition(
+      this.dragStartRect.x + diff.diffX,
+      this.dragStartRect.y + diff.diffY
+    );
+
+    const deltaX = newX - this.lastSnappedPos.x;
+    const deltaY = newY - this.lastSnappedPos.y;
+    this.lastSnappedPos = { x: newX, y: newY };
+
     const rect = {
-      x: this.state.rect.x + diff.deltaX,
-      y: this.state.rect.y + diff.deltaY,
+      x: newX,
+      y: newY,
       width: this.state.rect.width,
       height: this.state.rect.height,
     };
-    this.setState({
-      rect,
-    });
+    this.setState({ rect });
     this.updateHitBox(rect);
-    this.props.onDragUpdate(this.props.id, { deltaX: diff.deltaX, deltaY: diff.deltaY });
+
+    if (deltaX !== 0 || deltaY !== 0) {
+      this.props.onDragUpdate(this.props.id, { deltaX, deltaY });
+    }
   }
 
   /**
-   * Handle drag end - nothing special needed, DragService handles cleanup
+   * Handle drag end - clears isDragging flag and drag tracking state.
+   * Subclasses that override this method should call super.handleDragEnd() to preserve this behavior.
    */
   public override handleDragEnd(_context: DragContext): void {
-    // DragService handles autopanning disable and cursor unlock
+    this.isDragging = false;
+    this.dragStartRect = null;
+    this.lastSnappedPos = null;
   }
 
   protected getRect(rect = this.state.rect) {
@@ -227,11 +280,16 @@ export class Group<T extends TGroup = TGroup> extends GraphComponent<TGroupProps
       });
     });
     return this.subscribeSignal(this.groupState.$state, (group) => {
-      if (group) {
-        this.setState({
-          ...this.state,
-          ...group,
-        } as T);
+      if (!group) {
+        return;
+      }
+      if (this.isDragging) {
+        // Suppress rect update during drag to prevent the block bounding-box signal chain
+        // from overwriting the position set by handleDrag / subclass snapping logic.
+        const { rect: _rect, ...groupWithoutRect } = group;
+        this.setState({ ...this.state, ...groupWithoutRect } as T);
+      } else {
+        this.setState({ ...this.state, ...group } as T);
         this.updateHitBox(this.getRect(group.rect));
       }
     });

From 8c4f147f21a893b8586e014760c2bf26b4fc6b41 Mon Sep 17 00:00:00 2001
From: draedful <aschetinin@yandex-team.ru>
Date: Thu, 9 Apr 2026 15:13:30 +0300
Subject: [PATCH 2/2] ...

---
 src/components/canvas/groups/Group.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/canvas/groups/Group.ts b/src/components/canvas/groups/Group.ts
index 197a302c..6cc6dc23 100644
--- a/src/components/canvas/groups/Group.ts
+++ b/src/components/canvas/groups/Group.ts
@@ -287,9 +287,9 @@ export class Group<T extends TGroup = TGroup> extends GraphComponent<TGroupProps
         // Suppress rect update during drag to prevent the block bounding-box signal chain
         // from overwriting the position set by handleDrag / subclass snapping logic.
         const { rect: _rect, ...groupWithoutRect } = group;
-        this.setState({ ...this.state, ...groupWithoutRect } as T);
+        this.setState(groupWithoutRect);
       } else {
-        this.setState({ ...this.state, ...group } as T);
+        this.setState(group);
         this.updateHitBox(this.getRect(group.rect));
       }
     });