@infinite-table/infinite-react 3.3.2 → 3.3.3

package/index.dev.js

@@ -18800,7 +18800,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "3.3.2"
+      version: "3.3.3"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -19576,6 +19576,12 @@ function handleBrowserFocusChangeOnKeyboardNavigation(context, event) {
 var KeyModifierAliases = {
   control: "ctrl"
 };
+var CmdOrCtrlAliases = {
+  "control|cmd": "ctrl",
+  "cmd|control": "ctrl",
+  "ctrl|cmd": "ctrl",
+  "cmd|ctrl": "ctrl"
+};
 var KeyAliases = {
   esc: "escape"
 };
@@ -19587,6 +19593,7 @@ var keyModifierChecker = {
 };
 var keyModifierNames = Object.keys(keyModifierChecker);
 var keyModifierSet = new Set(keyModifierNames);
+var allowedStarModifiers = /* @__PURE__ */ new Set(["shift", "alt"]);
 function eventMatchesKeyboardShortcut(event, keyDescriptors) {
   if (!Array.isArray(keyDescriptors)) {
     return eventMatchesSingleShortcut(event, keyDescriptors);
@@ -19597,7 +19604,13 @@ function eventMatchesKeyboardShortcut(event, keyDescriptors) {
 }
 function eventMatchesSingleShortcut(event, keyDescriptor) {
   const keyLowercase = event.key.toLowerCase();
-  const parts = keyDescriptor.split("+").map((part) => part.toLowerCase().trim()).map((part) => KeyModifierAliases[part] || KeyAliases[part] || part);
+  const splitPartsLowercase = keyDescriptor.split("+").map((part) => part.toLowerCase().trim());
+  const hasCmdOrCtrlAlias = splitPartsLowercase.find(
+    (part) => CmdOrCtrlAliases[part]
+  );
+  const parts = splitPartsLowercase.map(
+    (part) => KeyModifierAliases[part] || CmdOrCtrlAliases[part] || KeyAliases[part] || part
+  );
   const expectedModifiers = parts.filter(
     (part) => keyModifierSet.has(part)
   );
@@ -19608,6 +19621,10 @@ function eventMatchesSingleShortcut(event, keyDescriptor) {
     acc[modifier] = keyModifierChecker[modifier](event);
     return acc;
   }, {});
+  if (hasCmdOrCtrlAlias && currentModifierMatches.cmd) {
+    currentModifierMatches.cmd = false;
+    currentModifierMatches.ctrl = true;
+  }
   const currentModifierMatchesList = Object.keys(currentModifierMatches).filter(
     (key) => currentModifierMatches[key]
   );
@@ -19617,13 +19634,26 @@ function eventMatchesSingleShortcut(event, keyDescriptor) {
   if (!hasAllModifiers) {
     return false;
   }
-  if (expectedModifiers.length != currentModifierMatchesList.length) {
-    return false;
+  const hasStar = nonModifierParts.includes("*");
+  if (!hasStar) {
+    if (expectedModifiers.length != currentModifierMatchesList.length) {
+      return false;
+    }
+  } else {
+    if (currentModifierMatchesList.length < expectedModifiers.length) {
+      return false;
+    }
+    const nonAllowedModifiers = currentModifierMatchesList.filter(
+      (modifier) => !allowedStarModifiers.has(modifier)
+    );
+    if (nonAllowedModifiers.length) {
+      return false;
+    }
   }
   if (!nonModifierParts.length) {
     return false;
   }
-  if (keyModifierSet.has(keyLowercase)) {
+  if (keyModifierSet.has(keyLowercase) || keyLowercase === "meta" || KeyModifierAliases[keyLowercase]) {
     return false;
   }
   return nonModifierParts.reduce((acc, part) => {

package/index.dev.mjs

@@ -18773,7 +18773,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "3.3.2"
+      version: "3.3.3"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
@@ -19549,6 +19549,12 @@ function handleBrowserFocusChangeOnKeyboardNavigation(context, event) {
 var KeyModifierAliases = {
   control: "ctrl"
 };
+var CmdOrCtrlAliases = {
+  "control|cmd": "ctrl",
+  "cmd|control": "ctrl",
+  "ctrl|cmd": "ctrl",
+  "cmd|ctrl": "ctrl"
+};
 var KeyAliases = {
   esc: "escape"
 };
@@ -19560,6 +19566,7 @@ var keyModifierChecker = {
 };
 var keyModifierNames = Object.keys(keyModifierChecker);
 var keyModifierSet = new Set(keyModifierNames);
+var allowedStarModifiers = /* @__PURE__ */ new Set(["shift", "alt"]);
 function eventMatchesKeyboardShortcut(event, keyDescriptors) {
   if (!Array.isArray(keyDescriptors)) {
     return eventMatchesSingleShortcut(event, keyDescriptors);
@@ -19570,7 +19577,13 @@ function eventMatchesKeyboardShortcut(event, keyDescriptors) {
 }
 function eventMatchesSingleShortcut(event, keyDescriptor) {
   const keyLowercase = event.key.toLowerCase();
-  const parts = keyDescriptor.split("+").map((part) => part.toLowerCase().trim()).map((part) => KeyModifierAliases[part] || KeyAliases[part] || part);
+  const splitPartsLowercase = keyDescriptor.split("+").map((part) => part.toLowerCase().trim());
+  const hasCmdOrCtrlAlias = splitPartsLowercase.find(
+    (part) => CmdOrCtrlAliases[part]
+  );
+  const parts = splitPartsLowercase.map(
+    (part) => KeyModifierAliases[part] || CmdOrCtrlAliases[part] || KeyAliases[part] || part
+  );
   const expectedModifiers = parts.filter(
     (part) => keyModifierSet.has(part)
   );
@@ -19581,6 +19594,10 @@ function eventMatchesSingleShortcut(event, keyDescriptor) {
     acc[modifier] = keyModifierChecker[modifier](event);
     return acc;
   }, {});
+  if (hasCmdOrCtrlAlias && currentModifierMatches.cmd) {
+    currentModifierMatches.cmd = false;
+    currentModifierMatches.ctrl = true;
+  }
   const currentModifierMatchesList = Object.keys(currentModifierMatches).filter(
     (key) => currentModifierMatches[key]
   );
@@ -19590,13 +19607,26 @@ function eventMatchesSingleShortcut(event, keyDescriptor) {
   if (!hasAllModifiers) {
     return false;
   }
-  if (expectedModifiers.length != currentModifierMatchesList.length) {
-    return false;
+  const hasStar = nonModifierParts.includes("*");
+  if (!hasStar) {
+    if (expectedModifiers.length != currentModifierMatchesList.length) {
+      return false;
+    }
+  } else {
+    if (currentModifierMatchesList.length < expectedModifiers.length) {
+      return false;
+    }
+    const nonAllowedModifiers = currentModifierMatchesList.filter(
+      (modifier) => !allowedStarModifiers.has(modifier)
+    );
+    if (nonAllowedModifiers.length) {
+      return false;
+    }
   }
   if (!nonModifierParts.length) {
     return false;
   }
-  if (keyModifierSet.has(keyLowercase)) {
+  if (keyModifierSet.has(keyLowercase) || keyLowercase === "meta" || KeyModifierAliases[keyLowercase]) {
     return false;
   }
   return nonModifierParts.reduce((acc, part) => {