@floegence/floe-webapp-core 0.86.40 → 0.86.42

package/dist/components/ui/KeyedFor.js

@@ -1,32 +1,34 @@
-import { createComponent as a } from "solid-js/web";
-import { createMemo as s, For as u } from "solid-js";
-function h(r) {
-  const o = s(() => {
-    const e = /* @__PURE__ */ new Map(), t = [];
-    for (const c of r.each ?? []) {
-      const n = r.by(c);
-      if (e.has(n)) throw new Error("KeyedFor requires unique keys");
-      e.set(n, c), t.push(n);
+import { createComponent as u } from "solid-js/web";
+import { createMemo as c, For as i, untrack as l } from "solid-js";
+function m(r) {
+  const s = c(() => {
+    const e = /* @__PURE__ */ new Map(), n = [];
+    for (const o of r.each ?? []) {
+      const t = r.by(o);
+      if (e.has(t)) throw new Error("KeyedFor requires unique keys");
+      e.set(t, o), n.push(t);
     }
     return {
       values: e,
-      keys: t
+      keys: n
     };
   });
-  return a(u, {
+  return u(i, {
     get each() {
-      return o().keys;
+      return s().keys;
     },
     get fallback() {
       return r.fallback;
     },
-    children: (e, t) => (
-      // Render callbacks receive accessors intentionally; the child owns their reads.
-      // eslint-disable-next-line solid/reactivity
-      r.children(() => o().values.get(e), t)
-    )
+    children: (e, n) => {
+      const o = c((t) => {
+        const a = s().values;
+        return a.has(e) ? a.get(e) : t;
+      }, l(() => s().values.get(e)));
+      return r.children(o, n);
+    }
   });
 }
 export {
-  h as KeyedFor
+  m as KeyedFor
 };

package/dist/hooks/useOverlayMask.js

@@ -1,17 +1,17 @@
 import { createEffect as U, onCleanup as X } from "solid-js";
 import { lockBodyStyle as Y } from "../utils/bodyStyleLock.js";
-import { deferAfterPaint as x } from "../utils/defer.js";
-import { getFocusableElements as I, getFirstFocusableElement as Z } from "../utils/focus.js";
+import { deferAfterPaint as I } from "../utils/defer.js";
+import { getFocusableElements as H, getFirstFocusableElement as Z } from "../utils/focus.js";
 import { matchKeybind as _ } from "../utils/keybind.js";
-const H = /* @__PURE__ */ new WeakMap();
+const L = /* @__PURE__ */ new WeakMap();
 function A(t) {
   return typeof Node < "u" && t instanceof Node;
 }
-function g(t, o, c) {
+function E(t, o, c) {
   return c ? c(o) : !t || !A(o) ? !1 : t.contains(o);
 }
 function W(t, o, c, f) {
-  return c === "none" ? !1 : c === "all" ? !0 : !g(t, o, f);
+  return c === "none" ? !1 : c === "all" ? !0 : !E(t, o, f);
 }
 function $(t) {
   return typeof t == "function" ? t() ?? [] : t ?? [];
@@ -37,29 +37,29 @@ function se(t) {
   }, R = () => s(t.blockHotkeys, !0), N = () => s(t.restoreFocus, !0), q = () => s(t.blockWheel, "none"), j = () => s(t.blockTouchMove, "none"), z = () => s(t.autoFocus, !0);
   U(() => {
     if (!t.open() || typeof document > "u") return;
-    const l = o(), L = c(), v = f(), y = s(t.escapeKeyPhase, "capture"), V = R(), G = N(), E = q(), k = j(), b = z(), d = H.get(document) ?? [];
-    H.set(document, d);
+    const l = o(), O = c(), v = f(), y = s(t.escapeKeyPhase, "capture"), V = R(), G = N(), k = q(), b = j(), w = z(), d = L.get(document) ?? [];
+    L.set(document, d);
     const h = {
       global: l || v === "always",
-      contains: (e) => g(t.root(), e, t.containsTarget)
+      contains: (e) => E(t.root(), e, t.containsTarget)
     };
     d.push(h);
-    let O = !0;
-    const a = (e) => O && !d.slice(d.indexOf(h) + 1).some((n) => n.global || n.contains(e)), w = document.activeElement instanceof HTMLElement ? document.activeElement : null, J = l ? Y({ overflow: "hidden" }) : null;
-    x(() => {
+    let T = !0;
+    const a = (e) => T && !d.slice(d.indexOf(h) + 1).some((n) => n.global || n.contains(e)), p = document.activeElement instanceof HTMLElement ? document.activeElement : null, J = l ? Y({ overflow: "hidden" }) : null;
+    I(() => {
       const e = t.root();
-      if (!e?.isConnected || !a(e) || b === !1 || h.contains(document.activeElement)) return;
-      const n = typeof b == "object" ? b.selector : void 0, r = (n ? e.querySelector(n) : null) ?? e.querySelector("[data-floe-autofocus]") ?? Z(e) ?? e;
+      if (!e?.isConnected || !a(e) || w === !1 || h.contains(document.activeElement)) return;
+      const n = typeof w == "object" ? w.selector : void 0, r = (n ? e.querySelector(n) : null) ?? e.querySelector("[data-floe-autofocus]") ?? Z(e) ?? e;
       try {
         r.focus({ preventScroll: !0 });
       } catch {
       }
     });
-    const T = (e) => {
+    const M = (e) => {
       if (e.key !== "Tab" || !a(e.target)) return;
       const n = t.root();
       if (!n) return;
-      const m = t.focusRoots?.() ?? [n], r = t.focusRoots ? [...new Set(m.flatMap(I))].filter((u) => u.tabIndex >= 0 && !u.closest('[hidden], [inert], [aria-hidden="true"]')) : I(n);
+      const m = t.focusRoots?.() ?? [n], r = t.focusRoots ? [...new Set(m.flatMap(H))].filter((u) => u.tabIndex >= 0 && !u.closest('[hidden], [inert], [aria-hidden="true"]')) : H(n);
       if (!r.length) {
         e.preventDefault();
         try {
@@ -68,30 +68,30 @@ function se(t) {
         }
         return;
       }
-      const P = r[0], K = r[r.length - 1], i = document.activeElement instanceof HTMLElement ? document.activeElement : null;
+      const K = r[0], x = r[r.length - 1], i = document.activeElement instanceof HTMLElement ? document.activeElement : null;
       if (t.focusRoots) {
         const u = i ? r.indexOf(i) : -1, Q = u < 0 ? e.shiftKey ? r.length - 1 : 0 : (u + (e.shiftKey ? -1 : 1) + r.length) % r.length;
         e.preventDefault(), r[Q]?.focus({ preventScroll: !0 });
         return;
       }
       if (e.shiftKey) {
-        if (i === P || !i || !m.some((u) => u.contains(i))) {
+        if (i === K || !i || !m.some((u) => u.contains(i))) {
           e.preventDefault();
           try {
-            K.focus();
+            x.focus();
           } catch {
           }
         }
-      } else if (i === K || !i || !m.some((u) => u.contains(i))) {
+      } else if (i === x || !i || !m.some((u) => u.contains(i))) {
         e.preventDefault();
         try {
-          P.focus();
+          K.focus();
         } catch {
         }
       }
-    }, M = (e) => {
+    }, B = (e) => {
       if (e.key !== "Escape" || !a(e.target) || y === "bubble" && (e.defaultPrevented || e.isComposing) || v === "none") return;
-      const n = t.root(), m = g(
+      const n = t.root(), m = E(
         n,
         A(e.target) ? e.target : document.activeElement,
         t.containsTarget
@@ -105,43 +105,43 @@ function se(t) {
         return;
       }
       e.preventDefault(), e.stopImmediatePropagation(), t.onClose?.();
-    }, B = (e) => {
-      if (!a(e.target)) return;
-      const n = t.root();
-      n && V && g(n, e.target, t.containsTarget) && (ee(e, t.allowHotkeys) || e.stopPropagation());
     }, F = (e) => {
       if (!a(e.target)) return;
       const n = t.root();
-      W(n, e.target, E, t.containsTarget) && e.cancelable && e.preventDefault();
+      n && V && E(n, e.target, t.containsTarget) && (ee(e, t.allowHotkeys) || e.stopPropagation());
     }, S = (e) => {
-      a(e.target) && e.stopPropagation();
-    }, C = (e) => {
       if (!a(e.target)) return;
       const n = t.root();
       W(n, e.target, k, t.containsTarget) && e.cancelable && e.preventDefault();
-    }, p = (e) => {
+    }, C = (e) => {
+      a(e.target) && e.stopPropagation();
+    }, D = (e) => {
+      if (!a(e.target)) return;
+      const n = t.root();
+      W(n, e.target, b, t.containsTarget) && e.cancelable && e.preventDefault();
+    }, g = (e) => {
       a(e.target) && !h.contains(e.target) && t.onInteractOutside?.(e);
     };
-    t.onInteractOutside && (document.addEventListener("pointerdown", p, !0), document.addEventListener("focusin", p)), L && document.addEventListener("keydown", T, !0);
-    const D = y === "capture" ? window : document;
-    v !== "none" && D.addEventListener(
+    t.onInteractOutside && (document.addEventListener("pointerdown", g, !0), document.addEventListener("focusin", g)), O && document.addEventListener("keydown", M, !0);
+    const P = y === "capture" ? window : document;
+    v !== "none" && P.addEventListener(
       "keydown",
-      M,
+      B,
       y === "capture"
-    ), document.addEventListener("keydown", B), E !== "none" && (document.addEventListener("wheel", F, { capture: !0, passive: !1 }), document.addEventListener("wheel", S)), k !== "none" && document.addEventListener("touchmove", C, {
+    ), document.addEventListener("keydown", F), k !== "none" && (document.addEventListener("wheel", S, { capture: !0, passive: !1 }), document.addEventListener("wheel", C)), b !== "none" && document.addEventListener("touchmove", D, {
       capture: !0,
       passive: !1
     }), X(() => {
-      O = !1, document.removeEventListener("pointerdown", p, !0), document.removeEventListener("focusin", p), d.splice(d.indexOf(h), 1), L && document.removeEventListener("keydown", T, !0), v !== "none" && D.removeEventListener(
+      T = !1, document.removeEventListener("pointerdown", g, !0), document.removeEventListener("focusin", g), d.splice(d.indexOf(h), 1), O && document.removeEventListener("keydown", M, !0), v !== "none" && P.removeEventListener(
         "keydown",
-        M,
+        B,
         y === "capture"
-      ), document.removeEventListener("keydown", B), E !== "none" && (document.removeEventListener("wheel", F, !0), document.removeEventListener("wheel", S)), k !== "none" && document.removeEventListener("touchmove", C, !0), J?.(), G && w && w.isConnected && x(() => {
-        if (typeof document > "u") return;
+      ), document.removeEventListener("keydown", F), k !== "none" && (document.removeEventListener("wheel", S, !0), document.removeEventListener("wheel", C)), b !== "none" && document.removeEventListener("touchmove", D, !0), J?.(), G && p && p.isConnected && I(() => {
+        if (typeof document > "u" || L.get(document)?.some((n) => !n.contains(p))) return;
         const e = document.activeElement;
         if (!(e && e !== document.body && e !== document.documentElement))
           try {
-            w.focus({ preventScroll: !0 });
+            p.focus({ preventScroll: !0 });
           } catch {
           }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floegence/floe-webapp-core",
-  "version": "0.86.40",
+  "version": "0.86.42",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",