@admin-layout/tailwind-design-pro 10.0.6-alpha.9 → 10.0.9-alpha.13

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

@@ -1,10 +1,5 @@
 import React from 'react';
 import { BasicLayoutProps, GlobalHeaderProps } from '@admin-layout/client';
-interface ThemeContextType {
-    isDarkMode: boolean;
-    toggleTheme: () => void;
-}
-export declare const useTheme: () => ThemeContextType;
 export declare const useHorizontalScroll: ({ scrolled, setScrolled, setSearchOptionsShown, onScrollReachEnd }: {
     scrolled: any;
     setScrolled: any;
@@ -15,5 +10,4 @@ export declare const BasicLayout: React.FC<BasicLayoutProps & GlobalHeaderProps
     routeParams?: any;
     children?: React.ReactNode;
 }>;
-export {};
 //# sourceMappingURL=index.d.ts.map

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,EAEpB,MAAM,sBAAsB,CAAC;AAK9B,UAAU,gBAAgB;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,IAAI,CAAC;CAC3B;AAID,eAAO,MAAM,QAAQ,wBAIpB,CAAC;AACF,eAAO,MAAM,mBAAmB;;;;;uCA6B/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,CA4I3F,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,EAGpB,MAAM,sBAAsB,CAAC;AAM9B,eAAO,MAAM,mBAAmB;;;;;uCA6B/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,CAmI3F,CAAC"}

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

@@ -1,9 +1,4 @@
-import {jsx,jsxs}from'react/jsx-runtime';import {createContext,useState,useRef,useEffect,useContext}from'react';import {Sidebar}from'../Sidebar/Sidebar.js';import {GlobalHeader}from'../GlobalHeader/Header.js';import {useLocation,Outlet}from'@remix-run/react';import warning from'warning';import {omit}from'lodash-es';import {SettingDrawer}from'../../SettingDrawer/SettingDrawer.js';import {defaultSettings,useComponentSize,getMenuSeparation}from'@admin-layout/client';import isBrowser from'../../../utils/isBrowser/index.js';import {getPageTitleInfo}from'../getPageTitle.js';import {GlobalFooter}from'../GlobalFooter/Footer.js';const ThemeContext = createContext(undefined);
-const useTheme = () => {
-  const context = useContext(ThemeContext);
-  return context;
-};
-const useHorizontalScroll = ({
+import {jsx,jsxs}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {Sidebar}from'../Sidebar/Sidebar.js';import {GlobalHeader}from'../GlobalHeader/Header.js';import {useLocation,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 {GlobalFooter}from'../GlobalFooter/Footer.js';import {ThemeProvider}from'../../ThemeProvider/ThemeProvider.js';const useHorizontalScroll = ({
   scrolled,
   setScrolled,
   setSearchOptionsShown,
@@ -65,7 +60,7 @@ const BasicLayout = props => {
     ...props
   };
   const [scrolled, setScrolled] = useState(false);
-  const [collapsed, setCollapsed] = useState();
+  const [collapsed, setCollapsed] = useState(false);
   const {
     children,
     onCollapse: propsOnCollapse,
@@ -85,10 +80,11 @@ const BasicLayout = props => {
     authorities,
     primaryColor,
     onSettingChange,
-    mainHeaderProps
+    mainHeaderProps,
+    actor
   } = propsWithSettings;
   const [isSideMenuOpen, setIsSideMenuOpen] = useState(false);
-  const [isDarkMode, setIsDarkMode] = useState(false);
+  useState(false);
   const location = useLocation();
   const [scrollEnd, setScrollEnd] = useState(false);
   const [searchOptionsShown, setSearchOptionsShown] = useState(false);
@@ -137,47 +133,27 @@ const BasicLayout = props => {
       if (heightBody < window.innerHeight - heightHeader - heightFooter) setFooterFixed(true);else setFooterFixed(false);
     }
   }, [heightHeader, heightBody, heightFooter]);
-  useEffect(() => {
-    const savedTheme = localStorage.getItem('theme');
-    const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-    if (savedTheme === 'dark' || !savedTheme && prefersDark) {
-      setIsDarkMode(true);
-      document.documentElement.classList.add('dark');
-    }
-  }, []);
-  const toggleTheme = () => {
-    setIsDarkMode(!isDarkMode);
-    if (isDarkMode) {
-      document.documentElement.classList.remove('dark');
-      localStorage.setItem('theme', 'light');
-    } else {
-      document.documentElement.classList.add('dark');
-      localStorage.setItem('theme', 'dark');
-    }
-  };
   const toggleSideMenu = () => {
     setIsSideMenuOpen(!isSideMenuOpen);
   };
   const closeSideMenu = () => {
     setIsSideMenuOpen(false);
   };
-  return jsx(ThemeContext.Provider, {
-    value: {
-      isDarkMode,
-      toggleTheme
-    },
+  return jsx(ThemeProvider, {
+    settings: settings,
     children: jsxs("div", {
-      className: `flex h-screen bg-gray-50 dark:bg-gray-900`,
-      children: [jsx(Sidebar, {
+      className: "flex h-screen bg-background font-sans",
+      children: [settings?.layout.navigationMode !== 'topbar' && settings?.regions.showMenu && !settings?.layout.splitMenus && jsx(Sidebar, {
         isSideMenuOpen: isSideMenuOpen,
         closeSideMenu: closeSideMenu,
         menuData: menuData,
-        collapsed: children,
+        collapsed: collapsed,
+        setCollapsed: setCollapsed,
         routeParams: routeParams,
         settings: settings
       }), jsxs("div", {
         className: "flex flex-col flex-1 w-full",
-        children: [jsx(GlobalHeader, {
+        children: [settings?.regions.showHeader && jsx(GlobalHeader, {
           toggleSideMenu: toggleSideMenu,
           settings: settings,
           upperMenus: getMenuSeparation(menuData).upperMenus,
@@ -186,18 +162,16 @@ const BasicLayout = props => {
         }), jsx(SettingDrawer, {
           primaryColor: primaryColor,
           settings: settings,
-          onSettingChange: onSettingChange
+          onSettingChange: onSettingChange,
+          actor: actor,
+          colorList: getThemeColors(settings?.theme)
         }), jsx("main", {
-          className: "h-full overflow-y-auto",
-          children: jsx("div", {
-            className: "container px-6 mx-auto grid",
-            children: jsx(Outlet, {})
-          })
+          children: jsx(Outlet, {})
         }), jsx(GlobalFooter, {
           settings: settings,
-          active: settings?.showFooter
+          active: settings?.regions?.showFooter
         })]
       })]
     })
   });
-};export{BasicLayout,useHorizontalScroll,useTheme};//# sourceMappingURL=index.js.map
+};export{BasicLayout,useHorizontalScroll};//# sourceMappingURL=index.js.map

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

@@ -13,6 +13,6 @@ export interface GlobalHeaderRightProps {
     settings?: ProSettings;
     toggleSideMenu?: any;
 }
-export declare const GlobalHeader: React.FC<GlobalHeaderRightProps>;
+export declare const GlobalHeader: React.FC<GlobalHeaderRightProps | any>;
 export default GlobalHeader;
 //# sourceMappingURL=Header.d.ts.map

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;AAK1B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,MAAM,WAAW,sBAAsB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,cAAc,CAAC,EAAE,GAAG,CAAC;CACxB;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CA4EzD,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;AAG1B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,MAAM,WAAW,sBAAsB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,cAAc,CAAC,EAAE,GAAG,CAAC;CACxB;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,GAAG,GAAG,CAwE/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 {useState}from'react';import {Menu,Search,Sun,Moon}from'lucide-react';import {useTheme}from'../BasicLayout/index.js';import OrganizationDropDown from'./OrganizationDropdown.js';import {LanguageMenu}from'../../LanguageMenu/LanguageMenu.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';const GlobalHeader = props => {
   const {
     theme,
     layout,
@@ -8,66 +8,60 @@ import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {Me
     settings,
     toggleSideMenu
   } = props;
-  useState(false);
-  useState(false);
   const {
-    isDarkMode,
-    toggleTheme
-  } = useTheme();
-  if (!settings?.showHeader) return null;
+    MenuIcon,
+    SearchIcon
+  } = icons;
+  // Calculate header styles
+  const headerStyles = React__default.useMemo(() => ({
+    backgroundColor: settings?.navTheme === 'realDark' ? '#222' : '',
+    color: settings?.navTheme === 'realDark' ? '#fff' : ''
+  }), [settings]);
+  if (!settings?.regions?.showHeader) return null;
   return jsx("header", {
-    className: "z-10 py-4 bg-white shadow-md dark:bg-gray-800",
+    className: "z-10 py-4  dark:bg-gray-800",
+    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",
       children: [jsx("button", {
         className: "p-1 mr-5 -ml-1 rounded-md md:hidden focus:outline-none focus:shadow-outline-purple",
         onClick: toggleSideMenu,
         "aria-label": "Menu",
-        children: jsx(Menu, {
+        children: jsx(MenuIcon, {
           className: "w-6 h-6"
         })
-      }), settings?.searchBarRender && jsx("div", {
+      }), 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",
+        style: headerStyles,
         children: jsxs("div", {
           className: "relative w-full max-w-xl mr-6 focus-within:text-purple-500",
+          style: headerStyles,
           children: [jsx("div", {
             className: "absolute inset-y-0 flex items-center pl-2",
-            children: jsx(Search, {
+            children: jsx(SearchIcon, {
               className: "w-4 h-4"
             })
           }), jsx("input", {
             className: "w-full pl-8 pr-2 text-sm text-gray-700 placeholder-gray-600 bg-gray-100 border-0 rounded-md dark:placeholder-gray-500 dark:focus:shadow-outline-gray dark:focus:placeholder-gray-600 dark:bg-gray-700 dark:text-gray-200 focus:placeholder-gray-500 focus:bg-white focus:border-purple-300 focus:outline-none focus:shadow-outline-purple form-input",
             type: "text",
             placeholder: "Search",
-            "aria-label": "Search"
+            "aria-label": "Search",
+            style: headerStyles
           })]
         })
-      }), jsxs("ul", {
-        className: "flex items-center flex-shrink-0 space-x-6",
-        children: [jsx("li", {
-          className: "flex",
-          children: jsx("button", {
-            className: "rounded-md focus:outline-none focus:shadow-outline-purple",
-            onClick: toggleTheme,
-            "aria-label": "Toggle color mode",
-            children: isDarkMode ? jsx(Sun, {
-              className: "w-5 h-5"
-            }) : jsx(Moon, {
-              className: "w-5 h-5"
-            })
-          })
-        }), jsx("li", {
-          className: "relative",
-          children: jsx(LanguageMenu, {})
-        }), jsx("li", {
-          className: "relative",
-          children: jsx(OrganizationDropDown, {
-            upperMenus: upperMenus,
-            routeParams: routeParams,
-            collapsed: collapsed,
-            settings: settings
-          })
-        })]
+      }), settings?.layout?.navigationMode != 'sidebar' && jsx(RightContent, {
+        upperMenus: upperMenus,
+        collapsed: collapsed,
+        routeParams: routeParams,
+        settings: settings
       })]
     })
   });

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":"+RAsBa,MAAA,YAAY,GAAqC,KAAC,IAAS;AACpE,EAAA,MAAA;IACA,KAAM;IACN,MAAM;IACN;IAEA,WAAM;AACF,IAAA,SAAA;YACoB;AACxB,IAAA;MAEM,KAAA;AACF,EAAyC,QAAA,CAAA,KAAA;EACP,QAAA,CAAA,KAAA;AACtC,EAAA,MAAE;IAEF,UAAa;AAAc,IAAA;AAC3B,GAAA,GAAA,QACY,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Header.js","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"sourcesContent":[null],"names":[],"mappings":"kMAqBa,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/Layout/GlobalHeader/RightContent.d.ts

@@ -12,7 +12,5 @@ export interface GlobalHeaderRightProps {
     collapsed?: boolean;
     settings?: ProSettings;
 }
-export declare const useHorizontalScroll: () => React.MutableRefObject<undefined>;
-declare const GlobalHeaderRight: React.FC<GlobalHeaderRightProps>;
-export default GlobalHeaderRight;
+export declare const RightContent: React.FC<GlobalHeaderRightProps>;
 //# sourceMappingURL=RightContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RightContent.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/RightContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,MAAM,WAAW,sBAAsB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;CAC1B;AAED,eAAO,MAAM,mBAAmB,yCAsB/B,CAAC;AAEF,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAkEvD,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"RightContent.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/RightContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,MAAM,WAAW,sBAAsB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;CAC1B;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CA+BzD,CAAC"}

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

@@ -0,0 +1,23 @@
+import {jsxs,jsx}from'react/jsx-runtime';import {LanguageMenu}from'../../LanguageMenu/LanguageMenu.js';import OrganizationDropDown from'./OrganizationDropdown.js';const RightContent = props => {
+  const {
+    routeParams,
+    upperMenus,
+    settings,
+    collapsed
+  } = props;
+  return jsxs("div", {
+    className: "flex items-center flex-shrink-0 space-x-6",
+    children: [jsx("div", {
+      className: "relative",
+      children: jsx(LanguageMenu, {})
+    }), jsx("div", {
+      className: "relative",
+      children: jsx(OrganizationDropDown, {
+        upperMenus: upperMenus,
+        routeParams: routeParams,
+        collapsed: collapsed,
+        settings: settings
+      })
+    })]
+  });
+};export{RightContent};//# sourceMappingURL=RightContent.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RightContent.js","sources":["../../../../src/components/Layout/GlobalHeader/RightContent.tsx"],"sourcesContent":[null],"names":[],"mappings":"mKAkBa,MAAA,YAAY,GAAqC,KAAC,IAAS;QAC9D;AACN,IAAA,WACS;AA4Bb,IAAE,UAAA;;;;;;;;;;;;;;;;;;;"}

package/lib/components/Layout/ProTailwindLayout.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import type { LinksFunction } from '@remix-run/node';
 import { BasicLayoutProps } from '@admin-layout/client';
 declare const ProTailwindLayout: React.FC<BasicLayoutProps & {
     loaderData?: any;
@@ -7,6 +8,7 @@ export default ProTailwindLayout;
 export declare const handle: {
     i18n: string;
 };
+export declare const links: LinksFunction;
 export declare const loader: (params: any) => Promise<{
     newMenuData: import("@common-stack/client-react").IMenuData[];
     apolloState: any;

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

@@ -1 +1 @@
-{"version":3,"file":"ProTailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/ProTailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAOH,gBAAgB,EACnB,MAAM,sBAAsB,CAAC;AAY9B,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,GAAG;IAAE,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,CASxE,CAAC;AACF,eAAe,iBAAiB,CAAC;AAEjC,eAAO,MAAM,MAAM;;CAElB,CAAC;AAEF,eAAO,MAAM,MAAM;;;EA2BlB,CAAC;AAEF,wBAAsB,YAAY,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE;;;;CAAA,gBAkBnE;AAED,eAAO,MAAM,gBAAgB;;;aAE5B,CAAC"}
+{"version":3,"file":"ProTailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/ProTailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAOH,gBAAgB,EACnB,MAAM,sBAAsB,CAAC;AAc9B,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,GAAG;IAAE,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,CASxE,CAAC;AACF,eAAe,iBAAiB,CAAC;AAEjC,eAAO,MAAM,MAAM;;CAElB,CAAC;AACF,eAAO,MAAM,KAAK,EAAE,aAA+D,CAAC;AAEpF,eAAO,MAAM,MAAM;;;EA2BlB,CAAC;AAEF,wBAAsB,YAAY,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE;;;;CAAA,gBAkBnE;AAED,eAAO,MAAM,gBAAgB;;;aAE5B,CAAC"}

package/lib/components/Layout/ProTailwindLayout.js

@@ -7,6 +7,7 @@ import { ClientTypes } from '@common-stack/client-core';
 import { createSelector } from 'reselect';
 import BasicLayoutEnhanced from './TailwindLayout.js';
 import { config } from '../../config/env-config.js';
+import stylesheet from '../../styles/index.css?url';
 const selectOrgName = state => state.platform.orgName;
 const selector = createSelector([selectOrgName], orgName => ({
   orgName
@@ -33,6 +34,10 @@ const ProTailwindLayout = props => {
 const handle = {
   i18n: 'menu'
 };
+const links = () => [{
+  rel: 'stylesheet',
+  href: stylesheet
+}];
 const loader = async params => {
   const {
     routeConfig
@@ -92,4 +97,4 @@ const shouldRevalidate = ({
 }) => {
   return currentParams.orgName !== nextParams.orgName;
 };
-export { clientLoader, ProTailwindLayout as default, handle, loader, shouldRevalidate }; //# sourceMappingURL=ProTailwindLayout.js.map
+export { clientLoader, ProTailwindLayout as default, handle, links, loader, shouldRevalidate }; //# sourceMappingURL=ProTailwindLayout.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProTailwindLayout.js","sources":["../../../src/components/Layout/ProTailwindLayout.tsx"],"sourcesContent":[null],"names":["_jsx","TailwindLayout"],"mappings":"4gBAkBA,MAAM,aAAa,GAAG,KAAC,IAAO,KAAG,CAAA,QAAM,CAAA,OAAS;AAEhD,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,aAAa,CAAC,EAAE,YAAY;AAE7D,EAAA;;AAII,MAAA,iBAAoB,GAAA,KAAA,IAAW;AAG/B,EAAA,MAAA;AACA,IAAA,UAAQ,EAAA;AACZ,MAAE,WAAA;AACF,MAAA;AAEA;AACI,GAAA,GAAA,KAAY;EACd,MAAA;AAEF,IAAM;AACF,GAAA,GAAA,WAAmB,CAAA,KAAA,YAAY,OAAO,CAAC;QACnC,MAAA,GAAA;AACJ,IAAA,OAAK,EAAA;;SAEJA,GAAA,CAAAC,mBAAA,EAAA;IAAC,WAAgB,EAAA,MAAA;AACd,IAAA,WAAO,EAAC,WAAO;IACnB,QAAC,EAAA;IAED;AACA;AAEA,MAAA,MAAA,GAAA;AACA,EAAA,IAAA,EAAI;AACJ;AACgB,MAAA,MAAA,GAAE,MAAC,MAAA,IAAA;AACf,EAAA,MAAA;IACJ;MACI,MAAY,CAAA,OAAA;AACZ,EAAA,IAAA,WAAU,GAAA,EAAA;MACb;IACD,WAAoD,GAAA,gBAAA,CAAA,WAAA,EAAA,MAAA,CAAA,WAAA,CAAA;AACpD,GAAA,CAAA,OAAiB,CAAA,EAAA;IACjB,OAAO,CAAA,GAAA,CAAA,CAAA,CAAA;;QAEH,eAAW,GAAA,sBAAA,CAAA,WAAA,CAAA,QAAA,CAAA,CAAA;QACb,iBAAA,GAAA,aAAA,CAAA,eAAA,CAAA;AACN,EAAE,MAAA,sBAAA,GAAA,sBAAA,CAAA,iBAAA,CAAA;AAEF,EAAM,sBAA4B,CAAA,OAAA,CAAA,IAAG,IAAA,2BAA+B,CAAA,IAAA,CAAA,CAAA;MACY,WAAA,GAAA,MAAA,EAAA,YAAA,EAAA,WAAA;AAC5E,EAAA,IAAA,WAAgB,GAAA,MAAS,EAAA,YAAA,aAAe;AACxC,EAAA,IAAA,CAAA,WAAQ,EAAA;AAER,IAAA,MAAK,IAAA,KAAA,CAAA,uBAAA,CAAA;AACD;kBAEM,EAAA;AACN,IAAA,MAAA,IAAA,KAAW,CAAC,uBAAqB,CAAA;;AAGjC;QACH,WAAA,GAAA,cAAA,CAAA,sBAAA,EAAA,WAAA,EAAA,oBAAA,IAAA,WAAA,CAAA;SAAQ;AACL,IAAA,WAAO;AACP,IAAA;;AAEJ;AACH,eAAA,YAAA,CAAA;AAED,EAAM,OAAO;AACT,EAAA,MAAA;AACJ,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"ProTailwindLayout.js","sources":["../../../src/components/Layout/ProTailwindLayout.tsx"],"sourcesContent":[null],"names":["_jsx","TailwindLayout"],"mappings":"+jBAqBA,MAAM,aAAa,GAAG,KAAC,IAAO,KAAG,CAAA,QAAM,CAAA,OAAS;AAEhD,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,aAAa,CAAC,EAAE,YAAY;AAE7D,EAAA;;AAII,MAAA,iBAAoB,GAAA,KAAA,IAAW;AAG/B,EAAA,MAAA;AACA,IAAA,UAAQ,EAAA;AACZ,MAAE,WAAA;AACF,MAAA;AAEA;AACI,GAAA,GAAA,KAAY;EACd,MAAA;AACF,IAAA;AAEA,GAAM,GAAA,WAAa,CAAA,SAAQ,QAAQ,MAAI,CAAA,CAAA;AACnC,EAAA,MAAA,MAAmB,GAAA;IACnB,OAAI,EAAA;AACJ,GAAA;SACeA,GAAA,CAAAC;IACf,WAAC,EAAA,MAAA;IAAC,WAAgB,EAAA,WAAA;AACd,IAAA,QAAA,EAAA;IACJ;;;AAKA,EAAA,IAAA,EAAA;AACA;cACkB,MAAA,CAAM;KACpB,EAAA,YAAY;AACZ,EAAA,IAAA,EAAA;;AAEY,MAAA,MAAA,GAAE,MAAC,MAAA,IAAA;AACf,EAAA,MAAA;IACJ;MACoD,MAAA,CAAA,OAAA;AACpD,EAAA,IAAA,WAAiB,GAAA,EAAA;MACV;eACQ,GAAA,gBAAA,CAAA,WAAA,EAAA,MAAA,CAAA,WAAA,CAAA;WACA,CAAA,EAAA;WACb,CAAA,GAAA,CAAA,CAAA,CAAA;AACN;AAEA,EAAM,MAAM,eAAsB,GAAA,sBAAY,CAAA,WAAQ,CAAA,QAAc,CAAA,CAAA;QACY,iBAAA,GAAA,aAAA,CAAA,eAAA,CAAA;AAC5E,EAAA,MAAA,sBAAyB,GAAA,sBAAe,CAAA,iBAAA,CAAA;AACxC,EAAA,sBAAqB,CAAA,gBAAc,2BAAA,CAAA,IAAA,CAAA,CAAA;AAEnC,EAAA,IAAA,WAAK,GAAA,MAAA,EAAA,YAAA,EAAA,WAAA;AACD,EAAA,IAAA,WAAiB,GAAA,MAAA;kBAEX,EAAA;AACN,IAAA,MAAA,IAAA,KAAW,CAAC,uBAAqB,CAAA;;AAGjC,EAAA,IAAA,CAAA,WAAA,EAAA;IACJ,MAAC,IAAA,KAAA,CAAA,uBAAA,CAAA;;AACG;AACA,EAAA,MAAA,WAAQ,GAAM,cAAG,CAAA,sBAAA,EAAA,WAAA,EAAA,oBAAA,IAAA,WAAA,CAAA;SACpB;AACD,IAAA;AACJ,IAAC;AAED,GAAM;AACF;AACF,eAAA,YAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -4,6 +4,7 @@ interface SidebarProps {
     closeSideMenu: () => void;
     menuData: any;
     collapsed: boolean;
+    setCollapsed: (collapsed: boolean) => void;
     routeParams: {
         orgName?: string;
         [key: string]: string;

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;AAY1B,UAAU,YAAY;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF,QAAQ,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAqJ1C,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;AAW1B,UAAU,YAAY;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3C,WAAW,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF,QAAQ,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAmM1C,CAAC;AAEF,eAAe,OAAO,CAAC"}

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

@@ -1,19 +1,27 @@
-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 {AiOutlineDash}from'@react-icons/all-files/ai/AiOutlineDash.js';import {useTheme}from'../BasicLayout/index.js';import BottomMenuDropDown from'../GlobalFooter/BottomMenuDropdown.js';import {getMenuSeparation}from'@admin-layout/client';import {Divider}from'./Divider.js';import {SidebarMenu}from'./SidebarMenu.js';const Sidebar = props => {
+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 => {
   const {
     isSideMenuOpen,
     closeSideMenu,
     menuData,
     collapsed,
     routeParams,
-    settings
+    settings,
+    setCollapsed
   } = props;
   useState(false);
   const [iconModule, setIconModule] = React__default.useState(null);
-  useTheme();
   const {
     t,
     i18n
   } = useTranslation('menu');
+  const {
+    OutlineDashIcon,
+    ChevronBackCircleIcon,
+    ChevronForwardCircleIcon
+  } = icons;
+  const toggleCollapsed = () => {
+    setCollapsed(!collapsed);
+  };
   // Close sidebar when clicking outside on mobile
   useEffect(() => {
     const handleClickOutside = event => {
@@ -58,16 +66,30 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
   };
   const middleMenu = getMenuSeparation(menuData).middleMenus;
   const lowerMenus = getMenuSeparation(menuData).lowerMenus;
+  const SidebarStyles = React__default.useMemo(() => ({
+    backgroundColor: settings?.navTheme === 'realDark' ? '#222' : '',
+    color: settings?.navTheme === 'realDark' ? '#fff' : ''
+  }), [settings]);
   const renderSidebarContent = () => jsxs("div", {
-    className: "py-4 text-gray-500 dark:text-gray-400",
+    className: "py-4 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]"
-      }), "Cdebase"]
+      }), !collapsed && jsx("span", {
+        children: settings?.title
+      })]
+    }), jsx("button", {
+      onClick: toggleCollapsed,
+      className: "rounded-md hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors text-[22px] absolute right-[0px] top-[63px]",
+      "aria-label": collapsed ? 'Expand sidebar' : 'Collapse sidebar',
+      children: collapsed ? jsx(ChevronForwardCircleIcon, {}) : jsx(ChevronBackCircleIcon, {})
     }), jsxs("div", {
+      className: "min-h-[93vh]",
       children: [jsxs("div", {
         style: {
           flex: 1,
@@ -80,8 +102,9 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
         children: [jsx(SidebarMenu, {
           menuData: updateMenuIcons(middleMenu),
           routeParams: routeParams,
-          settings: settings
-        }), collapsed && true ? jsx(AiOutlineDash, {
+          settings: settings,
+          collapsed: collapsed
+        }), collapsed && true ? jsx(OutlineDashIcon, {
           className: "ant-divider",
           style: {
             marginLeft: '17px',
@@ -111,9 +134,15 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
         children: jsx(SidebarMenu, {
           menuData: updateMenuIcons(lowerMenus),
           routeParams: routeParams,
-          settings: settings
+          settings: settings,
+          collapsed: collapsed
         })
       })]
+    }), 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, {
@@ -125,14 +154,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 w-64 overflow-y-auto bg-white dark:bg-gray-800 md:block flex-shrink-0",
+      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'}`,
+      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",
       onClick: closeSideMenu
     }), isSideMenuOpen && jsx("aside", {
       id: "mobile-sidebar",
-      className: "fixed inset-y-0 z-20 flex-shrink-0 w-64 mt-16 overflow-y-auto bg-white dark:bg-gray-800 md:hidden",
+      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'} `,
+      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":"6eAwBa,MAAA,OAAO,GAA2B,KAAC,IAAS;AACrD,EAAA,MAAA;IACA,cAAsB;AAEtB,IAAA,aAAO;AACP,IAAA,QAAQ;IACR,SAAS;IAET,WAAM;AACF,IAAA;AACJ,GAAA,GAAE,KAAA;EAE8C,QAAA,CAAA,KAAA;QACvC,CAAA,UAAM,EAAA,aAAA,CAAA,GAAAA,cAAA,CAAA,QAAA,CAAA,IAAA,CAAA;AACX,EAEI,QAAA;AACI,EAAA,MAAA;;AAER,IAAA;AAEA,GAAA,GAAA,cAAyB,CAAA,MAAA,CAAA;AAI7B;WAEqC,CAAA,MAAA;IACrC,MAAS,kBAAM,GAAA,KAAA,IAAA;AACX,MAAA,MAAA,OAAkB,GAAA,QAAI,CAAA,cAAwB,CAAA,gBAAA,CAAA;iBACtC,IAAK,CAAC,OAAG,CAAK,QAAQ,CAAI,KAAA,CAAA,MAAA,CAAA,IAAc,cAAG,EAAA;AAC3C,QAAA,aAAA,EAAA;;AAER,KAAA;AAEA,IAAA,QAAA,CAAA,gBAAyB,CAAA,aAAU,kBAAgB,CAAA;AACnD,IAAA,OAAA;AACI,MAAA,QAAA,CAAA,mBAA4B,CAAA,+BAA0B,CAAA;AAC1D,KAAA;AACJ,GAAA,EAAC,eAAG,EAAc,aAAe,CAAA,CAAA;;AAGjC,EAAA,SAAqB,CAAA,MAAA;AACjB,IAAA,MAAA,eAAiB,KAAK,IAAI;AACtB,MAAA,IAAA,KAAA,CAAA,gBAAoB,IAAA,cAAA,EAAA;AAChB,QAAA,aAAO,EAAA;AACP;;aAEH,gBAAC,CAAA,SAAA,EAAA,YAAA,CAAA;AACF,IAAA,OAAA,MAAe;4CACY,EAAA,YAA2B,CAAA;;AAGtD,GAAA,EAAA,CAAA,6BAAmB,CAAA,CAAA;AACvB,EAAA,MAAA,UAAG,GAAA,iBAAA,CAAA,QAAA,CAAA,CAAA,WAAA;AACP,EAAA,MAAE,eAAA,GAAA,SAAA,IAAA;IACF,OAAM,SAAA,CAAW,GAAG,CAAA,IAAU,IAAA;MAExB,MAAA,WAAa,GAAiB;QAC9B,GAAA,IAAA;AAEN,QAAA;AASoB,QAAA,IAAA,EAAA,UAAA,IAAA,IAAI,KAAG,GAAA,UAAA,CAAA,iBAAA,CAAA,IAAA,CAAA,IAAA,CAAA,GAAA;AACP,OAAA;AACA,MAAA,IAAA,WAAA,CAAA,QAAA,EAAA;AACA,QAAA,WAAA,CAAA,QAAA,GAAA,eAAe,CAAA,WAAA,CAAA,QAAA,CAAA;AACf;AACH,MAAA,OAAA,WAAA;AAQW,KAAA,CAAA;AACA,GAAA;AACA,EAAA,MAAA,WAAA,GAAA;AACA,IAAA,QAAA,EAAA,eAAA,CAAA,UAAA;;AAMA,EAAA,MAAA,UAAA,GAAA,iBAAA,CAAA,QAAgB,CAAA,CAAA,WAAA;AAChB,EAAA,MAAA,UAAA,GAAA,iBAAA,CAAA,QAAW,EAAE,UAAS;AACtB,EAAA,MAAA,oBAAA,GAAA,MAAAC,IAAM,MAAG,EAAA;AACT,IAAA,SAAA,EAAA,uCAAU;AACb,IAAA,QAAA,EAAA,CAAAA,IAAA,CAAA,IAAA,EAAA;AASL,MAAA,EAAA,EAAA,GAAA;AACA,MAAA,SAAA,EAAA,mFAAiB;AACjB,MAAA,QAAA,EAAA,CAAAC,GAAA,CAAA,KAAA,EAAA;AACA,QAAA,GAAA,EAAA,QAAA,EAAA,IAAA;AACA,QAAA,SAAA,EAAA;;AAcpB,KAAA,CAAA,EAAAD,IAGQ,CAAA,KAAA,EAAA;AAuBZ,MAAE,QAAA,EAAA,CAAAA,IAAA,CAAA,KAAA,EAAA;AAEF,QAAA,KAAA,EAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Sidebar.js","sources":["../../../../src/components/Layout/Sidebar/Sidebar.tsx"],"sourcesContent":[null],"names":["React","_jsxs","_jsx"],"mappings":"wdAwBa,MAAA,OAAO,GAA2B,KAAC,IAAS;AACrD,EAAA,MAAA;IACA,cAAsB;AAEtB,IAAA,aAAO;IACP,QAAQ;IACR;IAEA,WAAM;AACF,IAAA,QAAA;AACJ,IAAA;MAEgD,KAAA;EACjC,QAAA,CAAA,KAAA;AACX,EAAA,MAAA,CAAA,UAAwB,EAAA,aAAA,CAAG,GAACA,cAAmB,CAAE,QAAA,CAAA,IAAA,CAAA;;AAE7C,IAAA,CAAA;AACI,IAAA;oBACH,CAAA,MAAA,CAAA;AACL,EAAA,MAAA;AAEA,IAAA,eAAyB;AACzB,IAAA,qBAAY;AACR,IAAA;AACJ,GAAA,GAAA,KAAE;AACN,EAAA,MAAI,kBAA6B,MAAA;IAEjC,YAAqC,CAAA,CAAA,SAAA,CAAA;;AAEjC;YACI,MAAI;AACA,IAAA,MAAA,kBAAA,GAAe,KAAC,IAAA;YACpB,OAAC,GAAA,QAAA,CAAA,cAAA,CAAA,gBAAA,CAAA;AACL,MAAA,IAAE,OAAA,IAAA,CAAA,OAAA,CAAA,QAAA,CAAA,KAAA,CAAA,MAAA,CAAA,IAAA,cAAA,EAAA;AAEF,QAAA,aAAyB,EAAA;AACzB;AACI,KAAA;AACJ,IAAA,QAAE,CAAA,gBAAA,CAAA,WAAA,EAAA,kBAAA,CAAA;AACN,IAAA,OAAI,MAAA;MAEE,QAAA,CAAA,mBAA8B,CAAA,+BAAuB,CAAA;AAC3D,KAAA;AACI,GAAA,EAAA,CAAA,8BAA4B,CAAE;AAC1B;AACI,EAAA,SAAA,CAAA,MAAA;AACA,IAAA,MAAA,YAAM,GAAM,SAAM;gBAClB,GAAI,aAAY,IAAI,cAAY,EAAA;qBAClC,EAAA;AACF;;YAEA,CAAC,gBAAA,CAAA,SAAA,EAAA,YAAA,CAAA;AAED,IAAA,OAAA,MAAA;AACJ,MAAA,QAAG,CAAA,mBAAA,CAAA,SAAA,EAAA,YAAA,CAAA;AACP,KAAC;KACK,CAAA,cAAA,EAAc,aAAU,CAAE;QAE1B,UAAA,oBAA8B,CAAA,UAAS;QACvC,eAAa,GAAiB,SAAA,IAAA;IACpC,OAAM,SAAA,CAAA,QAAqB;AAGf,MAAA,MAAA,WAAe,GAAE;AACjB,QAAA,GAAA,IAAO;AACc,QAC7B,IAAS,EAAA,CAAA,CAAA,IACX,CAAA,IAAA,CAAA;QAEI,IAAA,EAAA,UAAA,IAAA,KAAuB,IAAG,GAC5B,UAAA,CAAA,iBAAe,CAAA,IAAA,CAAA,IAAA,CAAA,GAAA;AAmBC,OAAA;AACA,MAAA,IAAA,WAAA,CAAA,QAAA,EAAA;AACA,QAAA,WAAA,CAAA,QAAA,GAAA,eAAmB,CAAA,WAAA,CAAA,QAAA,CAAA;AACnB;AACA,MAAA,OAAA,WAAA;AACH,KAAA,CAAA;AAaW,GAAA;AACA,EAAA,MAAA,WAAA,GAAA;AACA,IAAA,QAAA,EAAA,eAAA,CAAA,UAAA;AACA,GAAA;sCAGV,CAAC,QACE,CAAA,CAAA,WACG;AACI,EAAA,MAAA,UAAA,GAAA,iBAAA,CAAA,QAAgB,CAAA,CAAA,UAAA;AAChB,EAAA,MAAA,aAAA,GAAAA,cAAA,CAAA,OAAA,CAAA,OAAA;AACA,IAAA,eAAA,EAAA,QAAA,EAAA,QAAA,KAAQ,UAAC,GAAA,MAAA,GAAA,EAAA;AACT,IAAA,KAAA,EAAA,QAAA,EAAA,QAAA,KAAA,aAAU,MAAA,GAAA;AACb,GAAA,CAAA,EAAA,CAAA,QAAA,CAAA,CAAA;AASL,EAAA,MAAA,oBAAA,GAAA,MAAOC,IAAA,CAAA,KAAA,EAAA;AACP,IAAA,SAAA,EAAA,gDAAiB;AACjB,IAAA,KAAA,EAAA,aAAA;AACA,IAAA,QAAA,EAAA,CAAAA,IAAA,CAAA,IAAA,EAAA;AACA,MAAA,EAAA,EAAA,GAAA;AACH,MAAA,SAAA,EAAA,mFAI4B;AAuB7C,MAAA,KAAO,EACH,aAAA;AAiCR,MAAE,QAAA,EAAA,CAAAC,GAAA,CAAA,KAAA,EAAA;AAEF,QAAA,GAAA,EAAA,UAAuB,IAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -1,6 +1,4 @@
-export declare const SidebarMenu: ({ menuData, routeParams, settings }: {
-    menuData: any;
-    routeParams: any;
-    settings: any;
-}) => import("react/jsx-runtime").JSX.Element;
+import React from 'react';
+import { SidebarMenuProps } from '../../typings';
+export declare const SidebarMenu: React.FC<SidebarMenuProps>;
 //# sourceMappingURL=SidebarMenu.d.ts.map

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":"AAOA,eAAO,MAAM,WAAW;;;;6CAgFvB,CAAC"}
+{"version":3,"file":"SidebarMenu.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/SidebarMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAK3D,OAAO,EAAgB,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE/D,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA+LlD,CAAC"}