@weasel-js/routing 1.11.0 → 1.12.0

package/dist/react.d.ts

@@ -1,16 +1,16 @@
-import { U as UseGestureDispatcherOptions } from './internal-21M1rTVo.js';
-export { D as DispatcherChannels } from './internal-21M1rTVo.js';
+import { U as UseGestureDispatcherOptions } from './internal-DejHXi0a.js';
+export { D as DispatcherChannels } from './internal-DejHXi0a.js';
 import * as react from 'react';
 import { ReactNode, ReactElement } from 'react';
-import { D as DepRegistry, a as DepName, b as DepSchema, S as ScopeNode, A as Action, c as ActionDeps, M as MenuHost, d as ActionsRegistry, e as ActionDisabledReason, B as BoundGesture, f as ActionVariant, g as MenuDef, h as DepNode, T as ToolNode, N as NodeId, K as KernelOverlay, C as Contribution, i as Tool, O as OverlayPosition } from './index-CmfVvwWD.js';
-export { j as ActiveToolContextProvider, k as ActiveToolContextProviderIfRoot, l as ActiveToolContextProviderProps, m as ActiveToolContextValue, u as useActiveToolContext, n as useOptionalActiveToolContext } from './index-CmfVvwWD.js';
+import { D as DepRegistry, a as DepName, b as DepSource, S as ScopeNode, A as Action, c as ActionDeps, M as MenuHost, d as ActionsRegistry, e as ActionDisabledReason, B as BoundGesture, f as ActionVariant, g as MenuDef, h as DepNode, T as ToolNode, K as KeymapDescription, N as NodeId, i as KernelOverlay, C as Contribution, j as Tool, O as OverlayPosition } from './index-CyBCsdie.js';
+export { k as ActiveToolContextProvider, l as ActiveToolContextProviderIfRoot, m as ActiveToolContextProviderProps, n as ActiveToolContextValue, u as useActiveToolContext, o as useOptionalActiveToolContext } from './index-CyBCsdie.js';
 import { IconRef } from '@weasel-js/icons';
 import { ModeRegistry } from '@weasel-js/modes';
 import '@weasel-js/gestures';
 import '@weasel-js/cursor';
+import '@weasel-js/geom';
 import '@weasel-js/menu';
 import '@weasel-js/prefs';
-import '@weasel-js/geom';
 import '@weasel-js/registry';
 import '@weasel-js/select';
 
@@ -39,8 +39,8 @@ declare function useDepRegistry(): DepRegistry;
 declare function useOptionalDepRegistry(): DepRegistry | null;
 /** Register a live source for `name` for the lifetime of the calling
  *  component. The `source` thunk is called at dispatch time and should
- *  return the latest value. */
-declare function useDepSource<K extends DepName>(name: K, source: () => DepSchema[K]): void;
+ *  return the latest value; its `below` reads the source it displaced. */
+declare function useDepSource<K extends DepName>(name: K, source: DepSource<K>): void;
 
 /**
  * One node of the actions tree: the actions registered at it, over its
@@ -53,6 +53,8 @@ declare class ActionsNode extends ScopeNode<ActionsNode> {
     private readonly actions;
     private readonly muted;
     private readonly tunings;
+    private readonly overrides;
+    private overrideCache;
     private readonly dispatchers;
     private cache;
     private host;
@@ -64,6 +66,8 @@ declare class ActionsNode extends ScopeNode<ActionsNode> {
     private tuningsOf;
     /** `a` under every tuning for its id from the root down to here. */
     private tuned;
+    /** Every binding override from the root down to here, read into specs. */
+    private overridesHere;
     private snapshot;
     private deps;
     /** The actions registered at this node itself, live, unmuted and tuned —
@@ -220,6 +224,10 @@ interface OngoingAction {
  */
 declare function useOngoingAction(actionId: string): OngoingAction;
 
+/** The innermost keymap open on the canvas in scope, described for a hint, or
+ *  `null` while none is. Re-renders as keymaps open and close. */
+declare function useOpenKeymap(): KeymapDescription | null;
+
 /** World-space pointer position and the view it is over — a
  *  view id, or `null` for a surface's own camera. `null` as a whole when the
  *  pointer is over no publishing surface. */
@@ -412,4 +420,4 @@ declare function useContributions<TOverlay = KernelOverlay>(opts: UseContributio
  */
 declare function useOffhandAction(entries: readonly Contribution<unknown>[]): void;
 
-export { ActionsProvider, type CommandOptions, type ContributionsApi, DepRegistry, DepRegistryProvider, InputScope, type InputScopeProps, type OngoingAction, PointerContextProvider, type PointerContextValue, type PointerWorldPos, SelectionContextProvider, SelectionContextProviderIfRoot, type SelectionContextValue, type ToolsApi, type UseContributionsOptions, UseGestureDispatcherOptions, type UseToolsOptions, Yoke, type YokeProps, createPointerStore, useAction, useActionsRegistry, useCommand, useContributions, useDepRegistry, useDepSource, useGestureDispatcher, useMenuHost, useMenus, useOffhandAction, useOngoingAction, useOptionalDepRegistry, usePointerContext, usePointerPosition, usePublishSelection, useSelectionContext, useTools, useYoke };
+export { ActionsProvider, type CommandOptions, type ContributionsApi, DepRegistry, DepRegistryProvider, InputScope, type InputScopeProps, type OngoingAction, PointerContextProvider, type PointerContextValue, type PointerWorldPos, SelectionContextProvider, SelectionContextProviderIfRoot, type SelectionContextValue, type ToolsApi, type UseContributionsOptions, UseGestureDispatcherOptions, type UseToolsOptions, Yoke, type YokeProps, createPointerStore, useAction, useActionsRegistry, useCommand, useContributions, useDepRegistry, useDepSource, useGestureDispatcher, useMenuHost, useMenus, useOffhandAction, useOngoingAction, useOpenKeymap, useOptionalDepRegistry, usePointerContext, usePointerPosition, usePublishSelection, useSelectionContext, useTools, useYoke };

package/dist/react.js

@@ -1,4 +1,4 @@
-import { createDepRegistry, createDispatcher, assembleEntries, liveScope, reportRouteConflicts, offhandKeyFor, makeToolOffhandAction, buildToolOffhandBindings, dlog, ScopeNode, tuneAction, createMenuHost, pushOwner, evaluateEnabled, tunedParams, validateActionId, validateActionDefaultBinding, isTool, depNodeOf, DepNode, buildDepsFromRequires, clientToCanvas, DEV, publishLiveDispatch, LONG_PRESS_HAPTIC_MS, multiTouchGestureId, openPointerSession, addCarrySurface, gestureIdFor, isEditableTarget, focusedControlOwnsKey, itemsFromClipboardData, itemsFromDataTransfer, itemTypesFromDataTransfer, actionCursor } from './chunk-QBQQIFPI.js';
+import { createDepRegistry, createKeymapStack, createDispatchTrace, createDispatcher, describeKeymap, assembleEntries, liveScope, offhandKeyFor, makeToolOffhandAction, buildToolOffhandBindings, dlog, NO_OVERRIDES, reportRouteConflicts, ScopeNode, overrideActionBindings, tuneAction, resolveBindingOverrides, createMenuHost, pushOwner, evaluateEnabled, tunedParams, validateActionId, validateActionDefaultBinding, isTool, depNodeOf, DepNode, buildDepsFromRequires, clientToCanvas, LONG_PRESS_HAPTIC_MS, multiTouchGestureId, openPointerSession, addCarrySurface, carryGestureId, anyBinding, isEditableTarget, focusedControlOwnsKey, itemsFromClipboardData, itemsFromDataTransfer, itemTypesFromDataTransfer, actionCursor } from './chunk-ARDHI47M.js';
 import { createContext, useState, useContext, useEffect, useMemo, useRef, useCallback, useSyncExternalStore } from 'react';
 import { isApplePlatform, heldPointers, createPointerRecognizer, isInControlWithin, longPressEvents, stylusOf } from '@weasel-js/gestures';
 import { isDev, useLatest, useKitSettings, useStableByContent, sameList } from '@weasel-js/react';
@@ -108,7 +108,7 @@ function useDepSource(name, source) {
   const registry = useDepRegistry();
   const sourceRef = useLatest(source);
   useEffect(() => {
-    return registry.register(name, () => sourceRef.current());
+    return registry.register(name, (below) => sourceRef.current(below));
   }, [name, registry, sourceRef]);
 }
 var MenuHostContext = createContext(null);
@@ -148,6 +148,8 @@ var ActionsNode = class extends ScopeNode {
   actions = /* @__PURE__ */ new Map();
   muted = /* @__PURE__ */ new Map();
   tunings = /* @__PURE__ */ new Map();
+  overrides = [];
+  overrideCache = null;
   dispatchers = [];
   cache = null;
   host = null;
@@ -173,7 +175,17 @@ var ActionsNode = class extends ScopeNode {
   /** `a` under every tuning for its id from the root down to here. */
   tuned(a) {
     const tunings = this.tuningsOf(a.id);
-    return tunings.length ? tuneAction(a, tunings) : a;
+    return overrideActionBindings(tunings.length ? tuneAction(a, tunings) : a, this.overridesHere());
+  }
+  /** Every binding override from the root down to here, read into specs. */
+  overridesHere() {
+    const cached = this.overrideCache;
+    if (cached && cached.version === this.tree.version) return cached.resolved;
+    const maps = [];
+    for (const n of this.chain()) maps.unshift(...n.overrides);
+    const resolved = resolveBindingOverrides(maps);
+    this.overrideCache = { version: this.tree.version, resolved };
+    return resolved;
   }
   snapshot() {
     const leaf = this.start();
@@ -291,6 +303,18 @@ var ActionsNode = class extends ScopeNode {
       };
     },
     paramsOf: (id, given) => tunedParams(this.tuningsOf(id), given),
+    overrideBindings: (overrides) => {
+      const release = pushOwner(this.overrides, overrides);
+      this.changed();
+      let released = false;
+      return () => {
+        if (released) return;
+        released = true;
+        release();
+        this.changed();
+      };
+    },
+    bindingOverrides: () => this.start().overridesHere(),
     list: () => this.snapshot(),
     trigger: (id, params) => {
       const leaf = this.start();
@@ -419,6 +443,7 @@ function useToolLifecycle(opts) {
 function createDispatchCore(src) {
   const { canvas } = src;
   let routedId = null;
+  let over = false;
   const target = () => {
     if (routedId === null) return src.root();
     return src.views()?.targets().find((t) => t.id === routedId) ?? src.root();
@@ -426,6 +451,10 @@ function createDispatchCore(src) {
   const dispatcherNow = () => target().dispatcher;
   const routedDeps = withViewDeps(() => src.context().depRegistry, () => target().deps?.());
   const routedRuleCtx = () => target().getRuleCtx?.();
+  const batch = (fn) => {
+    const keymaps = src.context().keymaps;
+    return keymaps ? keymaps.batch(fn) : fn();
+  };
   const ctxNow = () => ({
     ...src.context(),
     depRegistry: routedDeps,
@@ -461,12 +490,18 @@ function createDispatchCore(src) {
       const [x, y] = clientToCanvas(canvas, cx, cy);
       return { x, y };
     },
-    dispatch: (ev, on) => {
+    dispatch: (ev, on, reach) => batch(() => {
       const d = on ?? dispatcherNow();
       src.uses(d);
-      return d.handleInput(ev, ctxNow());
-    },
+      return d.handleInput(ev, reach ? { ...ctxNow(), keyReach: reach } : ctxNow());
+    }),
+    batch,
+    keymaps: () => src.context().keymaps,
     holdsKeys: () => canvas ? src.actions().holdsKeys() : src.actions().isActive(),
+    pointerOver: () => over,
+    setPointerOver: (next) => {
+      over = canvas !== null && next;
+    },
     activate: () => src.actions().activate(),
     disposed: src.disposed
   };
@@ -505,6 +540,25 @@ function dispatcherWatch(onChange) {
   };
 }
 
+// src/interactions/dispatcher/underPointer.ts
+function underPointer(view, mods, w) {
+  const affordance = view.affordanceAt?.(w) ?? void 0;
+  const body = view.classifyTarget?.(w);
+  return {
+    altKey: mods.altKey,
+    ctrlKey: mods.ctrlKey,
+    metaKey: mods.metaKey,
+    shiftKey: mods.shiftKey,
+    ...affordance !== void 0 ? { affordance } : {},
+    ...body?.body !== void 0 ? { bodyTarget: body.body } : {},
+    ...body?.kind !== void 0 ? { bodyKind: body.kind } : {},
+    ...body?.doubleClick !== void 0 ? { doubleClickBody: doubleClickBodyOf(body.doubleClick) } : {}
+  };
+}
+function doubleClickBodyOf(named) {
+  return { bodyTarget: named.body, ...named.kind !== void 0 ? { bodyKind: named.kind } : {} };
+}
+
 // src/interactions/dispatcher/channels/carry.ts
 function carryInput(core) {
   const { canvas } = core;
@@ -517,6 +571,7 @@ function carryInput(core) {
       if (core.disposed()) return "unhandled";
       const event = () => {
         const w = core.toWorld(at.clientX, at.clientY);
+        const { affordance, bodyTarget, bodyKind } = underPointer(core.target(), at, w);
         return {
           kind: "carry",
           stage,
@@ -530,7 +585,10 @@ function carryInput(core) {
           altKey: at.altKey,
           ctrlKey: at.ctrlKey,
           metaKey: at.metaKey,
-          shiftKey: at.shiftKey
+          shiftKey: at.shiftKey,
+          ...affordance !== void 0 ? { affordance } : {},
+          ...bodyTarget !== void 0 ? { bodyTarget } : {},
+          ...bodyKind !== void 0 ? { bodyKind } : {}
         };
       };
       const routedNow = core.routedView();
@@ -541,13 +599,12 @@ function carryInput(core) {
           return core.dispatch(event());
         }
         if (pinned.has(pointerId)) core.setRoutedView(pinned.get(pointerId));
-        if (stage !== "move") pinned.delete(pointerId);
-        const ev = event();
-        if (stage === "drop" && !core.dispatcherNow().inFlight().has(gestureIdFor(ev))) {
+        if (stage === "drop" || stage === "leave") pinned.delete(pointerId);
+        if (stage !== "leave" && !core.dispatcherNow().inFlight().has(carryGestureId(pointerId))) {
           core.routeAt(null, at.clientX, at.clientY);
-          return core.dispatch(event());
+          if (stage === "move") pinned.set(pointerId, core.routedView());
         }
-        return core.dispatch(ev);
+        return core.dispatch(event());
       } finally {
         core.setRoutedView(routedNow);
       }
@@ -555,25 +612,6 @@ function carryInput(core) {
   });
 }
 
-// src/interactions/dispatcher/underPointer.ts
-function underPointer(view, mods, w) {
-  const affordance = view.affordanceAt?.(w) ?? void 0;
-  const body = view.classifyTarget?.(w);
-  return {
-    altKey: mods.altKey,
-    ctrlKey: mods.ctrlKey,
-    metaKey: mods.metaKey,
-    shiftKey: mods.shiftKey,
-    ...affordance !== void 0 ? { affordance } : {},
-    ...body?.body !== void 0 ? { bodyTarget: body.body } : {},
-    ...body?.kind !== void 0 ? { bodyKind: body.kind } : {},
-    ...body?.doubleClick !== void 0 ? { doubleClickBody: doubleClickBodyOf(body.doubleClick) } : {}
-  };
-}
-function doubleClickBodyOf(named) {
-  return { bodyTarget: named.body, ...named.kind !== void 0 ? { bodyKind: named.kind } : {} };
-}
-
 // src/interactions/dispatcher/channels/contextMenu.ts
 function contextMenuInput(core, takeNativeHold) {
   const { routeAt, toWorld, target, dispatch } = core;
@@ -618,6 +656,15 @@ function hoverCursorInput(core, paintedCursor, pointersHeld, cursorSink = () =>
   };
   let last = null;
   let facts = null;
+  let heldHeard = null;
+  const hears = () => {
+    if (pointersHeld() === 0) {
+      heldHeard = null;
+      return true;
+    }
+    heldHeard ??= anyBinding(ctxNow(), (s) => s.kind === "hover" && s.held !== void 0);
+    return heldHeard;
+  };
   const resolve = () => {
     if (!canvas || !last) return;
     if (pointersHeld() > 0 || dispatcherNow().inFlight().size > 0) {
@@ -635,7 +682,7 @@ function hoverCursorInput(core, paintedCursor, pointersHeld, cursorSink = () =>
     const ctx = ctxNow();
     const d = dispatcherNow();
     const press = { kind: "pointerdown", x: w.x, y: w.y, clientX: h.clientX, clientY: h.clientY, ...where };
-    if (DEV) publishLiveDispatch(() => d.explain(press, ctx));
+    if (ctx.trace?.recording()) ctx.trace.setLive(() => d.explain(press, ctx));
     const click = { kind: "click", x: w.x, y: w.y, pressX: w.x, pressY: w.y, ...where };
     const cursorOf = (r) => r ? actionCursor(r.action, r.params) : void 0;
     const cursor = cursorOf(d.resolveOnly(press, ctx)) ?? cursorOf(dispatcherNow().resolveOnly(click, ctx));
@@ -657,16 +704,18 @@ function hoverCursorInput(core, paintedCursor, pointersHeld, cursorSink = () =>
     const w = toWorld(at.clientX, at.clientY);
     const where = underPointer(target(), at, w);
     const from = facts ? { from: whereOf(facts.where) } : {};
+    const held = pointersHeld() > 0 ? { held: true } : {};
     facts = { at, where };
-    dispatch({ kind: "hover", x: w.x, y: w.y, clientX: at.clientX, clientY: at.clientY, ...where, ...from });
+    dispatch({ kind: "hover", x: w.x, y: w.y, clientX: at.clientX, clientY: at.clientY, ...where, ...from, ...held });
   };
   return {
     moved(e) {
       last = hoverOf(e);
-      if (pointersHeld() === 0) hoverAt(last);
+      if (hears()) hoverAt(last);
       refresh();
     },
     released(e) {
+      heldHeard = null;
       last = hoverOf(e);
       refreshSoon();
     },
@@ -678,7 +727,7 @@ function hoverCursorInput(core, paintedCursor, pointersHeld, cursorSink = () =>
       }
       facts = null;
       last = null;
-      if (DEV) publishLiveDispatch(null);
+      ctxNow().trace?.setLive(null);
       paintedCursor()?.clearPointer();
       override.clear();
     },
@@ -687,7 +736,7 @@ function hoverCursorInput(core, paintedCursor, pointersHeld, cursorSink = () =>
       const prev = last;
       last = { ...last, altKey: e.altKey, ctrlKey: e.ctrlKey, metaKey: e.metaKey, shiftKey: e.shiftKey };
       const changed = prev.altKey !== last.altKey || prev.ctrlKey !== last.ctrlKey || prev.metaKey !== last.metaKey || prev.shiftKey !== last.shiftKey;
-      if (changed && pointersHeld() === 0) hoverAt(last);
+      if (changed && hears()) hoverAt(last);
       refreshSoon();
     },
     clear: override.clear
@@ -778,50 +827,73 @@ function ingestInput(core) {
   return { onDragOver, onDragLeave, onDrop, onPaste };
 }
 
+// src/interactions/dispatcher/channels/keymapKeys.ts
+function keymapKeys(stack) {
+  const leaders = /* @__PURE__ */ new Map();
+  const quiet = /* @__PURE__ */ new Set();
+  const release = (physical) => {
+    if (leaders.delete(physical)) stack()?.release(`key:${physical}`);
+  };
+  return {
+    quiet: (physical) => leaders.has(physical) || quiet.has(physical),
+    press: (e, physical, run) => {
+      const before = stack()?.innermost() ?? null;
+      run();
+      const s = stack();
+      if (s?.holdOpened(`key:${physical}`)) leaders.set(physical, e.metaKey);
+      else if (before !== null && s?.innermost() !== before) quiet.add(physical);
+    },
+    up: (e, physical) => {
+      quiet.delete(physical);
+      release(physical);
+      if (e.key === "Meta") {
+        for (const [k, withCmd] of [...leaders]) if (withCmd) release(k);
+      }
+    },
+    clear: () => {
+      leaders.clear();
+      quiet.clear();
+    }
+  };
+}
+
 // src/interactions/dispatcher/channels/keyboard.ts
 function typedWithAltGraph(e) {
   if (!e.ctrlKey || !e.altKey || e.key.length !== 1 || !e.getModifierState?.("AltGraph")) return false;
   const base = /^(?:Key|Digit)(.)$/.exec(e.code)?.[1];
   return base === void 0 || base.toLowerCase() !== e.key.toLowerCase();
 }
+function keystrokeEvents(e, mods) {
+  const common = { key: e.key, ...e.code ? { code: e.code } : {}, ...mods, metaKey: e.metaKey, shiftKey: e.shiftKey };
+  return {
+    keyEv: { kind: "key", ...common, repeat: e.repeat },
+    heldEv: { kind: "key-held", ...common, phase: "down" }
+  };
+}
 var inMenu = (t) => t instanceof Element && t.closest('[role="menu"]') !== null;
 function keyboardInput(core) {
   const { dispatch, dispatcherNow } = core;
   const heldKeys = /* @__PURE__ */ new Map();
+  const keymaps = keymapKeys(core.keymaps);
   const codeOf = (e) => e.code ? { code: e.code } : {};
   const physicalKey = (e) => e.code || e.key.toLowerCase();
   const onKeyDown = (e) => {
     if (e.defaultPrevented || isEditableTarget(e.target) || inMenu(e.target) || focusedControlOwnsKey(e)) return;
-    if (!core.holdsKeys()) return;
-    if (e.repeat && heldKeys.has(physicalKey(e))) {
+    const reach = { held: core.holdsKeys(), over: core.pointerOver() };
+    if (!reach.held && !reach.over) return;
+    if (e.repeat && (heldKeys.has(physicalKey(e)) || keymaps.quiet(physicalKey(e)))) {
       e.preventDefault();
       return;
     }
-    if (press(e, { altKey: e.altKey, ctrlKey: e.ctrlKey })) return;
-    if (typedWithAltGraph(e)) press(e, { altKey: false, ctrlKey: false });
+    const altGr = typedWithAltGraph(e);
+    const typed = { altKey: false, ctrlKey: false };
+    keymaps.press(e, physicalKey(e), () => core.batch(() => altGr && core.keymaps()?.innermost() ? press(e, typed, reach) : press(e, { altKey: e.altKey, ctrlKey: e.ctrlKey }, reach) || altGr && press(e, typed, reach)));
   };
-  const press = (e, mods) => {
-    const keyEv = {
-      kind: "key",
-      key: e.key,
-      ...codeOf(e),
-      ...mods,
-      metaKey: e.metaKey,
-      shiftKey: e.shiftKey,
-      repeat: e.repeat
-    };
-    const keyResult = dispatch(keyEv);
-    const heldEv = {
-      kind: "key-held",
-      key: e.key,
-      ...codeOf(e),
-      phase: "down",
-      ...mods,
-      metaKey: e.metaKey,
-      shiftKey: e.shiftKey
-    };
+  const press = (e, mods, reach) => {
+    const { keyEv, heldEv } = keystrokeEvents(e, mods);
+    const keyResult = dispatch(keyEv, void 0, reach);
     const heldOn = dispatcherNow();
-    const heldResult = dispatch(heldEv, heldOn);
+    const heldResult = dispatch(heldEv, heldOn, reach);
     if (heldResult === "handled") {
       heldKeys.set(physicalKey(e), { key: e.key, ...codeOf(e), on: heldOn });
     }
@@ -831,6 +903,7 @@ function keyboardInput(core) {
   };
   const onKeyUp = (e) => {
     const physical = physicalKey(e);
+    keymaps.up(e, physical);
     const down = heldKeys.get(physical);
     if (down === void 0) return;
     const ev = {
@@ -847,6 +920,7 @@ function keyboardInput(core) {
     dispatch(ev, down.on);
   };
   const releaseAll = () => {
+    keymaps.clear();
     const releasing = [...heldKeys.values()];
     heldKeys.clear();
     for (const { key, code, on } of releasing) {
@@ -887,6 +961,7 @@ var sampleOf = (e) => ({
   clientX: e.clientX,
   clientY: e.clientY,
   target: e.target,
+  timeStamp: e.timeStamp,
   altKey: e.altKey,
   ctrlKey: e.ctrlKey,
   metaKey: e.metaKey,
@@ -1173,6 +1248,7 @@ function attachInput(canvas, src, channels) {
     pinch.end();
     pointer.cancelHeld();
     keys.releaseAll();
+    src.context().keymaps?.closeAll();
   };
   const listeners = listenerSet();
   const keyCapture = channels.keyboard === "first";
@@ -1184,6 +1260,12 @@ function attachInput(canvas, src, channels) {
   listeners.on(canvas, "pointerdown", () => {
     src.actions().activate();
   });
+  const setOver = (on) => () => {
+    core.setPointerOver(on);
+  };
+  listeners.on(canvas, "pointerenter", setOver(true));
+  listeners.on(canvas, "pointermove", setOver(true));
+  listeners.on(canvas, "pointerleave", setOver(false));
   if (channels.pointer) {
     listeners.on(window, "keydown", hover.onKey);
     listeners.on(window, "keyup", hover.onKey);
@@ -1191,6 +1273,14 @@ function attachInput(canvas, src, channels) {
     listeners.on(canvas, "pointerdown", pointer.onPointerDown);
     listeners.on(canvas, "pointermove", pointer.onHoverMove);
     listeners.on(canvas, "dblclick", pointer.onNativeDoubleClick);
+  } else if (channels.hover) {
+    listeners.on(window, "keydown", hover.onKey);
+    listeners.on(window, "keyup", hover.onKey);
+    listeners.on(canvas, "pointerleave", hover.onLeave);
+    listeners.on(canvas, "pointermove", (e) => {
+      core.routeAt(null, e.clientX, e.clientY);
+      hover.moved(e);
+    });
   }
   if (channels.wheel) {
     listeners.on(canvas, "wheel", wheelInput(core, pinch.live), { passive: false, capture: true });
@@ -1222,13 +1312,15 @@ function attachInput(canvas, src, channels) {
     held?.release();
     redraw.stop();
     for (const d of src.dispatchers()) d.cancelAll("cancel");
+    src.context().keymaps?.closeAll();
   };
 }
 
 // src/interactions/dispatcher/useGestureDispatcher.tsx
 function useGestureDispatcher(opts) {
-  const { canvasRef, actions, entriesById, enabled = true, keyboard = true, affordanceAt, classifyTarget, dispatcher: dispatcherOpt, clientToWorld, clientToLocal, requestRedraw, paintedCursor, cursorSink, getRuleCtx, onClick, onDoubleClick, views, channels, longPress, claimKeys = false, hears = "scope" } = opts;
+  const { canvasRef, actions, entriesById, enabled = true, keyboard = true, affordanceAt, classifyTarget, dispatcher: dispatcherOpt, trace: traceOpt, clientToWorld, clientToLocal, requestRedraw, paintedCursor, cursorSink, getRuleCtx, onClick, onDoubleClick, views, channels, longPress, claimKeys = false, hears = "scope" } = opts;
   const pointerChannel = channels?.pointer !== false;
+  const hoverChannel = channels?.hover ?? pointerChannel;
   const wheelChannel = channels?.wheel !== false;
   const pinchChannel = channels?.pinch !== false;
   const contextMenuChannel = channels?.contextMenu !== false;
@@ -1239,6 +1331,12 @@ function useGestureDispatcher(opts) {
   const activeTool = useActiveToolContext();
   const depRegistry = useDepRegistry();
   const [isMac] = useState(isApplePlatform);
+  const [keymaps] = useState(createKeymapStack);
+  useEffect(() => depRegistry.register("keymaps", () => keymaps), [depRegistry, keymaps]);
+  const kitSettings = useKitSettings();
+  const [ownTrace] = useState(createDispatchTrace);
+  const trace = traceOpt ?? ownTrace;
+  useEffect(() => depRegistry.register("dispatchTrace", () => trace), [depRegistry, trace]);
   const dispatcherRef = useRef(null);
   if (!dispatcherRef.current) {
     dispatcherRef.current = dispatcherOpt ?? createDispatcher();
@@ -1254,7 +1352,11 @@ function useGestureDispatcher(opts) {
     activeToolId: activeTool.active,
     hotkeyStack: activeTool.hotkeyStack,
     entriesById,
-    isMac
+    isMac,
+    trace,
+    bindingOverrides: () => registryRef.current.bindingOverrides(),
+    keymaps,
+    leaderUnbound: kitSettings.get("gestures.keymapUnbound")
   });
   const rootTargetRef = useLatest({
     id: null,
@@ -1273,7 +1375,7 @@ function useGestureDispatcher(opts) {
   const requestRedrawRef = useLatest(requestRedraw);
   const cursorRef = useLatest({ painted: paintedCursor, sink: cursorSink });
   const longPressRef = useLatest(longPress);
-  const kitSettingsRef = useLatest(useKitSettings());
+  const kitSettingsRef = useLatest(kitSettings);
   const clicksRef = useRef({ last: null });
   useToolLifecycle({
     entriesById,
@@ -1309,6 +1411,7 @@ function useGestureDispatcher(opts) {
     }, {
       keyboard,
       pointer: pointerChannel,
+      hover: hoverChannel,
       wheel: wheelChannel,
       pinch: pinchChannel,
       contextMenu: contextMenuChannel,
@@ -1320,6 +1423,7 @@ function useGestureDispatcher(opts) {
     keyboard,
     canvasRef,
     pointerChannel,
+    hoverChannel,
     wheelChannel,
     pinchChannel,
     contextMenuChannel,
@@ -1447,6 +1551,34 @@ function useOngoingAction(actionId) {
   }, [edit, actionId]);
   return edit;
 }
+function useInnermostKeymap() {
+  const deps = useOptionalDepRegistry();
+  const subscribe = useCallback((notify) => {
+    if (!deps) return () => {
+    };
+    let leaveStack = deps.get("keymaps")?.subscribe(notify);
+    const leaveDeps = deps.subscribe?.(() => {
+      leaveStack?.();
+      leaveStack = deps.get("keymaps")?.subscribe(notify);
+      notify();
+    });
+    return () => {
+      leaveStack?.();
+      leaveDeps?.();
+    };
+  }, [deps]);
+  return useSyncExternalStore(subscribe, () => deps?.get("keymaps")?.innermost() ?? null);
+}
+
+// src/keymaps/useOpenKeymap.ts
+function useOpenKeymap() {
+  const registry = useActionsRegistry();
+  const open = useInnermostKeymap();
+  return useMemo(
+    () => open ? describeKeymap(open, registry?.list() ?? [], registry?.bindingOverrides()) : null,
+    [open, registry]
+  );
+}
 function samePos(a, b) {
   if (a === null || b === null) return a === b;
   return a.worldX === b.worldX && a.worldY === b.worldY && a.viewId === b.viewId;
@@ -1537,7 +1669,7 @@ function usePublishSelection(ids, kinds) {
     }
   }, [ctxRef, serializedRef]);
 }
-var NO_MODES = () => () => {
+var NO_SUBSCRIBE2 = () => () => {
 };
 function useContributions(opts) {
   const ctx = useActiveToolContext();
@@ -1559,16 +1691,18 @@ function useContributions(opts) {
   }, [ctx]);
   const modes = opts.modes;
   const modeVersion = useSyncExternalStore(
-    modes ? modes.subscribe : NO_MODES,
+    modes ? modes.subscribe : NO_SUBSCRIBE2,
     () => modes?.getVersion() ?? 0
   );
+  const openKeymap = useInnermostKeymap()?.id ?? null;
   const snapshot = useCallback(() => assembleEntries(entries, {
     focusedId: focused,
     hotkeyStack: engaged,
+    openKeymap,
     ...modes ? { allowedCapabilities: activeModeOf(modes.current()).allowedCapabilities } : {}
     // The version is what changes; `modes` is one object for the registry's life.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }), [entries, focused, engaged, modes, modeVersion]);
+  }), [entries, focused, engaged, openKeymap, modes, modeVersion]);
   const overlays = useCallback((position = "top") => {
     const { ordered, state } = snapshot();
     const active = [];
@@ -1591,21 +1725,28 @@ function useContributions(opts) {
   const modesRegistry = opts.modes;
   useEffect(() => {
     if (!isDev()) return;
-    const last = lastConflictSigRef.current;
-    if (last?.sig === entrySig && last.modes === modesRegistry) return;
-    lastConflictSigRef.current = { sig: entrySig, modes: modesRegistry };
-    const registry = [];
-    const ambient = [];
-    for (const entry of entries) {
-      if (entry.eligibility?.focus) registry.push(entry);
-      if (entry.eligibility?.always || entry.eligibility?.claimed) ambient.push(entry);
-    }
-    reportRouteConflicts({
-      registry,
-      ambient,
-      actions: actionsRegistry?.list() ?? [],
-      ...modesRegistry ? { modes: modesRegistry.list().map(activeModeOf) } : {}
-    });
+    const check = () => {
+      const overrides = actionsRegistry?.bindingOverrides() ?? NO_OVERRIDES;
+      const sig = `${entrySig}|${JSON.stringify([...overrides])}`;
+      const last = lastConflictSigRef.current;
+      if (last?.sig === sig && last.modes === modesRegistry) return;
+      lastConflictSigRef.current = { sig, modes: modesRegistry };
+      const registry = [];
+      const ambient = [];
+      for (const entry of entries) {
+        if (entry.eligibility?.focus) registry.push(entry);
+        if (entry.eligibility?.always || entry.eligibility?.claimed) ambient.push(entry);
+      }
+      reportRouteConflicts({
+        registry,
+        ambient,
+        actions: actionsRegistry?.list() ?? [],
+        overrides,
+        ...modesRegistry ? { modes: modesRegistry.list().map(activeModeOf) } : {}
+      });
+    };
+    check();
+    return actionsRegistry?.subscribe(check);
   }, [entrySig, entries, actionsRegistry, modesRegistry]);
   return useMemo(
     () => ({ entries, focused, setFocused, overlays }),
@@ -1726,6 +1867,6 @@ function useTools(opts) {
   );
 }
 
-export { ActionsProvider, ActiveToolContextProvider, ActiveToolContextProviderIfRoot, DepRegistryProvider, InputScope, PointerContextProvider, SelectionContextProvider, SelectionContextProviderIfRoot, Yoke, createPointerStore, useAction, useActionsRegistry, useActiveToolContext, useCommand, useContributions, useDepRegistry, useDepSource, useGestureDispatcher, useMenuHost, useMenus, useOffhandAction, useOngoingAction, useOptionalActiveToolContext, useOptionalDepRegistry, usePointerContext, usePointerPosition, usePublishSelection, useSelectionContext, useTools, useYoke };
+export { ActionsProvider, ActiveToolContextProvider, ActiveToolContextProviderIfRoot, DepRegistryProvider, InputScope, PointerContextProvider, SelectionContextProvider, SelectionContextProviderIfRoot, Yoke, createPointerStore, useAction, useActionsRegistry, useActiveToolContext, useCommand, useContributions, useDepRegistry, useDepSource, useGestureDispatcher, useMenuHost, useMenus, useOffhandAction, useOngoingAction, useOpenKeymap, useOptionalActiveToolContext, useOptionalDepRegistry, usePointerContext, usePointerPosition, usePublishSelection, useSelectionContext, useTools, useYoke };
 //# sourceMappingURL=react.js.map
 //# sourceMappingURL=react.js.map