@weasel-js/routing 1.15.0 → 1.15.1

package/dist/{chunk-ZK72IBMI.js → chunk-ZUAFANMN.js}

@@ -1,4 +1,4 @@
-import { NO_OVERRIDES, resolveParams, formatRoute, overriddenBindings, ActionDisabledReason, keySpecShortcut, actionBindings, canonicalModifiers, paramsMatch, VALID_MOD_NAMES, actionCursor, buildDepsFromRequires, resolveRoles, roleKeysOf, platformRoleKeys } from './chunk-A6MN3I6R.js';
+import { NO_OVERRIDES, resolveParams, formatRoute, overriddenBindings, ActionDisabledReason, keySpecShortcut, actionBindings, canonicalModifiers, paramsMatch, VALID_MOD_NAMES, actionCursor, buildDepsFromRequires, resolveRoles, roleKeysOf, platformRoleKeys } from './chunk-Z2BZBJ7W.js';
 import { routeGestureForSpecKind, getGestureDescriptor, parseTargetSpec, matchSpec, UNKNOWN_MIME, specificity, formatShortcut, stylusOf } from '@weasel-js/gestures';
 export { GESTURE_DESCRIPTORS, LONG_PRESS_MS, activatesFocusedControl, focusedControlOwnsKey, getGestureDescriptor, isEditableTarget, isKnownGestureName, matchKey, matchModifiers, matchPhase, matchSpec, matchTarget, routeGestureForSpecKind, specKindForRouteGesture, specificity } from '@weasel-js/gestures';
 import { isDev } from '@weasel-js/react';
@@ -2197,7 +2197,7 @@ function findConflictsKeyed(entries, rules, modes = KIT_MODES) {
   const conflicts = /* @__PURE__ */ new Map();
   for (const { base, platform, members } of groups.values()) {
     const ties = (e, i, f, j) => i !== j && !(i < j ? e : f).yields && tie(e, f);
-    const bucket = members.filter((e, i) => members.some((f, j) => ties(e, i, f, j)));
+    const bucket = foldPlatformCopies(members.filter((e, i) => members.some((f, j) => ties(e, i, f, j))));
     if (bucket.length < 2) continue;
     const first = bucket[0];
     const key = `${base}|${bucket.map((e) => `${objectId(e.spec)}:${canonicalModifiers(e.modifiers)}`).join(";")}`;
@@ -2221,6 +2221,18 @@ function findConflictsKeyed(entries, rules, modes = KIT_MODES) {
   }
   return [...conflicts].filter(([, c]) => c.platforms.size === PLATFORMS.length || !sameOutcome(c.bucket)).map(([key, { conflict }]) => ({ key, conflict }));
 }
+function platformBound(e) {
+  return modifierTieKeys(e, "mac").join() !== modifierTieKeys(e, "other").join();
+}
+function foldPlatformCopies(bucket) {
+  const out = [];
+  for (const e of bucket) {
+    const i = out.findIndex((k) => sameOutcome([k, e]) && (platformBound(k) || platformBound(e)));
+    if (i === -1) out.push(e);
+    else if (platformBound(out[i])) out[i] = e;
+  }
+  return out;
+}
 function rulesCanHoldTogether(a, b, modes) {
   if (rulesExclusive(a, b)) return false;
   return modes.some((m) => ruleCanHoldIn(a, m) && ruleCanHoldIn(b, m));
@@ -2455,5 +2467,5 @@ function dwarn(namespace, ...args) {
 }
 
 export { ALWAYS, COARSE_TARGET_SCALE, DEFAULT_ALLOWED_CAPABILITIES, DEFAULT_DEVICE_PROFILE, INGEST_STRING_MIMES, KEYMAP_HOLD, LONG_PRESS_HAPTIC_MS, NEVER, PREDICATE_TARGET, TOOL_OFFHAND_ID, addCarrySurface, admitIngestMime, anyBinding, assembleEntries, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, carryGestureId, clientToCanvas, clientToCanvasRect, createDispatchTrace, createDispatcher, createKeymapStack, createLongPressStore, createTraceRing, describeKeymap, describeRule, dlog, dwarn, evaluate, findConflicts, heldKeySpec, historyKey, immediateParams, isDebugEnabled, isTool, itemTypesFromDataTransfer, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, keymapContribution, keymapLeaderBindingId, keymapLeaderId, keymapShortcuts, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, modifierStateOf, multiTouchGestureId, offhandKeyFor, openPointerSession, pendingKindOf, pointerGestureId, reportRouteConflicts, resolveDeviceProfile, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, startCarry, targetConsultsAffordance };
-//# sourceMappingURL=chunk-ZK72IBMI.js.map
-//# sourceMappingURL=chunk-ZK72IBMI.js.map
+//# sourceMappingURL=chunk-ZUAFANMN.js.map
+//# sourceMappingURL=chunk-ZUAFANMN.js.map