@baleada/logic 0.23.2 → 0.23.3

package/lib/index.cjs

@@ -761,15 +761,13 @@ function createToGraph(options = {}) {
 }
 
 const defaultOptions$k = {
-  toKey: (alias) => fromAliasToKeyStatusKey(alias)
+  toKey: (alias) => fromAliasToKeyStatusKey(alias),
+  toAliases: (event) => fromEventToAliases(event)
 };
 const createPredicateKeycomboMatch$1 = (keycombo, options = {}) => {
-  const { toKey } = { ...defaultOptions$k, ...options }, keys = lazyCollections.pipe(
-    fromComboToAliases,
-    lazyCollections.map(toKey)
-  )(keycombo);
+  const { toKey, toAliases } = { ...defaultOptions$k, ...options }, aliases = fromComboToAliases(keycombo), keys = lazyCollections.map(toKey)(aliases);
   return (event) => {
-    const { toValue, set } = createKeyStatuses();
+    const { toValue, set, toEntries } = createKeyStatuses();
     set(fromEventToKeyStatusKey(event), "down");
     for (const modifier of modifiers) {
       if (event[`${modifier.toLowerCase()}Key`])
@@ -778,7 +776,11 @@ const createPredicateKeycomboMatch$1 = (keycombo, options = {}) => {
     return lazyCollections.every(lazyCollections.pipe(
       toValue,
       predicateDown
-    ))(keys);
+    ))(keys) && lazyCollections.every(
+      ([key]) => lazyCollections.some(
+        (alias) => lazyCollections.includes(alias)(aliases)
+      )(toAliases(key))
+    )(toEntries());
   };
 };
 

package/lib/index.d.ts

@@ -1245,6 +1245,7 @@ declare function createToGraph<TreeNode>(options?: CreateToGraphOptions<TreeNode
 type KeyboardEventFn<Returned> = (keyboardEvent: KeyboardEvent) => Returned;
 type CreatePredicateKeycomboMatchOptions = {
     toKey?: (alias: string) => KeyStatusKey;
+    toAliases?: (event: KeyboardEvent) => string[];
 };
 declare const createPredicateKeycomboMatch: (keycombo: string, options?: CreatePredicateKeycomboMatchOptions) => KeyboardEventFn<boolean>;
 

package/lib/index.js

@@ -759,15 +759,13 @@ function createToGraph(options = {}) {
 }
 
 const defaultOptions$k = {
-  toKey: (alias) => fromAliasToKeyStatusKey(alias)
+  toKey: (alias) => fromAliasToKeyStatusKey(alias),
+  toAliases: (event) => fromEventToAliases(event)
 };
 const createPredicateKeycomboMatch$1 = (keycombo, options = {}) => {
-  const { toKey } = { ...defaultOptions$k, ...options }, keys = pipe(
-    fromComboToAliases,
-    map(toKey)
-  )(keycombo);
+  const { toKey, toAliases } = { ...defaultOptions$k, ...options }, aliases = fromComboToAliases(keycombo), keys = map(toKey)(aliases);
   return (event) => {
-    const { toValue, set } = createKeyStatuses();
+    const { toValue, set, toEntries } = createKeyStatuses();
     set(fromEventToKeyStatusKey(event), "down");
     for (const modifier of modifiers) {
       if (event[`${modifier.toLowerCase()}Key`])
@@ -776,7 +774,11 @@ const createPredicateKeycomboMatch$1 = (keycombo, options = {}) => {
     return every(pipe(
       toValue,
       predicateDown
-    ))(keys);
+    ))(keys) && every(
+      ([key]) => some(
+        (alias) => includes(alias)(aliases)
+      )(toAliases(key))
+    )(toEntries());
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baleada/logic",
-  "version": "0.23.2",
+  "version": "0.23.3",
   "description": "UI logic for the Baleada toolkit",
   "main": "lib/index.cjs",
   "module": "lib/index.js",