@sikka/hawa 0.1.99 → 0.1.101

package/dist/index.d.mts

@@ -1110,7 +1110,7 @@ interface SidebarGroupProps {
 declare const SidebarGroup: React$1.FC<SidebarGroupProps>;
 declare const SidebarItem: React$1.FC<{
     item: Item;
-    isSelected: any;
+    selectedItem?: any;
     direction?: "rtl" | "ltr";
     onItemClick?: (value: string[]) => void;
     onSubItemClick?: (values: string[]) => void;

package/dist/index.d.ts

@@ -1110,7 +1110,7 @@ interface SidebarGroupProps {
 declare const SidebarGroup: React$1.FC<SidebarGroupProps>;
 declare const SidebarItem: React$1.FC<{
     item: Item;
-    isSelected: any;
+    selectedItem?: any;
     direction?: "rtl" | "ltr";
     onItemClick?: (value: string[]) => void;
     onSubItemClick?: (values: string[]) => void;

package/dist/index.js

@@ -7495,7 +7495,7 @@ var SidebarGroup = function(param) {
     }, items.map(function(item, idx) {
         return /* @__PURE__ */ React75.createElement(SidebarItem, {
             isOpen: isOpen,
-            isSelected: selectedItem,
+            selectedItem: selectedItem,
             key: idx,
             direction: direction,
             item: item,
@@ -7504,10 +7504,16 @@ var SidebarGroup = function(param) {
         });
     }))));
 };
-var SidebarItem = function(param) {
-    var item = param.item, isSelected = param.isSelected, onItemClick = param.onItemClick, onSubItemClick = param.onSubItemClick, direction = param.direction, _param_isOpen = param.isOpen, isOpen = _param_isOpen === void 0 ? true : _param_isOpen;
-    var getSelectedStyle = function(value, index) {
-        return isSelected && isSelected[index] === value ? "bg-primary text-primary-foreground  cursor-default" : "hover:bg-primary/10";
+var SidebarItem = function(_param) {
+    var item = _param.item, onItemClick = _param.onItemClick, onSubItemClick = _param.onSubItemClick, direction = _param.direction, _param_isOpen = _param.isOpen, isOpen = _param_isOpen === void 0 ? true : _param_isOpen, props = _object_without_properties(_param, [
+        "item",
+        "onItemClick",
+        "onSubItemClick",
+        "direction",
+        "isOpen"
+    ]);
+    var getSelectedStyle = function(value) {
+        return props.selectedItem === value ? "bg-primary text-primary-foreground  cursor-default" : "hover:bg-primary/10";
     };
     if (item.subitems) {
         return /* @__PURE__ */ React75.createElement(AccordionItem, {
@@ -7515,7 +7521,9 @@ var SidebarItem = function(param) {
             className: "overflow-x-clip",
             dir: direction
         }, /* @__PURE__ */ React75.createElement(AccordionTrigger, {
-            className: cn(getSelectedStyle(item.value, 0)),
+            className: cn("overflow-x-clip", props.selectedItem === item.value ? "cursor-default bg-primary  text-primary-foreground" : "hover:bg-primary/10", item.subitems && item.subitems.some(function(subitem) {
+                return props.selectedItem === subitem.value;
+            }) ? "bg-primary text-primary-foreground hover:bg-primary" : ""),
             showArrow: isOpen
         }, /* @__PURE__ */ React75.createElement("div", {
             className: cn(!isOpen && "py-1", "flex w-fit flex-row items-center  gap-2")
@@ -7538,7 +7546,7 @@ var SidebarItem = function(param) {
                         ]);
                     }
                 },
-                className: cn("flex h-full cursor-pointer flex-row items-center gap-2 rounded bg-foreground/10 p-2 transition-all", getSelectedStyle(subitem.value, 1))
+                className: cn("flex h-full cursor-pointer flex-row items-center gap-2 rounded bg-foreground/10 p-2 transition-all", getSelectedStyle(subitem.value))
             }, subitem.icon, subitem.label);
         }))));
     } else {
@@ -7552,7 +7560,7 @@ var SidebarItem = function(param) {
                     ]);
                 }
             },
-            className: cn(triggerStyles, getSelectedStyle(item.value, 0), "overflow-x-clip ")
+            className: cn(triggerStyles, getSelectedStyle(item.value), "overflow-x-clip ")
         }, /* @__PURE__ */ React75.createElement("div", {
             className: "flex flex-row items-center gap-2 "
         }, item.icon, /* @__PURE__ */ React75.createElement("span", {
@@ -7588,7 +7596,7 @@ var AppLayout = function(_param) {
     var ref = _react.useRef.call(void 0, null);
     var isRTL = direction === "rtl";
     var _react_useState_call = _sliced_to_array(_react.useState.call(void 0, ""), 2), openedSidebarItem = _react_useState_call[0], setOpenedSidebarItem = _react_useState_call[1];
-    var _react_useState_call1 = _sliced_to_array(_react.useState.call(void 0, currentPage ? currentPage : []), 2), selectedItem = _react_useState_call1[0], setSelectedItem = _react_useState_call1[1];
+    var _react_useState_call1 = _sliced_to_array(_react.useState.call(void 0, currentPage), 2), selectedItem = _react_useState_call1[0], setSelectedItem = _react_useState_call1[1];
     var size;
     if (typeof window !== "undefined") {
         size = useBreakpoint_default();
@@ -7723,19 +7731,16 @@ var AppLayout = function(_param) {
     }, /* @__PURE__ */ React6.default.createElement(SidebarGroup, {
         direction: direction,
         onItemClick: function(values) {
-            console.log("vals ", values);
-            setSelectedItem(values);
             if (clickedItem) {
                 clickedItem(values);
             }
         },
         onSubItemClick: function(values) {
-            setSelectedItem(values);
             if (clickedItem) {
                 clickedItem(values);
             }
         },
-        selectedItem: selectedItem,
+        selectedItem: currentPage,
         openedItem: openedSidebarItem,
         setOpenedItem: function(e) {
             return setOpenedSidebarItem(e);