@admin-layout/tailwind-design-pro 10.0.9-alpha.46 → 10.0.9-alpha.48

package/lib/components/Layout/BasicLayout/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiE,MAAM,OAAO,CAAC;AAOtF,OAAO,EACH,gBAAgB,EAGhB,iBAAiB,EAIpB,MAAM,sBAAsB,CAAC;AAQ9B,eAAO,MAAM,mBAAmB;;;;uCA4B/B,CAAC;AAgCF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAC9B,gBAAgB,GAAG,iBAAiB,GAAG;IAAE,WAAW,CAAC,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAiL3F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiE,MAAM,OAAO,CAAC;AAOtF,OAAO,EACH,gBAAgB,EAGhB,iBAAiB,EAIpB,MAAM,sBAAsB,CAAC;AAS9B,eAAO,MAAM,mBAAmB;;;;uCA4B/B,CAAC;AAgCF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAC9B,gBAAgB,GAAG,iBAAiB,GAAG;IAAE,WAAW,CAAC,EAAE,GAAG,CAAC;IAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,CAuM3F,CAAC"}

package/lib/components/Layout/BasicLayout/index.js

@@ -1,4 +1,4 @@
-import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {Sidebar}from'../Sidebar/Sidebar.js';import {GlobalHeader}from'../GlobalHeader/Header.js';import {Outlet}from'@remix-run/react';import warning from'warning';import {omit}from'lodash-es';import {SettingDrawer}from'../../SettingDrawer/SettingDrawer.js';import {defaultSettings,useComponentSize,getMenuSeparation,getThemeColors}from'@admin-layout/client';import isBrowser from'../../../utils/isBrowser/index.js';import {getPageTitleInfo}from'../getPageTitle.js';import {useTheme}from'../../ThemeProvider/ThemeProvider.js';import {MainHeader}from'../GlobalHeader/MainHeader.js';import'../GlobalHeader/Logo.js';import'react-router';import'../../../helpers/DynamicIcon.js';import'@app/dialog/WrappedDialogsSwitch';import'@common-stack/components-pro';import {FooterSlot}from'../slot-fill/Footer.js';import'reflect-metadata';import'@admin-layout/client/lib/constants/layout.js';import {config}from'../../../config/env-config.js';import {useScrollThreshold}from'../../../hooks/useScrollThreshold.js';const useHorizontalScroll = ({
+import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {Sidebar}from'../Sidebar/Sidebar.js';import {GlobalHeader}from'../GlobalHeader/Header.js';import {Outlet}from'@remix-run/react';import warning from'warning';import {omit}from'lodash-es';import {SettingDrawer}from'../../SettingDrawer/SettingDrawer.js';import {defaultSettings,useComponentSize,getMenuSeparation,getThemeColors}from'@admin-layout/client';import isBrowser from'../../../utils/isBrowser/index.js';import {getPageTitleInfo}from'../getPageTitle.js';import {useTheme}from'../../ThemeProvider/ThemeProvider.js';import {MainHeader}from'../GlobalHeader/MainHeader.js';import'../GlobalHeader/Logo.js';import'react-router';import'../../../helpers/DynamicIcon.js';import'@app/dialog/WrappedDialogsSwitch';import'@common-stack/components-pro';import {FooterSlot}from'../slot-fill/Footer.js';import'reflect-metadata';import'@admin-layout/client/lib/constants/layout.js';import {config}from'../../../config/env-config.js';import {useScrollThreshold}from'../../../hooks/useScrollThreshold.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import'../../../hooks/use-get-current-lat-long.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';const useHorizontalScroll = ({
   setScrolled,
   setSearchOptionsShown,
   onScrollReachEnd
@@ -96,6 +96,9 @@ const BasicLayout = props => {
     theme,
     isDarkMode
   } = useTheme();
+  const {
+    isMobile
+  } = useMediaQuery();
   const onScrollReachEnd = () => {
     setScrollEnd(prevScrollEnd => !prevScrollEnd);
   };
@@ -157,61 +160,67 @@ const BasicLayout = props => {
   // Get background color based on dark mode
   const backgroundColor = isDarkMode ? theme.colors.background.dark : theme.colors.background.light;
   return jsxs("div", {
-    className: "flex h-screen bg-background font-sans",
+    className: "flex flex-col h-screen bg-background font-sans",
     ref: horizontalScrollRef,
     style: {
       backgroundColor: backgroundColor
     },
-    children: [settings?.layout.navigationMode !== 'topbar' && settings?.regions.showMenu && !settings?.layout.splitMenus && LAYOUT_ROOT != '/' && jsx(Sidebar, {
-      isSideMenuOpen: isSideMenuOpen,
-      closeSideMenu: closeSideMenu,
-      menuData: menuData,
-      collapsed: collapsed,
-      setCollapsed: setCollapsed,
+    children: [settings?.regions.showHeader && LAYOUT_ROOT != '/' && jsx(GlobalHeader, {
+      toggleSideMenu: toggleSideMenu,
+      settings: settings,
+      upperMenus: getMenuSeparation(menuData).upperMenus,
       routeParams: routeParams,
-      settings: settings
+      collapsed: collapsed
+    }), LAYOUT_ROOT === '/' && settings?.regions.showHeader && jsx(MainHeader, {
+      scrolled: scrolled,
+      location: location,
+      menuData: menuData,
+      settings: settings,
+      pageTitleInfo: pageTitleInfo,
+      onSettingChange: onSettingChange,
+      searchOptionsShown: searchOptionsShown,
+      setSearchOptionsShown: setSearchOptionsShown,
+      authorities: authorities,
+      picture: picture,
+      componentVisibility: componentVisibility
     }), jsxs("div", {
-      className: "flex flex-col flex-1 w-full",
-      children: [settings?.regions.showHeader && LAYOUT_ROOT != '/' && jsx(GlobalHeader, {
-        toggleSideMenu: toggleSideMenu,
-        settings: settings,
-        upperMenus: getMenuSeparation(menuData).upperMenus,
-        routeParams: routeParams,
-        collapsed: collapsed
-      }), LAYOUT_ROOT === '/' && settings?.regions.showHeader && jsx(MainHeader, {
-        scrolled: scrolled,
-        location: location,
+      className: "flex flex-1  relative",
+      children: [settings?.layout.navigationMode !== 'topbar' && settings?.regions.showMenu && !settings?.layout.splitMenus && LAYOUT_ROOT != '/' && jsx(Sidebar, {
+        isSideMenuOpen: isSideMenuOpen,
+        closeSideMenu: closeSideMenu,
         menuData: menuData,
-        settings: settings,
-        pageTitleInfo: pageTitleInfo,
-        onSettingChange: onSettingChange,
-        searchOptionsShown: searchOptionsShown,
-        setSearchOptionsShown: setSearchOptionsShown,
-        authorities: authorities,
-        picture: picture,
-        componentVisibility: componentVisibility
-      }), jsx(SettingDrawer, {
-        primaryColor: primaryColor,
-        settings: settings,
-        onSettingChange: onSettingChange,
-        actor: actor,
-        colorList: getThemeColors(settings?.theme)
-      }), jsxs("main", {
-        className: "relative",
-        children: [searchOptionsShown && settings?.regions?.searchBarOverlay && jsx("div", {
-          className: "fixed inset-0 bg-black bg-opacity-50 z-30 cursor-pointer",
-          onClick: e => {
-            e.stopPropagation();
-            setSearchOptionsShown(false);
-          }
-        }), jsx(Outlet, {})]
-      }), jsx("div", {
-        ref: refFooter,
-        className: footerFixed ? 'fixed bottom-0 w-full' : '',
-        children: jsx(FooterSlot, {
+        collapsed: collapsed,
+        setCollapsed: setCollapsed,
+        routeParams: routeParams,
+        settings: settings
+      }), jsxs("div", {
+        className: "flex flex-col flex-1 overflow-auto",
+        style: {
+          marginLeft: settings?.layout.navigationMode !== 'topbar' && settings?.regions.showMenu && !settings?.layout.splitMenus && settings?.layout.fixedSidebar && !isMobile && LAYOUT_ROOT != '/' ? collapsed ? '64px' : '256px' : '0px'
+        },
+        children: [jsx(SettingDrawer, {
+          primaryColor: primaryColor,
           settings: settings,
-          active: settings?.regions?.showFooter === undefined ? true : settings?.regions?.showFooter
-        })
+          onSettingChange: onSettingChange,
+          actor: actor,
+          colorList: getThemeColors(settings?.theme)
+        }), jsxs("main", {
+          className: "flex-1 p-4",
+          children: [searchOptionsShown && settings?.regions?.searchBarOverlay && jsx("div", {
+            className: "fixed inset-0 bg-black bg-opacity-50 z-30 cursor-pointer",
+            onClick: e => {
+              e.stopPropagation();
+              setSearchOptionsShown(false);
+            }
+          }), jsx(Outlet, {})]
+        }), jsx("div", {
+          ref: refFooter,
+          className: footerFixed ? 'fixed bottom-0 w-full' : '',
+          children: jsx(FooterSlot, {
+            settings: settings,
+            active: settings?.regions?.showFooter === undefined ? true : settings?.regions?.showFooter
+          })
+        })]
       })]
     })]
   });

package/lib/components/Layout/BasicLayout/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/components/Layout/GlobalHeader/Header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Header.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,GAAG,GAAG,CAwE/D,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"Header.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAGvD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,GAAG,GAAG,CAyE/D,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/lib/components/Layout/GlobalHeader/Header.js

@@ -1,4 +1,4 @@
-import {jsx,jsxs}from'react/jsx-runtime';import React__default from'react';import {Link}from'@remix-run/react';import {RightContent}from'./RightContent.js';import {icons}from'../../../icons.js';const GlobalHeader = props => {
+import {jsx,jsxs}from'react/jsx-runtime';import React__default from'react';import {Link}from'@remix-run/react';import {RightContent}from'./RightContent.js';import {icons}from'../../../icons.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import'../../../hooks/use-get-current-lat-long.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';const GlobalHeader = props => {
   const {
     theme,
     layout,
@@ -12,37 +12,44 @@ import {jsx,jsxs}from'react/jsx-runtime';import React__default from'react';impor
     MenuIcon,
     SearchIcon
   } = icons;
+  const {
+    isMobile
+  } = useMediaQuery();
   // Calculate header styles
   const headerStyles = React__default.useMemo(() => ({
-    backgroundColor: settings?.navTheme === 'realDark' ? '#222' : '',
+    backgroundColor: settings?.navTheme === 'realDark' ? '#222' : 'white',
     color: settings?.navTheme === 'realDark' ? '#fff' : ''
   }), [settings]);
   if (!settings?.regions?.showHeader) return null;
   return jsx("header", {
-    className: "z-10 py-4  dark:bg-gray-800",
+    className: `z-10 py-4 dark:bg-gray-800 top-0 border-b border-gray-200 ${settings?.layout?.fixedHeader ? 'sticky' : 'relative'}`,
     style: headerStyles,
     children: jsxs("div", {
-      className: "container flex items-center justify-end h-full px-6 mx-auto text-gray-700 dark:text-gray-200",
+      className: "flex items-center justify-between h-full px-4 sm:px-6 mx-auto text-gray-700 dark:text-gray-200",
       children: [jsx("button", {
-        className: "p-1 mr-5 -ml-1 rounded-md md:hidden focus:outline-none focus:shadow-outline-purple",
+        className: "p-1 -ml-1 rounded-md md:hidden focus:outline-none focus:shadow-outline-purple",
         onClick: toggleSideMenu,
         "aria-label": "Menu",
         children: jsx(MenuIcon, {
           className: "w-6 h-6"
         })
-      }), settings?.layout?.navigationMode === 'topbar' || settings?.layout.splitMenus ? jsxs(Link, {
-        to: "/",
-        className: "ml-6 flex items-center gap-2.5 text-lg font-bold text-gray-800 dark:text-gray-200",
-        style: headerStyles,
-        children: [jsx("img", {
-          src: settings?.logo,
-          className: "w-[28px]"
-        }), "Cdebase"]
-      }) : '', settings?.regions?.searchBarRender && jsx("div", {
-        className: "flex justify-center flex-1 lg:mr-32",
+      }), jsx("div", {
+        children: jsxs(Link, {
+          to: "/",
+          className: "ml-6 flex items-center gap-2.5 text-lg font-bold text-gray-800 dark:text-gray-200",
+          style: headerStyles,
+          children: [jsx("img", {
+            src: settings?.logo,
+            className: "w-[28px]"
+          }), !isMobile && jsx("span", {
+            children: settings?.title
+          })]
+        })
+      }), settings?.regions?.searchBarRender && jsx("div", {
+        className: "flex-1 max-w-xl mx-4 hidden md:block",
         style: headerStyles,
         children: jsxs("div", {
-          className: "relative w-full max-w-xl mr-6 focus-within:text-purple-500",
+          className: "relative w-full focus-within:text-purple-500",
           style: headerStyles,
           children: [jsx("div", {
             className: "absolute inset-y-0 flex items-center pl-2",

package/lib/components/Layout/GlobalHeader/Header.js.map

@@ -1 +1 @@
-{"version":3,"file":"Header.js","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"sourcesContent":[null],"names":[],"mappings":"kMAMa,MAAA,YAAY,GAA2C,KAAC,IAAS;AAC1E,EAAA,MAAA;AACA,IAAA,KAAA;IAEA,MAA0B;IAC1B,UAAM;AAGM,IAAA,WAAA;AACA,IAAA,SAAK;AACgB,IAAA,QACpB;AAGb,IAAA;AAAoC,GAAA,GAAA,KAAA;AACpC,EAAA,MAAA;AAyDJ,IAAE,QAAA;AAEF,IAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Header.js","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"sourcesContent":[null],"names":[],"mappings":"wYAOa,MAAA,YAAY,GAA2C,KAAC,IAAS;AAC1E,EAAA,MAAA;AACA,IAAA,KAAA;AAEA,IAAA,MAAM;IAEN,UAA0B;IAC1B,WAAM;AAGM,IAAA,SAAA;AACA,IAAA,QAAA;AACqB,IAAA;AAIjC,GAAA,GAAA,KAAK;AAA+B,EAAA,MAAA;AACpC,IAAA,QACI;AAuDR,IAAE;AAEF,GAAA,GAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/Layout/Sidebar/Sidebar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/Sidebar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAyM1C,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"Sidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/Sidebar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7C,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAuM1C,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/lib/components/Layout/Sidebar/Sidebar.js

@@ -1,4 +1,4 @@
-import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffect}from'react';import {Link}from'@remix-run/react';import {useTranslation}from'react-i18next';import BottomMenuDropDown from'../GlobalFooter/BottomMenuDropdown.js';import {getMenuSeparation}from'@admin-layout/client';import {Divider}from'./Divider.js';import {SidebarMenu}from'./SidebarMenu.js';import {RightContent}from'../GlobalHeader/RightContent.js';import {icons}from'../../../icons.js';const Sidebar = props => {
+import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffect}from'react';import {useTranslation}from'react-i18next';import BottomMenuDropDown from'../GlobalFooter/BottomMenuDropdown.js';import {getMenuSeparation}from'@admin-layout/client';import {Divider}from'./Divider.js';import {SidebarMenu}from'./SidebarMenu.js';import {RightContent}from'../GlobalHeader/RightContent.js';import {icons}from'../../../icons.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import'../../../hooks/use-get-current-lat-long.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';const Sidebar = props => {
   const {
     isSideMenuOpen,
     closeSideMenu,
@@ -14,10 +14,13 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
     t,
     i18n
   } = useTranslation('menu');
+  const {
+    isMobile
+  } = useMediaQuery();
   const {
     OutlineDashIcon,
-    ChevronBackCircleIcon,
-    ChevronForwardCircleIcon
+    ChevronLeftIcon,
+    ChevronRightIcon
   } = icons;
   useEffect(() => {
     if (!iconModule) {
@@ -78,23 +81,17 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
     color: settings?.navTheme === 'realDark' ? '#fff' : ''
   }), [settings]);
   const renderSidebarContent = () => jsxs("div", {
-    className: "py-4 text-gray-500 dark:text-gray-400 relative",
+    className: " text-gray-500 dark:text-gray-400 relative",
     style: SidebarStyles,
-    children: [jsxs(Link, {
-      to: "/",
-      className: "ml-6 flex items-center gap-2.5 text-lg font-bold text-gray-800 dark:text-gray-200",
-      style: SidebarStyles,
-      children: [jsx("img", {
-        src: settings?.logo,
-        className: "w-[28px]"
-      }), !collapsed && jsx("span", {
-        children: settings?.title
-      })]
-    }), jsx("button", {
+    children: [jsx("button", {
       onClick: toggleCollapsed,
-      className: "rounded-md hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors text-[22px] absolute right-[0px] top-[92px]",
+      className: "w-6 h-6 text-center bg-white  text-gray-300 flex items-center justify-center rounded-full shadow-[0_2px_8px_-2px_rgba(0,0,0,0.05),0_1px_4px_-1px_rgba(25,15,15,0.07),0_0_1px_0_rgba(0,0,0,0.08)] hover:text-gray-600 hover:shadow-[0_4px_16px_-4px_rgba(0,0,0,0.05),0_2px_8px_-2px_rgba(25,15,15,0.07),0_1px_2px_0_rgba(0,0,0,0.08)] transition-colors text-[22px] absolute right-[-13px] top-[20px]",
       "aria-label": collapsed ? 'Expand sidebar' : 'Collapse sidebar',
-      children: collapsed ? jsx(ChevronForwardCircleIcon, {}) : jsx(ChevronBackCircleIcon, {})
+      children: collapsed ? jsx(ChevronRightIcon, {
+        fontSize: '11px'
+      }) : jsx(ChevronLeftIcon, {
+        fontSize: '11px'
+      })
     }), jsxs("div", {
       className: "min-h-[93vh]",
       children: [jsxs("div", {
@@ -144,12 +141,15 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
           settings: settings,
           collapsed: collapsed
         })
+      }), jsx("div", {
+        className: "p-4",
+        children: settings?.layout?.navigationMode === 'sidebar' && jsx(RightContent, {
+          upperMenus: getMenuSeparation(menuData).upperMenus,
+          collapsed: collapsed,
+          routeParams: routeParams,
+          settings: settings
+        })
       })]
-    }), settings?.layout?.navigationMode === 'sidebar' && jsx(RightContent, {
-      upperMenus: getMenuSeparation(menuData).upperMenus,
-      collapsed: collapsed,
-      routeParams: routeParams,
-      settings: settings
     }), jsx("div", {
       className: "absolute bottom-0 left-0  p-4  dark:border-gray-700",
       children: jsx(BottomMenuDropDown, {
@@ -160,16 +160,16 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
     })]
   });
   return jsxs("div", {
-    children: [jsx("aside", {
-      className: `z-20 hidden h-full  bg-white dark:bg-gray-800 md:block flex-shrink-0 transition-all duration-300 ease-in-out ${collapsed ? 'w-16' : 'w-64'}`,
+    children: [!isMobile && jsx("aside", {
+      className: `${settings?.layout?.fixedSidebar ? 'fixed' : 'relative'} border-r border-gray-200 z-20 h-screen bg-white dark:bg-gray-800 md:block flex-shrink-0 transition-all duration-300 ease-in-out ${collapsed ? 'w-16' : 'w-64'}`,
       style: SidebarStyles,
       children: renderSidebarContent()
-    }), isSideMenuOpen && jsx("div", {
-      className: "fixed inset-0 z-10 flex items-end bg-black bg-opacity-50 sm:items-center sm:justify-center",
+    }), isSideMenuOpen && isMobile && jsx("div", {
+      className: "fixed inset-0 z-10 flex items-end bg-black bg-opacity-50 sm:items-center sm:justify-center transition-opacity duration-300",
       onClick: closeSideMenu
-    }), isSideMenuOpen && jsx("aside", {
+    }), isSideMenuOpen && isMobile && jsx("aside", {
       id: "mobile-sidebar",
-      className: `fixed inset-y-0 z-20 flex-shrink-0  mt-16  bg-white dark:bg-gray-800 md:hidden ${collapsed ? 'w-16' : 'w-64'} `,
+      className: `fixed inset-y-0 z-20 flex-shrink-0 mt-16 bg-white dark:bg-gray-800 md:hidden transition-transform duration-300 ease-in-out transform ${collapsed ? 'w-16' : 'w-64'}`,
       style: SidebarStyles,
       children: renderSidebarContent()
     })]

package/lib/components/Layout/Sidebar/Sidebar.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sidebar.js","sources":["../../../../src/components/Layout/Sidebar/Sidebar.tsx"],"sourcesContent":[null],"names":["React","_jsxs","_jsx"],"mappings":"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"}
+{"version":3,"file":"Sidebar.js","sources":["../../../../src/components/Layout/Sidebar/Sidebar.tsx"],"sourcesContent":[null],"names":["React","_jsxs"],"mappings":"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"}

package/lib/components/Layout/Sidebar/SidebarMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SidebarMenu.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/SidebarMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAK3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA+LlD,CAAC"}
+{"version":3,"file":"SidebarMenu.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/SidebarMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAKnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA2MlD,CAAC"}

package/lib/components/Layout/Sidebar/SidebarMenu.js

@@ -1,11 +1,10 @@
-import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {Link}from'@remix-run/react';import {generateMenuPath}from'@admin-layout/client';import {generateLightShade}from'../BasicLayout/utils.js';import {icons}from'../../../icons.js';const SidebarMenu = ({
+import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {useLocation,Link}from'@remix-run/react';import {generateMenuPath}from'@admin-layout/client';import {generateLightShade}from'../BasicLayout/utils.js';import {icons}from'../../../icons.js';const SidebarMenu = ({
   menuData,
   routeParams,
   settings,
   collapsed
 }) => {
   const [openMenusByLevel, setOpenMenusByLevel] = useState({});
-  const [activePath, setActivePath] = useState('/dashboard');
   const [hoveredMenu, setHoveredMenu] = useState(null);
   const [popupPosition, setPopupPosition] = useState({
     top: 0,
@@ -13,8 +12,22 @@ import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {Li
   });
   const {
     ChevronDownIcon,
-    ChevronRightIcon
+    ChevronUpIcon
   } = icons;
+  const location = useLocation();
+  const isMenuItemActive = itemPath => {
+    const currentPath = location.pathname;
+    const menuPath = generateMenuPath(itemPath, routeParams);
+    // Exact match
+    if (currentPath === menuPath) {
+      return true;
+    }
+    // Check if current path is a child of the menu item path
+    if (menuPath && currentPath.startsWith(menuPath + '/')) {
+      return true;
+    }
+    return false;
+  };
   const toggleMenu = (path, depth, e) => {
     e.preventDefault();
     if (collapsed) return;
@@ -26,8 +39,6 @@ import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {Li
   const handleMenuClick = (path, hasChildren, depth, e) => {
     if (hasChildren && !collapsed) {
       toggleMenu(path, depth, e);
-    } else {
-      setActivePath(path);
     }
   };
   const getFirstLetter = name => {
@@ -102,10 +113,13 @@ import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {Li
   const renderMenuItem = (item, depth = 0, isHoverMenu = false) => {
     const hasChildren = item.children && item.children.length > 0;
     const isOpen = openMenusByLevel[depth] === item.path;
-    const isActive = activePath === item.path;
+    const isActive = isMenuItemActive(item.path);
     const isHovered = hoveredMenu === item.path;
     const paddingLeft = `${depth * 1}rem`;
     const bgColor = generateLightShade(settings?.primaryColor, 0.89);
+    // Determine styling based on whether it's a parent or child item
+    const isParentWithChildren = hasChildren && depth === 0;
+    const shouldApplyBackground = isActive && !isParentWithChildren || isHovered;
     return jsxs("div", {
       className: `w-full relative group ${isHovered && collapsed && !isHoverMenu ? `rounded-md` : ''}`,
       style: {
@@ -118,15 +132,15 @@ import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {Li
         className: `flex items-center justify-between w-full px-1 py-2 hover:bg-gray-100 text-sm cursor-pointer transition-colors rounded-md mx-1 my-0.5 whitespace-nowrap overflow-hidden text-ellipsis`,
         style: {
           paddingLeft: `calc(1rem + ${paddingLeft})`,
-          backgroundColor: isActive || isHovered ? bgColor : ''
+          backgroundColor: shouldApplyBackground ? bgColor : ''
         },
         onClick: e => handleMenuClick(item.path, hasChildren, depth, e),
         children: [jsxs("div", {
           className: `flex items-center ${collapsed && !isHoverMenu ? 'justify-center w-full' : 'gap-3'}`,
           children: [item.icon ? jsx("span", {
-            className: `${isActive || isHovered ? 'text-primary' : ''} flex-shrink-0`,
+            className: `flex-shrink-0`,
             style: {
-              color: isActive || isHovered ? settings?.primaryColor : ''
+              color: isActive ? settings?.primaryColor : ''
             },
             children: item.icon
           }) : collapsed && !isHoverMenu ? jsx("span", {
@@ -147,9 +161,9 @@ import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {Li
             color: isActive ? settings?.primaryColor : ''
           },
           className: "flex-shrink-0 ml-1",
-          children: isOpen ? jsx(ChevronDownIcon, {
+          children: isOpen ? jsx(ChevronUpIcon, {
             className: "h-4 w-4"
-          }) : jsx(ChevronRightIcon, {
+          }) : jsx(ChevronDownIcon, {
             className: "h-4 w-4"
           })
         })]

package/lib/components/Layout/Sidebar/SidebarMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"SidebarMenu.js","sources":["../../../../src/components/Layout/Sidebar/SidebarMenu.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"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"}
+{"version":3,"file":"SidebarMenu.js","sources":["../../../../src/components/Layout/Sidebar/SidebarMenu.tsx"],"sourcesContent":[null],"names":["_jsx"],"mappings":"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"}

package/lib/components/Layout/TailwindLayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,sBAAsB,CAAC;AAE3E,OAAO,KAAqC,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAqC,MAAM,aAAa,CAAC;AAwDpG,KAAK,cAAc,GAAG,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC;AAEvD,QAAA,MAAM,SAAS;;;0EAAoB,CAAC;AAEpC,KAAK,+BAA+B,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAEzE,QAAA,MAAM,mBAAmB,EAAE,kBAAkB,CACzC,KAAK,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,+BAA+B,KAAK,GAAG,CAAC,OAAO,CAAC,EAClF,GAAG,CAC8C,CAAC;AAEtD,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"TailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,sBAAsB,CAAC;AAE3E,OAAO,KAAwD,MAAM,OAAO,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAwB,MAAM,aAAa,CAAC;AAkFvF,KAAK,cAAc,GAAG,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC;AAEvD,QAAA,MAAM,SAAS;;;0EAAoB,CAAC;AAEpC,KAAK,+BAA+B,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAEzE,QAAA,MAAM,mBAAmB,EAAE,kBAAkB,CACzC,KAAK,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,+BAA+B,KAAK,GAAG,CAAC,OAAO,CAAC,EAClF,GAAG,CAC8C,CAAC;AAEtD,eAAe,mBAAmB,CAAC"}

package/lib/components/Layout/TailwindLayout.js

@@ -1,10 +1,9 @@
-import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout/client';import {userSelector}from'@adminide-stack/user-auth0-client';import React__default,{useMemo}from'react';import {connect,useSelector}from'react-redux';import {BasicLayout}from'./BasicLayout/index.js';import {settingsMachine}from'../../machines/settingsMachine.js';import {createActor}from'xstate';import {useSelector as useSelector$1}from'@xstate/react';import {ThemeProviderTailwind}from'../ThemeProvider/ThemeProvider.js';function BasicLayoutWithAuthorities(props) {
+import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout/client';import {userSelector}from'@adminide-stack/user-auth0-client';import React__default,{useRef,useEffect,useMemo,useCallback}from'react';import {connect,useSelector}from'react-redux';import {BasicLayout}from'./BasicLayout/index.js';import {settingsMachine}from'../../machines/settingsMachine.js';import {createActor}from'xstate';import {useSelector as useSelector$1}from'@xstate/react';import {ThemeProviderTailwind}from'../ThemeProvider/ThemeProvider.js';import {isEqual}from'lodash-es';function BasicLayoutWithAuthorities(props) {
   const userData = useSelector(userSelector);
   const {
     settings,
     setSettings
   } = useLayoutSettings();
-  // const { authenticated, user } = isUserAuthenticated();
   const settingsActor = createActor(settingsMachine, {
     systemId: 'settings'
   }).start();
@@ -13,14 +12,30 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
   const {
     permissions
   } = props;
+  // Track the last settings we processed to avoid loops
+  const lastProcessedSettingsRef = useRef(settings);
+  // Monitor external settings changes and update xstate context
+  useEffect(() => {
+    // Skip initial render
+    if (!settings) return;
+    // Skip if this is the same settings object we just processed
+    if (isEqual(settings, lastProcessedSettingsRef.current)) return;
+    // Update our reference to prevent processing the same settings again
+    lastProcessedSettingsRef.current = settings;
+    // Update the xstate context with the new settings
+    settingsActor.send({
+      type: 'UPDATE',
+      value: settings
+    });
+  }, [settings, settingsActor]);
   const mainHeaderProps = useMemo(() => ({
     picture: userData ? userData?.profile?.picture : null
   }), [userData]);
-  const onSettingChange = config => {
-    (async () => {
-      await setSettings(config);
-    })();
-  };
+  const onSettingChange = useCallback(config => {
+    // Just update the settings through the normal channel
+    // Our useEffect will detect this change and update xstate
+    setSettings(config);
+  }, [setSettings]);
   //@ts-ignore
   const {
     routeParams: {

package/lib/components/Layout/TailwindLayout.js.map

@@ -1 +1 @@
-{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"ggBAUA,SAAS,0BAA0B,CAAC,KAAgF,EAAA;AAChH,EAAA,MAAA,WAAiB,WAAA,CAAA,YAAY,CAAA;QACvB;IACN,QAAyD;AACzD,IAAA;AACI,GAAA,GAAA,iBAAoB,EAAA;;AAGxB,EAAA,MAAA,aAA+B,GAAA,WAAA,CAAC,eAAe,EAAC;AAEhD,IAAA,QAAmB,EAAA;AACnB,GAAA,CAAA,CAAA,KAAM,EAAE;AACR,EAAA,MAAA,qBAAwB,CAAA,aACb,EAAA,KAAA,IAAA,KAAA,CAAA;AACH,EAAA,MAAA,aAAS,GAAA,KAAW,EAAA,OAAU;AACjC,EAAA,MACD;AAGJ,IAAA;WACK;AACG,EAAA,MAAA,eAAiB,GAAA,OAAO,CAAA,OAAE;aACzB,QAAA,GAAA,QAAA,EAAA,OAAA,EAAA,OAAA,GAAA;AACT,GAAA,CAAA,EAAE,CAAA,QAAA,CAAA,CAAA;QAEU,eAAA,GAAA,MAAA,IAAA;IACZ,CAAM,YAAa;AACnB,MAAA,MACI,WAAC,CAAA,MAAA,CAAA;AAYT,KAAC,GAAA;AAED,GAAM;;QAEM;AACX,IAAE,WAAA,EAAA;AAMH,MAAM;AAIN,KAAM,GAAA;AAKN,GAAA,GAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":["useXstateSelector","_jsx"],"mappings":"6jBAWA,SAAS,0BAA0B,CAAC,KAAgF,EAAA;AAChH,EAAA,MAAA,WAAiB,WAAA,CAAA,YAAY,CAAA;QACvB;AAEN,IAAA,QAAmB;AACf,IAAA;MACF,iBAAS,EAAA;AAEX,EAAA,MAAA,aAA+B,GAAA,WAAA,CAAC,eAAe,EAAC;AAChD,IAAA,QAAmB,EAAA;AACnB,GAAA,CAAA,CAAA,KAAM,EAAE;QAE8C,KAAA,GAAAA,aAAA,CAAA,aAAA,EAAA,KAAA,IAAA,KAAA,CAAA;AACtD,EAAA,MAAA,8BAAiC;QAE6B;IAC9D;WAC0B;AACtB;gCAAsB,GAAA,MAAA,CAAA,QAAA,CAAA;;AAGtB,EAAA,SAAA,CAAI;;QAEJ,CAAqE,QAAA,EAAA;AACrE;QAEA,OAAkD,CAAA,QAAA,EAAA,wBAAA,CAAA,OAAA,CAAA,EAAA;;AAE9C,IAAA,wBAAc,CAAA,OAAA,GAAA,QAAA;AACd;AACH,IAAA,aAAE,CAAA,IAAA,CAAA;AACP,UAAI,EAAA,QAAuB;AAE3B,MAAA;AAEQ,KAAA,CAAA;AACH,GAAA,EAAA,CAAC,QACO,EAAA,aACX,CAAA,CAAA;AAEF,EAAA,MAAA,kBAAwB,OAAA,CAAA,OACnB;WACyD,EAAA,QAAA,GAAA,QAAA,EAAA,OAAA,EAAA,OAAA,GAAA;eACI,CAAA,CAAA;QAC1D,eAAkB,GAAA,WAAE,CAAA,MAAA,IAAA;AACxB;;IAKJ,WAAmB,CAAA,MAAA,CAAA;AAEnB,GAAA,EAAA,CAAA,WACK,CAAA,CAAA;AAYT;AAEA,EAAM,MAAA;IACF,WAAQ,EAAA;MACA;AACX,KAAE,GAAA;AAMH,GAAA,GAAM;AAIN,EAAM,OAAAC,GAAA,CAAA,qBAGF,EAAS;AAEb,IAAA,QAAA,EAAA;;;;;;;;;;;;;;;;;;;;"}

package/lib/hooks/index.d.ts

@@ -2,4 +2,5 @@ export * from './useWindowSize';
 export { default as useWindowSize } from './useWindowSize';
 export * from './useTailwindTheme';
 export * from './use-get-current-lat-long';
+export * from './useMediaQuery';
 //# sourceMappingURL=index.d.ts.map

package/lib/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC"}

package/lib/hooks/useMediaQuery.d.ts

@@ -0,0 +1,14 @@
+interface MediaQueryResult {
+    width: number;
+    height: number;
+    isMobile: boolean;
+    xs: boolean;
+    sm: boolean;
+    md: boolean;
+    lg: boolean;
+    xl: boolean;
+    '2xl': boolean;
+}
+export declare const useMediaQuery: () => MediaQueryResult;
+export {};
+//# sourceMappingURL=useMediaQuery.d.ts.map

package/lib/hooks/useMediaQuery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useMediaQuery.d.ts","sourceRoot":"","sources":["../../src/hooks/useMediaQuery.ts"],"names":[],"mappings":"AAEA,UAAU,gBAAgB;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,EAAE,EAAE,OAAO,CAAC;IACZ,EAAE,EAAE,OAAO,CAAC;IACZ,EAAE,EAAE,OAAO,CAAC;IACZ,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;CAClB;AAoBD,eAAO,MAAM,aAAa,QAAO,gBAyChC,CAAC"}

package/lib/hooks/useMediaQuery.js

@@ -0,0 +1,49 @@
+import {useState,useEffect}from'react';const breakpoints = {
+  xs: 0,
+  sm: 640,
+  md: 768,
+  lg: 1024,
+  xl: 1280,
+  '2xl': 1536
+};
+const getFlags = width => ({
+  xs: width < breakpoints.sm,
+  sm: width >= breakpoints.sm && width < breakpoints.md,
+  md: width >= breakpoints.md && width < breakpoints.lg,
+  lg: width >= breakpoints.lg && width < breakpoints.xl,
+  xl: width >= breakpoints.xl && width < breakpoints['2xl'],
+  '2xl': width >= breakpoints['2xl']
+});
+const useMediaQuery = () => {
+  const getDimensions = () => {
+    const width = window.innerWidth;
+    const height = window.innerHeight;
+    const isMobile = width < breakpoints.md;
+    const flags = getFlags(width);
+    return {
+      width,
+      height,
+      isMobile,
+      ...flags
+    };
+  };
+  const [state, setState] = useState(() => typeof window !== 'undefined' ? getDimensions() : {
+    width: 0,
+    height: 0,
+    isMobile: false,
+    xs: false,
+    sm: false,
+    md: false,
+    lg: false,
+    xl: false,
+    '2xl': false
+  });
+  useEffect(() => {
+    const handleResize = () => {
+      setState(getDimensions());
+    };
+    window.addEventListener('resize', handleResize);
+    return () => window.removeEventListener('resize', handleResize);
+  }, []);
+  return state;
+};export{useMediaQuery};//# sourceMappingURL=useMediaQuery.js.map

package/lib/hooks/useMediaQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useMediaQuery.js","sources":["../../src/hooks/useMediaQuery.ts"],"sourcesContent":[null],"names":[],"mappings":"uCAcA,MAAM,WAAW,GAAG;AAChB,EAAA,EAAA,EAAE;AACF,EAAA,EAAA,EAAE,GAAK;AACP,EAAA,EAAA,EAAE,GAAK;AACP,EAAA,EAAA,EAAE,IAAM;AACR,EAAA,EAAA,EAAE,IAAM;AACR,EAAA,KAAA,EAAK;CACR;AAED,MAAM,QAAQ,GAAG,UAA2E;AACxF,EAAA,EAAA,EAAE,KAAE,GAAQ,WAAA,CAAA,EAAY;IACxB,EAAE,KAAO,IAAA,WAAe,CAAA,EAAC,IAAE,KAAS,GAAA,WAAc,CAAA,EAAC;IACnD,EAAE,KAAO,IAAA,WAAe,CAAA,EAAC,IAAE,KAAS,GAAA,WAAc,CAAA,EAAC;IACnD,EAAE,KAAO,IAAA,WAAe,CAAA,EAAC,IAAE,KAAS,GAAA,WAAc,CAAA,EAAC;AACnD,EAAA,EAAA,EAAE,KAAE,IAAS,WAAA,CAAA,EAAY,IAAM,KAAA,GAAQ,WAAA,CAAA,KAAY,CAAA;AACnD,EAAA,KAAA,EAAK,KAAO,IAAA,WAAe,CAAA;AAC9B,CAAA,CAAC;AAEK,MAAM,aAAa,GAAG,MAAuB;QAC1C,aAAA,GAAgB,MAAK;AACvB,IAAA,MAAA,KAAW,GAAA,MAAS,CAAA;AACpB,IAAA,MAAA,MAAY,GAAA,MAAS,CAAA;AACrB,IAAA,MAAA,gBAAiB,GAAA,WAAmB,CAAA,EAAA;AACpC,IAAA,MAAA,gBAAc,CAAA,KAAS,CAAA;WAEhB;;YAEH;cACQ;AACR,MAAA,GAAA;;AAER,GAAA;AAEA,EAAA,MAAA,CAAA,KAAO,EAAK,QAAE,CAAA,GAAY,QAAA,CAAA,MAAgC,OAC/C,MAAA,gBAAsB,GAAA,aAAA,EAAA,GAAA;SACxB;AACD,IAAA,MAAE,EAAA,CAAA;AACI,IAAA,QAAA,EAAA,KAAO;AACP,IAAA,EAAA,EAAA,KAAA;AACA,IAAA,EAAA,EAAA,KAAA;AACA,IAAA,EAAA,EAAA,KAAA;AACA,IAAA,EAAA,EAAA,KAAA;AACA,IAAA,EAAA,EAAA,KAAA;AACA,IAAA,KAAA,EAAA;AACA,GAAA,CAAA;AACA,EAAA,SAAA,CAAA;AACH,IAAA,MACV,YAAC,GAAA,MAAA;MAEO,QAAC,cAAK,EAAA,CAAA;;AAEP,IAAA,MAAA,CAAA,gBAAS,CAAA,QAAe,EAAE,YAAA,CAAA;AAC9B,IAAA,OAAE,MAAA,MAAA,CAAA,mBAAA,CAAA,QAAA,EAAA,YAAA,CAAA;AAEF,GAAA,EAAA,EAAA,CAAA;SACO,KAAA;"}

package/lib/icons.d.ts

@@ -10,5 +10,7 @@ export declare const icons: {
     CheckIcon: import("@react-icons/all-files/lib").IconType;
     ChevronBackCircleIcon: import("@react-icons/all-files/lib").IconType;
     ChevronForwardCircleIcon: import("@react-icons/all-files/lib").IconType;
+    ChevronUpIcon: import("@react-icons/all-files/lib").IconType;
+    ChevronLeftIcon: import("@react-icons/all-files/lib").IconType;
 };
 //# sourceMappingURL=icons.d.ts.map

package/lib/icons.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"icons.d.ts","sourceRoot":"","sources":["../src/icons.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,KAAK;;;;;;;;;;;;CAYjB,CAAC"}
+{"version":3,"file":"icons.d.ts","sourceRoot":"","sources":["../src/icons.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,KAAK;;;;;;;;;;;;;;CAcjB,CAAC"}

package/lib/icons.js

@@ -1,4 +1,4 @@
-import {FaSearch}from'@react-icons/all-files/fa/FaSearch.js';import {IoMenu}from'@react-icons/all-files/io5/IoMenu.js';import {AiOutlineDash}from'@react-icons/all-files/ai/AiOutlineDash.js';import {FaChevronDown}from'@react-icons/all-files/fa/FaChevronDown.js';import {FaChevronRight}from'@react-icons/all-files/fa/FaChevronRight.js';import {MdClose}from'@react-icons/all-files/md/MdClose.js';import {RiSettings5Fill}from'@react-icons/all-files/ri/RiSettings5Fill.js';import {IoMdCopy}from'@react-icons/all-files/io/IoMdCopy.js';import {FaCheck}from'@react-icons/all-files/fa/FaCheck.js';import {IoChevronBackCircleOutline}from'@react-icons/all-files/io5/IoChevronBackCircleOutline.js';import {IoChevronForwardCircleOutline}from'@react-icons/all-files/io5/IoChevronForwardCircleOutline.js';const icons = {
+import {FaSearch}from'@react-icons/all-files/fa/FaSearch.js';import {IoMenu}from'@react-icons/all-files/io5/IoMenu.js';import {AiOutlineDash}from'@react-icons/all-files/ai/AiOutlineDash.js';import {FaChevronDown}from'@react-icons/all-files/fa/FaChevronDown.js';import {FaChevronUp}from'@react-icons/all-files/fa/FaChevronUp.js';import {FaChevronRight}from'@react-icons/all-files/fa/FaChevronRight.js';import {FaChevronLeft}from'@react-icons/all-files/fa/FaChevronLeft.js';import {MdClose}from'@react-icons/all-files/md/MdClose.js';import {RiSettings5Fill}from'@react-icons/all-files/ri/RiSettings5Fill.js';import {IoMdCopy}from'@react-icons/all-files/io/IoMdCopy.js';import {FaCheck}from'@react-icons/all-files/fa/FaCheck.js';import {IoChevronBackCircleOutline}from'@react-icons/all-files/io5/IoChevronBackCircleOutline.js';import {IoChevronForwardCircleOutline}from'@react-icons/all-files/io5/IoChevronForwardCircleOutline.js';const icons = {
   SearchIcon: FaSearch,
   ChevronDownIcon: FaChevronDown,
   ChevronRightIcon: FaChevronRight,
@@ -9,5 +9,7 @@ import {FaSearch}from'@react-icons/all-files/fa/FaSearch.js';import {IoMenu}from
   CopyIcon: IoMdCopy,
   CheckIcon: FaCheck,
   ChevronBackCircleIcon: IoChevronBackCircleOutline,
-  ChevronForwardCircleIcon: IoChevronForwardCircleOutline
+  ChevronForwardCircleIcon: IoChevronForwardCircleOutline,
+  ChevronUpIcon: FaChevronUp,
+  ChevronLeftIcon: FaChevronLeft
 };export{icons};//# sourceMappingURL=icons.js.map

package/lib/icons.js.map

@@ -1 +1 @@
-{"version":3,"file":"icons.js","sources":["../src/icons.ts"],"sourcesContent":[null],"names":[],"mappings":"sxBAYa,MAAA,KAAK,GAAG;sBACP;gCACK;kCACC;kBACR;gCACO;oBACN;oCACQ;oBACT;oBACC;mDACY;;"}
+{"version":3,"file":"icons.js","sources":["../src/icons.ts"],"sourcesContent":[null],"names":[],"mappings":"g6BAca,MAAA,KAAK,GAAG;sBACP;gCACK;kCACC;kBACR;gCACO;oBACN;oCACQ;oBACT;oBACC;mDACY;yDACG;4BACX;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/tailwind-design-pro",
-    "version": "10.0.9-alpha.46",
+    "version": "10.0.9-alpha.48",
     "description": "Sample core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -58,7 +58,7 @@
             }
         }
     },
-    "gitHead": "b2f98cdfe7fde9a05938039633b23a44b7f01ead",
+    "gitHead": "5dd0452bde63f03574b9f05b3934e4136cec46db",
     "typescript": {
         "definition": "lib/index.d.ts"
     }