@mhamz.01/easyflow-whiteboard 2.36.0 → 2.38.0

package/dist/components/node/custom-node-overlay-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom-node-overlay-layer.d.ts","sourceRoot":"","sources":["../../../src/components/node/custom-node-overlay-layer.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAM9C,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,CAAC;IACxC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACxC,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAC;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,YAAY,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzE,qBAAqB,CAAC,EAAE,YAAY,EAAE,CAAC;IACvC,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC/C;AAwBD,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,KAAK,EACL,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,UAAc,EACd,cAA+B,EAC/B,YAAmB,EACnB,qBAA0B,EAC1B,YAAY,GACb,EAAE,uBAAuB,2CAmezB"}
+{"version":3,"file":"custom-node-overlay-layer.d.ts","sourceRoot":"","sources":["../../../src/components/node/custom-node-overlay-layer.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAS9C,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,MAAM,CAAC;IACxC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,UAAU,uBAAuB;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC;IACxC,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAC;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,YAAY,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACzE,qBAAqB,CAAC,EAAE,YAAY,EAAE,CAAC;IACvC,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC/C;AAaD,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,KAAK,EACL,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,UAAc,EACd,cAA+B,EAC/B,YAAmB,EACnB,qBAA0B,EAC1B,YAAY,GACb,EAAE,uBAAuB,2CA6hBzB"}

package/dist/components/node/custom-node-overlay-layer.js

@@ -1,22 +1,14 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect, useRef, useCallback, memo } from "react";
+import { useState, useEffect, useRef } from "react";
 import TaskNode from "./custom-node";
 import DocumentNode from "./document-node";
-// ─── Memoized node wrappers ───────────────────────────────────────────────────
-// Prevents all sibling nodes re-rendering when one node's position or
-// selection state changes. Props compared shallowly by React.memo.
-const MemoTaskNode = memo(TaskNode);
-const MemoDocumentNode = memo(DocumentNode);
 // ─── Component ────────────────────────────────────────────────────────────────
 export default function CanvasOverlayLayer({ tasks, documents, onTasksUpdate, onDocumentsUpdate, canvasZoom = 1, canvasViewport = { x: 0, y: 0 }, selectionBox = null, selectedCanvasObjects = [], fabricCanvas, }) {
     const [localTasks, setLocalTasks] = useState(tasks);
     const [localDocuments, setLocalDocuments] = useState(documents);
     const [selectedIds, setSelectedIds] = useState(new Set());
-    // `dragging` state removed entirely — it caused a re-render on drag start
-    // which tore down/reattached the mousemove listener mid-gesture (jump bug).
-    // All drag lifecycle now lives exclusively in dragStateRef.
-    // ─── Refs ──────────────────────────────────────────────────────────────────
+    const [dragging, setDragging] = useState(null);
     const dragStateRef = useRef({
         isDragging: false,
         itemIds: [],
@@ -24,59 +16,76 @@ export default function CanvasOverlayLayer({ tasks, documents, onTasksUpdate, on
         canvasObjectsStartPos: new Map(),
         offsetX: 0,
         offsetY: 0,
-        fabricDragHtmlIds: new Set(),
     });
     const rafIdRef = useRef(null);
     const overlayRef = useRef(null);
-    // ── Always-fresh refs — assigned synchronously in render body ─────────────
-    // Read inside stable [] effect closures. Assigned during render (not useEffect)
-    // so they hold the latest value before any event handler can fire.
     const selectedIdsRef = useRef(selectedIds);
     selectedIdsRef.current = selectedIds;
-    // O(1) world-position lookup — replaces O(n) getItemPosition() scans
-    const nodePositionsRef = useRef(new Map());
-    nodePositionsRef.current = new Map([
-        ...localTasks.map((t) => [t.id, { x: t.x, y: t.y }]),
-        ...localDocuments.map((d) => [d.id, { x: d.x, y: d.y }]),
-    ]);
-    // Avoids stale prop capture of selectedCanvasObjects in handleDragStart
-    const selectedCanvasObjectsRef = useRef(selectedCanvasObjects);
-    selectedCanvasObjectsRef.current = selectedCanvasObjects;
-    // Stable callback refs — handleEnd never closes over stale prop functions
-    const onTasksUpdateRef = useRef(onTasksUpdate);
-    const onDocumentsUpdateRef = useRef(onDocumentsUpdate);
-    onTasksUpdateRef.current = onTasksUpdate;
-    onDocumentsUpdateRef.current = onDocumentsUpdate;
-    // ─── Sync props → local state ──────────────────────────────────────────────
+    // ── Sync props → local state ────────────────────────────────────────────────
     useEffect(() => { setLocalTasks(tasks); }, [tasks]);
     useEffect(() => { setLocalDocuments(documents); }, [documents]);
-    // ─── Wheel forwarding to Fabric ────────────────────────────────────────────
-    // `canvasZoom` removed from deps — handler reads canvas state imperatively,
-    // no stale data risk. Registered once per canvas mount.
+    // ── Event Forwarding (Fixes Zooming on Nodes) ───────────────────────────────
+    const handleOverlayWheel = (e) => {
+        if (e.ctrlKey || e.metaKey || e.shiftKey) {
+            const canvas = fabricCanvas?.current;
+            if (!canvas)
+                return;
+            const nativeEvent = e.nativeEvent;
+            // getScenePoint handles the transformation from screen to canvas space
+            const scenePoint = canvas.getScenePoint(nativeEvent);
+            // Viewport point is simply the mouse position relative to the canvas element
+            const rect = canvas.getElement().getBoundingClientRect();
+            const viewportPoint = {
+                x: nativeEvent.clientX - rect.left,
+                y: nativeEvent.clientY - rect.top,
+            };
+            // We cast to 'any' here because we are manually triggering an internal 
+            // event bus, and Fabric's internal types for .fire() can be overly strict.
+            canvas.fire("mouse:wheel", {
+                e: nativeEvent,
+                scenePoint,
+                viewportPoint,
+            });
+            e.preventDefault();
+            e.stopPropagation();
+        }
+    };
     useEffect(() => {
         const overlayEl = overlayRef.current;
         const canvas = fabricCanvas?.current;
         if (!overlayEl || !canvas)
             return;
         const handleGlobalWheel = (e) => {
-            const isOverNode = e.target !== overlayEl;
+            // Check if the user is hovering over an element that has pointer-events: auto
+            // (meaning they are hovering over a Task or Document)
+            const target = e.target;
+            const isOverNode = target !== overlayEl;
             if ((e.ctrlKey || e.metaKey) && isOverNode) {
+                // 1. Prevent Browser Zoom immediately
                 e.preventDefault();
                 e.stopPropagation();
+                // 2. Calculate coordinates for Fabric
                 const scenePoint = canvas.getScenePoint(e);
                 const rect = canvas.getElement().getBoundingClientRect();
+                const viewportPoint = {
+                    x: e.clientX - rect.left,
+                    y: e.clientY - rect.top,
+                };
+                // 3. Manually fire the event into Fabric
                 canvas.fire("mouse:wheel", {
-                    e,
+                    e: e,
                     scenePoint,
-                    viewportPoint: { x: e.clientX - rect.left, y: e.clientY - rect.top },
+                    viewportPoint,
                 });
             }
         };
+        // CRITICAL: { passive: false } allows us to cancel the browser's zoom
         overlayEl.addEventListener("wheel", handleGlobalWheel, { passive: false });
-        return () => overlayEl.removeEventListener("wheel", handleGlobalWheel);
-    }, [fabricCanvas]);
-    // ─── Fabric → Overlay sync + deselection ───────────────────────────────────
-    // Registered once — selectedIds always read via selectedIdsRef.
+        return () => {
+            overlayEl.removeEventListener("wheel", handleGlobalWheel);
+        };
+    }, [fabricCanvas, canvasZoom]); // Re-bind when zoom changes to keep closure fresh
+    // ── Fabric → Overlay Sync (Fixes Dragging from Fabric area) ──────────────────
     useEffect(() => {
         const canvas = fabricCanvas?.current;
         if (!canvas)
@@ -85,39 +94,17 @@ export default function CanvasOverlayLayer({ tasks, documents, onTasksUpdate, on
             const target = e.transform?.target || e.target;
             if (!target)
                 return;
-            // If an HTML-node drag is already in progress (handleDragStart was called),
-            // object:moving should not also move HTML nodes — the HTML drag loop owns that.
-            // itemIds.length > 0 means HTML drag is active.
-            if (dragStateRef.current.isDragging && dragStateRef.current.itemIds.length > 0)
-                return;
-            // On the very first object:moving frame of a FABRIC-initiated drag,
-            // snapshot which HTML nodes were selected at mousedown time — BEFORE
-            // selection:created/updated had a chance to clear them.
-            if (!dragStateRef.current.isDragging) {
-                dragStateRef.current.isDragging = true;
-                dragStateRef.current.fabricDragHtmlIds = new Set(selectedIdsRef.current);
-            }
             const deltaX = target.left - (target._prevLeft ?? target.left);
             const deltaY = target.top - (target._prevTop ?? target.top);
             target._prevLeft = target.left;
             target._prevTop = target.top;
             if (deltaX === 0 && deltaY === 0)
                 return;
-            // Use the snapshotted ids — immune to any post-mousedown selection clearing
-            const sel = dragStateRef.current.fabricDragHtmlIds;
-            if (sel.size === 0)
-                return;
+            // ── Read from ref — always fresh, never stale ──
+            const sel = selectedIdsRef.current;
             setLocalTasks((prev) => prev.map((t) => sel.has(t.id) ? { ...t, x: t.x + deltaX, y: t.y + deltaY } : t));
             setLocalDocuments((prev) => prev.map((d) => sel.has(d.id) ? { ...d, x: d.x + deltaX, y: d.y + deltaY } : d));
         };
-        // When Fabric drag ends, reset so next gesture gets a fresh snapshot
-        const handleObjectModified = () => {
-            // Only reset if this was a Fabric-initiated drag (not HTML drag)
-            if (dragStateRef.current.isDragging && dragStateRef.current.itemIds.length === 0) {
-                dragStateRef.current.isDragging = false;
-                dragStateRef.current.fabricDragHtmlIds = new Set();
-            }
-        };
         const handleMouseDown = (e) => {
             const target = e.target;
             if (target) {
@@ -125,84 +112,160 @@ export default function CanvasOverlayLayer({ tasks, documents, onTasksUpdate, on
                 target._prevTop = target.top;
             }
             if (!target) {
-                // Clicked empty canvas — always deselect HTML nodes
                 setSelectedIds(new Set());
                 return;
             }
-            // Clicked a Fabric object — only deselect HTML nodes if NOT already in
-            // the active selection (preserves mixed-group drag behaviour).
-            // Note: getActiveObjects() here reflects the selection BEFORE this click,
-            // which is exactly what we want — it tells us if this is a continuation
-            // of an existing selection (drag) vs a fresh click (deselect).
-            const activeObjects = canvas.getActiveObjects();
-            if (!activeObjects.includes(target)) {
-                setSelectedIds(new Set());
-            }
-            // If already selected: selectedIds stays intact.
-            // handleObjectMoving will snapshot it on the first move frame.
-        };
-        // Clear HTML selection on fresh Fabric selection, but never while a
-        // Fabric drag is active (fabricDragHtmlIds.size > 0 = drag in progress)
-        const handleFabricSelection = () => {
-            if (!dragStateRef.current.isDragging) {
+            // ── Read from ref — not stale closure ──
+            const activeObject = canvas.getActiveObject(); // the group/selection box
+            const activeObjects = canvas.getActiveObjects(); // individual objects inside it
+            const isTargetAlreadySelected = activeObjects.includes(target) || // clicked an individual selected object
+                activeObject === target; // clicked the selection box itself
+            if (!isTargetAlreadySelected) {
                 setSelectedIds(new Set());
             }
         };
         canvas.on("object:moving", handleObjectMoving);
-        canvas.on("object:modified", handleObjectModified);
         canvas.on("mouse:down", handleMouseDown);
-        canvas.on("selection:created", handleFabricSelection);
-        canvas.on("selection:updated", handleFabricSelection);
         return () => {
             canvas.off("object:moving", handleObjectMoving);
-            canvas.off("object:modified", handleObjectModified);
             canvas.off("mouse:down", handleMouseDown);
-            canvas.off("selection:created", handleFabricSelection);
-            canvas.off("selection:updated", handleFabricSelection);
         };
-    }, [fabricCanvas]); // selectedIds NOT in deps — read via ref
-    // ─── Selection box hit detection ───────────────────────────────────────────
+        // ── selectedIds REMOVED from deps — read via selectedIdsRef instead ──────
+        // Having selectedIds here caused the effect to re-register on every selection
+        // change, creating a new closure each time. The second drag captured a stale
+        // or empty selectedIds from the closure at re-registration time.
+    }, [canvasZoom, fabricCanvas]);
+    // ── Helpers ─────────────────────────────────────────────────────────────────
+    const getItemPosition = (id) => {
+        const task = localTasks.find((t) => t.id === id);
+        if (task)
+            return { x: task.x, y: task.y };
+        const doc = localDocuments.find((d) => d.id === id);
+        if (doc)
+            return { x: doc.x, y: doc.y };
+        return undefined;
+    };
+    const isItemInSelectionBox = (x, y, width, height, box) => {
+        const itemX1 = x * canvasZoom + canvasViewport.x;
+        const itemY1 = y * canvasZoom + canvasViewport.y;
+        const itemX2 = itemX1 + width * canvasZoom;
+        const itemY2 = itemY1 + height * canvasZoom;
+        const boxX1 = Math.min(box.x1, box.x2);
+        const boxY1 = Math.min(box.y1, box.y2);
+        const boxX2 = Math.max(box.x1, box.x2);
+        const boxY2 = Math.max(box.y1, box.y2);
+        return !(boxX2 < itemX1 || boxX1 > itemX2 || boxY2 < itemY1 || boxY1 > itemY2);
+    };
+    // ── Selection box detection ──────────────────────────────────────────────────
     useEffect(() => {
         if (!selectionBox)
             return;
-        const bX1 = Math.min(selectionBox.x1, selectionBox.x2);
-        const bY1 = Math.min(selectionBox.y1, selectionBox.y2);
-        const bX2 = Math.max(selectionBox.x1, selectionBox.x2);
-        const bY2 = Math.max(selectionBox.y1, selectionBox.y2);
-        const hits = (x, y, w, h) => {
-            const x1 = x * canvasZoom + canvasViewport.x;
-            const y1 = y * canvasZoom + canvasViewport.y;
-            return !(bX2 < x1 || bX1 > x1 + w * canvasZoom || bY2 < y1 || bY1 > y1 + h * canvasZoom);
-        };
+        // ── O(n) single pass — no sort, no join, no extra allocations ──
         const newSelected = new Set();
-        for (const task of localTasks)
-            if (hits(task.x, task.y, 300, 140))
+        for (const task of localTasks) {
+            if (isItemInSelectionBox(task.x, task.y, 300, 140, selectionBox))
                 newSelected.add(task.id);
-        for (const doc of localDocuments)
-            if (hits(doc.x, doc.y, 320, 160))
+        }
+        for (const doc of localDocuments) {
+            if (isItemInSelectionBox(doc.x, doc.y, 320, 160, selectionBox))
                 newSelected.add(doc.id);
-        // O(n) equality — same Set ref if unchanged → no re-render
+        }
+        // ── O(n) equality check: size first (fast path), then membership ──
         setSelectedIds((prev) => {
             if (prev.size !== newSelected.size)
                 return newSelected;
-            for (const id of newSelected)
+            for (const id of newSelected) {
                 if (!prev.has(id))
-                    return newSelected;
-            return prev;
+                    return newSelected; // found a difference, swap
+            }
+            return prev; // identical — return same reference, no re-render
         });
     }, [selectionBox, localTasks, localDocuments, canvasZoom, canvasViewport]);
-    // ─── Global drag listeners — registered ONCE on mount ──────────────────────
-    // Critical: must NOT be in a useEffect with [localTasks] or any state deps.
-    // Every setLocalTasks during drag would tear down + reattach mousemove → jump.
-    // All values read via refs so the [] closure is always correct.
+    // ── Drag start (HTML Node side) ──────────────────────────────────────────────
+    // Helper to extract coordinates regardless of event type
+    const getPointerEvent = (e) => {
+        if ('touches' in e && e.touches.length > 0)
+            return e.touches[0];
+        return e;
+    };
+    const handleDragStart = (itemId, e) => {
+        // 1. Safety check for the Fabric instance
+        const canvas = fabricCanvas?.current;
+        if (!canvas)
+            return;
+        // 2. Normalize the event (Touch vs Mouse)
+        if (e.cancelable)
+            e.preventDefault();
+        const pointer = getPointerEvent(e);
+        // 3. Determine which items are being dragged
+        // selection update DOES NOT trigger before drag snapshot
+        let itemsToDrag;
+        if (selectedIds.has(itemId)) {
+            itemsToDrag = Array.from(selectedIds);
+        }
+        else {
+            itemsToDrag = [itemId];
+        }
+        // 4. Capture current World Transform (Zoom & Pan)
+        // We read directly from the canvas to ensure zero-frame lag
+        const vpt = canvas.viewportTransform || [1, 0, 0, 1, 0, 0];
+        const liveZoom = vpt[0];
+        const liveVpX = vpt[4];
+        const liveVpY = vpt[5];
+        // 5. Convert the Click Position from Screen Pixels to World Units
+        const clickWorldX = (pointer.clientX - liveVpX) / liveZoom;
+        const clickWorldY = (pointer.clientY - liveVpY) / liveZoom;
+        // 6. Get the clicked item's current World Position
+        const clickedPos = getItemPosition(itemId);
+        if (!clickedPos)
+            return;
+        // 7. Calculate the Offset in WORLD UNITS
+        // This is the distance from the mouse to the node's top-left in the infinite grid.
+        // This value remains constant even if you zoom during the drag.
+        const worldOffsetX = clickWorldX - clickedPos.x;
+        const worldOffsetY = clickWorldY - clickedPos.y;
+        // 8. Snapshot starting positions for all selected HTML nodes
+        const startPositions = new Map();
+        itemsToDrag.forEach((id) => {
+            const pos = getItemPosition(id);
+            if (pos)
+                startPositions.set(id, pos);
+        });
+        // 9. Snapshot starting positions for all selected Fabric objects
+        const canvasObjectsStartPos = new Map();
+        selectedCanvasObjects.forEach((obj) => {
+            canvasObjectsStartPos.set(obj, { left: obj.left || 0, top: obj.top || 0 });
+        });
+        // 10. Commit to the ref for the requestAnimationFrame loop
+        dragStateRef.current = {
+            isDragging: true,
+            itemIds: itemsToDrag,
+            startPositions,
+            canvasObjectsStartPos,
+            offsetX: worldOffsetX, // Now stored as World Units
+            offsetY: worldOffsetY, // Now stored as World Units
+        };
+        if (!selectedIds.has(itemId) && dragStateRef.current.itemIds.length === 0) {
+            setSelectedIds(new Set([itemId]));
+        }
+        // 11. Trigger UI states
+        setDragging({ itemIds: itemsToDrag });
+        document.body.style.cursor = "grabbing";
+        document.body.style.userSelect = "none";
+        document.body.style.touchAction = "none";
+    };
+    // ── Drag move (HTML Node side) ───────────────────────────────────────────────
     useEffect(() => {
+        if (!dragging)
+            return;
+        // Inside the useEffect that watches [dragging, localTasks, localDocuments, fabricCanvas]
         const handleMove = (e) => {
             if (!dragStateRef.current.isDragging)
                 return;
             if (e.cancelable)
                 e.preventDefault();
-            const pointer = "touches" in e && e.touches.length > 0
-                ? e.touches[0] : e;
+            const pointer = getPointerEvent(e);
+            // 1. Throttle updates using requestAnimationFrame for 120Hz/144Hz screen support
             if (rafIdRef.current !== null)
                 cancelAnimationFrame(rafIdRef.current);
             rafIdRef.current = requestAnimationFrame(() => {
@@ -210,48 +273,59 @@ export default function CanvasOverlayLayer({ tasks, documents, onTasksUpdate, on
                 const canvas = fabricCanvas?.current;
                 if (!canvas)
                     return;
+                // 2. Read the "Source of Truth" transform from the canvas
                 const vpt = canvas.viewportTransform;
-                const liveZoom = vpt[0];
-                const liveVpX = vpt[4];
-                const liveVpY = vpt[5];
-                const newWorldX = (pointer.clientX - liveVpX) / liveZoom - offsetX;
-                const newWorldY = (pointer.clientY - liveVpY) / liveZoom - offsetY;
-                const firstStart = startPositions.get(itemIds[0]);
+                const liveZoom = vpt[0]; // Scale
+                const liveVpX = vpt[4]; // Pan X
+                const liveVpY = vpt[5]; // Pan Y
+                // 3. Convert current Mouse Screen Position → World Position
+                const currentWorldX = (pointer.clientX - liveVpX) / liveZoom;
+                const currentWorldY = (pointer.clientY - liveVpY) / liveZoom;
+                // 4. Calculate where the "Anchor" node should be in World Units
+                // (Current Mouse World - Initial World Offset from Start)
+                const newWorldX = currentWorldX - offsetX;
+                const newWorldY = currentWorldY - offsetY;
+                // 5. Calculate the Movement Delta in World Units
+                // We compare where the first item started vs where it is now.
+                const firstId = itemIds[0];
+                const firstStart = startPositions.get(firstId);
                 if (!firstStart)
                     return;
                 const deltaX = newWorldX - firstStart.x;
                 const deltaY = newWorldY - firstStart.y;
-                setLocalTasks((prev) => prev.map((t) => itemIds.includes(t.id)
-                    ? { ...t,
-                        x: (startPositions.get(t.id)?.x ?? t.x) + deltaX,
-                        y: (startPositions.get(t.id)?.y ?? t.y) + deltaY }
-                    : t));
-                setLocalDocuments((prev) => prev.map((d) => itemIds.includes(d.id)
-                    ? { ...d,
-                        x: (startPositions.get(d.id)?.x ?? d.x) + deltaX,
-                        y: (startPositions.get(d.id)?.y ?? d.y) + deltaY }
-                    : d));
+                // 6. Update HTML Nodes (Batching these into one state update)
+                setLocalTasks((prev) => prev.map((t) => itemIds.includes(t.id) ? {
+                    ...t,
+                    x: (startPositions.get(t.id)?.x ?? t.x) + deltaX,
+                    y: (startPositions.get(t.id)?.y ?? t.y) + deltaY,
+                } : t));
+                setLocalDocuments((prev) => prev.map((d) => itemIds.includes(d.id) ? {
+                    ...d,
+                    x: (startPositions.get(d.id)?.x ?? d.x) + deltaX,
+                    y: (startPositions.get(d.id)?.y ?? d.y) + deltaY,
+                } : d));
+                // 7. Sync Fabric Objects (Imperative update for performance)
                 canvasObjectsStartPos.forEach((startPos, obj) => {
-                    obj.set({ left: startPos.left + deltaX, top: startPos.top + deltaY });
-                    obj.setCoords();
+                    obj.set({
+                        left: startPos.left + deltaX,
+                        top: startPos.top + deltaY,
+                    });
+                    obj.setCoords(); // Required for selection/intersection accuracy
                 });
+                // 8. Single render call for all Fabric changes
                 canvas.requestRenderAll();
             });
         };
         const handleEnd = () => {
-            if (!dragStateRef.current.isDragging)
-                return;
-            if (rafIdRef.current !== null) {
+            if (rafIdRef.current !== null)
                 cancelAnimationFrame(rafIdRef.current);
-                rafIdRef.current = null;
-            }
             dragStateRef.current.isDragging = false;
+            setDragging(null);
             document.body.style.cursor = "";
             document.body.style.userSelect = "";
             document.body.style.touchAction = "";
-            // Flush via functional updater (reads latest state) + callback ref (never stale)
-            setLocalTasks((prev) => { onTasksUpdateRef.current?.(prev); return prev; });
-            setLocalDocuments((prev) => { onDocumentsUpdateRef.current?.(prev); return prev; });
+            onTasksUpdate?.(localTasks);
+            onDocumentsUpdate?.(localDocuments);
         };
         window.addEventListener("mousemove", handleMove, { passive: false });
         window.addEventListener("mouseup", handleEnd);
@@ -265,62 +339,9 @@ export default function CanvasOverlayLayer({ tasks, documents, onTasksUpdate, on
             window.removeEventListener("touchend", handleEnd);
             window.removeEventListener("touchcancel", handleEnd);
         };
-    }, []); // eslint-disable-line react-hooks/exhaustive-deps
-    // ─── Drag start ────────────────────────────────────────────────────────────
-    // useCallback: stable ref so MemoTaskNode/MemoDocumentNode don't re-render
-    // on unrelated parent state changes.
-    const handleDragStart = useCallback((itemId, e) => {
-        const canvas = fabricCanvas?.current;
-        if (!canvas)
-            return;
-        if (e.cancelable)
-            e.preventDefault();
-        const pointer = "touches" in e && e.touches.length > 0
-            ? e.touches[0] : e;
-        // Read from ref — never stale even if setSelectedIds was called this render
-        const currentSelected = selectedIdsRef.current;
-        const itemsToDrag = currentSelected.has(itemId)
-            ? Array.from(currentSelected)
-            : [itemId];
-        if (!currentSelected.has(itemId)) {
-            setSelectedIds(new Set([itemId]));
-        }
-        const vpt = canvas.viewportTransform || [1, 0, 0, 1, 0, 0];
-        const liveZoom = vpt[0];
-        const liveVpX = vpt[4];
-        const liveVpY = vpt[5];
-        // O(1) ref lookup — no stale state scan
-        const clickedPos = nodePositionsRef.current.get(itemId);
-        if (!clickedPos)
-            return;
-        const startPositions = new Map();
-        for (const id of itemsToDrag) {
-            const pos = nodePositionsRef.current.get(id);
-            if (pos)
-                startPositions.set(id, { x: pos.x, y: pos.y });
-        }
-        // Read Fabric objects from ref — not stale prop
-        const canvasObjectsStartPos = new Map();
-        for (const obj of selectedCanvasObjectsRef.current) {
-            canvasObjectsStartPos.set(obj, { left: obj.left || 0, top: obj.top || 0 });
-        }
-        // Write only to ref — zero re-render on drag start (eliminates listener churn)
-        dragStateRef.current = {
-            isDragging: true,
-            itemIds: itemsToDrag,
-            startPositions,
-            canvasObjectsStartPos,
-            offsetX: (pointer.clientX - liveVpX) / liveZoom - clickedPos.x,
-            offsetY: (pointer.clientY - liveVpY) / liveZoom - clickedPos.y,
-            fabricDragHtmlIds: new Set(),
-        };
-        document.body.style.cursor = "grabbing";
-        document.body.style.userSelect = "none";
-        document.body.style.touchAction = "none";
-    }, [fabricCanvas]);
-    // ─── Node interaction handlers ─────────────────────────────────────────────
-    // useCallback: stable refs prevent unnecessary re-renders of memoized nodes
-    const handleSelect = useCallback((id, e) => {
+    }, [dragging, localTasks, localDocuments, fabricCanvas]);
+    // ── Selection, Status, Keyboard Logic ────────────────────────────────────────
+    const handleSelect = (id, e) => {
         if (e?.shiftKey || e?.ctrlKey || e?.metaKey) {
             setSelectedIds((prev) => {
                 const next = new Set(prev);
@@ -331,65 +352,68 @@ export default function CanvasOverlayLayer({ tasks, documents, onTasksUpdate, on
         else {
             setSelectedIds(new Set([id]));
         }
-    }, []);
-    const handleStatusChange = useCallback((taskId, newStatus) => {
-        setLocalTasks((prev) => {
-            const updated = prev.map((t) => t.id === taskId ? { ...t, status: newStatus } : t);
-            onTasksUpdateRef.current?.(updated);
-            return updated;
-        });
-    }, []);
-    // ─── Keyboard shortcuts ────────────────────────────────────────────────────
-    // selectedIds removed from deps — read via selectedIdsRef (prevents
-    // re-registering the keydown listener on every single selection change)
+    };
+    const handleStatusChange = (taskId, newStatus) => {
+        const updated = localTasks.map((t) => (t.id === taskId ? { ...t, status: newStatus } : t));
+        setLocalTasks(updated);
+        onTasksUpdate?.(updated);
+    };
     useEffect(() => {
         const handleKeyDown = (e) => {
+            // Don't trigger if typing in input
             if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement)
                 return;
+            // Select All
             if ((e.ctrlKey || e.metaKey) && e.key === "a") {
                 e.preventDefault();
-                setSelectedIds(new Set([
-                    ...localTasks.map((t) => t.id),
-                    ...localDocuments.map((d) => d.id),
-                ]));
+                setSelectedIds(new Set([...localTasks.map((t) => t.id), ...localDocuments.map((d) => d.id)]));
             }
+            // Clear selection
             if (e.key === "Escape") {
                 setSelectedIds(new Set());
             }
-            if ((e.key === "Delete" || e.key === "Backspace") && selectedIdsRef.current.size > 0) {
+            // ← ADD THIS: Delete selected nodes
+            if ((e.key === "Delete" || e.key === "Backspace") && selectedIds.size > 0) {
                 e.preventDefault();
-                const ids = selectedIdsRef.current;
-                setLocalTasks((prev) => {
-                    const u = prev.filter((t) => !ids.has(t.id));
-                    onTasksUpdateRef.current?.(u);
-                    return u;
-                });
-                setLocalDocuments((prev) => {
-                    const u = prev.filter((d) => !ids.has(d.id));
-                    onDocumentsUpdateRef.current?.(u);
-                    return u;
-                });
+                const updatedTasks = localTasks.filter((t) => !selectedIds.has(t.id));
+                const updatedDocs = localDocuments.filter((d) => !selectedIds.has(d.id));
+                setLocalTasks(updatedTasks);
+                setLocalDocuments(updatedDocs);
                 setSelectedIds(new Set());
+                onTasksUpdate?.(updatedTasks);
+                onDocumentsUpdate?.(updatedDocs);
             }
         };
         window.addEventListener("keydown", handleKeyDown);
         return () => window.removeEventListener("keydown", handleKeyDown);
-    }, [localTasks, localDocuments]);
-    // ─── Render ────────────────────────────────────────────────────────────────
-    const renderItem = (id, x, y, children) => (_jsx("div", { className: "pointer-events-auto absolute", style: {
-            left: 0,
-            top: 0,
-            transform: `translate3d(${x * canvasZoom}px, ${y * canvasZoom}px, 0) scale(${canvasZoom})`,
-            transformOrigin: "top left",
-            transition: "none",
-            willChange: "transform",
-            zIndex: dragStateRef.current.itemIds.includes(id) ? 1000 : 1,
-        }, children: children }, id));
-    return (_jsx("div", { ref: overlayRef, className: "absolute inset-0 pointer-events-none", style: { zIndex: 50 }, onClick: (e) => {
+    }, [localTasks, localDocuments, selectedIds, onTasksUpdate, onDocumentsUpdate]);
+    // ── Render helper ────────────────────────────────────────────────────────────
+    const renderItem = (id, x, y, children) => {
+        const screenX = x * canvasZoom;
+        const screenY = y * canvasZoom;
+        // 1. Detect if the user is interacting with the canvas at all
+        // 'dragging' is your existing state. 
+        // You might want to pass 'isZooming' or 'isPanning' from your main canvas component here.
+        const isDragging = dragging?.itemIds.includes(id);
+        return (_jsx("div", { className: "pointer-events-auto absolute", style: {
+                left: 0,
+                top: 0,
+                // 2. Use translate3d for GPU performance
+                transform: `translate3d(${screenX}px, ${screenY}px, 0) scale(${canvasZoom})`,
+                transformOrigin: "top left",
+                // 3. THE FIX: Remove transition entirely during any viewport change
+                // Any 'ease' during zoom causes the "shaking" behavior.
+                transition: "none",
+                // 4. Optimization
+                willChange: "transform",
+                zIndex: isDragging ? 1000 : 1,
+            }, children: children }, id));
+    };
+    return (_jsx("div", { ref: overlayRef, className: "absolute inset-0 pointer-events-none", style: { zIndex: 50 }, onWheel: handleOverlayWheel, onClick: (e) => {
             if (e.target === e.currentTarget)
                 setSelectedIds(new Set());
         }, children: _jsxs("div", { className: "absolute top-0 left-0 pointer-events-none", style: {
                 transform: `translate(${canvasViewport.x}px, ${canvasViewport.y}px)`,
                 transformOrigin: "top left",
-            }, children: [localTasks.map((task) => renderItem(task.id, task.x, task.y, _jsx(MemoTaskNode, { ...task, isSelected: selectedIds.has(task.id), onSelect: handleSelect, onDragStart: handleDragStart, onStatusChange: handleStatusChange, zoom: 1 }))), localDocuments.map((doc) => renderItem(doc.id, doc.x, doc.y, _jsx(MemoDocumentNode, { ...doc, isSelected: selectedIds.has(doc.id), onSelect: handleSelect, onDragStart: handleDragStart })))] }) }));
+            }, children: [localTasks.map((task) => renderItem(task.id, task.x, task.y, _jsx(TaskNode, { ...task, isSelected: selectedIds.has(task.id), onSelect: handleSelect, onDragStart: handleDragStart, onStatusChange: handleStatusChange, zoom: 1 }))), localDocuments.map((doc) => renderItem(doc.id, doc.x, doc.y, _jsx(DocumentNode, { ...doc, isSelected: selectedIds.has(doc.id), onSelect: handleSelect, onDragStart: handleDragStart })))] }) }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mhamz.01/easyflow-whiteboard",
-    "version": "2.36.0",
+    "version": "2.38.0",
     "description": "A feature-rich whiteboard component built with Fabric.js and React",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",