@weasel-js/labkit 1.4.1 → 1.4.2

package/dist/{chunk-DG2IFMLA.js → chunk-54ZWZ5FQ.js}

@@ -2978,7 +2978,7 @@ var TEXT_SDF_UNIFORMS = [
 ];
 var TEXT_SDF_ATTRIBUTES = ["a_position", "a_uv", "a_baselineY"];
 
-// ../text/dist/chunk-BYL6KOD4.js
+// ../text/dist/chunk-7ZHZKQEH.js
 function resolveAlign(align, direction) {
   if (align === "start") return direction === "rtl" ? "right" : "left";
   if (align === "end") return direction === "rtl" ? "left" : "right";
@@ -3548,7 +3548,7 @@ function layoutRuns(runs, opts) {
       cells[pos] = cell;
       const step = e.advance + e.tracking;
       const scale2 = e.fontSize / e.metrics.size;
-      const baselineY = lineBaselineY - e.run.baselineShift;
+      const baselineY = lineBaselineY - (e.run.baselineShift ?? 0);
       if (e.run.underline || e.run.strikethrough || e.run.overline) {
         if (span !== null && span.underline === e.run.underline && span.strikethrough === e.run.strikethrough && span.overline === e.run.overline && span.fontSize === e.fontSize && span.baselineY === baselineY && sameFill(span.fill, e.run.fill)) {
           span.x1 = penX + step;
@@ -4670,7 +4670,7 @@ function serialToEntry(se, custom, logger) {
   };
 }
 
-// ../core/dist/chunk-NU7D64RL.js
+// ../core/dist/chunk-KIVJXUYE.js
 function worldToScreen(worldX, worldY, view) {
   return [view.panX + worldX * view.zoom.x, view.panY + worldY * view.zoom.y];
 }
@@ -10200,7 +10200,8 @@ function openPointerSession(origin, down, cb, opts = {}) {
     if (mine(e)) abort("superseded");
   }
   function onLostCapture(e) {
-    if (e.pointerId === pointerId) abort("lostcapture");
+    if (e.pointerId !== pointerId) return;
+    if (!origin.isConnected) abort("lostcapture");
   }
   if (opts.capture !== false) {
     try {
@@ -10221,6 +10222,39 @@ function openPointerSession(origin, down, cb, opts = {}) {
     cancel: () => abort("aborted")
   };
 }
+function startThresholdDrag(e, opts) {
+  const startX = e.clientX;
+  const startY = e.clientY;
+  const threshold = opts.threshold ?? 4;
+  let activated = false;
+  const maybeActivate = (ev) => {
+    if (activated) return;
+    const dx = ev.clientX - startX;
+    const dy = ev.clientY - startY;
+    if (dx * dx + dy * dy < threshold * threshold) return;
+    activated = true;
+    opts.onActivate?.(ev);
+  };
+  const session = openPointerSession(opts.origin ?? e.currentTarget, e, {
+    onMove: (ev) => {
+      maybeActivate(ev);
+      if (activated) opts.onMove(ev);
+    },
+    onEnd: (ev) => {
+      if (activated) opts.onCommit(ev);
+      else opts.onClick?.(ev);
+    },
+    onCancel: () => {
+      opts.onCancel?.();
+    }
+  });
+  return {
+    isDragging: () => activated,
+    cancel: () => {
+      session.cancel();
+    }
+  };
+}
 var BASE_PX = {
   handle: 8,
   anchor: 8,
@@ -16596,7 +16630,7 @@ function withViewDeps(base, overlay) {
   };
 }
 function computeMultiTouchGeometry(positions) {
-  const pts = [...positions.values()];
+  const pts = [...positions];
   if (pts.length < 2) {
     return { centroid: { x: 0, y: 0 }, spread: 0 };
   }
@@ -16723,14 +16757,13 @@ function useGestureDispatcher(opts) {
       return result;
     };
     const heldKeys = /* @__PURE__ */ new Set();
-    const activePointers = /* @__PURE__ */ new Set();
-    const buttonsReportedFor = /* @__PURE__ */ new Set();
-    const pointerPositions = /* @__PURE__ */ new Map();
+    const held = /* @__PURE__ */ new Map();
+    const heldGeometry = () => computeMultiTouchGeometry(
+      [...held.values()].map((p) => p.pos)
+    );
     let multiTouchStart = null;
     const TAP_THRESHOLD_PX = 8;
     const DRAG_THRESHOLD_PX = 4;
-    const bufferedDown = /* @__PURE__ */ new Map();
-    const lastPointerDown = /* @__PURE__ */ new Map();
     const LONG_PRESS_MS = 500;
     const longPressTimers = /* @__PURE__ */ new Map();
     const cancelLongPress = (pointerId) => {
@@ -16745,7 +16778,7 @@ function useGestureDispatcher(opts) {
       longPressTimers.clear();
     };
     const fireLongPress = (pointerId) => {
-      const down = lastPointerDown.get(pointerId);
+      const down = held.get(pointerId)?.down;
       if (!down) return;
       const shared = {
         target: down.target,
@@ -16867,15 +16900,8 @@ function useGestureDispatcher(opts) {
     };
     const onPointerDown = (e) => {
       if ((e.button ?? 0) !== 0) return;
-      if (activePointers.has(e.pointerId)) onPointerUp(e);
+      if (!canvas) return;
       routeDown(e.pointerId, e.clientX, e.clientY);
-      activePointers.add(e.pointerId);
-      if (reportsButtons(e)) buttonsReportedFor.add(e.pointerId);
-      pointerPositions.set(e.pointerId, { x: e.clientX, y: e.clientY });
-      try {
-        canvas?.setPointerCapture?.(e.pointerId);
-      } catch {
-      }
       const worldPoint = { x: e.clientX, y: e.clientY };
       const affordance = target().affordanceAt?.(worldPoint) ?? void 0;
       const body = target().classifyTarget?.(worldPoint);
@@ -16899,23 +16925,35 @@ function useGestureDispatcher(opts) {
         ...bodyTarget !== void 0 ? { bodyTarget } : {},
         ...bodyKind !== void 0 ? { bodyKind } : {}
       };
-      bufferedDown.set(e.pointerId, { ev, clientX: e.clientX, clientY: e.clientY });
-      dispatch2({ ...ev, stage: "press" });
-      lastPointerDown.set(e.pointerId, {
-        target: e.target,
-        clientX: e.clientX,
-        clientY: e.clientY,
-        worldX: w.x,
-        worldY: w.y,
-        affordance,
-        bodyTarget,
-        bodyKind,
-        altKey: e.altKey,
-        ctrlKey: e.ctrlKey,
-        metaKey: e.metaKey,
-        shiftKey: e.shiftKey
+      held.set(e.pointerId, {
+        session: openPointerSession(canvas, e, {
+          onMove: onPointerMove,
+          onEnd: onPointerUp,
+          onCancel: () => {
+            onPointerCancel(e.pointerId);
+          }
+        }),
+        pos: { x: e.clientX, y: e.clientY },
+        // Deferred until the first past-threshold pointermove: a bare
+        // press-and-release should fire `click`, not start a drag action.
+        buffered: { ev, clientX: e.clientX, clientY: e.clientY },
+        down: {
+          target: e.target,
+          clientX: e.clientX,
+          clientY: e.clientY,
+          worldX: w.x,
+          worldY: w.y,
+          affordance,
+          bodyTarget,
+          bodyKind,
+          altKey: e.altKey,
+          ctrlKey: e.ctrlKey,
+          metaKey: e.metaKey,
+          shiftKey: e.shiftKey
+        }
       });
-      if ((e.pointerType === "touch" || e.pointerType === "pen") && activePointers.size === 1) {
+      dispatch2({ ...ev, stage: "press" });
+      if ((e.pointerType === "touch" || e.pointerType === "pen") && held.size === 1) {
         cancelLongPress(e.pointerId);
         longPressTimers.set(
           e.pointerId,
@@ -16926,18 +16964,18 @@ function useGestureDispatcher(opts) {
           }, LONG_PRESS_MS)
         );
       }
-      if (activePointers.size >= 2) {
+      if (held.size >= 2) {
         cancelAllLongPress();
-        for (const id of activePointers) bufferedDown.delete(id);
-        const { centroid, spread } = computeMultiTouchGeometry(pointerPositions);
+        for (const p of held.values()) p.buffered = null;
+        const { centroid, spread } = heldGeometry();
         if (!multiTouchStart) {
-          multiTouchStart = { fingers: activePointers.size, centroid: { ...centroid } };
+          multiTouchStart = { fingers: held.size, centroid: { ...centroid } };
         } else {
-          multiTouchStart.fingers = activePointers.size;
+          multiTouchStart.fingers = held.size;
         }
         const mt = {
           kind: "multitouch",
-          fingers: activePointers.size,
+          fingers: held.size,
           altKey: e.altKey,
           ctrlKey: e.ctrlKey,
           metaKey: e.metaKey,
@@ -16949,30 +16987,25 @@ function useGestureDispatcher(opts) {
       }
     };
     const onPointerMove = (e) => {
-      if (activePointers.has(e.pointerId) && buttonsReportedFor.has(e.pointerId) && isMissedRelease(e)) {
-        onPointerUp(e);
-        return;
-      }
       routeAt(e.pointerId, e.clientX, e.clientY);
-      if (activePointers.has(e.pointerId)) {
-        pointerPositions.set(e.pointerId, { x: e.clientX, y: e.clientY });
-      }
-      const buffered = bufferedDown.get(e.pointerId);
-      if (buffered) {
+      const rec = held.get(e.pointerId);
+      if (rec) rec.pos = { x: e.clientX, y: e.clientY };
+      const buffered = rec?.buffered;
+      if (rec && buffered) {
         const dx = e.clientX - buffered.clientX;
         const dy = e.clientY - buffered.clientY;
         if (Math.hypot(dx, dy) >= DRAG_THRESHOLD_PX) {
-          bufferedDown.delete(e.pointerId);
+          rec.buffered = null;
           cancelLongPress(e.pointerId);
           dispatch2(buffered.ev);
         }
       }
-      const mtGestureId = `multitouch-${activePointers.size}`;
-      if (activePointers.size >= 2 && dispatcherNow().inFlight().has(mtGestureId)) {
-        const { centroid, spread } = computeMultiTouchGeometry(pointerPositions);
+      const mtGestureId = `multitouch-${held.size}`;
+      if (held.size >= 2 && dispatcherNow().inFlight().has(mtGestureId)) {
+        const { centroid, spread } = heldGeometry();
         const mtEv = {
           kind: "multitouch",
-          fingers: activePointers.size,
+          fingers: held.size,
           altKey: e.altKey,
           ctrlKey: e.ctrlKey,
           metaKey: e.metaKey,
@@ -17044,7 +17077,7 @@ function useGestureDispatcher(opts) {
     }
     function resolveHoverCursor() {
       if (!canvas || !lastHover) return;
-      if (activePointers.size > 0 || dispatcherNow().inFlight().size > 0) {
+      if (held.size > 0 || dispatcherNow().inFlight().size > 0) {
         applyHoverCursor(dispatcherNow().inFlightCursor());
         return;
       }
@@ -17092,6 +17125,10 @@ function useGestureDispatcher(opts) {
         if (!disposed) refreshHoverCursor();
       }, 0);
     };
+    const onHoverMove = (e) => {
+      if (held.has(e.pointerId)) return;
+      onPointerMove(e);
+    };
     const onHoverPointerLeave = () => {
       lastHover = null;
       paintedCursorRef.current?.()?.clearPointer();
@@ -17100,21 +17137,21 @@ function useGestureDispatcher(opts) {
     const onPointerUp = (e) => {
       routeAt(e.pointerId, e.clientX, e.clientY);
       cancelLongPress(e.pointerId);
-      const prevSize = activePointers.size;
-      activePointers.delete(e.pointerId);
-      buttonsReportedFor.delete(e.pointerId);
-      pointerPositions.delete(e.pointerId);
-      const staysUnderThreshold = bufferedDown.delete(e.pointerId);
-      if (prevSize >= 2 && activePointers.size < 2) {
+      const prevSize = held.size;
+      const rec = held.get(e.pointerId);
+      held.delete(e.pointerId);
+      const staysUnderThreshold = rec?.buffered != null;
+      if (prevSize >= 2 && held.size < 2) {
         const mtGestureId = `multitouch-${prevSize}`;
         if (dispatcherNow().inFlight().has(mtGestureId)) {
           dispatcherNow().cancelAll("commit");
         }
         const start = multiTouchStart;
         if (start) {
-          const finalPositions = new Map(pointerPositions);
-          finalPositions.set(e.pointerId, { x: e.clientX, y: e.clientY });
-          const { centroid } = computeMultiTouchGeometry(finalPositions);
+          const { centroid } = computeMultiTouchGeometry([
+            ...[...held.values()].map((p) => p.pos),
+            { x: e.clientX, y: e.clientY }
+          ]);
           const dx = centroid.x - start.centroid.x;
           const dy = centroid.y - start.centroid.y;
           if (Math.hypot(dx, dy) <= TAP_THRESHOLD_PX) {
@@ -17131,8 +17168,7 @@ function useGestureDispatcher(opts) {
           multiTouchStart = null;
         }
       }
-      const downForClick = lastPointerDown.get(e.pointerId);
-      const movedDuringDrag = downForClick ? downForClick.clientX !== e.clientX || downForClick.clientY !== e.clientY : true;
+      const movedDuringDrag = rec ? rec.down.clientX !== e.clientX || rec.down.clientY !== e.clientY : true;
       const hadDragInFlight = dispatcherNow().inFlight().has(pointerGestureId(e.pointerId)) && movedDuringDrag;
       const wUp = toWorld2(e.clientX, e.clientY);
       const ev = {
@@ -17148,8 +17184,7 @@ function useGestureDispatcher(opts) {
         shiftKey: e.shiftKey
       };
       dispatch2(ev);
-      const down = lastPointerDown.get(e.pointerId);
-      lastPointerDown.delete(e.pointerId);
+      const down = rec?.down;
       if (!hadDragInFlight && staysUnderThreshold && down) {
         const wClick = toWorld2(e.clientX, e.clientY);
         const clickEv = {
@@ -17206,30 +17241,24 @@ function useGestureDispatcher(opts) {
         if (!disposed) refreshHoverCursor();
       }, 0);
     };
-    const onPointerCancel = (e) => {
-      routeAt(e.pointerId, e.clientX, e.clientY);
-      cancelLongPress(e.pointerId);
-      activePointers.delete(e.pointerId);
-      buttonsReportedFor.delete(e.pointerId);
-      pointerPositions.delete(e.pointerId);
-      lastPointerDown.delete(e.pointerId);
-      bufferedDown.delete(e.pointerId);
+    const onPointerCancel = (pointerId) => {
+      if (disposed) return;
+      const rec = held.get(pointerId);
+      if (!rec) return;
+      held.delete(pointerId);
+      routeAt(pointerId, rec.pos.x, rec.pos.y);
+      cancelLongPress(pointerId);
       multiTouchStart = null;
       const ev = {
         kind: "pointercancel",
-        pointerId: e.pointerId,
-        altKey: e.altKey,
-        ctrlKey: e.ctrlKey,
-        metaKey: e.metaKey,
-        shiftKey: e.shiftKey
+        pointerId,
+        altKey: rec.down.altKey,
+        ctrlKey: rec.down.ctrlKey,
+        metaKey: rec.down.metaKey,
+        shiftKey: rec.down.shiftKey
       };
       dispatch2(ev);
-      routeRelease(e.pointerId);
-    };
-    const onLostCapture = (e) => {
-      const pe = e;
-      if (!activePointers.has(pe.pointerId)) return;
-      onPointerCancel(pe);
+      routeRelease(pointerId);
     };
     const onContextMenu = (e) => {
       e.preventDefault();
@@ -17317,10 +17346,7 @@ function useGestureDispatcher(opts) {
     canvas?.addEventListener("pointerleave", onHoverPointerLeave);
     canvas?.addEventListener("wheel", onWheel, { passive: false });
     canvas?.addEventListener("pointerdown", onPointerDown);
-    canvas?.addEventListener("pointermove", onPointerMove);
-    canvas?.addEventListener("pointerup", onPointerUp);
-    canvas?.addEventListener("pointercancel", onPointerCancel);
-    canvas?.addEventListener(LOST_CAPTURE_EVENT, onLostCapture);
+    canvas?.addEventListener("pointermove", onHoverMove);
     canvas?.addEventListener("contextmenu", onContextMenu);
     canvas?.addEventListener("dragenter", onDragOver);
     canvas?.addEventListener("dragover", onDragOver);
@@ -17338,10 +17364,7 @@ function useGestureDispatcher(opts) {
       canvas?.removeEventListener("pointerleave", onHoverPointerLeave);
       canvas?.removeEventListener("wheel", onWheel);
       canvas?.removeEventListener("pointerdown", onPointerDown);
-      canvas?.removeEventListener("pointermove", onPointerMove);
-      canvas?.removeEventListener("pointerup", onPointerUp);
-      canvas?.removeEventListener("pointercancel", onPointerCancel);
-      canvas?.removeEventListener(LOST_CAPTURE_EVENT, onLostCapture);
+      canvas?.removeEventListener("pointermove", onHoverMove);
       canvas?.removeEventListener("contextmenu", onContextMenu);
       canvas?.removeEventListener("dragenter", onDragOver);
       canvas?.removeEventListener("dragover", onDragOver);
@@ -17352,6 +17375,8 @@ function useGestureDispatcher(opts) {
       clearHoverCursor();
       cancelAllLongPress();
       disposed = true;
+      for (const p of held.values()) p.session.cancel();
+      held.clear();
       for (const d of allDispatchers()) d.cancelAll("cancel");
     };
   }, [enabled, keyboard, canvasRef]);
@@ -28232,7 +28257,6 @@ function SceneCanvasInner(props, ref) {
     () => isSerialized(sceneInput) ? sceneFromJSON(sceneInput, {}) : null
   );
   const scene = bakedScene ?? sceneInput;
-  useSyncExternalStore(scene.subscribe, scene.getVersion, scene.getVersion);
   const { view: viewProp, onViewChange: onViewChangeProp, defaultView, ...restProps } = rest;
   const internalCanvasRef = useRef(null);
   const canvasApiRef = useRef(null);
@@ -28263,6 +28287,9 @@ function SceneCanvasInner(props, ref) {
   useEffect(() => scene.overrides.subscribe(() => {
     canvasApiRef.current?.requestRedraw?.();
   }), [scene]);
+  useEffect(() => scene.subscribe(() => {
+    canvasApiRef.current?.requestRedraw?.();
+  }), [scene]);
   const currentViewRef = useRef(
     viewProp ?? defaultView ?? { x: 0, y: 0, scale: { x: 1, y: 1 } }
   );
@@ -29965,6 +29992,6 @@ function oklchToOklab(L, C, h) {
   return [L, C * Math.cos(h), C * Math.sin(h)];
 }
 
-export { ArrowIcon, EllipseIcon, FALLBACK_FIT_VIEW, LineIcon, MinimapCanvas, PATH_C, PATH_L, PATH_M, PATH_Q, PATH_Z, PathBuilder, PencilIcon, RectIcon, SCRIPT_METRICS, SceneCanvas, SceneViewCanvas, SelectIcon, TextIcon, UnknownIcon, WeaselProvider, asNodeId, boundsOfPath, buildSceneViewCommands, computeFitView, computeIndicatorCommand, createScene, eligibleContribution, ellipsePath, evaluateEnabled, getMarker, getPaintKind, isBuiltinToolPref, linePath, markerDrawCommands, oklabToSrgbU8, oklchToOklab, openPointerSession, rectPath, renderSceneToCanvas, renderSceneToPixels, resolveStrokeWidth, rgbaToHex, sceneFromJSON, textCommand, tileGeometry, useActionsRegistry, useActiveToolContext, useOptionalDepRegistry, useVisibleRaf };
-//# sourceMappingURL=chunk-DG2IFMLA.js.map
-//# sourceMappingURL=chunk-DG2IFMLA.js.map
+export { ArrowIcon, EllipseIcon, FALLBACK_FIT_VIEW, LineIcon, MinimapCanvas, PATH_C, PATH_L, PATH_M, PATH_Q, PATH_Z, PathBuilder, PencilIcon, RectIcon, SCRIPT_METRICS, SceneCanvas, SceneViewCanvas, SelectIcon, TextIcon, UnknownIcon, WeaselProvider, asNodeId, boundsOfPath, buildSceneViewCommands, computeFitView, computeIndicatorCommand, createScene, eligibleContribution, ellipsePath, evaluateEnabled, getMarker, getPaintKind, isBuiltinToolPref, linePath, markerDrawCommands, oklabToSrgbU8, oklchToOklab, openPointerSession, rectPath, renderSceneToCanvas, renderSceneToPixels, resolveStrokeWidth, rgbaToHex, sceneFromJSON, startThresholdDrag, textCommand, tileGeometry, useActionsRegistry, useActiveToolContext, useOptionalDepRegistry, useVisibleRaf };
+//# sourceMappingURL=chunk-54ZWZ5FQ.js.map
+//# sourceMappingURL=chunk-54ZWZ5FQ.js.map