gov-layout 1.2.0 → 1.2.2

package/dist/index.mjs

@@ -415,7 +415,8 @@ function MenuItemComponent({
   onItemClick,
   currentPath,
   depth = 0,
-  collapsed = false
+  collapsed = false,
+  onExpandRequest
 }) {
   const hasChildren = item.children && item.children.length > 0;
   const isActive = item.path ? currentPath === item.path : false;
@@ -426,8 +427,12 @@ function MenuItemComponent({
   const expanded = userToggled ? isOpen : isOpen || isChildActive;
   const handleClick = () => {
     if (hasChildren) {
-      setUserToggled(true);
-      setIsOpen(!expanded);
+      if (collapsed) {
+        onExpandRequest?.();
+      } else {
+        setUserToggled(true);
+        setIsOpen(!expanded);
+      }
     } else if (item.path) {
       onItemClick(item.path);
     }
@@ -536,7 +541,7 @@ function MenuItemComponent({
     } }) })
   ] });
 }
-function SidebarMenu({ menuItems, onItemClick, currentPath, collapsed }) {
+function SidebarMenu({ menuItems, onItemClick, currentPath, collapsed, onExpandRequest }) {
   return /* @__PURE__ */ jsx("nav", { style: {
     padding: collapsed ? "8px 8px" : "8px 12px",
     overflowY: "auto"
@@ -553,7 +558,8 @@ function SidebarMenu({ menuItems, onItemClick, currentPath, collapsed }) {
       item,
       onItemClick,
       currentPath,
-      collapsed
+      collapsed,
+      onExpandRequest
     },
     item.id
   )) }) });
@@ -811,7 +817,8 @@ function StaffSidebar({
   className,
   collapsible = false,
   isOpen: controlledIsOpen,
-  onToggle
+  onToggle,
+  onExpandRequest
 }) {
   const [internalOpen, setInternalOpen] = useState(true);
   const sidebarOpen = controlledIsOpen !== void 0 ? controlledIsOpen : internalOpen;
@@ -826,6 +833,17 @@ function StaffSidebar({
       setInternalOpen(!internalOpen);
     }
   };
+  const handleExpandRequest = () => {
+    if (onExpandRequest) {
+      onExpandRequest();
+    } else {
+      if (onToggle) {
+        onToggle();
+      } else {
+        setInternalOpen(true);
+      }
+    }
+  };
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsxs(
       "aside",
@@ -855,34 +873,44 @@ function StaffSidebar({
               collapsed
             }
           ),
-          /* @__PURE__ */ jsx(
+          /* @__PURE__ */ jsx("div", { style: { flex: 1, overflowY: "auto", minHeight: 0 }, children: /* @__PURE__ */ jsx(
             SidebarMenu,
             {
               menuItems,
               onItemClick: onNavigate,
               currentPath,
-              collapsed
-            }
-          ),
-          resolvedBottomMenu && resolvedBottomMenu.length > 0 && /* @__PURE__ */ jsx(
-            SidebarMenu,
-            {
-              menuItems: resolvedBottomMenu,
-              onItemClick: onNavigate,
-              currentPath,
-              collapsed
-            }
-          ),
-          /* @__PURE__ */ jsx("div", { style: { flex: 1 } }),
-          /* @__PURE__ */ jsx(
-            SidebarUserProfile,
-            {
-              user,
-              roleLabel,
-              onLogout,
-              collapsed
+              collapsed,
+              onExpandRequest: handleExpandRequest
             }
-          )
+          ) }),
+          /* @__PURE__ */ jsxs("div", { style: { flexShrink: 0 }, children: [
+            resolvedBottomMenu && resolvedBottomMenu.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
+              /* @__PURE__ */ jsx("hr", { style: {
+                border: "none",
+                borderTop: "1px solid var(--color-border-colors-neutral, #c8cedd)",
+                margin: "4px 12px"
+              } }),
+              /* @__PURE__ */ jsx(
+                SidebarMenu,
+                {
+                  menuItems: resolvedBottomMenu,
+                  onItemClick: onNavigate,
+                  currentPath,
+                  collapsed,
+                  onExpandRequest: handleExpandRequest
+                }
+              )
+            ] }),
+            /* @__PURE__ */ jsx(
+              SidebarUserProfile,
+              {
+                user,
+                roleLabel,
+                onLogout,
+                collapsed
+              }
+            )
+          ] })
         ]
       }
     ),