@weasel-js/gestures 1.11.1 → 1.12.0

package/dist/index.d.ts

@@ -1164,15 +1164,31 @@ type ShortcutInput = MenuShortcut;
 interface FormatShortcutOptions {
     /** Defaults to the detected platform. */
     platform?: Platform;
+    /** {@link formatShortcutParts} only; {@link formatShortcut} picks its own. Defaults to `'auto'`. */
+    legend?: LegendStyle;
 }
-/** Format a shortcut as an array of display chips, one per key: the
- *  modifiers, then the key, each as the platform's keyboard prints it, so
- *  `mod` is `⌘` on macOS and `Ctrl` elsewhere. UIs that want a boxed per-key
- *  look render each chip in its own element. `shift: 'optional'` is treated
- *  as falsy. */
-declare function formatShortcutParts(b: ShortcutInput | undefined, opts?: FormatShortcutOptions): readonly string[] | undefined;
+/** One keymap on the way to a key: its label, and the chips of the leader that opens it. */
+interface ShortcutLeaderStep {
+    label: string;
+    keys: readonly KeyLegend[];
+}
+/** A shortcut as display chips: {@link formatShortcutParts}'s result. */
+interface ShortcutParts {
+    /** The keymaps leading to the key, outermost first; empty for a key outside any keymap. */
+    leader: readonly ShortcutLeaderStep[];
+    /** The key's own chips: the modifiers, then the key. */
+    keys: readonly KeyLegend[];
+}
+/** What {@link formatShortcut} writes after each leader step's label: `Loupe ▸ 2`. */
+declare const SHORTCUT_LEADER_SEPARATOR = " \u25B8 ";
+/** Format a shortcut as display chips, one per key: the modifiers, then the
+ *  key, each as the platform's keyboard prints it, so `mod` is `⌘` on macOS
+ *  and `Ctrl` elsewhere, after the keymaps that lead to it (`Loupe ▸ 2`).
+ *  UIs that want a boxed per-key look render each chip in its own element.
+ *  `shift: 'optional'` gives an optional chip. */
+declare function formatShortcutParts(b: ShortcutInput | undefined, opts?: FormatShortcutOptions): ShortcutParts | undefined;
 /** Format a shortcut as a single display string. Order: mod, shift, alt,
- *  key. On macOS the glyphs run together (`⌘⇧Z`); elsewhere the keys are
+ *  key, after each keymap that leads to it (`Loupe ▸ ⌘2`). On macOS the glyphs run together (`⌘⇧Z`); elsewhere the keys are
  *  spelled out and joined with `+` (`Ctrl+Shift+Z`). Returns `undefined` for
  *  `undefined` input so callers can `??` a fallback. When `key` is an array,
  *  the first element is used. `shift: 'optional'` is treated as falsy. */
@@ -1181,7 +1197,7 @@ declare function formatShortcut(b: ShortcutInput | undefined, opts?: FormatShort
 /**
  * A shortcut as key legends, one per key, as `@weasel-js/ui`'s `KeySequence` draws them: mod, shift, alt, then the
  * key, each in the platform's own legend (`⌘` on macOS, `Ctrl` elsewhere).
- * `formatShortcutParts` is these labels as strings. `shift: 'optional'`
+ * Only the key itself: `formatShortcutParts` adds the keymaps that lead to it. `shift: 'optional'`
  * becomes an optional key; a key list
  * renders its first key. Returns `undefined` for no shortcut.
  *
@@ -1199,6 +1215,24 @@ declare function keySpecsFromShortcut(shortcut: ShortcutInput | undefined, opts?
  */
 declare function keySpecFromCode(code: string, opts?: KeySpecsFromModsOptions): KeyLegend;
 
+/** A keystroke in the `Mod+Shift+K` form. Modifiers are case-insensitive:
+ *  `Meta`/`Cmd`/`Command`, `Ctrl`/`Control`, `Alt`/`Option`, `Shift`, and
+ *  `Mod` for Cmd on Apple platforms and Ctrl elsewhere. */
+declare function key(shortcut: string): KeySpec;
+/** The same keystroke held down, as a `key-held` spec. */
+declare function held(shortcut: string): KeyHeldSpec;
+/** A binding override that removes the binding. */
+declare function unbound(): null;
+/** What a binding override is written as: a route string, a spec, or `null` to unbind. */
+type BindingOverrideInput = string | GestureSpec | null;
+/** Read a binding override into the spec it names, or `null`. */
+declare function bindingSpec(input: BindingOverrideInput): GestureSpec | null;
+/** A key spec as its route string — what `bindingSpec` reads back to an
+ *  equal spec — or `null` for a key the route grammar cannot spell (`?`,
+ *  `)`, `*`). A spec is plain JSON, so store that one as it is. A key list is
+ *  written as its first key. */
+declare function keySpecRoute(spec: KeySpec | KeyHeldSpec): string | null;
+
 /**
  * The nearest element `from` sits inside that can host a portalled overlay,
  * or `null` when there is none and the body is the only answer.
@@ -1523,4 +1557,4 @@ declare function activatesFocusedControl(e: KeyboardEvent): boolean;
  */
 declare function focusedControlOwnsKey(e: KeyboardEvent): boolean;
 
-export { ACTIVE_SIGILS, type BodyClassification, type BodyKind, type BodyTarget, CONTROL_SELECTOR, type CarryEvent, type CarrySpec, type ChannelRef, type ClaimableGesture, type ClickEvent, type ClickMemory, type ClickObserver, type ClickSpec, type ContextMenuEvent, type ContextMenuSpec, DOUBLE_CLICK_MAX_MS, DOUBLE_CLICK_MAX_PX, DRAG_THRESHOLD_PX, type DescribeRouteOptions, type DoubleClickBody, type DoubleClickEvent, type DoubleClickSpec, type DragSpec, type DropEvent, type DropSpec, type EventModifiers, type FixedSeat, type FormatShortcutOptions, GESTURE_DESCRIPTORS, type GestureArgSpec, type GestureDescriptor, type GestureName, type GestureSpec, type HeldPointers, type HeldPress, type HoverEvent, type HoverSpec, type HoverWhere, type IngestItem, type InputEvent, type KeyEvent, type KeyHeldEvent, type KeyHeldSpec, type KeyLabels, type KeyLegend, type KeySpec, type KeySpecsFromModsOptions, LONG_PRESS_MS, type LegendStyle, type LogicalMod, type LogicalModSpec, type LongPressEvent, type LongPressSpec, MODIFIER_LABELS, MOD_NAME_SET, type ModRequirement, type ModSpec, type ModifierCombo, type ModifierKey, type ModifiersEvent, type MultiTouchEvent, type MultiTouchGeometry, type MultiTouchSpec, type MultiTouchTapEvent, type MultiTouchTapSpec, type OptionalMod, type ParsedKeyRoute, type ParsedModifiers, type ParsedRoute, type PasteEvent, type PasteSpec, type PhaseAtom, type PhaseContext, type PhaseSpec, type PinchEvent, type PinchSpec, type Platform, type Point, type PointerCancelEvent, type PointerDownEvent, type PointerDownSpec, type PointerIdentity, type PointerMoveEvent, type PointerRecognizer, type PointerRecognizerOptions, type PointerSample, type PointerSampleStylus, type PointerUpEvent, type PressFacts, type PressSample, RESERVED_ID_NAMES, RESERVED_ID_PREFIXES, RESERVED_SIGILS, ROUTE_FIELD_DEFINITIONS, ROUTE_TERMS, type RecognizerClock, type RecognizerObserver, type RecognizerSink, type ReleaseFacts, type ReleaseOutcome, type RouteDescriptionPart, type RouteFieldName, type RoutePhase, type RouteTermLabel, type ShortcutInput, TAP_THRESHOLD_PX, type TargetPredicate, type TargetSpec, type TargetSpecForm, UNKNOWN_MIME, VALID_MOD_NAMES, type WheelEvent, type WheelSpec, activatesFocusedControl, bodyPredicate, canonicalModifiers, clickEvents, collapseShiftPairs, createPointerRecognizer, describeRoute, describeRouteParts, detectPlatform, fixedSeat, focusedControlOwnsKey, formatKeyRoute, formatPhaseAtom, formatRoute, formatShortcut, formatShortcutParts, getGestureDescriptor, heldPointers, hitPredicate, isApplePlatform, isEditableTarget, isInControlWithin, isKnownGestureName, keyRouteToSpec, keySpecFromCode, keySpecFromKey, keySpecsFromMods, keySpecsFromShortcut, longPressEvents, matchIngestTypes, matchKey, matchModifiers, matchPhase, matchSpec, matchTarget, mimeMatchesGlob, modifierComboToParsed, mods, multiTouchGeometry, nearestPortalHost, parseKeyRoute, parseRoute, parseTargetSpec, pastDragThreshold, routeGestureForSpecKind, routeToSpec, specKindForRouteGesture, specificity, stylusOf };
+export { ACTIVE_SIGILS, type BindingOverrideInput, type BodyClassification, type BodyKind, type BodyTarget, CONTROL_SELECTOR, type CarryEvent, type CarrySpec, type ChannelRef, type ClaimableGesture, type ClickEvent, type ClickMemory, type ClickObserver, type ClickSpec, type ContextMenuEvent, type ContextMenuSpec, DOUBLE_CLICK_MAX_MS, DOUBLE_CLICK_MAX_PX, DRAG_THRESHOLD_PX, type DescribeRouteOptions, type DoubleClickBody, type DoubleClickEvent, type DoubleClickSpec, type DragSpec, type DropEvent, type DropSpec, type EventModifiers, type FixedSeat, type FormatShortcutOptions, GESTURE_DESCRIPTORS, type GestureArgSpec, type GestureDescriptor, type GestureName, type GestureSpec, type HeldPointers, type HeldPress, type HoverEvent, type HoverSpec, type HoverWhere, type IngestItem, type InputEvent, type KeyEvent, type KeyHeldEvent, type KeyHeldSpec, type KeyLabels, type KeyLegend, type KeySpec, type KeySpecsFromModsOptions, LONG_PRESS_MS, type LegendStyle, type LogicalMod, type LogicalModSpec, type LongPressEvent, type LongPressSpec, MODIFIER_LABELS, MOD_NAME_SET, type ModRequirement, type ModSpec, type ModifierCombo, type ModifierKey, type ModifiersEvent, type MultiTouchEvent, type MultiTouchGeometry, type MultiTouchSpec, type MultiTouchTapEvent, type MultiTouchTapSpec, type OptionalMod, type ParsedKeyRoute, type ParsedModifiers, type ParsedRoute, type PasteEvent, type PasteSpec, type PhaseAtom, type PhaseContext, type PhaseSpec, type PinchEvent, type PinchSpec, type Platform, type Point, type PointerCancelEvent, type PointerDownEvent, type PointerDownSpec, type PointerIdentity, type PointerMoveEvent, type PointerRecognizer, type PointerRecognizerOptions, type PointerSample, type PointerSampleStylus, type PointerUpEvent, type PressFacts, type PressSample, RESERVED_ID_NAMES, RESERVED_ID_PREFIXES, RESERVED_SIGILS, ROUTE_FIELD_DEFINITIONS, ROUTE_TERMS, type RecognizerClock, type RecognizerObserver, type RecognizerSink, type ReleaseFacts, type ReleaseOutcome, type RouteDescriptionPart, type RouteFieldName, type RoutePhase, type RouteTermLabel, SHORTCUT_LEADER_SEPARATOR, type ShortcutInput, type ShortcutLeaderStep, type ShortcutParts, TAP_THRESHOLD_PX, type TargetPredicate, type TargetSpec, type TargetSpecForm, UNKNOWN_MIME, VALID_MOD_NAMES, type WheelEvent, type WheelSpec, activatesFocusedControl, bindingSpec, bodyPredicate, canonicalModifiers, clickEvents, collapseShiftPairs, createPointerRecognizer, describeRoute, describeRouteParts, detectPlatform, fixedSeat, focusedControlOwnsKey, formatKeyRoute, formatPhaseAtom, formatRoute, formatShortcut, formatShortcutParts, getGestureDescriptor, held, heldPointers, hitPredicate, isApplePlatform, isEditableTarget, isInControlWithin, isKnownGestureName, key, keyRouteToSpec, keySpecFromCode, keySpecFromKey, keySpecRoute, keySpecsFromMods, keySpecsFromShortcut, longPressEvents, matchIngestTypes, matchKey, matchModifiers, matchPhase, matchSpec, matchTarget, mimeMatchesGlob, modifierComboToParsed, mods, multiTouchGeometry, nearestPortalHost, parseKeyRoute, parseRoute, parseTargetSpec, pastDragThreshold, routeGestureForSpecKind, routeToSpec, specKindForRouteGesture, specificity, stylusOf, unbound };

package/dist/index.js

@@ -107,7 +107,7 @@ function parseRoute(input) {
     target = "*";
   }
   const modifiers = {};
-  let held;
+  let held2;
   while (rest.length > 0) {
     const ch = rest[0];
     if (RESERVED_SIGILS.has(ch)) {
@@ -123,8 +123,8 @@ function parseRoute(input) {
     const name = nameMatch[1];
     if (name === HELD) {
       if (gestureName !== "hover") throw new Error(`invalid route (${gestureName} takes no "${HELD}"): ${input}`);
-      if (held !== void 0) throw new Error(`invalid route (duplicate "${HELD}"): ${input}`);
-      held = sigil === "+" ? "required" : "optional";
+      if (held2 !== void 0) throw new Error(`invalid route (duplicate "${HELD}"): ${input}`);
+      held2 = sigil === "+" ? "required" : "optional";
       rest = rest.slice(nameMatch[0].length).trimStart();
       continue;
     }
@@ -137,7 +137,7 @@ function parseRoute(input) {
     modifiers[name] = sigil === "+" ? "required" : "optional";
     rest = rest.slice(nameMatch[0].length).trimStart();
   }
-  return { phases, gesture: gestureName, arg, target, modifiers, ...held ? { held } : {} };
+  return { phases, gesture: gestureName, arg, target, modifiers, ...held2 ? { held: held2 } : {} };
 }
 var HELD = "held";
 function parsePhaseList(raw, input) {
@@ -264,15 +264,15 @@ function formatRoute(r) {
 // src/grammar/keyRouteGrammar.ts
 var OPTIONAL_SET = new Set(VALID_MOD_NAMES);
 function parseKeyRoute(input) {
-  const [key, ...mods2] = input.split("?");
-  if (!key) throw new Error(`invalid key route (empty key): ${input}`);
+  const [key2, ...mods2] = input.split("?");
+  if (!key2) throw new Error(`invalid key route (empty key): ${input}`);
   const seen = /* @__PURE__ */ new Set();
   for (const m of mods2) {
     if (!OPTIONAL_SET.has(m)) throw new Error(`unknown optional modifier "${m}" in ${input}`);
     if (seen.has(m)) throw new Error(`duplicate optional modifier "${m}" in ${input}`);
     seen.add(m);
   }
-  return { key, optionalMods: mods2 };
+  return { key: key2, optionalMods: mods2 };
 }
 function formatKeyRoute(r) {
   return r.optionalMods.length === 0 ? r.key : `${r.key}?${r.optionalMods.join("?")}`;
@@ -378,9 +378,9 @@ function matchModifiers(e, mods2, isMac) {
   }
   return checkKey(alt, e.altKey) && checkKey(ctrl, e.ctrlKey) && checkKey(meta, e.metaKey) && checkKey(shift, e.shiftKey);
 }
-function checkKey(req, held) {
-  if (req === "required") return held;
-  if (req === "forbidden") return !held;
+function checkKey(req, held2) {
+  if (req === "required") return held2;
+  if (req === "forbidden") return !held2;
   return true;
 }
 function matchKey(eventKey, specKey) {
@@ -609,10 +609,10 @@ function routeToSpec(parsed) {
     case "key":
     case "key-held": {
       if (arg === void 0) return fail("a key spec needs a concrete key");
-      const { key, optionalMods } = parseKeyRoute(arg);
+      const { key: key2, optionalMods } = parseKeyRoute(arg);
       const optional = {};
       for (const m of optionalMods) optional[m] = "optional";
-      return withMods({ kind, key, ...optionalMods.length > 0 ? { mods: optional } : {} });
+      return withMods({ kind, key: key2, ...optionalMods.length > 0 ? { mods: optional } : {} });
     }
     case "multiTouch":
     case "multiTouchTap":
@@ -712,8 +712,8 @@ function actionClause(parsed, required) {
     case "keyUp":
     case "keyHeld": {
       const verb = parsed.gesture === "keyDown" ? "presses" : parsed.gesture === "keyUp" ? "releases" : "holds";
-      const key = arg ?? "any key";
-      return required.length > 0 ? `the user holds ${joinAnd(required)} and ${verb} ${key}` : `the user ${verb} ${key}`;
+      const key2 = arg ?? "any key";
+      return required.length > 0 ? `the user holds ${joinAnd(required)} and ${verb} ${key2}` : `the user ${verb} ${key2}`;
     }
     case "wheel": {
       const direction = arg === "up" ? " up" : arg === "down" ? " down" : "";
@@ -736,9 +736,9 @@ function actionClause(parsed, required) {
     case "pointerDown":
       return userDoes(required, `presses${target}`);
     case "hover": {
-      const held = parsed.held === "required" ? " with a button held" : parsed.held === "optional" ? " whether or not a button is held" : "";
+      const held2 = parsed.held === "required" ? " with a button held" : parsed.held === "optional" ? " whether or not a button is held" : "";
       const where = arg === "leave" ? ` ${leftClause(parsed.target)}` : target;
-      return userDoes(required, `moves the pointer${where}${held}`);
+      return userDoes(required, `moves the pointer${where}${held2}`);
     }
     case "dblTap":
       return userDoes(required, `double-taps${target}`);
@@ -779,10 +779,10 @@ function mergeAdjacentStrings(parts) {
 }
 
 // src/grammar/modifierComboToParsed.ts
-function modifierComboToParsed(key) {
-  if (key === "default") return {};
+function modifierComboToParsed(key2) {
+  if (key2 === "default") return {};
   const out = {};
-  for (const part of key.split("+")) {
+  for (const part of key2.split("+")) {
     out[part] = "required";
   }
   return out;
@@ -916,9 +916,9 @@ function keySpecsFromShortcut(shortcut, opts = {}) {
   if (shortcut.mod) mods2.push({ name: "mod" });
   if (shortcut.shift) mods2.push(shortcut.shift === "optional" ? { name: "shift", optional: true } : { name: "shift" });
   if (shortcut.alt) mods2.push({ name: "alt" });
-  const key = typeof shortcut.key === "string" ? shortcut.key : shortcut.key[0];
+  const key2 = typeof shortcut.key === "string" ? shortcut.key : shortcut.key[0];
   const keys = keySpecsFromMods(mods2, opts);
-  return key === void 0 ? keys : [...keys, keySpecFromKey(key, opts)];
+  return key2 === void 0 ? keys : [...keys, keySpecFromKey(key2, opts)];
 }
 
 // src/ui/keySpecFromCode.ts
@@ -961,13 +961,79 @@ function keySpecFromCode(code, opts = {}) {
 }
 
 // src/ui/formatShortcut.ts
-var labels = (b, opts) => b ? keySpecsFromShortcut({ ...b, shift: b.shift === true }, opts)?.map((k) => k.label) : void 0;
+var SHORTCUT_LEADER_SEPARATOR = " \u25B8 ";
 function formatShortcutParts(b, opts = {}) {
-  return labels(b, opts);
+  const keys = keySpecsFromShortcut(b, opts);
+  if (!b || !keys) return void 0;
+  const leader = (b.leader ?? []).map((l) => ({ label: l.label, keys: keySpecsFromShortcut(l.shortcut, opts) ?? [] }));
+  return { leader, keys };
 }
 function formatShortcut(b, opts = {}) {
   const platform = opts.platform ?? detectPlatform();
-  return platform === "macos" ? labels(b, { platform })?.join("") : labels(b, { platform, legend: "text" })?.join("+");
+  const mac = platform === "macos";
+  const parts = formatShortcutParts(b && { ...b, shift: b.shift === true }, mac ? { platform } : { platform, legend: "text" });
+  if (!parts) return void 0;
+  const keys = parts.keys.map((k) => k.label).join(mac ? "" : "+");
+  return [...parts.leader.map((l) => `${l.label}${SHORTCUT_LEADER_SEPARATOR}`), keys].join("");
+}
+
+// src/ui/keySugar.ts
+var MODIFIERS = {
+  meta: "meta",
+  cmd: "meta",
+  command: "meta",
+  ctrl: "ctrl",
+  control: "ctrl",
+  alt: "alt",
+  option: "alt",
+  shift: "shift",
+  mod: "mod"
+};
+var KEY_NAMES = { space: " ", esc: "Escape" };
+function parse(shortcut) {
+  const parts = shortcut.endsWith("++") ? [...shortcut.slice(0, -2).split("+"), "+"] : shortcut.split("+");
+  const raw = parts.pop();
+  if (!raw) throw new Error(`shortcut "${shortcut}" names no key`);
+  const mods2 = {};
+  for (const part of parts) {
+    const mod = MODIFIERS[part.toLowerCase()];
+    if (!mod) throw new Error(`shortcut "${shortcut}": unknown modifier "${part}"`);
+    mods2[mod] = true;
+  }
+  return { key: KEY_NAMES[raw.toLowerCase()] ?? raw, mods: mods2 };
+}
+function key(shortcut) {
+  const { key: k, mods: mods2 } = parse(shortcut);
+  return Object.keys(mods2).length > 0 ? { kind: "key", key: k, mods: mods2 } : { kind: "key", key: k };
+}
+function held(shortcut) {
+  const { key: k, mods: mods2 } = parse(shortcut);
+  return Object.keys(mods2).length > 0 ? { kind: "key-held", key: k, mods: mods2 } : { kind: "key-held", key: k };
+}
+function unbound() {
+  return null;
+}
+function bindingSpec(input) {
+  if (typeof input === "string") return routeToSpec(parseRoute(input));
+  return input;
+}
+var MOD_ORDER3 = ["mod", "shift", "alt", "ctrl", "meta"];
+function keySpecRoute(spec) {
+  const k = Array.isArray(spec.key) ? spec.key[0] : spec.key;
+  const optional = MOD_ORDER3.filter((m) => spec.mods?.[m] === "optional");
+  const required = MOD_ORDER3.filter((m) => spec.mods?.[m] === true);
+  const arg = [k, ...optional].join("?");
+  const gesture = spec.kind === "key" ? "keyDown" : "keyHeld";
+  const route = [`[*:*] ${gesture}(${arg})`, ...required.map((m) => `+${m}`)].join(" ");
+  return spellsKey(route, k) ? route : null;
+}
+function spellsKey(route, k) {
+  try {
+    const back = bindingSpec(route);
+    return back !== null && (back.kind === "key" || back.kind === "key-held") && back.key === k;
+  } catch {
+    return false;
+  }
 }
 
 // src/ui/fixedSeat.ts
@@ -1234,9 +1300,9 @@ function pointerUpEvent(s, world) {
 function multiTouchEvent(fingers, mods2, more) {
   return { kind: "multitouch", fingers, ...modifiersOf(mods2), ...more };
 }
-var positionsOf = (held) => new Map([...held].map(([id, p]) => [id, p.pos]));
-function heldGeometry(held, toSurface, extra) {
-  const g = multiTouchGeometry([...positionsOf(held).values(), ...extra]);
+var positionsOf = (held2) => new Map([...held2].map(([id, p]) => [id, p.pos]));
+function heldGeometry(held2, toSurface, extra) {
+  const g = multiTouchGeometry([...positionsOf(held2).values(), ...extra]);
   return { ...g, centroid: toSurface(g.centroid) };
 }
 function fireLongPress(rec, sink, observer) {
@@ -1270,40 +1336,40 @@ function createPointerRecognizer(opts) {
   const { sink, clock, observer = {}, toSurface = (p) => p } = opts;
   const world = (s) => opts.toWorld?.(s.clientX, s.clientY) ?? { x: s.clientX, y: s.clientY };
   const clicks = opts.clicks ?? { last: null };
-  const held = /* @__PURE__ */ new Map();
+  const held2 = /* @__PURE__ */ new Map();
   const { longPressMs, tapPx, dragPx, doubleClick } = thresholdsOf(opts);
   const touches = createMultiTouchEpisode(tapPx);
   const hold = createLongPressHold(clock, (pending) => {
     observer.holdChanged?.(pending);
   });
-  const geometry = (extra = []) => heldGeometry(held, toSurface, extra);
+  const geometry = (extra = []) => heldGeometry(held2, toSurface, extra);
   const happenedAt = sampleTime(clock);
   const claimForMultiTouch = (s) => {
     hold.cancel();
-    for (const p of held.values()) p.buffered = null;
+    for (const p of held2.values()) p.buffered = null;
     const g = geometry();
-    touches.join(positionsOf(held), g.centroid, happenedAt(s));
-    sink.dispatch(multiTouchEvent(held.size, s, g));
+    touches.join(positionsOf(held2), g.centroid, happenedAt(s));
+    sink.dispatch(multiTouchEvent(held2.size, s, g));
   };
   return {
     press(s) {
       const ev = pointerDownEvent(s);
       const rec = { pos: { x: s.clientX, y: s.clientY }, buffered: ev, down: pressFactsOf(s) };
-      held.set(s.pointerId, rec);
-      if (held.size < 2) sink.dispatch({ ...ev, stage: "press" });
-      if ((s.pointerType === "touch" || s.pointerType === "pen") && held.size === 1) {
+      held2.set(s.pointerId, rec);
+      if (held2.size < 2) sink.dispatch({ ...ev, stage: "press" });
+      if ((s.pointerType === "touch" || s.pointerType === "pen") && held2.size === 1) {
         rec.holdType = s.pointerType;
         hold.arm(
           { pointerId: s.pointerId, pointerType: s.pointerType, press: rec.down, startedAt: clock.now(), duration: longPressMs() },
           () => {
-            fireLongPress(held.get(s.pointerId), sink, observer);
+            fireLongPress(held2.get(s.pointerId), sink, observer);
           }
         );
       }
-      if (held.size >= 2) claimForMultiTouch(s);
+      if (held2.size >= 2) claimForMultiTouch(s);
     },
     move(s) {
-      const rec = held.get(s.pointerId);
+      const rec = held2.get(s.pointerId);
       const to = { x: s.clientX, y: s.clientY };
       if (rec) rec.pos = to;
       touches.moved(s.pointerId, to);
@@ -1313,18 +1379,18 @@ function createPointerRecognizer(opts) {
         hold.cancel(s.pointerId);
         sink.dispatch(press);
       }
-      if (held.size >= 2 && sink.multiTouchInFlight(held.size)) {
-        sink.dispatch(multiTouchEvent(held.size, s, geometry()));
+      if (held2.size >= 2 && sink.multiTouchInFlight(held2.size)) {
+        sink.dispatch(multiTouchEvent(held2.size, s, geometry()));
       }
       sink.dispatch(pointerMoveEvent(s, world(s)));
     },
     release(s) {
       hold.cancel(s.pointerId);
-      const before = held.size;
-      const rec = held.get(s.pointerId);
-      held.delete(s.pointerId);
+      const before = held2.size;
+      const rec = held2.get(s.pointerId);
+      held2.delete(s.pointerId);
       if (before >= 2) sink.dispatch(multiTouchEvent(before, s, { end: "commit" }));
-      if (before >= 2 && held.size < 2) {
+      if (before >= 2 && held2.size < 2) {
         const fingers = touches.finish(
           geometry([{ x: s.clientX, y: s.clientY }]).centroid,
           happenedAt(s),
@@ -1346,10 +1412,10 @@ function createPointerRecognizer(opts) {
       return composeClick(rec.down, up, clicks, () => happenedAt(s), (ev) => sink.dispatch(ev), observer, doubleClick());
     },
     cancel(pointerId) {
-      const rec = held.get(pointerId);
+      const rec = held2.get(pointerId);
       if (!rec) return;
-      const before = held.size;
-      held.delete(pointerId);
+      const before = held2.size;
+      held2.delete(pointerId);
       hold.cancel(pointerId);
       if (before >= 2) sink.dispatch(multiTouchEvent(before, rec.down, { end: "cancel" }));
       touches.abandon();
@@ -1357,7 +1423,7 @@ function createPointerRecognizer(opts) {
     },
     takeHold() {
       let holding = false;
-      for (const [id, rec] of held) {
+      for (const [id, rec] of held2) {
         if (!rec.holdType) continue;
         holding = true;
         if (!hold.pendingFor(id)) continue;
@@ -1366,11 +1432,11 @@ function createPointerRecognizer(opts) {
       }
       return holding;
     },
-    heldCount: () => held.size,
-    positionOf: (pointerId) => held.get(pointerId)?.pos,
+    heldCount: () => held2.size,
+    positionOf: (pointerId) => held2.get(pointerId)?.pos,
     reset() {
       hold.cancel();
-      held.clear();
+      held2.clear();
       touches.abandon();
     }
   };
@@ -1402,20 +1468,20 @@ var trackers = /* @__PURE__ */ new WeakMap();
 function attach(element) {
   const doc = element.ownerDocument;
   const win = doc.defaultView;
-  const held = /* @__PURE__ */ new Map();
+  const held2 = /* @__PURE__ */ new Map();
   const down = (e) => {
     const p = e;
-    held.set(p.pointerId, !!p.buttons);
+    held2.set(p.pointerId, !!p.buttons);
   };
   const up = (e) => {
-    held.delete(e.pointerId);
+    held2.delete(e.pointerId);
   };
   const move = (e) => {
     const p = e;
-    if (held.get(p.pointerId) && p.buttons === 0) held.delete(p.pointerId);
+    if (held2.get(p.pointerId) && p.buttons === 0) held2.delete(p.pointerId);
   };
   const blur = () => {
-    held.clear();
+    held2.clear();
   };
   element.addEventListener("pointerdown", down, true);
   doc.addEventListener("pointerup", up, true);
@@ -1424,7 +1490,7 @@ function attach(element) {
   win?.addEventListener("blur", blur);
   return {
     readers: 0,
-    held,
+    held: held2,
     detach() {
       element.removeEventListener("pointerdown", down, true);
       doc.removeEventListener("pointerup", up, true);
@@ -1497,6 +1563,6 @@ function focusedControlOwnsKey(e) {
   return activatesFocusedControl(e) || selectOwnsKey(e);
 }
 
-export { ACTIVE_SIGILS, CONTROL_SELECTOR, DOUBLE_CLICK_MAX_MS, DOUBLE_CLICK_MAX_PX, DRAG_THRESHOLD_PX, GESTURE_DESCRIPTORS, LONG_PRESS_MS, MODIFIER_LABELS, MOD_NAME_SET, RESERVED_ID_NAMES, RESERVED_ID_PREFIXES, RESERVED_SIGILS, ROUTE_FIELD_DEFINITIONS, ROUTE_TERMS, TAP_THRESHOLD_PX, UNKNOWN_MIME, VALID_MOD_NAMES, activatesFocusedControl, bodyPredicate, canonicalModifiers, clickEvents, collapseShiftPairs, createPointerRecognizer, describeRoute, describeRouteParts, detectPlatform, fixedSeat, focusedControlOwnsKey, formatKeyRoute, formatPhaseAtom, formatRoute, formatShortcut, formatShortcutParts, getGestureDescriptor, heldPointers, hitPredicate, isApplePlatform, isEditableTarget, isInControlWithin, isKnownGestureName, keyRouteToSpec, keySpecFromCode, keySpecFromKey, keySpecsFromMods, keySpecsFromShortcut, longPressEvents, matchIngestTypes, matchKey, matchModifiers, matchPhase, matchSpec, matchTarget, mimeMatchesGlob, modifierComboToParsed, mods, multiTouchGeometry, nearestPortalHost, parseKeyRoute, parseRoute, parseTargetSpec, pastDragThreshold, routeGestureForSpecKind, routeToSpec, specKindForRouteGesture, specificity, stylusOf };
+export { ACTIVE_SIGILS, CONTROL_SELECTOR, DOUBLE_CLICK_MAX_MS, DOUBLE_CLICK_MAX_PX, DRAG_THRESHOLD_PX, GESTURE_DESCRIPTORS, LONG_PRESS_MS, MODIFIER_LABELS, MOD_NAME_SET, RESERVED_ID_NAMES, RESERVED_ID_PREFIXES, RESERVED_SIGILS, ROUTE_FIELD_DEFINITIONS, ROUTE_TERMS, SHORTCUT_LEADER_SEPARATOR, TAP_THRESHOLD_PX, UNKNOWN_MIME, VALID_MOD_NAMES, activatesFocusedControl, bindingSpec, bodyPredicate, canonicalModifiers, clickEvents, collapseShiftPairs, createPointerRecognizer, describeRoute, describeRouteParts, detectPlatform, fixedSeat, focusedControlOwnsKey, formatKeyRoute, formatPhaseAtom, formatRoute, formatShortcut, formatShortcutParts, getGestureDescriptor, held, heldPointers, hitPredicate, isApplePlatform, isEditableTarget, isInControlWithin, isKnownGestureName, key, keyRouteToSpec, keySpecFromCode, keySpecFromKey, keySpecRoute, keySpecsFromMods, keySpecsFromShortcut, longPressEvents, matchIngestTypes, matchKey, matchModifiers, matchPhase, matchSpec, matchTarget, mimeMatchesGlob, modifierComboToParsed, mods, multiTouchGeometry, nearestPortalHost, parseKeyRoute, parseRoute, parseTargetSpec, pastDragThreshold, routeGestureForSpecKind, routeToSpec, specKindForRouteGesture, specificity, stylusOf, unbound };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map