@floegence/floe-webapp-core 0.35.13 → 0.35.15

package/dist/components/file-browser/FileBrowserContext.js

@@ -1,21 +1,21 @@
-import { createComponent as pt } from "solid-js/web";
-import { createSignal as p, createEffect as I, createMemo as z, useContext as St, createContext as gt, untrack as It } from "solid-js";
-import { createStore as ae, produce as le } from "solid-js/store";
-import { useResolvedFloeConfig as wt } from "../../context/FloeConfigContext.js";
-import { deferAfterPaint as yt, deferNonBlocking as y } from "../../utils/defer.js";
-const ye = gt(), E = {
+import { createComponent as St } from "solid-js/web";
+import { createSignal as p, createEffect as I, createMemo as D, useContext as gt, createContext as It, untrack as wt } from "solid-js";
+import { createStore as le, produce as de } from "solid-js/store";
+import { useResolvedFloeConfig as yt } from "../../context/FloeConfigContext.js";
+import { deferAfterPaint as xt, deferNonBlocking as y } from "../../utils/defer.js";
+const ye = It(), E = {
   name: 0.65,
   modifiedAt: 0.2,
   size: 0.15
-}, de = "fileBrowser:listColumnRatios", fe = 220, xt = "fileBrowser:sidebarWidth", Ct = 160, Pt = 520, ue = "fileBrowser:viewMode", me = "fileBrowser:sortConfig", he = "fileBrowser:expandedFolders", pe = "fileBrowser:sidebarCollapsed";
-function Se(n, i) {
+}, fe = "fileBrowser:listColumnRatios", ue = 220, Ct = "fileBrowser:sidebarWidth", Pt = 160, At = 520, me = "fileBrowser:viewMode", he = "fileBrowser:sortConfig", pe = "fileBrowser:expandedFolders", Se = "fileBrowser:sidebarCollapsed";
+function N(n, i) {
   const o = typeof n == "number" && Number.isFinite(n) ? n : i;
-  return Math.max(Ct, Math.min(Pt, Math.round(o)));
+  return Math.max(Pt, Math.min(At, Math.round(o)));
 }
-function At(n, i) {
+function Et(n, i) {
   return n === "list" || n === "grid" ? n : i;
 }
-function Et(n, i) {
+function bt(n, i) {
   if (!n || typeof n != "object") return i;
   const o = n, d = o.field, l = o.direction;
   return !(d === "name" || d === "size" || d === "modifiedAt" || d === "type") || !(l === "asc" || l === "desc") ? i : {
@@ -23,7 +23,7 @@ function Et(n, i) {
     direction: l
   };
 }
-function bt(n) {
+function Mt(n) {
   if (!Array.isArray(n)) return ["/"];
   const i = [], o = /* @__PURE__ */ new Set();
   for (const d of n) {
@@ -33,7 +33,7 @@ function bt(n) {
   }
   return o.has("/") || i.unshift("/"), i;
 }
-function Mt(n) {
+function Ft(n) {
   const i = [], o = /* @__PURE__ */ new Set();
   for (const d of n) {
     if (typeof d != "string") continue;
@@ -48,7 +48,7 @@ function ge(n) {
     i[o] = !0;
   return i;
 }
-function Ft(n, i) {
+function Lt(n, i) {
   if (n.length !== i.length) return !1;
   for (let o = 0; o < n.length; o += 1)
     if (n[o] !== i[o]) return !1;
@@ -73,71 +73,71 @@ function we(n, i) {
   }
   return o;
 }
-function zt(n) {
-  const i = wt(), o = (e) => {
+function Dt(n) {
+  const i = yt(), o = (e) => {
     const t = (e ?? "").trim();
     return t === "" ? "/" : t;
-  }, d = (n.persistenceKey ?? "").trim(), l = !!d, u = (e) => d ? `${d}:${e}` : e, x = l ? At(i.persist.load(u(ue), n.initialViewMode ?? "list"), n.initialViewMode ?? "list") : n.initialViewMode ?? "list", g = {
+  }, d = (n.persistenceKey ?? "").trim(), l = !!d, u = (e) => d ? `${d}:${e}` : e, x = l ? Et(i.persist.load(u(me), n.initialViewMode ?? "list"), n.initialViewMode ?? "list") : n.initialViewMode ?? "list", g = {
     field: "name",
     direction: "asc"
-  }, xe = l ? Et(i.persist.load(u(me), g), g) : g, D = l ? bt(i.persist.load(u(he), ["/"])) : ["/"], Ce = l ? i.persist.load(u(pe), !1) === !0 : !1, Pe = () => typeof n.path == "string" ? o(n.path) : o(n.initialPath ?? "/"), [C, N] = p(Pe()), [W, Ae] = ae({}), [b, Ee] = p([]), [k, be] = p(x), [F, Me] = p(xe), Fe = Ie(i.persist.load(de, n.initialListColumnRatios ?? E)), [K, Le] = p(Fe), U = (n.sidebarWidthStorageKey ?? "").trim() || xt, _e = Se(i.persist.load(U, n.initialSidebarWidth ?? fe), n.initialSidebarWidth ?? fe), [V, ve] = p(_e), [L, G] = ae(ge(D)), [q, X] = p(D), [Y, Be] = p(Ce), [Re, j] = p(null), [Q, H] = p(""), [_, v] = p(""), [Oe, $] = p(!1);
-  let B = 0;
+  }, xe = l ? bt(i.persist.load(u(he), g), g) : g, W = l ? Mt(i.persist.load(u(pe), ["/"])) : ["/"], Ce = l ? i.persist.load(u(Se), !1) === !0 : !1, Pe = () => typeof n.path == "string" ? o(n.path) : o(n.initialPath ?? "/"), [C, k] = p(Pe()), [K, Ae] = le({}), [b, Ee] = p([]), [U, be] = p(x), [F, Me] = p(xe), Fe = Ie(i.persist.load(fe, n.initialListColumnRatios ?? E)), [V, Le] = p(Fe), G = (n.sidebarWidthStorageKey ?? "").trim() || Ct, _e = N(i.persist.load(G, n.initialSidebarWidth ?? ue), n.initialSidebarWidth ?? ue), [L, ve] = p(_e), [_, q] = le(ge(W)), [X, Y] = p(W), [j, Be] = p(Ce), [Re, Q] = p(null), [H, $] = p(""), [v, B] = p(""), [Oe, J] = p(!1);
+  let R = 0;
   I(() => {
-    const e = Q().trim();
-    B += 1;
-    const t = B;
+    const e = H().trim();
+    R += 1;
+    const t = R;
     if (!e) {
-      v("");
+      B("");
       return;
     }
-    yt(() => {
-      t === B && v(e);
+    xt(() => {
+      t === R && B(e);
     });
   }), I(() => {
-    i.persist.debouncedSave(de, K());
+    i.persist.debouncedSave(fe, V());
   }), I(() => {
-    i.persist.debouncedSave(U, V());
+    i.persist.debouncedSave(G, L());
   }), I(() => {
-    l && i.persist.debouncedSave(u(ue), k());
+    l && i.persist.debouncedSave(u(me), U());
   }), I(() => {
-    l && i.persist.debouncedSave(u(me), F());
+    l && i.persist.debouncedSave(u(he), F());
   }), I(() => {
     if (!l) return;
-    const e = [...q()].sort((t, r) => t.localeCompare(r));
-    i.persist.debouncedSave(u(he), e);
+    const e = [...X()].sort((t, r) => t.localeCompare(r));
+    i.persist.debouncedSave(u(pe), e);
   }), I(() => {
-    l && i.persist.debouncedSave(u(pe), Y());
+    l && i.persist.debouncedSave(u(Se), j());
   });
-  const Te = (e) => be(e), ze = (e) => Me(e), De = () => n.homeLabel ?? "Root", Ne = () => new Set(b()), We = () => new Set(q()), M = (e) => {
-    const t = Mt(e), r = ge(t);
-    Ae(le((s) => {
+  const Te = (e) => be(e), ze = (e) => Me(e), De = (e) => N(e, L()), Ne = () => n.homeLabel ?? "Root", We = () => new Set(b()), ke = () => new Set(X()), M = (e) => {
+    const t = Ft(e), r = ge(t);
+    Ae(de((s) => {
       for (const c of Object.keys(s))
         c in r || delete s[c];
       for (const c of t)
         s[c] = !0;
-    })), Ee((s) => Ft(s, t) ? s : t);
-  }, J = (e) => {
-    L[e] !== !0 && (G(e, !0), X((t) => t.includes(e) ? t : [...t, e]));
-  }, ke = (e) => {
-    if (L[e] === !0) {
-      G(le((t) => {
+    })), Ee((s) => Lt(s, t) ? s : t);
+  }, Z = (e) => {
+    _[e] !== !0 && (q(e, !0), Y((t) => t.includes(e) ? t : [...t, e]));
+  }, Ke = (e) => {
+    if (_[e] === !0) {
+      q(de((t) => {
         delete t[e];
-      })), X((t) => t.filter((r) => r !== e));
+      })), Y((t) => t.filter((r) => r !== e));
       return;
     }
-    J(e);
-  }, [Z, P] = p([]);
-  let w = null, R = {
+    Z(e);
+  }, [ee, P] = p([]);
+  let w = null, O = {
     top: 0,
     left: 0
   };
-  const ee = () => n.files, te = (e) => {
+  const te = () => n.files, ne = (e) => {
     const t = o(e);
     if (t === "/") return "/";
     const r = t.split("/").filter(Boolean);
     return r.pop(), r.length ? "/" + r.join("/") : "/";
-  }, Ke = (e, t) => {
-    const r = Z();
+  }, Ue = (e, t) => {
+    const r = ee();
     if (r.length === 0) return e;
     let s = [...e];
     const c = o(t);
@@ -152,13 +152,13 @@ function zt(n) {
           const m = o(a.oldPath), f = s.findIndex((S) => o(S.path) === m);
           if (f !== -1) {
             const S = a.updates.path ?? s[f].path;
-            te(S) === c ? s[f] = {
+            ne(S) === c ? s[f] = {
               ...s[f],
               ...a.updates
             } : s.splice(f, 1);
           } else {
             const S = a.updates.path;
-            S && te(S);
+            S && ne(S);
           }
           break;
         }
@@ -168,16 +168,16 @@ function zt(n) {
         }
       }
     return s;
-  }, Ue = z(() => {
+  }, Ve = D(() => {
     const e = /* @__PURE__ */ new Map(), t = (s) => {
       for (const c of s)
         c.type === "folder" && (e.set(o(c.path), c.children ?? []), c.children?.length && t(c.children));
-    }, r = ee();
+    }, r = te();
     return e.set("/", r), t(r), e;
-  }), Ve = z(() => {
+  }), Ge = D(() => {
     const e = o(C());
-    let t = Ue().get(e) ?? [];
-    t = Ke(t, e);
+    let t = Ve().get(e) ?? [];
+    t = Ue(t, e);
     const r = F(), s = [...t].sort((a, m) => {
       if (a.type !== m.type) return a.type === "folder" ? -1 : 1;
       let f = 0;
@@ -203,11 +203,11 @@ function zt(n) {
       items: s,
       nameLowerById: c
     };
-  }), O = z(() => {
+  }), T = D(() => {
     const {
       items: e,
       nameLowerById: t
-    } = Ve(), s = _().trim().toLowerCase(), c = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map();
+    } = Ge(), s = v().trim().toLowerCase(), c = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), m = /* @__PURE__ */ new Map();
     if (!s) {
       for (let h = 0; h < e.length; h++) {
         const A = e[h];
@@ -223,9 +223,9 @@ function zt(n) {
     const f = [];
     let S = 0;
     for (const h of e) {
-      const A = t.get(h.id) ?? h.name.toLowerCase(), ce = we(A, s);
-      ce && (f.push(h), c.set(h.id, {
-        matchedIndices: ce
+      const A = t.get(h.id) ?? h.name.toLowerCase(), ae = we(A, s);
+      ae && (f.push(h), c.set(h.id, {
+        matchedIndices: ae
       }), a.set(h.id, h), m.set(h.id, S), S += 1);
     }
     return {
@@ -234,8 +234,8 @@ function zt(n) {
       fileById: a,
       indexById: m
     };
-  }), Ge = () => O().items, ne = (e) => {
-    const t = O(), r = [];
+  }), qe = () => T().items, oe = (e) => {
+    const t = T(), r = [];
     for (const s of e) {
       const c = t.fileById.get(s);
       if (!c) continue;
@@ -246,166 +246,167 @@ function zt(n) {
       });
     }
     return r.sort((s, c) => s.index - c.index), r.map((s) => s.item);
-  }, oe = () => {
-    M([]), H(""), v(""), $(!1);
+  }, ie = () => {
+    M([]), $(""), B(""), J(!1);
     const e = n.onSelect;
     y(() => e?.([]));
   };
   I(() => {
     if (typeof n.path != "string") return;
     const e = o(n.path);
-    e !== C() && (N(e), oe());
+    e !== C() && (k(e), ie());
   });
-  const T = (e) => {
+  const z = (e) => {
     const t = o(e);
     if (t === C()) return;
-    N(t), oe();
+    k(t), ie();
     const r = n.onNavigate;
     y(() => r?.(t));
     const s = n.onPathChange;
     y(() => s?.(t, "user"));
-  }, qe = (e) => {
+  }, Xe = (e) => {
     Le(Ie(e));
-  }, Xe = () => {
+  }, Ye = () => {
     const e = C();
     if (e === "/" || e === "") return;
     const t = e.split("/").filter(Boolean);
-    t.pop(), T(t.length ? "/" + t.join("/") : "/");
-  }, ie = (e) => {
-    e.type === "folder" && (T(e.path), J(e.path));
-  }, Ye = (e, t = !1) => {
-    const r = t ? W[e] === !0 ? b().filter((c) => c !== e) : [...b(), e] : [e];
+    t.pop(), z(t.length ? "/" + t.join("/") : "/");
+  }, se = (e) => {
+    e.type === "folder" && (z(e.path), Z(e.path));
+  }, je = (e, t = !1) => {
+    const r = t ? K[e] === !0 ? b().filter((c) => c !== e) : [...b(), e] : [e];
     M(r);
     const s = n.onSelect;
     if (s) {
       const c = [...r];
       y(() => {
-        const a = It(() => ne(c));
+        const a = wt(() => oe(c));
         s(a);
       });
     }
-  }, je = () => {
+  }, Qe = () => {
     M([]);
     const e = n.onSelect;
     y(() => e?.([]));
-  }, Qe = (e) => W[e] === !0, He = (e) => ke(e), $e = (e) => L[e] === !0, Je = () => Be((e) => !e), Ze = (e) => {
-    ve((t) => Se(e, t));
-  }, et = (e) => j(e), tt = () => j(null), nt = (e) => {
-    H(e);
-  }, ot = (e) => {
-    const t = _().trim();
+  }, He = (e) => K[e] === !0, $e = (e) => Ke(e), Je = (e) => _[e] === !0, Ze = () => Be((e) => !e), et = (e) => {
+    ve((t) => N(e, t));
+  }, tt = (e) => Q(e), nt = () => Q(null), ot = (e) => {
+    $(e);
+  }, it = (e) => {
+    const t = v().trim();
     if (!t) return null;
     const r = we(e.toLowerCase(), t.toLowerCase());
     return r ? {
       matchedIndices: r
     } : null;
-  }, it = (e) => O().matchById.get(e) ?? null, st = () => ne(b()), rt = (e) => {
+  }, st = (e) => T().matchById.get(e) ?? null, rt = () => oe(b()), ct = (e) => {
     if (e.type === "folder")
-      ie(e);
+      se(e);
     else {
       const t = n.onOpen;
       y(() => t?.(e));
     }
-  }, ct = (e) => {
+  }, at = (e) => {
     e.length !== 0 && P((t) => [...t, {
       type: "remove",
       paths: e
     }]);
-  }, at = (e, t) => {
+  }, lt = (e, t) => {
     P((r) => [...r, {
       type: "update",
       oldPath: e,
       updates: t
     }]);
-  }, lt = (e, t) => {
+  }, dt = (e, t) => {
     P((r) => [...r, {
       type: "insert",
       parentPath: e,
       item: t
     }]);
-  }, dt = () => {
-    P([]);
   }, ft = () => {
     P([]);
-  }, ut = () => Z().length > 0, mt = (e) => {
+  }, ut = () => {
+    P([]);
+  }, mt = () => ee().length > 0, ht = (e) => {
     w = e;
-  }, se = () => w ? {
+  }, re = () => w ? {
     top: w.scrollTop,
     left: w.scrollLeft
   } : {
     top: 0,
     left: 0
-  }, re = (e) => {
+  }, ce = (e) => {
     w && (w.scrollTop = e.top, w.scrollLeft = e.left);
-  }, ht = {
+  }, pt = {
     currentPath: C,
-    setCurrentPath: T,
-    navigateUp: Xe,
-    navigateTo: ie,
-    homeLabel: De,
-    selectedItems: Ne,
-    selectItem: Ye,
-    clearSelection: je,
-    isSelected: Qe,
-    getSelectedItemsList: st,
-    viewMode: k,
+    setCurrentPath: z,
+    navigateUp: Ye,
+    navigateTo: se,
+    homeLabel: Ne,
+    selectedItems: We,
+    selectItem: je,
+    clearSelection: Qe,
+    isSelected: He,
+    getSelectedItemsList: rt,
+    viewMode: U,
     setViewMode: Te,
     sortConfig: F,
     setSortConfig: ze,
-    listColumnRatios: K,
-    setListColumnRatios: qe,
-    expandedFolders: We,
-    toggleFolder: He,
-    isExpanded: $e,
-    files: ee,
-    currentFiles: Ge,
-    filterQuery: Q,
-    setFilterQuery: nt,
-    filterQueryApplied: _,
+    listColumnRatios: V,
+    setListColumnRatios: Xe,
+    expandedFolders: ke,
+    toggleFolder: $e,
+    isExpanded: Je,
+    files: te,
+    currentFiles: qe,
+    filterQuery: H,
+    setFilterQuery: ot,
+    filterQueryApplied: v,
     isFilterActive: Oe,
-    setFilterActive: $,
-    getFilterMatch: ot,
-    getFilterMatchForId: it,
-    sidebarCollapsed: Y,
-    toggleSidebar: Je,
-    sidebarWidth: V,
-    setSidebarWidth: Ze,
+    setFilterActive: J,
+    getFilterMatch: it,
+    getFilterMatchForId: st,
+    sidebarCollapsed: j,
+    toggleSidebar: Ze,
+    sidebarWidth: L,
+    clampSidebarWidth: De,
+    setSidebarWidth: et,
     contextMenu: Re,
-    showContextMenu: et,
-    hideContextMenu: tt,
-    openItem: rt,
+    showContextMenu: tt,
+    hideContextMenu: nt,
+    openItem: ct,
     // Optimistic updates
-    optimisticRemove: ct,
-    optimisticUpdate: at,
-    optimisticInsert: lt,
-    clearOptimisticUpdates: dt,
-    rollbackOptimisticUpdates: ft,
-    hasOptimisticUpdates: ut,
+    optimisticRemove: at,
+    optimisticUpdate: lt,
+    optimisticInsert: dt,
+    clearOptimisticUpdates: ft,
+    rollbackOptimisticUpdates: ut,
+    hasOptimisticUpdates: mt,
     // Scroll position management
-    setScrollContainer: mt,
-    getScrollPosition: se,
-    setScrollPosition: re,
-    saveScrollPosition: () => (R = se(), R),
+    setScrollContainer: ht,
+    getScrollPosition: re,
+    setScrollPosition: ce,
+    saveScrollPosition: () => (O = re(), O),
     restoreScrollPosition: () => {
       requestAnimationFrame(() => {
-        re(R);
+        ce(O);
       });
     }
   };
-  return pt(ye.Provider, {
-    value: ht,
+  return St(ye.Provider, {
+    value: pt,
     get children() {
       return n.children;
     }
   });
 }
-function Dt() {
-  const n = St(ye);
+function Nt() {
+  const n = gt(ye);
   if (!n)
     throw new Error("useFileBrowser must be used within a FileBrowserProvider");
   return n;
 }
 export {
-  zt as FileBrowserProvider,
-  Dt as useFileBrowser
+  Dt as FileBrowserProvider,
+  Nt as useFileBrowser
 };

package/dist/components/file-browser/types.d.ts

@@ -206,6 +206,7 @@ export interface FileBrowserContextValue {
     sidebarCollapsed: Accessor<boolean>;
     toggleSidebar: () => void;
     sidebarWidth: Accessor<number>;
+    clampSidebarWidth: (width: number) => number;
     setSidebarWidth: (width: number) => void;
     contextMenu: Accessor<ContextMenuEvent | null>;
     showContextMenu: (event: ContextMenuEvent) => void;

package/dist/components/layout/ActivityBar.js

@@ -1,53 +1,53 @@
-import { insert as o, createComponent as l, effect as f, className as b, template as u, Dynamic as A, memo as k, setAttribute as y, delegateEvents as w } from "solid-js/web";
+import { insert as a, createComponent as l, effect as f, className as b, template as s, Dynamic as A, memo as k, setAttribute as y, delegateEvents as w } from "solid-js/web";
 import { createMemo as v, For as x, Show as g } from "solid-js";
 import { cn as m } from "../../utils/cn.js";
 import { deferNonBlocking as I } from "../../utils/defer.js";
 import { Tooltip as $ } from "../ui/Tooltip.js";
 import { resolveActivityBarClick as _ } from "./activityBarBehavior.js";
-var B = /* @__PURE__ */ u('<div class="flex flex-col">'), p = /* @__PURE__ */ u('<div data-floe-shell-slot=activity-bar style=border-right-color:var(--activity-bar-border)><div class="flex flex-col">'), S = /* @__PURE__ */ u('<div class="absolute left-0 top-0 w-1 h-full bg-primary rounded-r">'), j = /* @__PURE__ */ u("<span>"), N = /* @__PURE__ */ u("<button type=button>");
+var B = /* @__PURE__ */ s('<div class="flex flex-col">'), p = /* @__PURE__ */ s('<div data-floe-shell-slot=activity-bar style=border-right-color:var(--activity-bar-border)><div class="flex flex-col">'), S = /* @__PURE__ */ s('<div class="absolute left-0 top-0 w-1 h-full bg-primary rounded-r">'), j = /* @__PURE__ */ s("<span>"), N = /* @__PURE__ */ s("<button type=button>");
 function V(e) {
-  const a = v(() => e.activeId), r = v(() => e.collapsed ?? !1), t = v(() => e.onActiveChange), c = v(() => e.onCollapsedChange), s = (i) => {
+  const o = v(() => e.activeId), r = v(() => e.collapsed ?? !1), t = v(() => e.onActiveChange), c = v(() => e.onCollapsedChange), u = (i) => {
     if (i.onClick) {
       I(() => i.onClick());
       return;
     }
     const n = _({
       clickedId: i.id,
-      activeId: a(),
+      activeId: o(),
       collapsed: r(),
       behavior: i.collapseBehavior
     });
-    n.nextActiveId !== a() && (typeof n.openSidebar == "boolean" ? t()(n.nextActiveId, {
+    n.nextActiveId !== o() && (typeof n.openSidebar == "boolean" ? t()(n.nextActiveId, {
       openSidebar: n.openSidebar
     }) : t()(n.nextActiveId)), typeof n.nextCollapsed == "boolean" && c()?.(n.nextCollapsed);
   };
   return (() => {
     var i = p(), n = i.firstChild;
-    return o(n, l(x, {
+    return a(n, l(x, {
       get each() {
         return e.items;
       },
       children: (d) => l(C, {
         item: d,
         get isActive() {
-          return a() === d.id;
+          return o() === d.id;
         },
-        onClick: () => s(d)
+        onClick: () => u(d)
       })
-    })), o(i, l(g, {
+    })), a(i, l(g, {
       get when() {
         return e.bottomItems?.length;
       },
       get children() {
         var d = B();
-        return o(d, l(x, {
+        return a(d, l(x, {
           get each() {
             return e.bottomItems;
           },
           children: (h) => l(C, {
             item: h,
             isActive: !1,
-            onClick: () => s(h)
+            onClick: () => u(h)
           })
         })), d;
       }
@@ -55,7 +55,7 @@ function V(e) {
   })();
 }
 function C(e) {
-  const a = () => typeof e.item.badge == "function" ? e.item.badge() : e.item.badge;
+  const o = () => typeof e.item.badge == "function" ? e.item.badge() : e.item.badge;
   return l($, {
     get content() {
       return e.item.label;
@@ -64,32 +64,32 @@ function C(e) {
     delay: 0,
     get children() {
       var r = N();
-      return r.$$click = () => e.onClick(), o(r, l(g, {
+      return r.$$click = () => e.onClick(), a(r, l(g, {
         get when() {
           return e.isActive;
         },
         get children() {
           return S();
         }
-      }), null), o(r, l(A, {
+      }), null), a(r, l(A, {
         get component() {
           return e.item.icon;
         },
         class: "w-5 h-5"
-      }), null), o(r, l(g, {
+      }), null), a(r, l(g, {
         get when() {
-          return a();
+          return o();
         },
         get children() {
           var t = j();
-          return o(t, (() => {
-            var c = k(() => typeof a() == "number" && a() > 99);
-            return () => c() ? "99+" : a();
+          return a(t, (() => {
+            var c = k(() => typeof o() == "number" && o() > 99);
+            return () => c() ? "99+" : o();
           })()), f(() => b(t, m("absolute top-0.5 right-0.5 min-w-3.5 h-3.5 px-1", "flex items-center justify-center", "text-[9px] font-medium rounded-full", "bg-activity-bar-badge text-activity-bar-badge-foreground"))), t;
         }
       }), null), f((t) => {
-        var c = m("relative w-full aspect-square flex items-center justify-center cursor-pointer", "transition-all duration-100", "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-inset", e.isActive ? "text-activity-bar-foreground-active bg-accent/80" : "text-activity-bar-foreground hover:text-activity-bar-foreground-active hover:bg-accent/40"), s = e.item.label, i = e.isActive;
-        return c !== t.e && b(r, t.e = c), s !== t.t && y(r, "aria-label", t.t = s), i !== t.a && y(r, "aria-pressed", t.a = i), t;
+        var c = m("relative w-full aspect-square flex items-center justify-center cursor-pointer", "transition-[color,background-color] duration-100", "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-inset", e.isActive ? "text-activity-bar-foreground-active bg-accent/80" : "text-activity-bar-foreground hover:text-activity-bar-foreground-active hover:bg-accent/40"), u = e.item.label, i = e.isActive;
+        return c !== t.e && b(r, t.e = c), u !== t.t && y(r, "aria-label", t.t = u), i !== t.a && y(r, "aria-pressed", t.a = i), t;
       }, {
         e: void 0,
         t: void 0,