react-hotkeys-hook 5.2.3 → 5.2.4

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createContext as T, useContext as M, useState as A, useCallback as k, useRef as S, useLayoutEffect as z, useEffect as J } from "react";
+import { createContext as T, useContext as M, useState as A, useCallback as w, useRef as S, useLayoutEffect as z, useEffect as J } from "react";
 import { jsx as b } from "react/jsx-runtime";
 const j = ["shift", "alt", "meta", "mod", "ctrl", "control"], Q = {
   esc: "escape",
@@ -24,27 +24,27 @@ function K(e) {
 function D(e) {
   return j.includes(e);
 }
-function H(e, n = ",") {
-  return e.toLowerCase().split(n);
+function H(e, r = ",") {
+  return e.toLowerCase().split(r);
 }
-function P(e, n = "+", r = ">", i = !1, u, f) {
-  let o = [], y = !1;
-  e = e.trim(), e.includes(r) ? (y = !0, o = e.toLocaleLowerCase().split(r).map((d) => K(d))) : o = e.toLocaleLowerCase().split(n).map((d) => K(d));
-  const c = {
-    alt: o.includes("alt"),
-    ctrl: o.includes("ctrl") || o.includes("control"),
-    shift: o.includes("shift"),
-    meta: o.includes("meta"),
-    mod: o.includes("mod"),
+function P(e, r = "+", o = ">", i = !1, c, a) {
+  let n = [], y = !1;
+  e = e.trim(), e.includes(o) ? (y = !0, n = e.toLocaleLowerCase().split(o).map((f) => K(f))) : n = e.toLocaleLowerCase().split(r).map((f) => K(f));
+  const u = {
+    alt: n.includes("alt"),
+    ctrl: n.includes("ctrl") || n.includes("control"),
+    shift: n.includes("shift"),
+    meta: n.includes("meta"),
+    mod: n.includes("mod"),
     useKey: i
-  }, m = o.filter((d) => !j.includes(d));
+  }, l = n.filter((f) => !j.includes(f));
   return {
-    ...c,
-    keys: m,
-    description: u,
+    ...u,
+    keys: l,
+    description: c,
     isSequence: y,
     hotkey: e,
-    metadata: f
+    metadata: a
   };
 }
 typeof document < "u" && (document.addEventListener("keydown", (e) => {
@@ -62,28 +62,28 @@ const L = /* @__PURE__ */ new Set();
 function R(e) {
   return Array.isArray(e);
 }
-function U(e, n = ",") {
-  return (R(e) ? e : e.split(n)).every((i) => L.has(i.trim().toLowerCase()));
+function U(e, r = ",") {
+  return (R(e) ? e : e.split(r)).every((i) => L.has(i.trim().toLowerCase()));
 }
 function _(e) {
-  const n = Array.isArray(e) ? e : [e];
-  L.has("meta") && L.forEach((r) => {
-    D(r) || L.delete(r.toLowerCase());
-  }), n.forEach((r) => {
-    L.add(r.toLowerCase());
+  const r = Array.isArray(e) ? e : [e];
+  L.has("meta") && L.forEach((o) => {
+    D(o) || L.delete(o.toLowerCase());
+  }), r.forEach((o) => {
+    L.add(o.toLowerCase());
   });
 }
 function I(e) {
-  const n = Array.isArray(e) ? e : [e];
-  e === "meta" ? L.clear() : n.forEach((r) => {
-    L.delete(r.toLowerCase());
+  const r = Array.isArray(e) ? e : [e];
+  e === "meta" ? L.clear() : r.forEach((o) => {
+    L.delete(o.toLowerCase());
   });
 }
-function V(e, n, r) {
-  (typeof r == "function" && r(e, n) || r === !0) && e.preventDefault();
+function V(e, r, o) {
+  (typeof o == "function" && o(e, r) || o === !0) && e.preventDefault();
 }
-function X(e, n, r) {
-  return typeof r == "function" ? r(e, n) : r === !0 || r === void 0;
+function X(e, r, o) {
+  return typeof o == "function" ? o(e, r) : o === !0 || o === void 0;
 }
 const Y = [
   "input",
@@ -102,50 +102,40 @@ const Y = [
 function Z(e) {
   return F(e, Y);
 }
-function F(e, n = !1) {
-  const { target: r, composed: i } = e;
-  let u, f;
-  return ee(r) && i ? (u = e.composedPath()[0] && e.composedPath()[0].tagName, f = e.composedPath()[0] && e.composedPath()[0].role) : (u = r && r.tagName, f = r && r.role), R(n) ? !!(u && n && n.some((o) => o.toLowerCase() === u.toLowerCase() || o === f)) : !!(u && n && n);
+function F(e, r = !1) {
+  const { target: o, composed: i } = e;
+  let c, a;
+  return ee(o) && i ? (c = e.composedPath()[0] && e.composedPath()[0].tagName, a = e.composedPath()[0] && e.composedPath()[0].role) : (c = o && o.tagName, a = o && o.role), R(r) ? !!(c && r && r.some((n) => n.toLowerCase() === c.toLowerCase() || n === a)) : !!(c && r && r);
 }
 function ee(e) {
   return !!e.tagName && !e.tagName.startsWith("-") && e.tagName.includes("-");
 }
-function te(e, n) {
-  return e.length === 0 && n ? !1 : n ? e.some((r) => n.includes(r)) || e.includes("*") : !0;
+function te(e, r) {
+  return e.length === 0 && r ? !1 : r ? e.some((o) => r.includes(o)) || e.includes("*") : !0;
 }
-const re = (e, n, r = !1) => {
-  const { alt: i, meta: u, mod: f, shift: o, ctrl: y, keys: c, useKey: m } = n, { code: d, key: t, ctrlKey: a, metaKey: l, shiftKey: h, altKey: w } = e, p = K(d);
-  if (m) {
-    if (c?.length === 1 && c.includes(t.toLowerCase())) {
-      if (!r) {
-        if (i !== w || o !== h) return !1;
-        if (f) {
-          if (!l && !a) return !1;
-        } else if (u !== l || y !== a) return !1;
-      }
-      return !0;
-    }
-    return !1;
-  }
-  if (!c?.includes(p) && !["ctrl", "control", "unknown", "meta", "alt", "shift", "os"].includes(p))
+const re = (e, r, o = !1) => {
+  const { alt: i, meta: c, mod: a, shift: n, ctrl: y, keys: u, useKey: l } = r, { code: f, key: t, ctrlKey: d, metaKey: m, shiftKey: g, altKey: k } = e, p = K(f);
+  if (l && u?.length === 1 && u.includes(t.toLowerCase()))
+    return !0;
+  if (!u?.includes(p) && !["ctrl", "control", "unknown", "meta", "alt", "shift", "os"].includes(p))
     return !1;
-  if (!r) {
-    if (i !== w && p !== "alt" || o !== h && p !== "shift")
+  if (!o) {
+    if (i !== k && p !== "alt" || n !== g && p !== "shift")
       return !1;
-    if (f) {
-      if (!l && !a)
+    if (a) {
+      if (!m && !d)
         return !1;
-    } else if (u !== l && p !== "meta" && p !== "os" || y !== a && p !== "ctrl" && p !== "control")
+    } else if (c !== m && p !== "meta" && p !== "os" || y !== d && p !== "ctrl" && p !== "control")
       return !1;
   }
-  return c && c.length === 1 && c.includes(p) ? !0 : c && c.length > 0 ? c.includes(p) ? U(c) : !1 : !c || c.length === 0;
-}, $ = T(void 0), ne = () => M($);
-function oe({ addHotkey: e, removeHotkey: n, children: r }) {
-  return /* @__PURE__ */ b($.Provider, { value: { addHotkey: e, removeHotkey: n }, children: r });
+  return u && u.length === 1 && u.includes(p) ? !0 : u && u.length > 0 ? u.includes(p) ? U(u) : !1 : !u || u.length === 0;
+}, $ = T(void 0), oe = () => M($);
+function ne({ addHotkey: e, removeHotkey: r, children: o }) {
+  return /* @__PURE__ */ b($.Provider, { value: { addHotkey: e, removeHotkey: r }, children: o });
 }
-function x(e, n) {
-  return e && n && typeof e == "object" && typeof n == "object" ? Object.keys(e).length === Object.keys(n).length && // @ts-expect-error TS7053
-  Object.keys(e).reduce((r, i) => r && x(e[i], n[i]), !0) : e === n;
+function x(e, r) {
+  return e && r && typeof e == "object" && typeof r == "object" ? Object.keys(e).length === Object.keys(r).length && // @ts-expect-error TS7053
+  Object.keys(e).reduce((o, i) => o && x(e[i], r[i]), !0) : e === r;
 }
 const W = T({
   hotkeys: [],
@@ -157,46 +147,46 @@ const W = T({
   },
   disableScope: () => {
   }
-}), se = () => M(W), fe = ({ initiallyActiveScopes: e = ["*"], children: n }) => {
-  const [r, i] = A(e), [u, f] = A([]), o = k((t) => {
-    i((a) => a.includes("*") ? [t] : Array.from(/* @__PURE__ */ new Set([...a, t])));
-  }, []), y = k((t) => {
-    i((a) => a.filter((l) => l !== t));
-  }, []), c = k((t) => {
-    i((a) => a.includes(t) ? a.filter((l) => l !== t) : a.includes("*") ? [t] : Array.from(/* @__PURE__ */ new Set([...a, t])));
-  }, []), m = k((t) => {
-    f((a) => [...a, t]);
-  }, []), d = k((t) => {
-    f((a) => a.filter((l) => !x(l, t)));
+}), se = () => M(W), de = ({ initiallyActiveScopes: e = ["*"], children: r }) => {
+  const [o, i] = A(e), [c, a] = A([]), n = w((t) => {
+    i((d) => d.includes("*") ? [t] : Array.from(/* @__PURE__ */ new Set([...d, t])));
+  }, []), y = w((t) => {
+    i((d) => d.filter((m) => m !== t));
+  }, []), u = w((t) => {
+    i((d) => d.includes(t) ? d.filter((m) => m !== t) : d.includes("*") ? [t] : Array.from(/* @__PURE__ */ new Set([...d, t])));
+  }, []), l = w((t) => {
+    a((d) => [...d, t]);
+  }, []), f = w((t) => {
+    a((d) => d.filter((m) => !x(m, t)));
   }, []);
   return /* @__PURE__ */ b(
     W.Provider,
     {
-      value: { activeScopes: r, hotkeys: u, enableScope: o, disableScope: y, toggleScope: c },
-      children: /* @__PURE__ */ b(oe, { addHotkey: m, removeHotkey: d, children: n })
+      value: { activeScopes: o, hotkeys: c, enableScope: n, disableScope: y, toggleScope: u },
+      children: /* @__PURE__ */ b(ne, { addHotkey: l, removeHotkey: f, children: r })
     }
   );
 };
 function ie(e) {
-  const n = S(void 0);
-  return x(n.current, e) || (n.current = e), n.current;
+  const r = S(void 0);
+  return x(r.current, e) || (r.current = e), r.current;
 }
 const N = (e) => {
   e.stopPropagation(), e.preventDefault(), e.stopImmediatePropagation();
-}, ue = typeof window < "u" ? z : J;
-function de(e, n, r, i) {
-  const u = S(null), f = S(!1), o = Array.isArray(r) ? Array.isArray(i) ? void 0 : i : r, y = R(e) ? e.join(o?.delimiter) : e, c = Array.isArray(r) ? r : Array.isArray(i) ? i : void 0, m = k(n, c ?? []), d = S(m);
-  c ? d.current = m : d.current = n;
-  const t = ie(o), { activeScopes: a } = se(), l = ne();
-  return ue(() => {
-    if (t?.enabled === !1 || !te(a, t?.scopes))
+}, ce = typeof window < "u" ? z : J;
+function fe(e, r, o, i) {
+  const c = S(null), a = S(!1), n = Array.isArray(o) ? Array.isArray(i) ? void 0 : i : o, y = R(e) ? e.join(n?.delimiter) : e, u = Array.isArray(o) ? o : Array.isArray(i) ? i : void 0, l = w(r, u ?? []), f = S(l);
+  u ? f.current = l : f.current = r;
+  const t = ie(n), { activeScopes: d } = se(), m = oe();
+  return ce(() => {
+    if (t?.enabled === !1 || !te(d, t?.scopes))
       return;
-    let h = [], w;
+    let g = [], k;
     const p = (s, B = !1) => {
       if (!(Z(s) && !F(s, t?.enableOnFormTags))) {
-        if (u.current !== null) {
-          const v = u.current.getRootNode();
-          if ((v instanceof Document || v instanceof ShadowRoot) && v.activeElement !== u.current && !u.current.contains(v.activeElement)) {
+        if (c.current !== null) {
+          const v = c.current.getRootNode();
+          if ((v instanceof Document || v instanceof ShadowRoot) && v.activeElement !== c.current && !c.current.contains(v.activeElement)) {
             N(s);
             return;
           }
@@ -208,7 +198,7 @@ function de(e, n, r, i) {
             );
             return;
           }
-          const g = P(
+          const h = P(
             v,
             t?.splitKey,
             t?.sequenceSplitKey,
@@ -216,38 +206,38 @@ function de(e, n, r, i) {
             t?.description,
             t?.metadata
           );
-          if (g.isSequence) {
-            w = setTimeout(() => {
-              h = [];
+          if (h.isSequence) {
+            k = setTimeout(() => {
+              g = [];
             }, t?.sequenceTimeoutMs ?? 1e3);
-            const C = g.useKey ? s.key : K(s.code);
+            const C = h.useKey ? s.key : K(s.code);
             if (D(C.toLowerCase()))
               return;
-            h.push(C);
-            const G = g.keys?.[h.length - 1];
+            g.push(C);
+            const G = h.keys?.[g.length - 1];
             if (C !== G) {
-              h = [], w && clearTimeout(w);
+              g = [], k && clearTimeout(k);
               return;
             }
-            h.length === g.keys?.length && (d.current(s, g), w && clearTimeout(w), h = []);
-          } else if (re(s, g, t?.ignoreModifiers) || g.keys?.includes("*")) {
-            if (t?.ignoreEventWhen?.(s) || B && f.current)
+            g.length === h.keys?.length && (f.current(s, h), k && clearTimeout(k), g = []);
+          } else if (re(s, h, t?.ignoreModifiers) || h.keys?.includes("*")) {
+            if (t?.ignoreEventWhen?.(s) || B && a.current)
               return;
-            if (V(s, g, t?.preventDefault), !X(s, g, t?.enabled)) {
+            if (V(s, h, t?.preventDefault), !X(s, h, t?.enabled)) {
               N(s);
               return;
             }
-            d.current(s, g), B || (f.current = !0);
+            f.current(s, h), B || (a.current = !0);
           }
         });
       }
     }, O = (s) => {
       s.code !== void 0 && (_(K(s.code)), (t?.keydown === void 0 && t?.keyup !== !0 || t?.keydown) && p(s));
     }, q = (s) => {
-      s.code !== void 0 && (I(K(s.code)), f.current = !1, t?.keyup && p(s, !0));
-    }, E = u.current || o?.document || document;
-    return E.addEventListener("keyup", q, o?.eventListenerOptions), E.addEventListener("keydown", O, o?.eventListenerOptions), l && H(y, t?.delimiter).forEach((s) => {
-      l.addHotkey(
+      s.code !== void 0 && (I(K(s.code)), a.current = !1, t?.keyup && p(s, !0));
+    }, E = c.current || n?.document || document;
+    return E.addEventListener("keyup", q, n?.eventListenerOptions), E.addEventListener("keydown", O, n?.eventListenerOptions), m && H(y, t?.delimiter).forEach((s) => {
+      m.addHotkey(
         P(
           s,
           t?.splitKey,
@@ -258,8 +248,8 @@ function de(e, n, r, i) {
         )
       );
     }), () => {
-      E.removeEventListener("keyup", q, o?.eventListenerOptions), E.removeEventListener("keydown", O, o?.eventListenerOptions), l && H(y, t?.delimiter).forEach((s) => {
-        l.removeHotkey(
+      E.removeEventListener("keyup", q, n?.eventListenerOptions), E.removeEventListener("keydown", O, n?.eventListenerOptions), m && H(y, t?.delimiter).forEach((s) => {
+        m.removeHotkey(
           P(
             s,
             t?.splitKey,
@@ -269,32 +259,32 @@ function de(e, n, r, i) {
             t?.metadata
           )
         );
-      }), h = [], w && clearTimeout(w);
+      }), g = [], k && clearTimeout(k);
     };
-  }, [y, t, a]), u;
+  }, [y, t, d]), c;
 }
 function le(e = !1) {
-  const [n, r] = A(/* @__PURE__ */ new Set()), [i, u] = A(!1), f = k(
-    (m) => {
-      m.code !== void 0 && (m.preventDefault(), m.stopPropagation(), r((d) => {
-        const t = new Set(d);
-        return t.add(K(e ? m.key : m.code)), t;
+  const [r, o] = A(/* @__PURE__ */ new Set()), [i, c] = A(!1), a = w(
+    (l) => {
+      l.code !== void 0 && (l.preventDefault(), l.stopPropagation(), o((f) => {
+        const t = new Set(f);
+        return t.add(K(e ? l.key : l.code)), t;
       }));
     },
     [e]
-  ), o = k(() => {
-    typeof document < "u" && (document.removeEventListener("keydown", f), u(!1));
-  }, [f]), y = k(() => {
-    r(/* @__PURE__ */ new Set()), typeof document < "u" && (o(), document.addEventListener("keydown", f), u(!0));
-  }, [f, o]), c = k(() => {
-    r(/* @__PURE__ */ new Set());
+  ), n = w(() => {
+    typeof document < "u" && (document.removeEventListener("keydown", a), c(!1));
+  }, [a]), y = w(() => {
+    o(/* @__PURE__ */ new Set()), typeof document < "u" && (n(), document.addEventListener("keydown", a), c(!0));
+  }, [a, n]), u = w(() => {
+    o(/* @__PURE__ */ new Set());
   }, []);
-  return [n, { start: y, stop: o, resetKeys: c, isRecording: i }];
+  return [r, { start: y, stop: n, resetKeys: u, isRecording: i }];
 }
 export {
-  fe as HotkeysProvider,
+  de as HotkeysProvider,
   U as isHotkeyPressed,
-  de as useHotkeys,
+  fe as useHotkeys,
   se as useHotkeysContext,
   le as useRecordHotkeys
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hotkeys-hook",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "type": "module",
   "scripts": {
     "dev": "vite",