@ixo/ui 0.0.34 → 0.0.36

package/dist/.vite/manifest.json

@@ -29,8 +29,8 @@
       "_useUITheme-DqgAb7n1.cjs"
     ]
   },
-  "_components-Bbc5HijA.js": {
-    "file": "components-Bbc5HijA.js",
+  "_components-B1a2iVqu.js": {
+    "file": "components-B1a2iVqu.js",
     "name": "components",
     "imports": [
       "_UsersSolid-BAU7PbE4.js",
@@ -55,8 +55,8 @@
       "src/components/SodaCard/components/Actions/index.tsx"
     ]
   },
-  "_components-BpMWfEEt.cjs": {
-    "file": "components-BpMWfEEt.cjs",
+  "_components-DClyFU-M.cjs": {
+    "file": "components-DClyFU-M.cjs",
     "name": "components",
     "imports": [
       "_UsersSolid-D60imcQv.cjs",
@@ -103,18 +103,18 @@
       "_constants-B7xlU8b8.js"
     ]
   },
-  "_index-DthSPEUj.js": {
-    "file": "index-DthSPEUj.js",
+  "_index-BBHzZvIm.js": {
+    "file": "index-BBHzZvIm.js",
     "name": "index",
     "imports": [
-      "_components-Bbc5HijA.js"
+      "_components-B1a2iVqu.js"
     ]
   },
-  "_index-dOpxVj7U.cjs": {
-    "file": "index-dOpxVj7U.cjs",
+  "_index-cb7wQOdp.cjs": {
+    "file": "index-cb7wQOdp.cjs",
     "name": "index",
     "imports": [
-      "_components-BpMWfEEt.cjs"
+      "_components-DClyFU-M.cjs"
     ]
   },
   "_themes-BwGjuKnC.cjs": {
@@ -158,41 +158,41 @@
     "name": "utils"
   },
   "src/components/ActionCard/components/Footer/index.tsx": {
-    "file": "index-ChMy4OWq.cjs",
+    "file": "index-CfGbTIXG.cjs",
     "name": "index",
     "src": "src/components/ActionCard/components/Footer/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_index-dOpxVj7U.cjs",
-      "_components-BpMWfEEt.cjs"
+      "_index-cb7wQOdp.cjs",
+      "_components-DClyFU-M.cjs"
     ]
   },
   "src/components/ActionCard/components/Header/index.tsx": {
-    "file": "index-C5RwHoR5.cjs",
+    "file": "index-BnNEw5sb.cjs",
     "name": "index",
     "src": "src/components/ActionCard/components/Header/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_components-BpMWfEEt.cjs",
+      "_components-DClyFU-M.cjs",
       "_UsersSolid-D60imcQv.cjs"
     ]
   },
   "src/components/ActionSheet/components/Badge/index.tsx": {
-    "file": "index-CrKmiIcJ.cjs",
+    "file": "index-eldkvceu.cjs",
     "name": "index",
     "src": "src/components/ActionSheet/components/Badge/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_components-BpMWfEEt.cjs"
+      "_components-DClyFU-M.cjs"
     ]
   },
   "src/components/Card/components/Header/index.tsx": {
-    "file": "index-BYkENVo6.cjs",
+    "file": "index-BSG0zFC9.cjs",
     "name": "index",
     "src": "src/components/Card/components/Header/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_components-BpMWfEEt.cjs"
+      "_components-DClyFU-M.cjs"
     ]
   },
   "src/components/Chart/components/LazyChart/index.tsx": {
@@ -202,31 +202,31 @@
     "isDynamicEntry": true
   },
   "src/components/SodaCard/components/Actions/index.tsx": {
-    "file": "index-YrKDHLOm.cjs",
+    "file": "index-B9pVBHoG.cjs",
     "name": "index",
     "src": "src/components/SodaCard/components/Actions/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_index-dOpxVj7U.cjs",
-      "_components-BpMWfEEt.cjs"
+      "_index-cb7wQOdp.cjs",
+      "_components-DClyFU-M.cjs"
     ]
   },
   "src/components/SodaCard/components/Assets/index.tsx": {
-    "file": "index-DYyekNVE.cjs",
+    "file": "index-BCq1MsXT.cjs",
     "name": "index",
     "src": "src/components/SodaCard/components/Assets/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_components-BpMWfEEt.cjs"
+      "_components-DClyFU-M.cjs"
     ]
   },
   "src/components/SodaCard/components/Content/index.tsx": {
-    "file": "index-CJEzVPBB.cjs",
+    "file": "index-BPMwSQiu.cjs",
     "name": "index",
     "src": "src/components/SodaCard/components/Content/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_components-BpMWfEEt.cjs",
+      "_components-DClyFU-M.cjs",
       "_utils-BmyeZmSR.cjs"
     ]
   },
@@ -237,22 +237,22 @@
     "isDynamicEntry": true
   },
   "src/components/SodaCard/components/Header/index.tsx": {
-    "file": "index-T_N7l0dY.cjs",
+    "file": "index-DAeeijml.cjs",
     "name": "index",
     "src": "src/components/SodaCard/components/Header/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_components-BpMWfEEt.cjs",
+      "_components-DClyFU-M.cjs",
       "_constants-DFJRYpE2.cjs"
     ]
   },
   "src/components/SodaCard/components/MainAction/index.tsx": {
-    "file": "index-DmZxf_3K.cjs",
+    "file": "index-DIjbP65y.cjs",
     "name": "index",
     "src": "src/components/SodaCard/components/MainAction/index.tsx",
     "isDynamicEntry": true,
     "imports": [
-      "_components-BpMWfEEt.cjs"
+      "_components-DClyFU-M.cjs"
     ]
   },
   "src/components/SodaCard/components/Map/index.tsx": {
@@ -272,7 +272,7 @@
     "src": "src/export/components.ts",
     "isEntry": true,
     "imports": [
-      "_components-BpMWfEEt.cjs"
+      "_components-DClyFU-M.cjs"
     ]
   },
   "src/export/hooks.ts": {

package/dist/components/AppShellNavigation/components/MenuItem.d.ts

@@ -7,6 +7,7 @@ export type IMenuItem = {
     disabled?: boolean;
     isActive?: boolean;
     children?: IMenuItem[];
+    isChild?: boolean;
     actions?: {
         label: string;
         onClick: () => void;

package/dist/components/AppShellNavigation/components/MenuItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MenuItem.d.ts","sourceRoot":"","sources":["../../../../src/components/AppShellNavigation/components/MenuItem.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,IAAI,EAAE,OAAO,CAAC;QACd,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,KAAS,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,eAAe,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,oDAqFrJ"}
+{"version":3,"file":"MenuItem.d.ts","sourceRoot":"","sources":["../../../../src/components/AppShellNavigation/components/MenuItem.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,IAAI,EAAE,OAAO,CAAC;QACd,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,EAAE,CAAC;CACL,CAAC;AAQF,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,KAAS,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,eAAe,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,oDA2HrJ"}

package/dist/components/AppShellNavigation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/AppShellNavigation/index.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAA4C,MAAM,OAAO,CAAC;AAIlG,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAqB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAiB,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAkB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAG/D,KAAK,KAAK,GAAG;IACX,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;KAC/B,CAAC;IACF,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;QAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,eAAe,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IAC3C,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE;QACX,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;QACnC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,YAAY,CAAC;CAChC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,QAAQ,EACR,aAAa,EACb,cAAc,EACd,SAAS,EACT,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,KAAK,EACL,cAAqB,EACrB,aAAa,EACb,WAAW,EACX,QAAQ,EACR,UAAU,EACV,cAAc,EACd,OAAO,EACP,QAAQ,EACR,eAAe,EAChB,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,YAAY,CAkQzC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/AppShellNavigation/index.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAA4C,MAAM,OAAO,CAAC;AAIlG,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAqB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAiB,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAkB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAG/D,KAAK,KAAK,GAAG;IACX,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;KAC/B,CAAC;IACF,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC;QAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,eAAe,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IAC3C,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE;QACX,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAAC;QACnC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,YAAY,CAAC;CAChC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,EACN,QAAQ,EACR,aAAa,EACb,cAAc,EACd,SAAS,EACT,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,KAAK,EACL,cAAqB,EACrB,aAAa,EACb,WAAW,EACX,QAAQ,EACR,UAAU,EACV,cAAc,EACd,OAAO,EACP,QAAQ,EACR,eAAe,EAChB,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,YAAY,CAgQzC"}

package/dist/{components-Bbc5HijA.js → components-B1a2iVqu.js}

@@ -2,9 +2,9 @@ import { jsx, Fragment, jsxs } from "@emotion/react/jsx-runtime";
 import { isString, toggle, get, isFunction, assign } from "radash";
 import { useTheme, jsx as jsx$1, keyframes, ThemeProvider } from "@emotion/react";
 import { g as getElementColor, A as AngleDownSolid, a as CheckSolid, C as Close, L as Loading, P as PlusSolid, S as SearchSolid, b as Assistant, c as ArrowUpSolid, E as EllipsisVSolid, d as ArrowLeftSolid, H as HistorySolid, U as User, e as AngleLeftSolid, M as MinusCircleSolid, f as SettingsBarSolid, G as Globe, D as Dashboard, h as Groups, i as UserCircleSolid, j as Assets$1, k as Claims, l as Accounts, m as LinkedResources, n as Proposals, I as ImpactCredits, o as GoTo, p as Share, q as PiePiece, r as ImpactCertificates, s as CommentDotsSolid, t as CommentAltSolid, u as MicrophoneSolid, v as Command, w as ArrowCircleRightSolid, x as Protocols, y as Investments, O as Oracles, z as Projects, B as Daos, F as Star, J as AngleRightSolid, K as Expand, N as LeafSolid, Q as ArrowDownSolid, R as ArrowRightSolid, T as Play, V as CheckCircle, W as Events, X as ThumbsUpSolid, Y as CommentsSolid, Z as CopySolid, _ as Hourglass, $ as Act, a0 as Info$1, a1 as ClaimsW, a2 as TachometerAltSolid, a3 as UserCogSolid, a4 as UsersSolid, a5 as EllipsisHSolid } from "./UsersSolid-BAU7PbE4.js";
-import { useState, useCallback, useRef, useEffect, Suspense, lazy, forwardRef, useId, useMemo, Fragment as Fragment$1, useLayoutEffect, useImperativeHandle, memo } from "react";
+import { useState, useCallback, useRef, useEffect, Suspense, lazy, forwardRef, useMemo, useId, Fragment as Fragment$1, useLayoutEffect, useImperativeHandle, memo } from "react";
 import { T as TAG_SMALL_HEIGHT, D as DEFAULT_ICON_SIZE } from "./constants-B7xlU8b8.js";
-import { Accordion as Accordion$1, Box, Image, Popover, Text as Text$1, Badge as Badge$1, Center, AppShell, Skeleton, Stack as Stack$1, Tooltip as Tooltip$4, Divider } from "@mantine/core";
+import { Accordion as Accordion$1, Box, Image, Popover, Text as Text$1, Badge as Badge$1, Center, AppShell, Skeleton, Stack as Stack$1, Tooltip as Tooltip$4, Divider, ScrollArea } from "@mantine/core";
 import { cx, css } from "@emotion/css";
 import { createPortal } from "react-dom";
 import DOMPurify from "dompurify";
@@ -774,8 +774,8 @@ function AccordionTable({
     }
   );
 }
-const Header$3 = lazy(() => import("./index-CcdgltF2.js"));
-const Footer = lazy(() => import("./index-Cps8sTdh.js"));
+const Header$3 = lazy(() => import("./index-CHaUG4pj.js"));
+const Footer = lazy(() => import("./index-CkY33lka.js"));
 function ActionCard({ header, content, footer, useHoverMode = false }) {
   const hasContent = !!content || !!footer;
   const initialVisibility = footer?.startHidden !== true;
@@ -859,7 +859,7 @@ function Loader({ size, color = "primary" }) {
 }
 const CARD_WIDTH$1 = 350;
 const CARD_HEADER_HEIGHT = 158;
-const Header$2 = lazy(() => import("./index-Tr9N7wIo.js"));
+const Header$2 = lazy(() => import("./index-D0Hsuk8i.js"));
 function Card({ children, className, contentClassName, roundedBottom, noPadding = false, fullWidth = false, header, wrapperSx, onClick }) {
   const wrapperRef = useRef(null);
   const handleOnClick = useCallback(
@@ -1294,7 +1294,7 @@ function ModalSheet({ isOpen, children, hideHandler, zIndex, onRequestHide, onRe
     document.body
   );
 }
-const Badge = lazy(() => import("./index-BJ_C_QL7.js"));
+const Badge = lazy(() => import("./index-NInTEDOl.js"));
 function ActionSheet({ children, isOpen, header, navMenu = void 0, onRequestHide, onRequestShow }) {
   const shadowScrollRef = useRef(null);
   const wrapperContentAreaRef = useRef(null);
@@ -2407,19 +2407,70 @@ function RoomCategory({ category }) {
     !value && /* @__PURE__ */ jsx(Stack$1, { gap: 1, children: category.rooms.map((room) => /* @__PURE__ */ jsx(RoomItem, { room }, room.id)) })
   ] });
 }
+function hasActiveDescendant(children) {
+  if (!children || children.length === 0) return false;
+  return children.some((child) => child.isActive === true || hasActiveDescendant(child.children));
+}
 function MenuItem({ item, onMenuItemClick, depth = 0 }) {
   const { hovered, ref } = useHover();
   const theme = useUITheme();
-  const { value: isExpanded, toggle: toggle2 } = useToggle(false);
   const hasChildren = item.children && item.children.length > 0;
+  const hasActiveChild = useMemo(() => hasActiveDescendant(item.children), [item.children]);
+  const initialExpanded = item?.isActive === true || hasActiveChild;
+  const { value: isExpanded, toggle: toggle2, set: setIsExpanded } = useToggle(initialExpanded);
+  const prevHasActiveChildRef = useRef(hasActiveChild);
+  const manuallyToggledRef = useRef(false);
+  useEffect(() => {
+    if (item?.isActive !== void 0) {
+      setIsExpanded(item.isActive);
+      manuallyToggledRef.current = false;
+    }
+  }, [item?.isActive, setIsExpanded]);
+  useEffect(() => {
+    if (hasActiveChild && !prevHasActiveChildRef.current) {
+      if (!manuallyToggledRef.current || isExpanded) {
+        setIsExpanded(true);
+      }
+    }
+    prevHasActiveChildRef.current = hasActiveChild;
+  }, [hasActiveChild, isExpanded, setIsExpanded]);
   const handleItemClick = () => {
     if (!!item?.disabled) return;
     onMenuItemClick(item);
   };
   const handleToggleClick = (e) => {
     e.stopPropagation();
+    manuallyToggledRef.current = true;
     toggle2();
   };
+  const shouldShowActiveStyle = item.isActive === true && !hasActiveChild;
+  const renderIcon = () => {
+    if (hasChildren && hovered) {
+      return /* @__PURE__ */ jsx(
+        Center,
+        {
+          onClick: handleToggleClick,
+          p: 4,
+          sx: {
+            cursor: "pointer",
+            borderRadius: 4,
+            transform: isExpanded ? "rotate(-90deg)" : "rotate(0deg)",
+            transition: "transform 0.2s ease",
+            "&:hover": {
+              backgroundColor: theme.neutral.transparent10
+            }
+          },
+          children: /* @__PURE__ */ jsx(AngleLeftSolid, { size: 12, color: "secondary" })
+        }
+      );
+    } else {
+      if (typeof item.icon === "string") {
+        return /* @__PURE__ */ jsx(Image, { w: 20, h: 20, src: item.icon, radius: "50%" });
+      } else {
+        return /* @__PURE__ */ jsx(item.icon, { size: 20, color: shouldShowActiveStyle ? "overPicture" : "secondary" });
+      }
+    }
+  };
   return /* @__PURE__ */ jsxs(Stack$1, { gap: 1, children: [
     /* @__PURE__ */ jsxs(
       Flex,
@@ -2434,50 +2485,31 @@ function MenuItem({ item, onMenuItemClick, depth = 0 }) {
         style: {
           cursor: "pointer",
           borderRadius: 8,
-          backgroundColor: item.isActive ? theme.neutral.transparent10 : hovered ? theme.neutral.transparent10 : "transparent",
+          backgroundColor: shouldShowActiveStyle ? theme.neutral.transparent10 : hovered ? theme.neutral.transparent10 : "transparent",
           transform: hovered ? "translateX(4px)" : "translateX(0px)",
           transition: "all 0.2s ease"
         },
         onClick: handleItemClick,
         children: [
           /* @__PURE__ */ jsxs(Flex, { align: "center", gap: 8, children: [
-            typeof item.icon === "string" ? /* @__PURE__ */ jsx(Image, { w: 20, h: 20, src: item.icon, radius: "50%" }) : /* @__PURE__ */ jsx(item.icon, { size: 20, color: item.isActive ? "overPicture" : "secondary" }),
-            /* @__PURE__ */ jsx(Text$1, { fz: 14, fw: 500, c: item.isActive ? theme.neutral.lightGray : theme.text.secondary, style: { flex: 1 }, children: item.name }),
+            renderIcon(),
+            /* @__PURE__ */ jsx(Text$1, { fz: 14, fw: 500, c: shouldShowActiveStyle ? theme.neutral.lightGray : theme.text.secondary, style: { flex: 1 }, children: item.name }),
             item.badgeCount ? /* @__PURE__ */ jsx(Badge$1, { size: "xs", variant: "filled", ml: 4, style: { minWidth: "16px", height: "15px", padding: "0 4px", fontSize: "8px" }, children: item.badgeCount }) : null
           ] }),
-          /* @__PURE__ */ jsxs(Flex, { children: [
-            hasChildren && /* @__PURE__ */ jsx(
-              Center,
-              {
-                onClick: handleToggleClick,
-                p: 4,
-                sx: {
-                  cursor: "pointer",
-                  borderRadius: 4,
-                  transform: isExpanded ? "rotate(-90deg)" : "rotate(0deg)",
-                  transition: "transform 0.2s ease",
-                  "&:hover": {
-                    backgroundColor: theme.neutral.transparent10
-                  }
-                },
-                children: /* @__PURE__ */ jsx(AngleLeftSolid, { size: 12, color: "secondary" })
-              }
-            ),
-            item?.actions && item.actions.length > 0 && /* @__PURE__ */ jsx(
-              Center,
-              {
-                sx: {
-                  cursor: "pointer",
-                  borderRadius: 4,
-                  transition: "transform 0.2s ease",
-                  "&:hover": {
-                    backgroundColor: theme.neutral.transparent10
-                  }
-                },
-                children: /* @__PURE__ */ jsx(MoreMenu, { items: item.actions, controlColor: "secondary" })
-              }
-            )
-          ] })
+          /* @__PURE__ */ jsx(Flex, { children: item?.actions && item.actions.length > 0 && /* @__PURE__ */ jsx(
+            Center,
+            {
+              sx: {
+                cursor: "pointer",
+                borderRadius: 4,
+                transition: "transform 0.2s ease",
+                "&:hover": {
+                  backgroundColor: theme.neutral.transparent10
+                }
+              },
+              children: /* @__PURE__ */ jsx(MoreMenu, { items: item.actions, controlColor: "secondary" })
+            }
+          ) })
         ]
       }
     ),
@@ -2595,7 +2627,6 @@ function AppShellNavigation({
       document.body.style.cursor = "col-resize";
       document.body.style.userSelect = "none";
     } else {
-      console.count("2");
       clearNavbarListeners();
     }
     return () => clearNavbarListeners();
@@ -2681,23 +2712,20 @@ function AppShellNavigation({
                   /* @__PURE__ */ jsx(Divider, { w: 40, mx: 10, color: theme.neutral.transparent10 })
                 ] }),
                 /* @__PURE__ */ jsx(
-                  Stack$1,
+                  ScrollArea,
                   {
-                    align: "center",
-                    gap: 8,
+                    scrollbarSize: 0,
                     style: {
                       flex: 1,
-                      overflowY: "auto",
-                      maxHeight: "calc(100vh - 300px)",
-                      scrollbarWidth: "none",
-                      msOverflowStyle: "none"
+                      maxHeight: "calc(100vh - 360px)"
                     },
-                    sx: {
-                      "&::-webkit-scrollbar": {
-                        display: "none"
+                    viewportProps: {
+                      style: {
+                        paddingLeft: 8,
+                        paddingRight: 8
                       }
                     },
-                    children: spaces.map(({ icon, id, name, onClick }) => /* @__PURE__ */ jsx(SpaceItem, { selectedSpace, icon, name, id, onClick }, id))
+                    children: /* @__PURE__ */ jsx(Stack$1, { align: "center", gap: 8, children: spaces.map(({ icon, id, name, onClick }) => /* @__PURE__ */ jsx(SpaceItem, { selectedSpace, icon, name, id, onClick }, id)) })
                   }
                 )
               ] }),
@@ -5763,13 +5791,13 @@ function ActionButton({ onClick, left, right }) {
     }
   );
 }
-const MainAction = lazy(() => import("./index-WpYDX7r4.js"));
-const Header$1 = lazy(() => import("./index-Dw-UB8QG.js"));
-const Content = lazy(() => import("./index-B91AEI-O.js"));
+const MainAction = lazy(() => import("./index-D2vpQrea.js"));
+const Header$1 = lazy(() => import("./index-CrLkPKdH.js"));
+const Content = lazy(() => import("./index-CgY82myI.js"));
 const Map = lazy(() => import("./index-D5Ufmf-s.js"));
 const CustomContent = lazy(() => import("./index-DsYjW_4y.js"));
-const Assets = lazy(() => import("./index-Cd9_EsL3.js"));
-const Actions = lazy(() => import("./index-DiC6w4Dz.js"));
+const Assets = lazy(() => import("./index-Dzht1xdr.js"));
+const Actions = lazy(() => import("./index-BUOaLr6a.js"));
 const HOVER_BORDER_WIDTH = 1;
 function SodaCardCmp({ numSelected = 0, expanded = true, mainAction, header, content, map, customContent, customFooter, actions, assets, onClick }, ref) {
   const wrapperRef = useRef(null);
@@ -11084,4 +11112,4 @@ export {
   CardHero as y,
   CardSelector as z
 };
-//# sourceMappingURL=components-Bbc5HijA.js.map
+//# sourceMappingURL=components-B1a2iVqu.js.map