@weasel-js/routing 1.10.0 → 1.10.1

package/dist/react.js

@@ -1,6 +1,6 @@
-import { createDepRegistry, createDispatcher, assembleEntries, liveScope, isDev, reportRouteConflicts, offhandKeyFor, makeToolOffhandAction, buildToolOffhandBindings, dlog, ScopeNode, isTool, DEV, publishLiveDispatch, LONG_PRESS_HAPTIC_MS, multiTouchGestureId, openPointerSession, pushOwner, evaluateEnabled, validateActionId, validateActionDefaultBinding, depNodeOf, DepNode, clientToCanvas, buildDepsFromRequires, isEditableTarget, focusedControlOwnsKey, itemsFromClipboardData, itemsFromDataTransfer, itemTypesFromDataTransfer } from './chunk-4DR6AJMN.js';
+import { createDepRegistry, createDispatcher, assembleEntries, liveScope, isDev, reportRouteConflicts, offhandKeyFor, makeToolOffhandAction, buildToolOffhandBindings, dlog, ScopeNode, isTool, tuneAction, pushOwner, evaluateEnabled, validateActionId, validateActionDefaultBinding, depNodeOf, DepNode, clientToCanvas, DEV, publishLiveDispatch, LONG_PRESS_HAPTIC_MS, multiTouchGestureId, openPointerSession, buildDepsFromRequires, isEditableTarget, focusedControlOwnsKey, itemsFromClipboardData, itemsFromDataTransfer, itemTypesFromDataTransfer } from './chunk-VCEIQ64H.js';
 import { createContext, useState, useContext, useEffect, useRef, useCallback, useMemo, useSyncExternalStore } from 'react';
-import { isApplePlatform, createPointerRecognizer, isInControlWithin, longPressEvents, stylusOf } from '@weasel-js/gestures';
+import { isApplePlatform, heldPointers, createPointerRecognizer, isInControlWithin, longPressEvents, stylusOf } from '@weasel-js/gestures';
 import { useLatest, useStableByContent, sameList } from '@weasel-js/react';
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { createCursorSink, resolveCursorTier } from '@weasel-js/cursor';
@@ -133,7 +133,7 @@ function useToolLifecycle(opts) {
     const next = new Set(active === null ? hotkeyStack : [active, ...hotkeyStack]);
     liveRef.current = next;
     for (const id of prev) if (!next.has(id)) fire(id, "onDeactivate");
-    if (prevActiveRef.current !== active) onSwitchRef.current?.();
+    if (prevActiveRef.current !== null && prevActiveRef.current !== active) onSwitchRef.current?.();
     prevActiveRef.current = active;
     for (const id of next) if (!prev.has(id)) fire(id, "onActivate");
   });
@@ -268,6 +268,11 @@ function contextMenuInput(core, takeNativeHold) {
   };
   return onContextMenu;
 }
+var whereOf = ({ affordance, bodyTarget, bodyKind }) => ({
+  ...affordance !== void 0 ? { affordance } : {},
+  ...bodyTarget !== void 0 ? { bodyTarget } : {},
+  ...bodyKind !== void 0 ? { bodyKind } : {}
+});
 var hoverOf = (e) => ({
   clientX: e.clientX,
   clientY: e.clientY,
@@ -325,8 +330,9 @@ function hoverCursorInput(core, paintedCursor, pointersHeld, cursorSink = () =>
       if (pointersHeld() === 0) {
         const w = toWorld(e.clientX, e.clientY);
         const where = underPointer(target(), last, w);
+        const from = facts ? { from: whereOf(facts.where) } : {};
         facts = { at: last, where };
-        dispatch({ kind: "hover", x: w.x, y: w.y, clientX: e.clientX, clientY: e.clientY, ...where });
+        dispatch({ kind: "hover", x: w.x, y: w.y, clientX: e.clientX, clientY: e.clientY, ...where, ...from });
       }
       refresh();
     },
@@ -335,6 +341,12 @@ function hoverCursorInput(core, paintedCursor, pointersHeld, cursorSink = () =>
       refreshSoon();
     },
     onLeave() {
+      if (facts) {
+        const { at, where } = facts;
+        const w = toWorld(at.clientX, at.clientY);
+        dispatch({ kind: "hover", off: true, x: w.x, y: w.y, clientX: at.clientX, clientY: at.clientY, ...where, from: whereOf(where) });
+      }
+      facts = null;
       last = null;
       if (DEV) publishLiveDispatch(null);
       paintedCursor()?.clearPointer();
@@ -678,7 +690,6 @@ function pointerInput(core, opts) {
       hold.routeToPress();
       return recognizer.takeHold();
     },
-    heldCount: () => recognizer.heldCount(),
     cancelHeld() {
       for (const session of [...sessions.values()]) session.cancel();
     },
@@ -783,6 +794,88 @@ function wheelInput(core, pinchLive) {
   return onWheel;
 }
 
+// src/interactions/dispatcher/attachInput.ts
+function attachInput(canvas, src, channels) {
+  let disposed = false;
+  const redraw = dispatcherWatch(src.requestRedraw);
+  redraw.sync(src.dispatchers());
+  const core = createDispatchCore({
+    canvas,
+    root: src.root,
+    views: src.views,
+    context: src.context,
+    actions: src.actions,
+    uses: () => {
+      redraw.sync(src.dispatchers());
+    },
+    disposed: () => disposed
+  });
+  const keys = keyboardInput(core);
+  const pinch = webkitPinchInput(core);
+  const ingest = ingestInput(core);
+  const held = canvas ? heldPointers(canvas) : null;
+  const hover = hoverCursorInput(core, src.paintedCursor, () => held?.count() ?? 0, src.cursorSink);
+  const pointer = pointerInput(core, {
+    longPress: src.longPress,
+    onClick: src.onClick,
+    onDoubleClick: src.onDoubleClick,
+    clicks: src.clicks,
+    hover
+  });
+  const onWindowBlur = () => {
+    pinch.end();
+    pointer.cancelHeld();
+    keys.releaseAll();
+  };
+  const listeners = listenerSet();
+  const keyCapture = channels.keyboard === "first";
+  if (channels.keyboard) {
+    listeners.on(window, "keydown", keys.onKeyDown, keyCapture);
+    listeners.on(window, "keyup", keys.onKeyUp, keyCapture);
+  }
+  listeners.on(window, "blur", onWindowBlur);
+  listeners.on(canvas, "pointerdown", () => {
+    src.actions().activate();
+  });
+  if (channels.pointer) {
+    listeners.on(window, "keydown", hover.onKey);
+    listeners.on(window, "keyup", hover.onKey);
+    listeners.on(canvas, "pointerleave", hover.onLeave);
+    listeners.on(canvas, "pointerdown", pointer.onPointerDown);
+    listeners.on(canvas, "pointermove", pointer.onHoverMove);
+    listeners.on(canvas, "dblclick", pointer.onNativeDoubleClick);
+  }
+  if (channels.wheel) {
+    listeners.on(canvas, "wheel", wheelInput(core, pinch.live), { passive: false, capture: true });
+  }
+  if (channels.pinch) {
+    listeners.on(canvas, "gesturestart", pinch.onGestureStart);
+    listeners.on(canvas, "gesturechange", pinch.onGestureChange);
+    listeners.on(canvas, "gestureend", pinch.onGestureEnd);
+  }
+  if (channels.contextMenu) {
+    listeners.on(canvas, "contextmenu", contextMenuInput(core, pointer.takeNativeHold));
+  }
+  if (channels.ingest) {
+    listeners.on(canvas, "dragenter", ingest.onDragOver);
+    listeners.on(canvas, "dragover", ingest.onDragOver);
+    listeners.on(canvas, "dragleave", ingest.onDragLeave);
+    listeners.on(canvas, "drop", ingest.onDrop);
+    listeners.on(window, "paste", ingest.onPaste);
+  }
+  return () => {
+    listeners.removeAll();
+    canvas?.classList.remove(DROPOVER_CLASS);
+    src.actions().dropKeys();
+    hover.clear();
+    disposed = true;
+    pointer.dispose();
+    held?.release();
+    redraw.stop();
+    for (const d of src.dispatchers()) d.cancelAll("cancel");
+  };
+}
+
 // src/interactions/dispatcher/useGestureDispatcher.tsx
 function useGestureDispatcher(opts) {
   const { canvasRef, actions, entriesById, enabled = true, keyboard = true, affordanceAt, classifyTarget, dispatcher: dispatcherOpt, clientToWorld, requestRedraw, paintedCursor, cursorSink, getRuleCtx, onClick, onDoubleClick, views, channels, longPress, claimKeys = false } = opts;
@@ -840,85 +933,29 @@ function useGestureDispatcher(opts) {
   }, [enabled, claimKeys, registryRef]);
   useEffect(() => {
     if (!enabled) return;
-    let disposed = false;
-    const canvas = canvasRef.current;
-    const redraw = dispatcherWatch(() => {
-      requestRedrawRef.current?.();
-    });
-    redraw.sync(allDispatchers());
-    const core = createDispatchCore({
-      canvas,
+    return attachInput(canvasRef.current, {
       root: () => rootTargetRef.current,
       views: () => viewsRef.current,
       context: () => ctxRef.current,
       actions: () => registryRef.current,
-      uses: () => {
-        redraw.sync(allDispatchers());
+      dispatchers: allDispatchers,
+      requestRedraw: () => {
+        requestRedrawRef.current?.();
       },
-      disposed: () => disposed
-    });
-    const keys = keyboardInput(core);
-    const pinch = webkitPinchInput(core);
-    const ingest = ingestInput(core);
-    const hover = hoverCursorInput(core, () => cursorRef.current.painted?.(), () => pointer.heldCount(), () => cursorRef.current.sink?.());
-    const pointer = pointerInput(core, {
+      paintedCursor: () => cursorRef.current.painted?.(),
+      cursorSink: () => cursorRef.current.sink?.(),
       longPress: () => longPressRef.current,
       onClick: () => onClickRef.current,
       onDoubleClick: () => onDoubleClickRef.current,
-      clicks: clicksRef.current,
-      hover
-    });
-    const onWindowBlur = () => {
-      pinch.end();
-      pointer.cancelHeld();
-      keys.releaseAll();
-    };
-    const listeners = listenerSet();
-    const keyCapture = keyboard === "first";
-    if (keyboard) {
-      listeners.on(window, "keydown", keys.onKeyDown, keyCapture);
-      listeners.on(window, "keyup", keys.onKeyUp, keyCapture);
-    }
-    listeners.on(window, "blur", onWindowBlur);
-    listeners.on(canvas, "pointerdown", () => {
-      registryRef.current.activate();
+      clicks: clicksRef.current
+    }, {
+      keyboard,
+      pointer: pointerChannel,
+      wheel: wheelChannel,
+      pinch: pinchChannel,
+      contextMenu: contextMenuChannel,
+      ingest: ingestChannel
     });
-    if (pointerChannel) {
-      listeners.on(window, "keydown", hover.onKey);
-      listeners.on(window, "keyup", hover.onKey);
-      listeners.on(canvas, "pointerleave", hover.onLeave);
-      listeners.on(canvas, "pointerdown", pointer.onPointerDown);
-      listeners.on(canvas, "pointermove", pointer.onHoverMove);
-      listeners.on(canvas, "dblclick", pointer.onNativeDoubleClick);
-    }
-    if (wheelChannel) {
-      listeners.on(canvas, "wheel", wheelInput(core, pinch.live), { passive: false, capture: true });
-    }
-    if (pinchChannel) {
-      listeners.on(canvas, "gesturestart", pinch.onGestureStart);
-      listeners.on(canvas, "gesturechange", pinch.onGestureChange);
-      listeners.on(canvas, "gestureend", pinch.onGestureEnd);
-    }
-    if (contextMenuChannel) {
-      listeners.on(canvas, "contextmenu", contextMenuInput(core, pointer.takeNativeHold));
-    }
-    if (ingestChannel) {
-      listeners.on(canvas, "dragenter", ingest.onDragOver);
-      listeners.on(canvas, "dragover", ingest.onDragOver);
-      listeners.on(canvas, "dragleave", ingest.onDragLeave);
-      listeners.on(canvas, "drop", ingest.onDrop);
-      listeners.on(window, "paste", ingest.onPaste);
-    }
-    return () => {
-      listeners.removeAll();
-      canvas?.classList.remove(DROPOVER_CLASS);
-      registryRef.current.dropKeys();
-      hover.clear();
-      disposed = true;
-      pointer.dispose();
-      redraw.stop();
-      for (const d of allDispatchers()) d.cancelAll("cancel");
-    };
   }, [
     enabled,
     keyboard,
@@ -962,6 +999,7 @@ var ActionsNode = class extends ScopeNode {
   contextDeps;
   actions = /* @__PURE__ */ new Map();
   muted = /* @__PURE__ */ new Map();
+  tunings = /* @__PURE__ */ new Map();
   dispatchers = [];
   cache = null;
   /** Called on `activate`, so a scope's dep and tool nodes move with it. */
@@ -970,10 +1008,19 @@ var ActionsNode = class extends ScopeNode {
     for (const n of this.chain()) {
       if (n.muted.has(id)) return void 0;
       const a = n.actions.get(id)?.at(-1);
-      if (a) return a;
+      if (a) return this.tuned(a);
     }
     return void 0;
   }
+  /** `a` under every tuning for its id from the root down to here. */
+  tuned(a) {
+    const tunings = [];
+    for (const n of this.chain()) {
+      const stack = n.tunings.get(a.id);
+      if (stack) tunings.unshift(...stack);
+    }
+    return tunings.length ? tuneAction(a, tunings) : a;
+  }
   snapshot() {
     const leaf = this.start();
     const cached = this.cache;
@@ -1050,6 +1097,20 @@ var ActionsNode = class extends ScopeNode {
         this.changed();
       };
     },
+    tune: (id, tuning) => {
+      let stack = this.tunings.get(id);
+      if (!stack) this.tunings.set(id, stack = []);
+      const release = pushOwner(stack, tuning);
+      this.changed();
+      let released = false;
+      return () => {
+        if (released) return;
+        released = true;
+        release();
+        if (stack.length === 0) this.tunings.delete(id);
+        this.changed();
+      };
+    },
     list: () => this.snapshot(),
     trigger: (id, params) => {
       const leaf = this.start();
@@ -1177,7 +1238,20 @@ function useOngoingAction(actionId) {
       }
     };
   }, [regRef, idRef]);
-  useEffect(() => () => edit.commit(), [edit, actionId]);
+  const leaving = useRef(null);
+  useEffect(() => {
+    const left = leaving.current;
+    leaving.current = null;
+    if (left !== null && left !== actionId) edit.commit();
+    return () => {
+      leaving.current = actionId;
+      queueMicrotask(() => {
+        if (leaving.current !== actionId) return;
+        leaving.current = null;
+        edit.commit();
+      });
+    };
+  }, [edit, actionId]);
   return edit;
 }
 function samePos(a, b) {