impact-nova 1.7.9 → 1.7.11

package/dist/components/ui/command-palette/shortcut-overlay.js

@@ -1,91 +1,112 @@
-import { jsxs as O, Fragment as L, jsx as p } from "react/jsx-runtime";
-import * as d from "react";
-import { createPortal as M } from "react-dom";
+import { jsxs as x, Fragment as L, jsx as v } from "react/jsx-runtime";
+import * as h from "react";
+import { createPortal as O } from "react-dom";
 import { useShortcutOverlay as S } from "./shortcut-overlay-context.js";
-import { useCommandPalette as C } from "./command-palette-context.js";
-import { Kbd as X } from "./kbd.js";
-const u = 26, h = 80, s = 4;
-function z() {
-  const t = document.querySelectorAll(
-    '[role="dialog"][data-state="open"]'
+import { useCommandPalette as M } from "./command-palette-context.js";
+import { Kbd as T } from "./kbd.js";
+const u = 26, y = 80, s = 4;
+function X() {
+  const o = document.querySelectorAll(
+    '[role="dialog"][data-state="open"], [role="alertdialog"][data-state="open"], [data-component="sheet-content"][data-state="open"]'
   );
-  return t.length > 0 ? t[t.length - 1] : null;
+  return o.length === 0 ? null : o[o.length - 1];
 }
-function F(t) {
-  if (t.length <= 1) return t;
-  const r = [...t].sort((n, e) => n.top - e.top), l = (n, e) => Math.abs(n.left - e.left) < h && Math.abs(n.top - e.top) < u + s;
-  for (let n = 1; n < r.length; n++) {
-    const e = r[n], c = () => r.slice(Math.max(0, n - 5), n).some((y) => l(y, e));
-    c() && (e.placement === "above" ? (e.placement = "below", e.top = e.top + u + 32 + s) : (e.placement = "above", e.top = e.top - u - 32 - s), c() && (e.left = e.left + h + s));
+function z(o) {
+  if (o.length <= 1) return o;
+  const a = [...o].sort((e, t) => e.top - t.top || e.left - t.left), f = (e, t) => Math.abs(e.left - t.left) < y && Math.abs(e.top - t.top) < u + s, c = (e) => a.slice(0, e).some((t) => f(t, a[e]));
+  for (let e = 1; e < a.length; e++) {
+    if (!c(e)) continue;
+    const t = a[e], d = t.top, m = t.left, n = t.placement;
+    if (t.placement === "above" ? (t.placement = "below", t.top = d + u + 32 + s) : (t.placement = "above", t.top = d - u - 32 - s), !c(e)) continue;
+    t.placement = n, t.left = m;
+    let i = !1;
+    for (let r = 1; r <= 6; r++)
+      if (t.top = d + (u + s) * r, !c(e)) {
+        i = !0;
+        break;
+      }
+    if (!i) {
+      t.top = d;
+      for (let r = 1; r <= 4; r++)
+        if (t.left = m + (y + s) * r, !c(e)) {
+          i = !0;
+          break;
+        }
+      if (!i) {
+        t.left = m;
+        for (let r = 1; r <= 4 && (t.top = d - (u + s) * r, !!c(e)); r++)
+          ;
+      }
+    }
   }
-  return r;
+  return a;
 }
-function R(t) {
-  const r = window.innerWidth, l = window.innerHeight;
+function C(o) {
+  const a = window.innerWidth, f = window.innerHeight;
   return {
-    ...t,
-    top: Math.max(s, Math.min(t.top, l - u - s)),
-    left: Math.max(h / 2, Math.min(t.left, r - h / 2))
+    ...o,
+    top: Math.max(s, Math.min(o.top, f - u - s)),
+    left: Math.max(y / 2, Math.min(o.left, a - y / 2))
   };
 }
-function T() {
-  const { isOverlayVisible: t, setOverlayVisible: r } = S(), { getEffectiveKeybinding: l, version: n } = C(), [e, c] = d.useState([]), [y, x] = d.useState(0);
-  return d.useLayoutEffect(() => {
-    if (!t) {
-      c([]);
+function D() {
+  const { isOverlayVisible: o, setOverlayVisible: a } = S(), { getEffectiveKeybinding: f, version: c } = M(), [e, t] = h.useState([]), [d, m] = h.useState(0);
+  return h.useLayoutEffect(() => {
+    if (!o) {
+      t([]);
       return;
     }
-    const f = (z() ?? document).querySelectorAll("[data-shortcut-id]"), m = [];
-    f.forEach((v) => {
-      const w = v.getAttribute("data-shortcut-id");
-      if (!w) return;
-      const b = window.getComputedStyle(v);
+    const n = X(), i = document.querySelectorAll("[data-shortcut-id]"), r = [];
+    i.forEach((p) => {
+      const w = p.getAttribute("data-shortcut-id");
+      if (!w || n && !n.contains(p)) return;
+      const b = window.getComputedStyle(p);
       if (b.display === "none" || b.visibility === "hidden" || b.opacity === "0")
         return;
-      const a = v.getBoundingClientRect();
-      if (a.width === 0 || a.height === 0 || a.bottom < 0 || a.top > window.innerHeight || a.right < 0 || a.left > window.innerWidth)
+      const l = p.getBoundingClientRect();
+      if (l.width === 0 || l.height === 0 || l.bottom < 0 || l.top > window.innerHeight || l.right < 0 || l.left > window.innerWidth)
         return;
-      const E = l(w);
-      if (!E) return;
-      const A = a.left + a.width / 2;
-      let k = "above", g = a.top - u - s;
-      g < s && (k = "below", g = a.bottom + s), m.push({
+      const k = f(w);
+      if (!k) return;
+      const A = l.left + l.width / 2;
+      let E = "above", g = l.top - u - s;
+      g < s && (E = "below", g = l.bottom + s), r.push({
         id: w,
-        keybinding: E,
+        keybinding: k,
         top: g,
         left: A,
-        placement: k
+        placement: E
       });
-    }), c(F(m).map(R));
-  }, [t, l, n, y]), d.useEffect(() => {
-    if (!t) return;
-    const o = (i) => {
-      i.key === "Escape" && (i.preventDefault(), i.stopPropagation(), r(!1));
+    }), t(z(r).map(C));
+  }, [o, f, c, d]), h.useEffect(() => {
+    if (!o) return;
+    const n = (i) => {
+      i.key === "Escape" && (i.preventDefault(), i.stopPropagation(), a(!1));
     };
-    return window.addEventListener("keydown", o, !0), () => window.removeEventListener("keydown", o, !0);
-  }, [t, r]), d.useEffect(() => {
-    if (!t) return;
-    let o;
+    return window.addEventListener("keydown", n, !0), () => window.removeEventListener("keydown", n, !0);
+  }, [o, a]), h.useEffect(() => {
+    if (!o) return;
+    let n;
     const i = () => {
-      cancelAnimationFrame(o), o = requestAnimationFrame(() => x((m) => m + 1));
+      cancelAnimationFrame(n), n = requestAnimationFrame(() => m((p) => p + 1));
     };
     window.addEventListener("scroll", i, !0), window.addEventListener("resize", i);
-    const f = new MutationObserver(i);
-    return f.observe(document.body, {
+    const r = new MutationObserver(i);
+    return r.observe(document.body, {
       childList: !0,
       subtree: !0,
       attributes: !0,
       attributeFilter: ["data-state"]
     }), () => {
-      cancelAnimationFrame(o), window.removeEventListener("scroll", i, !0), window.removeEventListener("resize", i), f.disconnect();
+      cancelAnimationFrame(n), window.removeEventListener("scroll", i, !0), window.removeEventListener("resize", i), r.disconnect();
     };
-  }, [t]), !t || e.length === 0 ? null : M(
-    /* @__PURE__ */ O(L, { children: [
-      /* @__PURE__ */ p(
+  }, [o]), !o || e.length === 0 ? null : O(
+    /* @__PURE__ */ x(L, { children: [
+      /* @__PURE__ */ v(
         "div",
         {
           "data-shortcut-overlay-backdrop": "",
-          onClick: () => r(!1),
+          onClick: () => a(!1),
           style: {
             position: "fixed",
             inset: 0,
@@ -95,31 +116,31 @@ function T() {
           }
         }
       ),
-      e.map((o) => /* @__PURE__ */ p(
+      e.map((n) => /* @__PURE__ */ v(
         "div",
         {
           "data-shortcut-overlay-badge": "",
           style: {
             position: "fixed",
-            top: o.top,
-            left: o.left,
+            top: n.top,
+            left: n.left,
             transform: "translateX(-50%)",
             zIndex: 99999,
             pointerEvents: "none",
-            animation: o.placement === "below" ? "shortcut-overlay-badge-in-below 0.15s ease-out" : "shortcut-overlay-badge-in 0.15s ease-out"
+            animation: n.placement === "below" ? "shortcut-overlay-badge-in-below 0.15s ease-out" : "shortcut-overlay-badge-in 0.15s ease-out"
           },
-          children: /* @__PURE__ */ p(
-            X,
+          children: /* @__PURE__ */ v(
+            T,
             {
-              keybinding: o.keybinding,
+              keybinding: n.keybinding,
               size: "sm",
               variant: "dark"
             }
           )
         },
-        o.id
+        n.id
       )),
-      /* @__PURE__ */ p("style", { children: `
+      /* @__PURE__ */ v("style", { children: `
         @keyframes shortcut-overlay-badge-in {
           from {
             opacity: 0;
@@ -145,7 +166,7 @@ function T() {
     document.body
   );
 }
-T.displayName = "ShortcutOverlay";
+D.displayName = "ShortcutOverlay";
 export {
-  T as ShortcutOverlay
+  D as ShortcutOverlay
 };

package/dist/components/ui/command-palette/shortcut-registry.js

@@ -1,4 +1,4 @@
-import { deserialiseOverrides as h, serialiseOverrides as f, isReservedShortcut as u, keybindingsEqual as m, scopePriority as a, matchesKeybinding as g } from "./utils.js";
+import { deserialiseOverrides as h, serialiseOverrides as u, isReservedShortcut as f, keybindingsEqual as m, scopePriority as a, matchesKeybinding as g } from "./utils.js";
 const v = 10;
 class c {
   static STORAGE_KEY = "impact-nova-shortcuts";
@@ -15,7 +15,7 @@ class c {
   saveOverrides(e) {
     if (!(typeof localStorage > "u"))
       try {
-        localStorage.setItem(c.STORAGE_KEY, f(e));
+        localStorage.setItem(c.STORAGE_KEY, u(e));
       } catch {
       }
   }
@@ -86,7 +86,7 @@ class C {
     const s = this.commands.get(e);
     if (!s) return { success: !1 };
     if (!s.customisable) return { success: !1 };
-    if (u(t))
+    if (f(t))
       return { success: !1, reserved: !0 };
     const i = this.findConflict(e, t, s.scope);
     return i ? { success: !1, conflict: i } : (s.keybinding = t, this.overrides.set(e, t), this.saveOverrides(), this.emit({ type: "update-keybinding", commandId: e }), { success: !0 });
@@ -147,7 +147,7 @@ class C {
   getPaletteCommands() {
     const t = this.getRegisteredInstances().length > 1;
     return this.getAllCommands().filter((s) => {
-      if (s.hidden || s.when && !s.when()) return !1;
+      if (s.hidden) return !1;
       const i = this.getHighestActiveScopePriority();
       return !(a(s.scope) > i || s.instance && t && this.activeInstance && s.instance !== this.activeInstance);
     });