@tsdraw/react 0.8.2 → 0.8.3

package/dist/index.js

@@ -290,6 +290,7 @@ function getCanvasCursor(currentTool, state) {
     if (state.isRotatingSelection) return "grabbing";
     if (state.isResizingSelection) return "nwse-resize";
     if (state.isMovingSelection) return "grabbing";
+    if (state.isHoveringSelectionBounds) return "move";
     return "default";
   }
   return state.showToolOverlay ? "none" : "crosshair";
@@ -318,8 +319,7 @@ function createTouchInteractionController(editor, canvas, handlers) {
     previousCenter: { x: 0, y: 0 },
     initialCenter: { x: 0, y: 0 },
     previousDistance: 1,
-    initialDistance: 1,
-    previousAngle: 0
+    initialDistance: 1
   };
   const isTouchPointer = (event) => event.pointerType === "touch";
   const endTouchCameraGesture = () => {
@@ -327,7 +327,6 @@ function createTouchInteractionController(editor, canvas, handlers) {
     touchCameraState.mode = "not-sure";
     touchCameraState.previousDistance = 1;
     touchCameraState.initialDistance = 1;
-    touchCameraState.previousAngle = 0;
   };
   const maybeHandleTouchTapGesture = () => {
     if (activeTouchPoints.size > 0) return;
@@ -358,14 +357,12 @@ function createTouchInteractionController(editor, canvas, handlers) {
     const second = points[1];
     const center = { x: (first.x + second.x) / 2, y: (first.y + second.y) / 2 };
     const distance = Math.hypot(second.x - first.x, second.y - first.y);
-    const angle = Math.atan2(second.y - first.y, second.x - first.x);
     touchCameraState.active = true;
     touchCameraState.mode = "not-sure";
     touchCameraState.previousCenter = center;
     touchCameraState.initialCenter = center;
     touchCameraState.previousDistance = Math.max(1, distance);
     touchCameraState.initialDistance = Math.max(1, distance);
-    touchCameraState.previousAngle = angle;
   };
   const updateTouchCameraGesture = () => {
     if (!touchCameraState.active) return false;
@@ -378,7 +375,6 @@ function createTouchInteractionController(editor, canvas, handlers) {
     const second = points[1];
     const center = { x: (first.x + second.x) / 2, y: (first.y + second.y) / 2 };
     const distance = Math.max(1, Math.hypot(second.x - first.x, second.y - first.y));
-    const angle = Math.atan2(second.y - first.y, second.x - first.x);
     const centerDx = center.x - touchCameraState.previousCenter.x;
     const centerDy = center.y - touchCameraState.previousCenter.y;
     const touchDistance = Math.abs(distance - touchCameraState.initialDistance);
@@ -394,11 +390,9 @@ function createTouchInteractionController(editor, canvas, handlers) {
     if (touchCameraState.mode === "zooming") {
       const zoomFactor = distance / touchCameraState.previousDistance;
       editor.zoomAt(zoomFactor, centerOnCanvasX, centerOnCanvasY);
-      editor.rotateAt(angle - touchCameraState.previousAngle, centerOnCanvasX, centerOnCanvasY);
     }
     touchCameraState.previousCenter = center;
     touchCameraState.previousDistance = distance;
-    touchCameraState.previousAngle = angle;
     handlers.refreshView();
     return true;
   };
@@ -679,6 +673,18 @@ function toScreenRect(editor, bounds) {
 function resolveDrawColor(colorStyle, theme) {
   return resolveThemeColor(colorStyle, theme);
 }
+function getHandlePagePoint(bounds, handle) {
+  switch (handle) {
+    case "nw":
+      return { x: bounds.minX, y: bounds.minY };
+    case "ne":
+      return { x: bounds.maxX, y: bounds.minY };
+    case "sw":
+      return { x: bounds.minX, y: bounds.maxY };
+    case "se":
+      return { x: bounds.maxX, y: bounds.maxY };
+  }
+}
 var ZOOM_WHEEL_CAP = 10;
 function useTsdrawCanvasController(options = {}) {
   const onMountRef = useRef(options.onMount);
@@ -700,7 +706,8 @@ function useTsdrawCanvasController(options = {}) {
   const resizeRef = useRef({
     handle: null,
     startBounds: null,
-    startShapes: /* @__PURE__ */ new Map()
+    startShapes: /* @__PURE__ */ new Map(),
+    cursorHandleOffset: { x: 0, y: 0 }
   });
   const rotateRef = useRef({
     center: null,
@@ -787,33 +794,38 @@ function useTsdrawCanvasController(options = {}) {
     setIsResizingSelection(false);
     setIsRotatingSelection(false);
     selectDragRef.current.mode = "none";
-    resizeRef.current = { handle: null, startBounds: null, startShapes: /* @__PURE__ */ new Map() };
-    rotateRef.current = {
-      center: null,
-      startAngle: 0,
-      startSelectionRotationDeg: selectionRotationRef.current,
-      startShapes: /* @__PURE__ */ new Map()
-    };
+    resizeRef.current = { handle: null, startBounds: null, startShapes: /* @__PURE__ */ new Map(), cursorHandleOffset: { x: 0, y: 0 } };
+    rotateRef.current = { center: null, startAngle: 0, startSelectionRotationDeg: 0, startShapes: /* @__PURE__ */ new Map() };
   }, []);
   const handleResizePointerDown = useCallback(
     (e, handle) => {
       e.preventDefault();
       e.stopPropagation();
       const editor = editorRef.current;
-      if (!editor || selectedShapeIdsRef.current.length === 0) return;
+      const canvas = canvasRef.current;
+      if (!editor || !canvas || selectedShapeIdsRef.current.length === 0) return;
       const bounds = getSelectionBoundsPage(editor, selectedShapeIdsRef.current);
       if (!bounds) return;
+      const handlePagePoint = getHandlePagePoint(bounds, handle);
+      const pointerPage = getPagePointFromClient(editor, e.clientX, e.clientY);
+      const cursorOffset = {
+        x: pointerPage.x - handlePagePoint.x,
+        y: pointerPage.y - handlePagePoint.y
+      };
       resizeRef.current = {
         handle,
         startBounds: bounds,
-        startShapes: buildTransformSnapshots(editor, selectedShapeIdsRef.current)
+        startShapes: buildTransformSnapshots(editor, selectedShapeIdsRef.current),
+        cursorHandleOffset: cursorOffset
       };
+      isPointerActiveRef.current = true;
+      activePointerIdsRef.current.add(e.pointerId);
+      canvas.setPointerCapture(e.pointerId);
       editor.beginHistoryEntry();
       selectDragRef.current.mode = "resize";
-      const p = getPagePointFromClient(editor, e.clientX, e.clientY);
-      editor.input.pointerDown(p.x, p.y, 0.5, false);
-      selectDragRef.current.startPage = p;
-      selectDragRef.current.currentPage = p;
+      editor.input.pointerDown(handlePagePoint.x, handlePagePoint.y, 0.5, false);
+      selectDragRef.current.startPage = handlePagePoint;
+      selectDragRef.current.currentPage = handlePagePoint;
       lastPointerClientRef.current = { x: e.clientX, y: e.clientY };
       setIsResizingSelection(true);
     },
@@ -824,7 +836,8 @@ function useTsdrawCanvasController(options = {}) {
       e.preventDefault();
       e.stopPropagation();
       const editor = editorRef.current;
-      if (!editor || selectedShapeIdsRef.current.length === 0) return;
+      const canvas = canvasRef.current;
+      if (!editor || !canvas || selectedShapeIdsRef.current.length === 0) return;
       const bounds = getSelectionBoundsPage(editor, selectedShapeIdsRef.current);
       if (!bounds) return;
       const center = {
@@ -838,6 +851,9 @@ function useTsdrawCanvasController(options = {}) {
         startSelectionRotationDeg: selectionRotationRef.current,
         startShapes: buildTransformSnapshots(editor, selectedShapeIdsRef.current)
       };
+      isPointerActiveRef.current = true;
+      activePointerIdsRef.current.add(e.pointerId);
+      canvas.setPointerCapture(e.pointerId);
       editor.beginHistoryEntry();
       selectDragRef.current.mode = "rotate";
       editor.input.pointerDown(p.x, p.y, 0.5, false);
@@ -967,7 +983,6 @@ function useTsdrawCanvasController(options = {}) {
       setDrawDash(nextDrawStyle.dash);
       setDrawFill(nextDrawStyle.fill);
       setDrawSize(nextDrawStyle.size);
-      setSelectionRotationDeg(0);
       render();
       refreshSelectionBounds(editor, nextSelectionIds);
       ignorePersistenceChanges = false;
@@ -983,7 +998,6 @@ function useTsdrawCanvasController(options = {}) {
     const applyDocumentChangeResult = (changed) => {
       if (!changed) return false;
       reconcileSelectionAfterDocumentLoad();
-      setSelectionRotationDeg(0);
       render();
       syncHistoryState();
       return true;
@@ -1010,8 +1024,7 @@ function useTsdrawCanvasController(options = {}) {
       setSelectedShapeIds([]);
       selectedShapeIdsRef.current = [];
       setSelectionBounds(null);
-      setSelectionBrush(null);
-      setSelectionRotationDeg(0);
+      resetSelectUi();
       render();
       syncHistoryState();
       return true;
@@ -1022,12 +1035,7 @@ function useTsdrawCanvasController(options = {}) {
       lastPointerClientRef.current = null;
       editor.input.pointerUp();
       if (currentToolRef.current === "select") {
-        const dragMode = selectDragRef.current.mode;
-        if (dragMode === "rotate") setIsRotatingSelection(false);
-        if (dragMode === "resize") setIsResizingSelection(false);
-        if (dragMode === "move") setIsMovingSelection(false);
-        if (dragMode === "marquee") setSelectionBrush(null);
-        selectDragRef.current.mode = "none";
+        resetSelectUi();
       } else {
         editor.tools.pointerUp();
       }
@@ -1081,7 +1089,13 @@ function useTsdrawCanvasController(options = {}) {
       if (currentToolRef.current === "select") {
         const hit = getTopShapeAtPoint(editor, { x, y });
         const isHitSelected = !!(hit && selectedShapeIdsRef.current.includes(hit.id));
-        if (isHitSelected) {
+        const isInsideSelectionBounds = (() => {
+          if (selectedShapeIdsRef.current.length === 0) return false;
+          const pageBounds = getSelectionBoundsPage(editor, selectedShapeIdsRef.current);
+          if (!pageBounds) return false;
+          return x >= pageBounds.minX && x <= pageBounds.maxX && y >= pageBounds.minY && y <= pageBounds.maxY;
+        })();
+        if (isHitSelected || isInsideSelectionBounds) {
           selectDragRef.current = {
             mode: "move",
             startPage: { x, y },
@@ -1152,9 +1166,9 @@ function useTsdrawCanvasController(options = {}) {
           return;
         }
         if (mode === "resize") {
-          const { handle, startBounds, startShapes } = resizeRef.current;
+          const { handle, startBounds, startShapes, cursorHandleOffset } = resizeRef.current;
           if (!handle || !startBounds) return;
-          applyResize(editor, handle, startBounds, startShapes, { x: px, y: py }, e.shiftKey);
+          applyResize(editor, handle, startBounds, startShapes, { x: px - cursorHandleOffset.x, y: py - cursorHandleOffset.y }, e.shiftKey);
           render();
           refreshSelectionBounds(editor);
           return;
@@ -1174,7 +1188,6 @@ function useTsdrawCanvasController(options = {}) {
           const nextIds = selectDragRef.current.additive ? Array.from(/* @__PURE__ */ new Set([...selectDragRef.current.initialSelection, ...ids])) : ids;
           setSelectedShapeIds(nextIds);
           selectedShapeIdsRef.current = nextIds;
-          setSelectionRotationDeg(0);
           refreshSelectionBounds(editor, nextIds);
           return;
         }
@@ -1204,12 +1217,7 @@ function useTsdrawCanvasController(options = {}) {
           setIsRotatingSelection(false);
           selectDragRef.current.mode = "none";
           setSelectionRotationDeg(0);
-          rotateRef.current = {
-            center: null,
-            startAngle: 0,
-            startSelectionRotationDeg: selectionRotationRef.current,
-            startShapes: /* @__PURE__ */ new Map()
-          };
+          rotateRef.current = { center: null, startAngle: 0, startSelectionRotationDeg: 0, startShapes: /* @__PURE__ */ new Map() };
           render();
           refreshSelectionBounds(editor);
           editor.endHistoryEntry();
@@ -1218,7 +1226,7 @@ function useTsdrawCanvasController(options = {}) {
         if (drag.mode === "resize") {
           setIsResizingSelection(false);
           selectDragRef.current.mode = "none";
-          resizeRef.current = { handle: null, startBounds: null, startShapes: /* @__PURE__ */ new Map() };
+          resizeRef.current = { handle: null, startBounds: null, startShapes: /* @__PURE__ */ new Map(), cursorHandleOffset: { x: 0, y: 0 } };
           render();
           refreshSelectionBounds(editor);
           editor.endHistoryEntry();
@@ -1251,7 +1259,6 @@ function useTsdrawCanvasController(options = {}) {
           }
           setSelectedShapeIds(ids);
           selectedShapeIdsRef.current = ids;
-          setSelectionRotationDeg(0);
           setSelectionBrush(null);
           selectDragRef.current.mode = "none";
           render();
@@ -1434,11 +1441,17 @@ function useTsdrawCanvasController(options = {}) {
     resize();
     const ro = new ResizeObserver(resize);
     ro.observe(container);
+    const handlePointerLeaveViewport = (e) => {
+      if (e.relatedTarget === null) {
+        setIsPointerInsideCanvas(false);
+      }
+    };
     canvas.addEventListener("pointerdown", handlePointerDown);
     container.addEventListener("wheel", handleWheel, { passive: false });
     document.addEventListener("gesturestart", handleGestureEvent);
     document.addEventListener("gesturechange", handleGestureEvent);
     document.addEventListener("gestureend", handleGestureEvent);
+    document.documentElement.addEventListener("pointerleave", handlePointerLeaveViewport);
     window.addEventListener("pointermove", handlePointerMove);
     window.addEventListener("pointerup", handlePointerUp);
     window.addEventListener("pointercancel", handlePointerCancel);
@@ -1462,7 +1475,6 @@ function useTsdrawCanvasController(options = {}) {
         const changed = editor.undo();
         if (!changed) return false;
         reconcileSelectionAfterDocumentLoad();
-        setSelectionRotationDeg(0);
         render();
         syncHistoryState();
         return true;
@@ -1471,7 +1483,6 @@ function useTsdrawCanvasController(options = {}) {
         const changed = editor.redo();
         if (!changed) return false;
         reconcileSelectionAfterDocumentLoad();
-        setSelectionRotationDeg(0);
         render();
         syncHistoryState();
         return true;
@@ -1499,6 +1510,7 @@ function useTsdrawCanvasController(options = {}) {
       document.removeEventListener("gesturestart", handleGestureEvent);
       document.removeEventListener("gesturechange", handleGestureEvent);
       document.removeEventListener("gestureend", handleGestureEvent);
+      document.documentElement.removeEventListener("pointerleave", handlePointerLeaveViewport);
       window.removeEventListener("pointermove", handlePointerMove);
       window.removeEventListener("pointerup", handlePointerUp);
       window.removeEventListener("pointercancel", handlePointerCancel);
@@ -1563,7 +1575,6 @@ function useTsdrawCanvasController(options = {}) {
       selectedShapeIdsRef.current = nextSelectedShapeIds;
       setSelectedShapeIds(nextSelectedShapeIds);
     }
-    setSelectionRotationDeg(0);
     render();
     setCanUndo(editor.canUndo());
     setCanRedo(editor.canRedo());
@@ -1579,17 +1590,18 @@ function useTsdrawCanvasController(options = {}) {
       selectedShapeIdsRef.current = nextSelectedShapeIds;
       setSelectedShapeIds(nextSelectedShapeIds);
     }
-    setSelectionRotationDeg(0);
     render();
     setCanUndo(editor.canUndo());
     setCanRedo(editor.canRedo());
     return true;
   }, [render]);
+  const isHoveringSelectionBounds = isPointerInsideCanvas && currentTool === "select" && selectedShapeIds.length > 0 && selectionBounds != null && pointerScreenPoint.x >= selectionBounds.left && pointerScreenPoint.x <= selectionBounds.left + selectionBounds.width && pointerScreenPoint.y >= selectionBounds.top && pointerScreenPoint.y <= selectionBounds.top + selectionBounds.height;
   const showToolOverlay = isPointerInsideCanvas && (currentTool === "pen" || currentTool === "eraser");
   const canvasCursor = getCanvasCursor(currentTool, {
     isMovingSelection,
     isResizingSelection,
     isRotatingSelection,
+    isHoveringSelectionBounds,
     showToolOverlay
   });
   const cursorContext = {