@weasel-js/gestures 1.10.1 → 1.11.1

package/dist/index.js

@@ -18,6 +18,7 @@ var GESTURE_DESCRIPTORS = [
   // matches any payload, which is what an omitted arg slot means for a
   // `'free'` arg.
   { name: "drop", hasTarget: false, arg: { name: "types", values: "free" } },
+  { name: "carry", hasTarget: true, arg: { name: "types", values: "free" } },
   { name: "paste", hasTarget: false, arg: { name: "types", values: "free" } }
 ];
 var BY_NAME = new Map(
@@ -106,6 +107,7 @@ function parseRoute(input) {
     target = "*";
   }
   const modifiers = {};
+  let held;
   while (rest.length > 0) {
     const ch = rest[0];
     if (RESERVED_SIGILS.has(ch)) {
@@ -119,6 +121,13 @@ function parseRoute(input) {
     const nameMatch = /^([a-z]+)/.exec(rest);
     if (!nameMatch) throw new Error(`invalid route (sigil "${sigil}" without modifier name): ${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";
+      rest = rest.slice(nameMatch[0].length).trimStart();
+      continue;
+    }
     if (!MOD_NAME_SET.has(name)) {
       throw new Error(`invalid route (unknown modifier "${name}"): ${input}`);
     }
@@ -128,8 +137,9 @@ function parseRoute(input) {
     modifiers[name] = sigil === "+" ? "required" : "optional";
     rest = rest.slice(nameMatch[0].length).trimStart();
   }
-  return { phases, gesture: gestureName, arg, target, modifiers };
+  return { phases, gesture: gestureName, arg, target, modifiers, ...held ? { held } : {} };
 }
+var HELD = "held";
 function parsePhaseList(raw, input) {
   if (raw === "") throw new Error(`invalid route (empty phase list): ${input}`);
   const tokens = raw.split(",").map((p) => p.trim()).filter((p) => p.length > 0);
@@ -203,6 +213,7 @@ function collapseShiftPairs(routes) {
 }
 function isShiftTwin(a, b) {
   if (a.gesture !== b.gesture) return false;
+  if (a.held !== b.held) return false;
   if (a.arg !== b.arg) return false;
   if (a.target !== b.target) return false;
   if (!samePhases(a.phases, b.phases)) return false;
@@ -245,6 +256,8 @@ function formatRoute(r) {
     if (req === "required") out += ` +${name}`;
     else if (req === "optional") out += ` ?${name}`;
   }
+  if (r.held === "required") out += ` +${HELD}`;
+  else if (r.held === "optional") out += ` ?${HELD}`;
   return out;
 }
 
@@ -473,6 +486,7 @@ function matchSpec(e, spec, isMac, phaseCtx) {
     case "hover": {
       if (e.kind !== "hover") return false;
       if (!matchModifiers(e, spec.mods, isMac)) return false;
+      if (!e.off && (e.held === true ? spec.held === void 0 : spec.held === true)) return false;
       const on = !e.off && matchTarget(e.affordance, spec.target, e.bodyTarget, e.bodyKind);
       if (spec.motion !== "leave") return on;
       return !on && e.from !== void 0 && matchTarget(e.from.affordance, spec.target, e.from.bodyTarget, e.from.bodyKind);
@@ -490,21 +504,27 @@ function matchSpec(e, spec, isMac, phaseCtx) {
       if (e.fingers !== spec.fingers) return false;
       return matchModifiers(e, spec.mods, isMac);
     }
-    case "drop": {
-      if (e.kind !== "drop") return false;
-      if (!matchIngestTypes(e.items, spec.types)) return false;
-      return matchModifiers(e, spec.mods, isMac);
-    }
-    case "paste": {
-      if (e.kind !== "paste") return false;
-      if (!matchIngestTypes(e.items, spec.types)) return false;
-      return matchModifiers(e, spec.mods, isMac);
-    }
+    case "drop":
+    case "carry":
+    case "paste":
+      return matchArrival(e, spec, isMac);
     default: {
       return false;
     }
   }
 }
+function matchArrival(e, spec, isMac) {
+  if (e.kind !== spec.kind) return false;
+  if (e.kind === "carry") {
+    const target = "target" in spec ? spec.target : void 0;
+    if (e.stage === "leave" || e.stage === "move" && target === void 0) return false;
+    if (!matchIngestTypes([{ mime: e.type }], spec.types)) return false;
+    if (!matchTarget(e.affordance, target, e.bodyTarget, e.bodyKind)) return false;
+  } else if (e.kind === "drop" || e.kind === "paste") {
+    if (!matchIngestTypes(e.items, spec.types)) return false;
+  }
+  return matchModifiers(e, spec.mods, isMac);
+}
 var EMPTY_ENGAGED = /* @__PURE__ */ new Set();
 
 // src/grammar/specKinds.ts
@@ -523,6 +543,7 @@ var SPEC_KIND_TO_GESTURE = {
   multiTouch: "multiTouch",
   multiTouchTap: "multiTouchTap",
   drop: "drop",
+  carry: "carry",
   paste: "paste"
 };
 var GESTURE_TO_SPEC_KIND = new Map(
@@ -568,7 +589,12 @@ function routeToSpec(parsed) {
     case void 0:
       return fail(`${parsed.gesture} has no GestureSpec kind`);
     case "hover":
-      return withMods({ kind, ...arg === "leave" ? { motion: "leave" } : {}, ...t });
+      return withMods({
+        kind,
+        ...arg === "leave" ? { motion: "leave" } : {},
+        ...parsed.held ? { held: parsed.held === "required" ? true : "optional" } : {},
+        ...t
+      });
     case "click":
     case "pointerDown":
     case "doubleClick":
@@ -592,6 +618,8 @@ function routeToSpec(parsed) {
     case "multiTouchTap":
       if (arg === void 0) return fail(`a ${kind} spec needs concrete fingers`);
       return withMods({ kind, fingers: Number(arg) });
+    case "carry":
+      return withMods({ kind, ...arg ? { types: arg.split("|") } : {}, ...t });
     case "drop":
     case "paste":
       return withMods({ kind, ...arg ? { types: arg.split("|") } : {} });
@@ -662,6 +690,11 @@ function targetClause(target, hasTarget) {
   if (target === "empty") return " on empty canvas";
   return ` on a ${target}`;
 }
+function carryOnto(target) {
+  if (target === void 0 || target === "*") return "onto the canvas";
+  if (target === "empty") return "onto empty canvas";
+  return `onto a ${target}`;
+}
 function concreteArg(parsed) {
   return parsed.arg === "*" ? void 0 : parsed.arg;
 }
@@ -702,14 +735,19 @@ function actionClause(parsed, required) {
       return userDoes(required, `clicks${target}`);
     case "pointerDown":
       return userDoes(required, `presses${target}`);
-    case "hover":
-      return userDoes(required, arg === "leave" ? `moves the pointer ${leftClause(parsed.target)}` : `moves the pointer${target}`);
+    case "hover": {
+      const held = 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}`);
+    }
     case "dblTap":
       return userDoes(required, `double-taps${target}`);
     case "drag":
       return userDoes(required, `drags${target}`);
     case "drop":
       return userDoes(required, `drops ${arg ?? "any"} content onto the canvas`);
+    case "carry":
+      return userDoes(required, `carries ${arg ?? "anything"} ${carryOnto(parsed.target)}`);
     case "paste":
       return userDoes(required, `pastes ${arg ?? "any"} content`);
   }
@@ -784,6 +822,154 @@ function isApplePlatform() {
   return /mac|iphone|ipad|ipod/i.test(raw);
 }
 
+// src/ui/keySpecsFromMods.ts
+var MOD_BY_PLATFORM = {
+  mod: {
+    macos: { auto: "\u2318", symbol: "\u2318", text: "Cmd" },
+    windows: { auto: "Ctrl", symbol: "\u2388", text: "Ctrl" },
+    linux: { auto: "Ctrl", symbol: "\u2388", text: "Ctrl" }
+  },
+  shift: {
+    macos: { auto: "\u21E7", symbol: "\u21E7", text: "Shift" },
+    windows: { auto: "\u21E7", symbol: "\u21E7", text: "Shift" },
+    linux: { auto: "\u21E7", symbol: "\u21E7", text: "Shift" }
+  },
+  // Off macOS the symbols are ISO/IEC 9995-7's: ⎈ for Control, ⎇ for Alt.
+  alt: {
+    macos: { auto: "\u2325", symbol: "\u2325", text: "Option" },
+    windows: { auto: "Alt", symbol: "\u2387", text: "Alt" },
+    linux: { auto: "Alt", symbol: "\u2387", text: "Alt" }
+  },
+  ctrl: {
+    macos: { auto: "\u2303", symbol: "\u2303", text: "Control" },
+    windows: { auto: "Ctrl", symbol: "\u2388", text: "Ctrl" },
+    linux: { auto: "Ctrl", symbol: "\u2388", text: "Ctrl" }
+  },
+  // Windows/Linux Meta has a recognized symbol on the physical key (⊞ Win
+  // logo / Super logo), so `auto` shows it. Use `text` for Win / Super.
+  meta: {
+    macos: { auto: "\u2318", symbol: "\u2318", text: "Cmd" },
+    windows: { auto: "\u229E", symbol: "\u229E", text: "Win" },
+    linux: { auto: "\u229E", symbol: "\u229E", text: "Super" }
+  }
+};
+var MODIFIER_LABELS = new Set(
+  Object.values(MOD_BY_PLATFORM).flatMap(
+    (byPlatform) => Object.values(byPlatform).flatMap((byLegend) => Object.values(byLegend))
+  )
+);
+function detectPlatform() {
+  if (typeof navigator === "undefined" || !navigator) return "macos";
+  if (isApplePlatform()) return "macos";
+  const nav = navigator;
+  const raw = nav.userAgentData?.platform || nav.platform || nav.userAgent || "";
+  return /\bwin/i.test(raw) ? "windows" : "linux";
+}
+function keySpecsFromMods(mods2, opts = {}) {
+  const platform = opts.platform ?? detectPlatform();
+  const legend = opts.legend ?? "auto";
+  return mods2.map((m) => {
+    const label = opts.labels?.[m.name] ?? MOD_BY_PLATFORM[m.name][platform][legend];
+    return m.optional ? { label, optional: true } : { label };
+  });
+}
+var NAMED_KEY = {
+  Escape: { macos: { auto: "\u238B", symbol: "\u238B", text: "Esc" }, windows: { auto: "Esc", symbol: "\u238B", text: "Esc" }, linux: { auto: "Esc", symbol: "\u238B", text: "Esc" } },
+  Enter: { macos: { auto: "\u21B5", symbol: "\u21B5", text: "Return" }, windows: { auto: "Enter", symbol: "\u21B5", text: "Enter" }, linux: { auto: "Enter", symbol: "\u21B5", text: "Enter" } },
+  Return: { macos: { auto: "\u21B5", symbol: "\u21B5", text: "Return" }, windows: { auto: "Enter", symbol: "\u21B5", text: "Enter" }, linux: { auto: "Enter", symbol: "\u21B5", text: "Enter" } },
+  Tab: { macos: { auto: "\u21E5", symbol: "\u21E5", text: "Tab" }, windows: { auto: "Tab", symbol: "\u21E5", text: "Tab" }, linux: { auto: "Tab", symbol: "\u21E5", text: "Tab" } },
+  Space: { macos: { auto: "\u2423", symbol: "\u2423", text: "Space" }, windows: { auto: "Space", symbol: "\u2423", text: "Space" }, linux: { auto: "Space", symbol: "\u2423", text: "Space" } },
+  " ": { macos: { auto: "\u2423", symbol: "\u2423", text: "Space" }, windows: { auto: "Space", symbol: "\u2423", text: "Space" }, linux: { auto: "Space", symbol: "\u2423", text: "Space" } },
+  Backspace: { macos: { auto: "\u232B", symbol: "\u232B", text: "Backspace" }, windows: { auto: "Backspace", symbol: "\u27F5", text: "Backspace" }, linux: { auto: "Backspace", symbol: "\u27F5", text: "Backspace" } },
+  Delete: { macos: { auto: "\u2326", symbol: "\u2326", text: "Delete" }, windows: { auto: "Delete", symbol: "\u2326", text: "Delete" }, linux: { auto: "Delete", symbol: "\u2326", text: "Delete" } },
+  // Context-menu key (the right-Ctrl-area key on Windows / Linux keyboards
+  // with a ▤ icon). Mac has no equivalent; falls back to text 'Menu'.
+  ContextMenu: { macos: { auto: "Menu", symbol: "Menu", text: "Menu" }, windows: { auto: "\u25A4", symbol: "\u25A4", text: "Menu" }, linux: { auto: "\u25A4", symbol: "\u25A4", text: "Menu" } },
+  // Symbol mode only: Apple's arrows for Home, End, and the page keys, and
+  // ISO/IEC 9995-7's symbols for the rest.
+  Home: { macos: { auto: "Home", symbol: "\u2196", text: "Home" }, windows: { auto: "Home", symbol: "\u2196", text: "Home" }, linux: { auto: "Home", symbol: "\u2196", text: "Home" } },
+  End: { macos: { auto: "End", symbol: "\u2198", text: "End" }, windows: { auto: "End", symbol: "\u2198", text: "End" }, linux: { auto: "End", symbol: "\u2198", text: "End" } },
+  PageUp: { macos: { auto: "PgUp", symbol: "\u21DE", text: "PgUp" }, windows: { auto: "PgUp", symbol: "\u21DE", text: "PgUp" }, linux: { auto: "PgUp", symbol: "\u21DE", text: "PgUp" } },
+  PageDown: { macos: { auto: "PgDn", symbol: "\u21DF", text: "PgDn" }, windows: { auto: "PgDn", symbol: "\u21DF", text: "PgDn" }, linux: { auto: "PgDn", symbol: "\u21DF", text: "PgDn" } },
+  PrintScreen: { macos: { auto: "PrtSc", symbol: "\u2399", text: "PrtSc" }, windows: { auto: "PrtSc", symbol: "\u2399", text: "PrtSc" }, linux: { auto: "PrtSc", symbol: "\u2399", text: "PrtSc" } },
+  Insert: { macos: { auto: "Ins", symbol: "\u2380", text: "Insert" }, windows: { auto: "Ins", symbol: "\u2380", text: "Insert" }, linux: { auto: "Ins", symbol: "\u2380", text: "Insert" } },
+  ScrollLock: { macos: { auto: "ScrLk", symbol: "\u21F3", text: "ScrLk" }, windows: { auto: "ScrLk", symbol: "\u21F3", text: "ScrLk" }, linux: { auto: "ScrLk", symbol: "\u21F3", text: "ScrLk" } },
+  Pause: { macos: { auto: "Pause", symbol: "\u2389", text: "Pause" }, windows: { auto: "Pause", symbol: "\u2389", text: "Pause" }, linux: { auto: "Pause", symbol: "\u2389", text: "Pause" } },
+  ArrowUp: { macos: { auto: "\u2191", symbol: "\u2191", text: "\u2191" }, windows: { auto: "\u2191", symbol: "\u2191", text: "\u2191" }, linux: { auto: "\u2191", symbol: "\u2191", text: "\u2191" } },
+  ArrowDown: { macos: { auto: "\u2193", symbol: "\u2193", text: "\u2193" }, windows: { auto: "\u2193", symbol: "\u2193", text: "\u2193" }, linux: { auto: "\u2193", symbol: "\u2193", text: "\u2193" } },
+  ArrowLeft: { macos: { auto: "\u2190", symbol: "\u2190", text: "\u2190" }, windows: { auto: "\u2190", symbol: "\u2190", text: "\u2190" }, linux: { auto: "\u2190", symbol: "\u2190", text: "\u2190" } },
+  ArrowRight: { macos: { auto: "\u2192", symbol: "\u2192", text: "\u2192" }, windows: { auto: "\u2192", symbol: "\u2192", text: "\u2192" }, linux: { auto: "\u2192", symbol: "\u2192", text: "\u2192" } }
+};
+function keySpecFromKey(raw, opts = {}) {
+  const platform = opts.platform ?? detectPlatform();
+  const legend = opts.legend ?? "auto";
+  const entry = NAMED_KEY[raw];
+  const override = opts.labels?.[raw] ?? (raw.length === 1 ? opts.labels?.[raw.toUpperCase()] : void 0);
+  const label = override ?? (entry ? entry[platform][legend] : raw.length === 1 ? raw.toUpperCase() : raw);
+  return opts.optional ? { label, optional: true } : { label };
+}
+
+// src/ui/keySpecsFromShortcut.ts
+function keySpecsFromShortcut(shortcut, opts = {}) {
+  if (!shortcut) return void 0;
+  const mods2 = [];
+  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 keys = keySpecsFromMods(mods2, opts);
+  return key === void 0 ? keys : [...keys, keySpecFromKey(key, opts)];
+}
+
+// src/ui/keySpecFromCode.ts
+var MOD_CODES = {
+  ShiftLeft: "shift",
+  ShiftRight: "shift",
+  ControlLeft: "ctrl",
+  ControlRight: "ctrl",
+  AltLeft: "alt",
+  AltRight: "alt",
+  MetaLeft: "meta",
+  MetaRight: "meta"
+};
+var PRINTED = {
+  Backquote: "`",
+  Minus: "-",
+  Equal: "=",
+  BracketLeft: "[",
+  BracketRight: "]",
+  Backslash: "\\",
+  Semicolon: ";",
+  Quote: "'",
+  Comma: ",",
+  Period: ".",
+  Slash: "/",
+  IntlBackslash: "\xA7",
+  CapsLock: "Caps",
+  Fn: "fn"
+};
+function keySpecFromCode(code, opts = {}) {
+  const own = opts.labels?.[code];
+  if (own !== void 0) return { label: own };
+  const mod = MOD_CODES[code];
+  if (mod) return keySpecsFromMods([{ name: mod }], opts)[0];
+  const char = /^Key([A-Z])$/.exec(code) ?? /^Digit(\d)$/.exec(code);
+  if (char) return keySpecFromKey(char[1], opts);
+  if (code === "NumpadEnter") return keySpecFromKey("Enter", opts);
+  const printed = PRINTED[code];
+  return printed !== void 0 ? { label: printed } : keySpecFromKey(code, opts);
+}
+
+// src/ui/formatShortcut.ts
+var labels = (b, opts) => b ? keySpecsFromShortcut({ ...b, shift: b.shift === true }, opts)?.map((k) => k.label) : void 0;
+function formatShortcutParts(b, opts = {}) {
+  return labels(b, opts);
+}
+function formatShortcut(b, opts = {}) {
+  const platform = opts.platform ?? detectPlatform();
+  return platform === "macos" ? labels(b, { platform })?.join("") : labels(b, { platform, legend: "text" })?.join("+");
+}
+
 // src/ui/fixedSeat.ts
 var HOST_SELECTOR = "[data-wzl-portal-host],[data-wzl-theme],[data-wzl-mode]";
 function nearestPortalHost(from) {
@@ -849,7 +1035,7 @@ function specificity(spec) {
   const mods2 = "mods" in spec ? spec.mods : void 0;
   const m = modsCount(mods2);
   const p = phaseRank("phase" in spec ? spec.phase : void 0);
-  const typed = (spec.kind === "drop" || spec.kind === "paste") && spec.types !== void 0 && spec.types.length > 0 ? 2 : 1;
+  const typed = (spec.kind === "drop" || spec.kind === "carry" || spec.kind === "paste") && spec.types !== void 0 && spec.types.length > 0 ? 2 : 1;
   return [t, m, p, typed];
 }
 
@@ -883,12 +1069,16 @@ function clickEvents(down, up) {
     x: up.worldX,
     y: up.worldY,
     clientX: up.clientX,
-    clientY: up.clientY,
-    ...pressedOn(down)
+    clientY: up.clientY
   };
+  const named = down.doubleClickBody;
   return {
-    click: { kind: "click", ...shared, pressX: down.worldX, pressY: down.worldY },
-    doubleclick: { kind: "doubleclick", ...shared }
+    click: { kind: "click", ...shared, ...pressedOn(down), pressX: down.worldX, pressY: down.worldY },
+    doubleclick: {
+      kind: "doubleclick",
+      ...shared,
+      ...pressedOn(named ? { affordance: down.affordance, ...named } : down)
+    }
   };
 }
 function longPressEvents(down) {
@@ -908,14 +1098,14 @@ function longPressEvents(down) {
 }
 
 // src/recognizer/click.ts
-function composeClick(down, up, clicks, now, dispatch, observer) {
+function composeClick(down, up, clicks, now, dispatch, observer, limits = { maxMs: DOUBLE_CLICK_MAX_MS, maxPx: DOUBLE_CLICK_MAX_PX }) {
   const evs = clickEvents(down, up);
   const world = { x: up.worldX, y: up.worldY };
   dispatch(evs.click);
   observer.click?.(world);
   const t = now();
   const prev = clicks.last;
-  const follows = prev !== null && t - prev.t < DOUBLE_CLICK_MAX_MS && Math.hypot(up.clientX - prev.clientX, up.clientY - prev.clientY) < DOUBLE_CLICK_MAX_PX;
+  const follows = prev !== null && t - prev.t < limits.maxMs && Math.hypot(up.clientX - prev.clientX, up.clientY - prev.clientY) < limits.maxPx;
   if (!follows) {
     clicks.last = { t, clientX: up.clientX, clientY: up.clientY };
     return {};
@@ -969,7 +1159,7 @@ function multiTouchGeometry(positions) {
     angle: Math.atan2(dy, dx) * 180 / Math.PI
   };
 }
-function createMultiTouchEpisode() {
+function createMultiTouchEpisode(tapPx = () => TAP_THRESHOLD_PX) {
   let episode = null;
   return {
     join(positions, centroid, now) {
@@ -990,14 +1180,14 @@ function createMultiTouchEpisode() {
     },
     moved(pointerId, to) {
       const from = episode?.joinedAt.get(pointerId);
-      if (episode && from && Math.hypot(to.x - from.x, to.y - from.y) > TAP_THRESHOLD_PX) episode.moved = true;
+      if (episode && from && Math.hypot(to.x - from.x, to.y - from.y) > tapPx()) episode.moved = true;
     },
     finish(centroid, now, maxHoldMs) {
       const e = episode;
       episode = null;
       if (!e) return null;
       const brief = now - e.startedAt < maxHoldMs;
-      const still = Math.hypot(centroid.x - e.centroid.x, centroid.y - e.centroid.y) <= TAP_THRESHOLD_PX;
+      const still = Math.hypot(centroid.x - e.centroid.x, centroid.y - e.centroid.y) <= tapPx();
       return brief && !e.moved && still ? e.fingers : null;
     },
     abandon() {
@@ -1018,7 +1208,8 @@ function pressFactsOf(s) {
     worldX: s.x,
     worldY: s.y,
     ...modifiersOf(s),
-    ...pressedOn(s)
+    ...pressedOn(s),
+    ...s.doubleClickBody !== void 0 ? { doubleClickBody: s.doubleClickBody } : {}
   };
 }
 var at = (s, world) => ({
@@ -1057,23 +1248,42 @@ function fireLongPress(rec, sink, observer) {
   rec.buffered = null;
   if (rec.holdType) observer.longPress?.(rec.holdType);
 }
+function thresholdsOf(opts) {
+  return {
+    longPressMs: () => opts.longPressMs?.() ?? LONG_PRESS_MS,
+    tapPx: () => opts.tapPx?.() ?? TAP_THRESHOLD_PX,
+    dragPx: () => opts.dragPx?.() ?? DRAG_THRESHOLD_PX,
+    doubleClick: () => ({
+      maxMs: opts.doubleClickMs?.() ?? DOUBLE_CLICK_MAX_MS,
+      maxPx: opts.doubleClickPx?.() ?? DOUBLE_CLICK_MAX_PX
+    })
+  };
+}
+function sampleTime(clock) {
+  return (s) => {
+    const now = clock.now();
+    const t = s.timeStamp;
+    return t !== void 0 && t > 0 && t <= now ? t : now;
+  };
+}
 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 touches = createMultiTouchEpisode();
+  const { longPressMs, tapPx, dragPx, doubleClick } = thresholdsOf(opts);
+  const touches = createMultiTouchEpisode(tapPx);
   const hold = createLongPressHold(clock, (pending) => {
     observer.holdChanged?.(pending);
   });
-  const longPressMs = () => opts.longPressMs?.() ?? LONG_PRESS_MS;
   const geometry = (extra = []) => heldGeometry(held, toSurface, extra);
-  const claimForMultiTouch = (mods2) => {
+  const happenedAt = sampleTime(clock);
+  const claimForMultiTouch = (s) => {
     hold.cancel();
     for (const p of held.values()) p.buffered = null;
     const g = geometry();
-    touches.join(positionsOf(held), g.centroid, clock.now());
-    sink.dispatch(multiTouchEvent(held.size, mods2, g));
+    touches.join(positionsOf(held), g.centroid, happenedAt(s));
+    sink.dispatch(multiTouchEvent(held.size, s, g));
   };
   return {
     press(s) {
@@ -1097,7 +1307,7 @@ function createPointerRecognizer(opts) {
       const to = { x: s.clientX, y: s.clientY };
       if (rec) rec.pos = to;
       touches.moved(s.pointerId, to);
-      if (rec?.buffered && pastDragThreshold(rec.down, s)) {
+      if (rec?.buffered && pastDragThreshold(rec.down, s, dragPx())) {
         const press = rec.buffered;
         rec.buffered = null;
         hold.cancel(s.pointerId);
@@ -1117,7 +1327,7 @@ function createPointerRecognizer(opts) {
       if (before >= 2 && held.size < 2) {
         const fingers = touches.finish(
           geometry([{ x: s.clientX, y: s.clientY }]).centroid,
-          clock.now(),
+          happenedAt(s),
           longPressMs()
         );
         if (fingers !== null) sink.dispatch({ kind: "multitouchtap", fingers, ...modifiersOf(s) });
@@ -1133,7 +1343,7 @@ function createPointerRecognizer(opts) {
         worldY: at2.y,
         ...modifiersOf(s)
       };
-      return composeClick(rec.down, up, clicks, () => clock.now(), (ev) => sink.dispatch(ev), observer);
+      return composeClick(rec.down, up, clicks, () => happenedAt(s), (ev) => sink.dispatch(ev), observer, doubleClick());
     },
     cancel(pointerId) {
       const rec = held.get(pointerId);
@@ -1287,6 +1497,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, 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, fixedSeat, focusedControlOwnsKey, formatKeyRoute, formatPhaseAtom, formatRoute, getGestureDescriptor, heldPointers, hitPredicate, isApplePlatform, isEditableTarget, isInControlWithin, isKnownGestureName, keyRouteToSpec, 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, 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 };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map