@weasel-js/guides 1.15.1 → 1.16.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import { useState, useRef, useCallback, useEffect } from 'react';
-import { sceneBoxFrames, scenePoseFrame, useLatest, viewportWorldRect, tickedSegment, measuredSegmentCommands, AUTO_POSE_DESCRIPTOR, visualBoundsViaDescriptor, rectFromPlane, unionAABB, sceneMagnification, asNodeId, createTransformOp, sceneUnitScopes, screenToWorld, nodeGates, resolveStrokeWidth, resolveUnit, axisUnits, resolveScoped } from '@weasel-js/core';
-import { pointInPolygon, invert, mat3, applyToPoint, pxExtent, PATH_M, PATH_L, PATH_Z, pxExtentInFrame } from '@weasel-js/geom';
+import { sceneBoxFrames, scenePoseFrame, useLatest, viewportWorldRect, viewWorldToScreen, tickedSegment, measuredSegmentCommands, AUTO_POSE_DESCRIPTOR, visualBoundsViaDescriptor, rectFromPlane, unionAABB, sceneMagnification, asNodeId, createTransformOp, sceneUnitScopes, screenToWorld, nodeGates, resolveStrokeWidth, resolveUnit, axisUnits, resolveScoped } from '@weasel-js/core';
+import { pointInPolygon, invert, mat3, distance2, rectContainsPointHalfOpen, applyToPoint, pxExtent, PATH_M, PATH_L, PATH_Z, pxExtentInFrame } from '@weasel-js/geom';
 
 // src/grid/roundToCell.ts
 function roundToCell(value, cellSize) {
@@ -592,26 +592,27 @@ function createGuidesLayer(opts) {
       const guides = opts.getGuides();
       const gaps = opts.getGaps?.() ?? [];
       if (guides.length === 0 && gaps.length === 0) return [];
-      const sx = (x) => (x - view.x) * view.scale.x;
-      const sy = (y) => (y - view.y) * view.scale.y;
       const out = [];
       for (const g of guides) {
         const span2 = spanned ? g.span : void 0;
         if (g.axis === "x") {
-          const x = sx(g.offset);
+          const lo3 = viewWorldToScreen(view, { x: g.offset, y: span2?.min ?? 0 });
+          const x = lo3.x;
           if (x < -lineWidth || x > dims.width + lineWidth) continue;
-          const path = span2 ? tickedSegment(x, sy(span2.min), x, sy(span2.max), ticks) : tickedSegment(x, 0, x, dims.height, 0);
+          const path = span2 ? tickedSegment(x, lo3.y, x, viewWorldToScreen(view, { x: g.offset, y: span2.max }).y, ticks) : tickedSegment(x, 0, x, dims.height, 0);
           out.push({ kind: "path", path, stroke });
         } else {
-          const y = sy(g.offset);
+          const lo3 = viewWorldToScreen(view, { x: span2?.min ?? 0, y: g.offset });
+          const y = lo3.y;
           if (y < -lineWidth || y > dims.height + lineWidth) continue;
-          const path = span2 ? tickedSegment(sx(span2.min), y, sx(span2.max), y, ticks) : tickedSegment(0, y, dims.width, y, 0);
+          const path = span2 ? tickedSegment(lo3.x, y, viewWorldToScreen(view, { x: span2.max, y: g.offset }).x, y, ticks) : tickedSegment(0, y, dims.width, y, 0);
           out.push({ kind: "path", path, stroke });
         }
       }
       for (const g of gaps) {
-        const [x0, y0, x1, y1] = g.axis === "x" ? [sx(g.min), sy(g.at), sx(g.max), sy(g.at)] : [sx(g.at), sy(g.min), sx(g.at), sy(g.max)];
-        out.push(...measuredSegmentCommands(x0, y0, x1, y1, ticks, gapStroke, format?.(g.max - g.min) ?? null, gapColor));
+        const a = viewWorldToScreen(view, g.axis === "x" ? { x: g.min, y: g.at } : { x: g.at, y: g.min });
+        const b = viewWorldToScreen(view, g.axis === "x" ? { x: g.max, y: g.at } : { x: g.at, y: g.max });
+        out.push(...measuredSegmentCommands(a.x, a.y, b.x, b.y, ticks, gapStroke, format?.(g.max - g.min) ?? null, gapColor));
       }
       return out;
     }
@@ -1135,19 +1136,12 @@ function createSpacingHintsPreset(opts = {}) {
   if (opts.readout !== false) contributions.push(distanceReadout({ ...opts.readout, ...color }));
   return { id, snapSources, contributions };
 }
-
-// src/layout/snaps.ts
-function dist2(a, b) {
-  const dx = a.x - b.x;
-  const dy = a.y - b.y;
-  return dx * dx + dy * dy;
-}
 function nearestOf(targets, pointer) {
   if (targets.length === 0) return null;
   let best = targets[0];
-  let bestD = dist2(best.origin, pointer);
+  let bestD = distance2(best.origin, pointer);
   for (let i = 1; i < targets.length; i++) {
-    const d = dist2(targets[i].origin, pointer);
+    const d = distance2(targets[i].origin, pointer);
     if (d < bestD) {
       bestD = d;
       best = targets[i];
@@ -1167,18 +1161,15 @@ function nearestWithin(opts) {
     pickTarget(targets, pointer) {
       const got = nearestOf(targets, pointer);
       if (got === null) return null;
-      return dist2(got.origin, pointer) <= tol2 ? got : null;
+      return distance2(got.origin, pointer) <= tol2 ? got : null;
     }
   };
 }
-function rectContains(r, p) {
-  return p.x >= r.x && p.x < r.x + r.width && p.y >= r.y && p.y < r.y + r.height;
-}
 function containedThenNearest() {
   return {
     pickTarget(targets, pointer) {
       for (const t of targets) {
-        if (t.hitBounds && rectContains(t.hitBounds, pointer)) return t;
+        if (t.hitBounds && rectContainsPointHalfOpen(t.hitBounds, pointer.x, pointer.y)) return t;
       }
       return nearestOf(targets, pointer);
     }
@@ -1191,8 +1182,8 @@ function cellAt() {
   return {
     pickTarget(targets, pointer) {
       for (const t of targets) {
-        if (t.hitBounds && rectContains(t.hitBounds, pointer)) return t;
-        if (isCellMeta(t.meta) && rectContains(t.meta.cellRect, pointer)) return t;
+        if (t.hitBounds && rectContainsPointHalfOpen(t.hitBounds, pointer.x, pointer.y)) return t;
+        if (isCellMeta(t.meta) && rectContainsPointHalfOpen(t.meta.cellRect, pointer.x, pointer.y)) return t;
       }
       return nearestOf(targets, pointer);
     }