sia-reactor 0.0.40 → 0.0.42

package/dist/{TimeTravelConsole-BjDL0JjZ.d.ts → TimeTravelConsole-Bo83b1S5.d.ts}

@@ -1,5 +1,5 @@
-import { R as Reactive } from './index-BtHNGnRR.js';
-import { T as TimeTravelModule } from './index-CKHoDs6x.js';
+import { R as Reactive } from './index-C4Z3aveO.js';
+import { T as TimeTravelModule } from './index-DN85zmt_.js';
 
 /** Reactive options for the TimeTravel overlay instance. */
 interface TimeTravelConsoleConfig {

package/dist/{TimeTravelConsole-Dt8txKnt.d.cts → TimeTravelConsole-DPJf_Ee7.d.cts}

@@ -1,5 +1,5 @@
-import { R as Reactive } from './index-BtHNGnRR.cjs';
-import { T as TimeTravelModule } from './index-C_djeddc.cjs';
+import { R as Reactive } from './index-C4Z3aveO.cjs';
+import { T as TimeTravelModule } from './index-B55979dE.cjs';
 
 /** Reactive options for the TimeTravel overlay instance. */
 interface TimeTravelConsoleConfig {

package/dist/adapters/react.cjs

@@ -95,12 +95,12 @@ function canHandle(obj, config = CTX.defaults, typecheck = true) {
   if (config.preserveContext) return !(obj instanceof String) && !(obj instanceof Number) && !(obj instanceof Function) && !(obj instanceof Date) && !(obj instanceof Error) && !(obj instanceof RegExp) && !(obj instanceof Promise) && !(obj instanceof Map) && !(obj instanceof WeakMap) && !(obj instanceof Set) && !(obj instanceof WeakSet) && !(obj instanceof EventTarget);
   return false;
 }
-function getPath(source, key, separator = ".", keyFunc) {
+function getPath(source, key, separator = ".", keyFn) {
   if (key === "*") return source;
   const keys2 = key.split(separator);
   let currObj = source;
   for (let i = 0, len = keys2.length; i < len; i++) {
-    const key2 = keyFunc ? keyFunc(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
+    const key2 = keyFn ? keyFn(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
     if (match) {
       const [, key3, iStr] = match;
       if (!Array.isArray(currObj[key3]) || !(key3 in currObj)) return currObj[key3];
@@ -112,11 +112,11 @@ function getPath(source, key, separator = ".", keyFunc) {
   }
   return currObj;
 }
-function setPath(target, key, value, separator = ".", keyFunc) {
+function setPath(target, key, value, separator = ".", keyFn) {
   if (key === "*") return Object.assign(target, value);
   const keys2 = key.split(separator);
   for (let currObj = target, i = 0, len = keys2.length; i < len; i++) {
-    const key2 = keyFunc ? keyFunc(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
+    const key2 = keyFn ? keyFn(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
     if (match) {
       const [, key3, iStr] = match;
       if (!Array.isArray(currObj[key3])) currObj[key3] = [];
@@ -128,7 +128,7 @@ function setPath(target, key, value, separator = ".", keyFunc) {
     }
   }
 }
-function deletePath(target, key, separator = ".", keyFunc) {
+function deletePath(target, key, separator = ".", keyFn) {
   if (key === "*") {
     const keys3 = Object.keys(target);
     for (let i = 0, len = keys3.length; i < len; i++) delete target[keys3[i]];
@@ -136,7 +136,7 @@ function deletePath(target, key, separator = ".", keyFunc) {
   }
   const keys2 = key.split(separator);
   for (let currObj = target, i = 0, len = keys2.length; i < len; i++) {
-    const key2 = keyFunc ? keyFunc(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
+    const key2 = keyFn ? keyFn(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
     if (match) {
       const [, key3, iStr] = match;
       if (!Array.isArray(currObj[key3]) || !(key3 in currObj)) return;
@@ -149,11 +149,11 @@ function deletePath(target, key, separator = ".", keyFunc) {
     }
   }
 }
-function hasPath(source, key, separator = ".", keyFunc) {
+function hasPath(source, key, separator = ".", keyFn) {
   if (key === "*") return true;
   const keys2 = key.split(separator);
   for (let currObj = source, i = 0, len = keys2.length; i < len; i++) {
-    const key2 = keyFunc ? keyFunc(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
+    const key2 = keyFn ? keyFn(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
     if (match) {
       const [, key3, iStr] = match;
       if (!Array.isArray(currObj[key3]) || !(key3 in currObj)) return false;
@@ -515,7 +515,7 @@ var Reactor = class {
       if (cord._dead) continue;
       const response = isGet ? cord.cb(value, payload) : isSet ? cord.cb(value, terminated, payload) : cord.cb(terminated, payload);
       if (isGet || !(terminated ||= payload.terminated = response === TERMINATOR)) value = response;
-      if (cord.once) cord._dead = true, killed = true;
+      if (cord.once) killed = cord._dead = true;
     }
     if (killed) {
       for (let i = cords.length - 1; i >= 0; i--) if (cords[i]._dead) cords.splice(i, 1), !cords.length && mediators.delete(path);
@@ -531,7 +531,7 @@ var Reactor = class {
           const cord = scords[i];
           if (cord._dead) continue;
           cord.cb(payload.target.value, payload);
-          if (cord.once) cord._dead = true, killed = true;
+          if (cord.once) killed = cord._dead = true;
         }
         if (killed) {
           for (let i = cords.length - 1; i >= 0; i--) if (cords[i]._dead) cords.splice(i, 1), !cords.length && this.watchers.delete(path);
@@ -543,7 +543,7 @@ var Reactor = class {
           const wildcord = wildscords[i];
           if (wildcord._dead) continue;
           wildcord.cb(payload.target.value, payload);
-          if (wildcord.once) wildcord._dead = true, killed = true;
+          if (wildcord.once) killed = wildcord._dead = true;
         }
         if (killed) {
           for (let i = wildcords.length - 1; i >= 0; i--) if (wildcords[i]._dead) wildcords.splice(i, 1), !wildcords.length && this.watchers.delete("*");
@@ -599,7 +599,7 @@ var Reactor = class {
         if (tDepth > cord.lDepth + cord.depth) continue;
       }
       cord.cb(e);
-      if (cord.once) cord._dead = true, killed = true;
+      if (cord.once) killed = cord._dead = true;
     }
     if (killed) {
       for (let i = cords.length - 1; i >= 0; i--) if (cords[i]._dead) cords.splice(i, 1), !cords.length && this.listeners.delete(path);
@@ -607,7 +607,7 @@ var Reactor = class {
   }
   /**
    * Flushes queued listener payloads.
-   * @param paths Optional path (or paths) to flush.
+   * @param paths Optional path(s) to flush.
    * @example
    * rtr.tick(); // to flush all paths in batch or pass "*" wildcard
    * @example
@@ -1159,9 +1159,9 @@ function assignEl(el, props, dataset, styles, nodiff = true) {
   }
   return el;
 }
-function getActiveEl(root) {
+function getActiveEl(root, noBody = true) {
   const activeEl = (root ?? document).activeElement;
-  return !activeEl ? null : activeEl.shadowRoot ? getActiveEl(activeEl.shadowRoot) : activeEl;
+  return !activeEl || noBody && activeEl === document.body ? null : activeEl.shadowRoot ? getActiveEl(activeEl.shadowRoot) : activeEl;
 }
 
 // src/ts/utils/keys.ts
@@ -1185,24 +1185,30 @@ function cleanKeyCombo(combo) {
   };
   return Array.isArray(combo) ? combo.map(clean) : clean(combo);
 }
-function matchKeys(required, actual, strict = false) {
-  actual = cleanKeyCombo(actual);
+function matchKeys(required, actual, strict = false, cleaned = false) {
+  if (!cleaned) actual = cleanKeyCombo(actual);
   const match = (required2, actual2) => {
-    required2 = cleanKeyCombo(required2);
+    if (!cleaned) required2 = cleanKeyCombo(required2);
     if (strict) return required2 === actual2;
-    const reqKeys = required2.split("+"), actKeys = actual2.split("+");
-    return reqKeys.every((k) => actKeys.includes(k));
+    const actualKeys = actual2.split("+");
+    return required2.split("+").every((k) => actualKeys.includes(k));
   };
-  return Array.isArray(required) ? required.some((req) => match(req, actual)) : match(required, actual);
+  return Array.isArray(required) ? required.some((required2) => match(required2, actual)) : match(required, actual);
 }
 function getTermsForKey(combo, settings) {
-  const terms = { override: false, block: false, whitelisted: false, action: null }, { overrides = [], shortcuts = {}, blocks = [], strictMatches: s = false, whitelist = [] } = settings || {};
+  const terms = { override: false, block: false, whitelisted: false, action: null }, { overrides = [], shortcuts = {}, blocks = [], strictMatch: s = false, rankedMatch = true, whitelist = [] } = settings || {};
   combo = cleanKeyCombo(combo);
   if (matchKeys(overrides, combo, s)) terms.override = true;
   if (matchKeys(blocks, combo, s)) terms.block = true;
   if (matchKeys(whitelist, combo)) terms.whitelisted = true;
-  terms.action = Object.keys(shortcuts).find((key) => matchKeys(shortcuts[key], combo, s)) || null;
-  return terms;
+  if (!rankedMatch) return terms.action = Object.keys(shortcuts).find((key) => matchKeys(shortcuts[key], combo, s)) || null, terms;
+  let bestA = null, bestE = false, bestL = 0;
+  for (const action of Object.keys(shortcuts))
+    for (const c of Array.isArray(shortcuts[action]) ? shortcuts[action] : [shortcuts[action]]) {
+      const required = cleanKeyCombo(c), isE = required === combo, len = required.split("+").length;
+      if (matchKeys(required, combo, s, true) && (!bestA || isE && !bestE || isE === bestE && len > bestL)) bestA = action, bestE = isE, bestL = len;
+    }
+  return terms.action = bestA, terms;
 }
 function keyEventAllowed(e, settings) {
   if (settings.disabled) return false;

package/dist/adapters/react.d.cts

@@ -1,7 +1,7 @@
-import { E as EffectOptions, d as Reactor, R as Reactive, J as ReactorBuild, K as DeepReadonly, W as WildPaths, a as PathValue } from '../index-BtHNGnRR.cjs';
+import { E as EffectOptions, d as Reactor, R as Reactive, J as ReactorBuild, K as DeepReadonly, W as WildPaths, a as PathValue } from '../index-C4Z3aveO.cjs';
 import { useLayoutEffect } from 'react';
-import { T as TimeTravelModule } from '../index-C_djeddc.cjs';
-import { a as TimeTravelConsoleConfig } from '../TimeTravelConsole-Dt8txKnt.cjs';
+import { T as TimeTravelModule } from '../index-B55979dE.cjs';
+import { a as TimeTravelConsoleConfig } from '../TimeTravelConsole-DPJf_Ee7.cjs';
 
 /**
  * Subscribes a component to desired Reactor state and returns it.

package/dist/adapters/react.d.ts

@@ -1,7 +1,7 @@
-import { E as EffectOptions, d as Reactor, R as Reactive, J as ReactorBuild, K as DeepReadonly, W as WildPaths, a as PathValue } from '../index-BtHNGnRR.js';
+import { E as EffectOptions, d as Reactor, R as Reactive, J as ReactorBuild, K as DeepReadonly, W as WildPaths, a as PathValue } from '../index-C4Z3aveO.js';
 import { useLayoutEffect } from 'react';
-import { T as TimeTravelModule } from '../index-CKHoDs6x.js';
-import { a as TimeTravelConsoleConfig } from '../TimeTravelConsole-BjDL0JjZ.js';
+import { T as TimeTravelModule } from '../index-DN85zmt_.js';
+import { a as TimeTravelConsoleConfig } from '../TimeTravelConsole-Bo83b1S5.js';
 
 /**
  * Subscribes a component to desired Reactor state and returns it.

package/dist/adapters/react.js

@@ -2,16 +2,16 @@ import {
   Autotracker,
   TimeTravelConsole,
   withTracker
-} from "../chunk-ENEEV334.js";
-import "../chunk-KPJ5SPXP.js";
-import "../chunk-ORK3EGB6.js";
+} from "../chunk-4U7VB3JS.js";
+import "../chunk-BOBAOEKS.js";
+import "../chunk-4SGW3Y6X.js";
 import {
   CTX,
   NIL,
   NOOP,
   getPath,
   getReactor
-} from "../chunk-LZJYX2LE.js";
+} from "../chunk-GH5QAGIC.js";
 
 // src/ts/adapters/react/hooks/useReactor.ts
 import { useRef, useCallback, useSyncExternalStore, useMemo } from "react";

package/dist/adapters/vanilla.cjs

@@ -385,7 +385,7 @@ var Reactor = class {
       if (cord._dead) continue;
       const response = isGet ? cord.cb(value, payload) : isSet ? cord.cb(value, terminated, payload) : cord.cb(terminated, payload);
       if (isGet || !(terminated ||= payload.terminated = response === TERMINATOR)) value = response;
-      if (cord.once) cord._dead = true, killed = true;
+      if (cord.once) killed = cord._dead = true;
     }
     if (killed) {
       for (let i = cords.length - 1; i >= 0; i--) if (cords[i]._dead) cords.splice(i, 1), !cords.length && mediators.delete(path);
@@ -401,7 +401,7 @@ var Reactor = class {
           const cord = scords[i];
           if (cord._dead) continue;
           cord.cb(payload.target.value, payload);
-          if (cord.once) cord._dead = true, killed = true;
+          if (cord.once) killed = cord._dead = true;
         }
         if (killed) {
           for (let i = cords.length - 1; i >= 0; i--) if (cords[i]._dead) cords.splice(i, 1), !cords.length && this.watchers.delete(path);
@@ -413,7 +413,7 @@ var Reactor = class {
           const wildcord = wildscords[i];
           if (wildcord._dead) continue;
           wildcord.cb(payload.target.value, payload);
-          if (wildcord.once) wildcord._dead = true, killed = true;
+          if (wildcord.once) killed = wildcord._dead = true;
         }
         if (killed) {
           for (let i = wildcords.length - 1; i >= 0; i--) if (wildcords[i]._dead) wildcords.splice(i, 1), !wildcords.length && this.watchers.delete("*");
@@ -469,7 +469,7 @@ var Reactor = class {
         if (tDepth > cord.lDepth + cord.depth) continue;
       }
       cord.cb(e);
-      if (cord.once) cord._dead = true, killed = true;
+      if (cord.once) killed = cord._dead = true;
     }
     if (killed) {
       for (let i = cords.length - 1; i >= 0; i--) if (cords[i]._dead) cords.splice(i, 1), !cords.length && this.listeners.delete(path);
@@ -477,7 +477,7 @@ var Reactor = class {
   }
   /**
    * Flushes queued listener payloads.
-   * @param paths Optional path (or paths) to flush.
+   * @param paths Optional path(s) to flush.
    * @example
    * rtr.tick(); // to flush all paths in batch or pass "*" wildcard
    * @example
@@ -791,12 +791,12 @@ function canHandle(obj, config = CTX.defaults, typecheck = true) {
   if (config.preserveContext) return !(obj instanceof String) && !(obj instanceof Number) && !(obj instanceof Function) && !(obj instanceof Date) && !(obj instanceof Error) && !(obj instanceof RegExp) && !(obj instanceof Promise) && !(obj instanceof Map) && !(obj instanceof WeakMap) && !(obj instanceof Set) && !(obj instanceof WeakSet) && !(obj instanceof EventTarget);
   return false;
 }
-function getPath(source, key, separator = ".", keyFunc) {
+function getPath(source, key, separator = ".", keyFn) {
   if (key === "*") return source;
   const keys2 = key.split(separator);
   let currObj = source;
   for (let i = 0, len = keys2.length; i < len; i++) {
-    const key2 = keyFunc ? keyFunc(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
+    const key2 = keyFn ? keyFn(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
     if (match) {
       const [, key3, iStr] = match;
       if (!Array.isArray(currObj[key3]) || !(key3 in currObj)) return currObj[key3];
@@ -808,11 +808,11 @@ function getPath(source, key, separator = ".", keyFunc) {
   }
   return currObj;
 }
-function setPath(target, key, value, separator = ".", keyFunc) {
+function setPath(target, key, value, separator = ".", keyFn) {
   if (key === "*") return Object.assign(target, value);
   const keys2 = key.split(separator);
   for (let currObj = target, i = 0, len = keys2.length; i < len; i++) {
-    const key2 = keyFunc ? keyFunc(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
+    const key2 = keyFn ? keyFn(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
     if (match) {
       const [, key3, iStr] = match;
       if (!Array.isArray(currObj[key3])) currObj[key3] = [];
@@ -824,7 +824,7 @@ function setPath(target, key, value, separator = ".", keyFunc) {
     }
   }
 }
-function deletePath(target, key, separator = ".", keyFunc) {
+function deletePath(target, key, separator = ".", keyFn) {
   if (key === "*") {
     const keys3 = Object.keys(target);
     for (let i = 0, len = keys3.length; i < len; i++) delete target[keys3[i]];
@@ -832,7 +832,7 @@ function deletePath(target, key, separator = ".", keyFunc) {
   }
   const keys2 = key.split(separator);
   for (let currObj = target, i = 0, len = keys2.length; i < len; i++) {
-    const key2 = keyFunc ? keyFunc(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
+    const key2 = keyFn ? keyFn(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
     if (match) {
       const [, key3, iStr] = match;
       if (!Array.isArray(currObj[key3]) || !(key3 in currObj)) return;
@@ -845,11 +845,11 @@ function deletePath(target, key, separator = ".", keyFunc) {
     }
   }
 }
-function hasPath(source, key, separator = ".", keyFunc) {
+function hasPath(source, key, separator = ".", keyFn) {
   if (key === "*") return true;
   const keys2 = key.split(separator);
   for (let currObj = source, i = 0, len = keys2.length; i < len; i++) {
-    const key2 = keyFunc ? keyFunc(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
+    const key2 = keyFn ? keyFn(keys2[i]) : keys2[i], match = key2.includes("[") && key2.match(arrRegex);
     if (match) {
       const [, key3, iStr] = match;
       if (!Array.isArray(currObj[key3]) || !(key3 in currObj)) return false;
@@ -1079,9 +1079,9 @@ function assignEl(el, props, dataset, styles, nodiff = true) {
   }
   return el;
 }
-function getActiveEl(root) {
+function getActiveEl(root, noBody = true) {
   const activeEl = (root ?? document).activeElement;
-  return !activeEl ? null : activeEl.shadowRoot ? getActiveEl(activeEl.shadowRoot) : activeEl;
+  return !activeEl || noBody && activeEl === document.body ? null : activeEl.shadowRoot ? getActiveEl(activeEl.shadowRoot) : activeEl;
 }
 
 // src/ts/utils/keys.ts
@@ -1105,24 +1105,30 @@ function cleanKeyCombo(combo) {
   };
   return Array.isArray(combo) ? combo.map(clean) : clean(combo);
 }
-function matchKeys(required, actual, strict = false) {
-  actual = cleanKeyCombo(actual);
+function matchKeys(required, actual, strict = false, cleaned = false) {
+  if (!cleaned) actual = cleanKeyCombo(actual);
   const match = (required2, actual2) => {
-    required2 = cleanKeyCombo(required2);
+    if (!cleaned) required2 = cleanKeyCombo(required2);
     if (strict) return required2 === actual2;
-    const reqKeys = required2.split("+"), actKeys = actual2.split("+");
-    return reqKeys.every((k) => actKeys.includes(k));
+    const actualKeys = actual2.split("+");
+    return required2.split("+").every((k) => actualKeys.includes(k));
   };
-  return Array.isArray(required) ? required.some((req) => match(req, actual)) : match(required, actual);
+  return Array.isArray(required) ? required.some((required2) => match(required2, actual)) : match(required, actual);
 }
 function getTermsForKey(combo, settings) {
-  const terms = { override: false, block: false, whitelisted: false, action: null }, { overrides = [], shortcuts = {}, blocks = [], strictMatches: s = false, whitelist = [] } = settings || {};
+  const terms = { override: false, block: false, whitelisted: false, action: null }, { overrides = [], shortcuts = {}, blocks = [], strictMatch: s = false, rankedMatch = true, whitelist = [] } = settings || {};
   combo = cleanKeyCombo(combo);
   if (matchKeys(overrides, combo, s)) terms.override = true;
   if (matchKeys(blocks, combo, s)) terms.block = true;
   if (matchKeys(whitelist, combo)) terms.whitelisted = true;
-  terms.action = Object.keys(shortcuts).find((key) => matchKeys(shortcuts[key], combo, s)) || null;
-  return terms;
+  if (!rankedMatch) return terms.action = Object.keys(shortcuts).find((key) => matchKeys(shortcuts[key], combo, s)) || null, terms;
+  let bestA = null, bestE = false, bestL = 0;
+  for (const action of Object.keys(shortcuts))
+    for (const c of Array.isArray(shortcuts[action]) ? shortcuts[action] : [shortcuts[action]]) {
+      const required = cleanKeyCombo(c), isE = required === combo, len = required.split("+").length;
+      if (matchKeys(required, combo, s, true) && (!bestA || isE && !bestE || isE === bestE && len > bestL)) bestA = action, bestE = isE, bestL = len;
+    }
+  return terms.action = bestA, terms;
 }
 function keyEventAllowed(e, settings) {
   if (settings.disabled) return false;

package/dist/adapters/vanilla.d.cts

@@ -1,7 +1,7 @@
-import { E as EffectOptions } from '../index-BtHNGnRR.cjs';
-export { A as Autotracker, w as withTracker } from '../index-BtHNGnRR.cjs';
-export { T as TimeTravelConsole, a as TimeTravelConsoleConfig } from '../TimeTravelConsole-Dt8txKnt.cjs';
-import '../index-C_djeddc.cjs';
+import { E as EffectOptions } from '../index-C4Z3aveO.cjs';
+export { A as Autotracker, w as withTracker } from '../index-C4Z3aveO.cjs';
+export { T as TimeTravelConsole, a as TimeTravelConsoleConfig } from '../TimeTravelConsole-DPJf_Ee7.cjs';
+import '../index-B55979dE.cjs';
 
 /**
  * Runs a reactive side effect in vanilla JavaScript.

package/dist/adapters/vanilla.d.ts

@@ -1,7 +1,7 @@
-import { E as EffectOptions } from '../index-BtHNGnRR.js';
-export { A as Autotracker, w as withTracker } from '../index-BtHNGnRR.js';
-export { T as TimeTravelConsole, a as TimeTravelConsoleConfig } from '../TimeTravelConsole-BjDL0JjZ.js';
-import '../index-CKHoDs6x.js';
+import { E as EffectOptions } from '../index-C4Z3aveO.js';
+export { A as Autotracker, w as withTracker } from '../index-C4Z3aveO.js';
+export { T as TimeTravelConsole, a as TimeTravelConsoleConfig } from '../TimeTravelConsole-Bo83b1S5.js';
+import '../index-DN85zmt_.js';
 
 /**
  * Runs a reactive side effect in vanilla JavaScript.

package/dist/adapters/vanilla.js

@@ -3,10 +3,10 @@ import {
   TimeTravelConsole,
   effect,
   withTracker
-} from "../chunk-ENEEV334.js";
-import "../chunk-KPJ5SPXP.js";
-import "../chunk-ORK3EGB6.js";
-import "../chunk-LZJYX2LE.js";
+} from "../chunk-4U7VB3JS.js";
+import "../chunk-BOBAOEKS.js";
+import "../chunk-4SGW3Y6X.js";
+import "../chunk-GH5QAGIC.js";
 export {
   Autotracker,
   TimeTravelConsole,

package/dist/{chunk-ORK3EGB6.js → chunk-4SGW3Y6X.js}

@@ -54,16 +54,16 @@ function assignEl(el, props, dataset, styles, nodiff = true) {
   }
   return el;
 }
-function getActiveEl(root) {
+function getActiveEl(root, noBody = true) {
   const activeEl = (root ?? document).activeElement;
-  return !activeEl ? null : activeEl.shadowRoot ? getActiveEl(activeEl.shadowRoot) : activeEl;
+  return !activeEl || noBody && activeEl === document.body ? null : activeEl.shadowRoot ? getActiveEl(activeEl.shadowRoot) : activeEl;
 }
 
 // src/ts/utils/keys.ts
 var KEYS_BLOCKS = ["Ctrl+Tab", "Ctrl+Shift+Tab", "Ctrl+PageUp", "Ctrl+PageDown", "Cmd+Option+ArrowRight", "Cmd+Option+ArrowLeft", "Ctrl+1", "Ctrl+2", "Ctrl+3", "Ctrl+4", "Ctrl+5", "Ctrl+6", "Ctrl+7", "Ctrl+8", "Ctrl+9", "Cmd+1", "Cmd+2", "Cmd+3", "Cmd+4", "Cmd+5", "Cmd+6", "Cmd+7", "Cmd+8", "Cmd+9", "Alt+ArrowLeft", "Alt+ArrowRight", "Cmd+ArrowLeft", "Cmd+ArrowRight", "Ctrl+r", "Ctrl+Shift+r", "F5", "Shift+F5", "Cmd+r", "Cmd+Shift+r", "Ctrl+h", "Ctrl+j", "Ctrl+d", "Ctrl+f", "Cmd+y", "Cmd+Option+b", "Cmd+d", "Cmd+f", "Ctrl+Shift+i", "Ctrl+Shift+j", "Ctrl+Shift+c", "Ctrl+u", "F12", "Cmd+Option+i", "Cmd+Option+j", "Cmd+Option+c", "Cmd+Option+u", "Ctrl+=", "Ctrl+-", "Ctrl+0", "Cmd+=", "Cmd+-", "Cmd+0", "Ctrl+p", "Ctrl+s", "Ctrl+o", "Cmd+p", "Cmd+s", "Cmd+o"];
 function parseKeyCombo(combo) {
   const parts = cleanKeyCombo(combo).toLowerCase().split("+");
-  return { ctrlKey: parts.includes("ctrl"), shiftKey: parts.includes("shift"), altKey: parts.includes("alt"), metaKey: parts.includes("meta") || parts.includes("cmd"), key: parts.find((p) => !["ctrl", "shift", "alt", "meta", "cmd"].includes(p)) || "" };
+  return { ctrlKey: parts.includes("ctrl"), shiftKey: parts.includes("shift"), altKey: parts.includes("alt"), metaKey: parts.includes("meta") || parts.includes("cmd"), key: parts.find((p) => !/^(ctrl|shift|alt|meta|cmd)$/.test(p)) || "" };
 }
 function stringifyKeyEvent(e) {
   const parts = [];
@@ -84,24 +84,30 @@ function cleanKeyCombo(combo) {
   };
   return Array.isArray(combo) ? combo.map(clean) : clean(combo);
 }
-function matchKeys(required, actual, strict = false) {
-  actual = cleanKeyCombo(actual);
+function matchKeys(required, actual, strict = false, cleaned = false) {
+  if (!cleaned) actual = cleanKeyCombo(actual);
   const match = (required2, actual2) => {
-    required2 = cleanKeyCombo(required2);
+    if (!cleaned) required2 = cleanKeyCombo(required2);
     if (strict) return required2 === actual2;
-    const reqKeys = required2.split("+"), actKeys = actual2.split("+");
-    return reqKeys.every((k) => actKeys.includes(k));
+    const actualKeys = actual2.split("+");
+    return required2.split("+").every((k) => actualKeys.includes(k));
   };
-  return Array.isArray(required) ? required.some((req) => match(req, actual)) : match(required, actual);
+  return Array.isArray(required) ? required.some((required2) => match(required2, actual)) : match(required, actual);
 }
 function getTermsForKey(combo, settings) {
-  const terms = { override: false, block: false, whitelisted: false, action: null }, { overrides = [], shortcuts = {}, blocks = [], strictMatches: s = false, whitelist = [] } = settings || {};
+  const terms = { override: false, block: false, whitelisted: false, action: null }, { overrides = [], shortcuts = {}, blocks = [], strictMatch: s = false, rankedMatch = true, whitelist = [] } = settings || {};
   combo = cleanKeyCombo(combo);
   if (matchKeys(overrides, combo, s)) terms.override = true;
   if (matchKeys(blocks, combo, s)) terms.block = true;
   if (matchKeys(whitelist, combo)) terms.whitelisted = true;
-  terms.action = Object.keys(shortcuts).find((key) => matchKeys(shortcuts[key], combo, s)) || null;
-  return terms;
+  if (!rankedMatch) return terms.action = Object.keys(shortcuts).find((key) => matchKeys(shortcuts[key], combo, s)) || null, terms;
+  let bestA = null, bestE = false, bestL = 0;
+  for (const action of Object.keys(shortcuts))
+    for (const c of Array.isArray(shortcuts[action]) ? shortcuts[action] : [shortcuts[action]]) {
+      const required = cleanKeyCombo(c), isE = required === combo, len = required.split("+").length;
+      if (matchKeys(required, combo, s, true) && (!bestA || isE && !bestE || isE === bestE && len > bestL)) bestA = action, bestE = isE, bestL = len;
+    }
+  return terms.action = bestA, terms;
 }
 function keyEventAllowed(e, settings) {
   if (settings.disabled) return false;

package/dist/{chunk-ENEEV334.js → chunk-4U7VB3JS.js}

@@ -1,13 +1,13 @@
 import {
   wpArr
-} from "./chunk-KPJ5SPXP.js";
+} from "./chunk-BOBAOEKS.js";
 import {
   KEYS_BLOCKS,
   createEl,
   formatKeyForDisplay,
   keyEventAllowed,
   parseForARIAKS
-} from "./chunk-ORK3EGB6.js";
+} from "./chunk-4SGW3Y6X.js";
 import {
   CTX,
   NIL,
@@ -15,7 +15,7 @@ import {
   canHandle,
   nuke,
   reactive
-} from "./chunk-LZJYX2LE.js";
+} from "./chunk-GH5QAGIC.js";
 
 // src/ts/adapters/autotracker.ts
 var Autotracker = class {

package/dist/{chunk-KPJ5SPXP.js → chunk-BOBAOEKS.js}

@@ -1,7 +1,7 @@
 import {
   guardAllMethods,
   guardMethod
-} from "./chunk-ORK3EGB6.js";
+} from "./chunk-4SGW3Y6X.js";
 import {
   getPath,
   getReactor,
@@ -10,7 +10,7 @@ import {
   nuke,
   reactive,
   setPath
-} from "./chunk-LZJYX2LE.js";
+} from "./chunk-GH5QAGIC.js";
 
 // src/ts/modules/base/index.ts
 var BaseReactorModule = class {