@admin-layout/tailwind-design-pro 10.0.9-alpha.9 → 10.1.1-alpha.0

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,
@@ -6,19 +6,33 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
     collapsed,
     routeParams,
     settings,
-    setCollapsed
+    setCollapsed,
+    location
   } = props;
-  useState(false);
+  const [isPagesMenuOpen, setIsPagesMenuOpen] = useState(false);
   const [iconModule, setIconModule] = React__default.useState(null);
   const {
     t,
     i18n
   } = useTranslation('menu');
   const {
-    OutlineDashIcon,
-    ChevronBackCircleIcon,
-    ChevronForwardCircleIcon
+    isMobile
+  } = useMediaQuery();
+  const {
+    ChevronLeftIcon,
+    ChevronRightIcon
   } = icons;
+  const currentRoute = location?.pathname || '/';
+  const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
+  const deviceType = isMobile ? 'mobile' : 'desktop';
+  const deviceLayout = routeSettings?.layout?.[deviceType] || {};
+  useEffect(() => {
+    if (!iconModule) {
+      import('./DynamicIcon.js').then(module => {
+        setIconModule(module);
+      });
+    }
+  }, []);
   const toggleCollapsed = () => {
     setCollapsed(!collapsed);
   };
@@ -47,8 +61,14 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
       document.removeEventListener('keydown', handleEscape);
     };
   }, [isSideMenuOpen, closeSideMenu]);
-  const bottomMenu = getMenuSeparation(menuData).bottomMenus;
-  const updateMenuIcons = menuItems => {
+  const {
+    upperMenus,
+    middleMenus,
+    lowerMenus,
+    bottomMenus
+  } = getMenuSeparation(menuData || []);
+  const updateMenuIcons = (menuItems = []) => {
+    if (!menuItems || !Array.isArray(menuItems)) return [];
     return menuItems.map(item => {
       const updatedItem = {
         ...item,
@@ -61,108 +81,104 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
       return updatedItem;
     });
   };
-  const bottomMenus = {
-    menuData: updateMenuIcons(bottomMenu)
+  const bottomMenusData = {
+    menuData: updateMenuIcons(bottomMenus)
   };
-  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 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",
+  // Helper function to render a separator with a name
+  const renderSeparator = name => {
+    if (!deviceLayout?.splitMenus) return null;
+    return collapsed ? jsx("hr", {
+      className: "border-t border-gray-200"
+    }) : jsx(Divider, {
+      style: {
+        color: '#6b6767',
+        borderColor: '#6b6767',
+        margin: '8px 0',
+        padding: 0
+      },
+      plain: true,
+      children: name
+    });
+  };
+  const renderSidebarContent = () => {
+    return jsxs("div", {
+      className: "text-gray-500 dark:text-gray-400 relative",
       style: SidebarStyles,
-      children: [jsx("img", {
-        src: settings?.logo,
-        className: "w-[28px]"
-      }), !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,
-          overflowY: 'auto',
-          overflowX: 'hidden',
-          display: 'flex',
-          flexDirection: 'column'
-        },
-        className: "removeBoxShadow",
-        children: [jsx(SidebarMenu, {
-          menuData: updateMenuIcons(middleMenu),
-          routeParams: routeParams,
-          settings: settings,
-          collapsed: collapsed
-        }), collapsed && true ? jsx(OutlineDashIcon, {
-          className: "ant-divider",
+      children: [jsx("button", {
+        onClick: toggleCollapsed,
+        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(ChevronRightIcon, {
+          fontSize: '11px'
+        }) : jsx(ChevronLeftIcon, {
+          fontSize: '11px'
+        })
+      }), jsxs("div", {
+        className: "min-h-[93vh]",
+        children: [middleMenus?.length > 0 && jsxs("div", {
           style: {
-            marginLeft: '17px',
-            borderTop: '0px',
-            fontSize: 'large',
-            margin: 0
-          }
-        }) : jsx(Divider, {
+            flex: 1,
+            overflowY: 'auto',
+            overflowX: 'hidden',
+            display: 'flex',
+            flexDirection: 'column'
+          },
+          className: "removeBoxShadow",
+          children: [renderSeparator(deviceLayout?.middleMenuDividerName), jsx(SidebarMenu, {
+            menuData: updateMenuIcons(middleMenus),
+            routeParams: routeParams,
+            settings: settings,
+            collapsed: collapsed
+          })]
+        }), lowerMenus?.length > 0 && jsxs("div", {
           style: {
-            color: '#6b6767',
-            borderColor: '#6b6767',
-            margin: 0,
-            padding: 0
+            flex: 1,
+            overflowY: 'auto',
+            overflowX: 'hidden',
+            display: 'flex',
+            flexDirection: 'column'
           },
-          plain: true,
-          children: "Admin"
+          className: "removeBoxShadow",
+          children: [renderSeparator(deviceLayout?.lowerMenuDividerName), jsx(SidebarMenu, {
+            menuData: updateMenuIcons(lowerMenus),
+            routeParams: routeParams,
+            settings: settings,
+            collapsed: collapsed
+          })]
+        }), jsx("div", {
+          className: "p-4",
+          children: deviceLayout?.navigationMode === 'sidebar' && jsx(RightContent, {
+            upperMenus: upperMenus,
+            collapsed: collapsed,
+            routeParams: routeParams,
+            settings: settings
+          })
         })]
       }), jsx("div", {
-        style: {
-          flex: 1,
-          overflowY: 'auto',
-          overflowX: 'hidden',
-          display: 'flex',
-          flexDirection: 'column'
-        },
-        className: "removeBoxShadow",
-        children: jsx(SidebarMenu, {
-          menuData: updateMenuIcons(lowerMenus),
-          routeParams: routeParams,
-          settings: settings,
-          collapsed: collapsed
+        className: "absolute bottom-0 left-0 p-4 dark:border-gray-700",
+        children: jsx(BottomMenuDropDown, {
+          menus: bottomMenusData,
+          collapsed: collapsed,
+          routeParams: routeParams
         })
       })]
-    }), 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, {
-        menus: bottomMenus,
-        collapsed: collapsed,
-        routeParams: routeParams
-      })
-    })]
-  });
+    });
+  };
   return jsxs("div", {
-    children: [jsx("aside", {
-      className: `z-20 hidden h-full overflow-y-auto bg-white dark:bg-gray-800 md:block flex-shrink-0 transition-all duration-300 ease-in-out ${collapsed ? 'w-20' : 'w-64'}`,
+    children: [!isMobile && jsx("aside", {
+      className: `${deviceLayout?.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 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 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","_jsx"],"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,KAAmB,MAAM,OAAO,CAAC;AAKxC,OAAO,EAAgB,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE/D,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAsGlD,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,16 +1,33 @@
-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,
+    height: 0
+  });
   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;
@@ -22,47 +39,118 @@ 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 => {
     return name.charAt(0).toUpperCase();
   };
+  const handleMenuHover = (e, item, isHoverMenu) => {
+    // Only set hover state if the menu has children
+    if (collapsed && !isHoverMenu && item.children && item.children.length > 0) {
+      const element = e.currentTarget;
+      const rect = element.getBoundingClientRect();
+      let top = rect.top;
+      // Store the height to use for positioning
+      setPopupPosition({
+        top: top,
+        height: rect.height
+      });
+      setHoveredMenu(item.path);
+    }
+  };
+  const handleMenuLeave = (item, isHoverMenu) => {
+    if (collapsed && !isHoverMenu) {
+      setHoveredMenu(null);
+    }
+  };
+  const renderPopupMenu = (item, depth = 0) => {
+    if (!item.children || item.children.length === 0) return null;
+    const bgColor = generateLightShade(settings?.primaryColor, 0.98);
+    const sidebarWidth = collapsed ? 64 : 256; // 80px for collapsed (w-20), 256px for expanded (w-64)
+    return jsxs("div", {
+      className: "fixed shadow-xl rounded-md border border-gray-100 z-[999] overflow-hidden",
+      style: {
+        backgroundColor: bgColor,
+        left: `${sidebarWidth}px`,
+        // Position right after sidebar
+        top: `${popupPosition.top}px`,
+        boxShadow: '0 5px 15px rgba(0, 0, 0, 0.2)',
+        animation: 'fadeIn 0.2s ease-out forwards',
+        maxWidth: 'calc(100vw - 100px)',
+        // Prevent overflow on small screens
+        width: 'max-content',
+        minWidth: '220px'
+      },
+      children: [jsx("style", {
+        dangerouslySetInnerHTML: {
+          __html: `
+                    @keyframes fadeIn {
+                        from { opacity: 0; transform: translateX(-10px); }
+                        to { opacity: 1; transform: translateX(0); }
+                    }
+                    `
+        }
+      }), jsx("div", {
+        className: "font-medium text-sm px-4 py-3 border-b border-gray-100 whitespace-nowrap",
+        style: {
+          backgroundColor: generateLightShade(settings?.primaryColor, 0.95)
+        },
+        children: jsx("span", {
+          style: {
+            color: settings?.primaryColor
+          },
+          children: item.name
+        })
+      }), jsx("div", {
+        className: "max-h-[400px] overflow-y-auto overflow-x-hidden py-1",
+        children: item.children.map(child => jsx("div", {
+          className: "w-full min-w-max",
+          children: renderMenuItem(child, depth + 1, true)
+        }, child.path))
+      })]
+    });
+  };
   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",
-      onMouseEnter: () => collapsed && !isHoverMenu && setHoveredMenu(item.path),
-      onMouseLeave: () => collapsed && !isHoverMenu && setHoveredMenu(null),
+      className: `w-full relative group ${isHovered && collapsed && !isHoverMenu ? `rounded-md` : ''}`,
+      style: {
+        backgroundColor: isHovered && !isHoverMenu ? bgColor : ''
+      },
+      onMouseEnter: e => handleMenuHover(e, item, isHoverMenu),
+      onMouseLeave: () => handleMenuLeave(item, isHoverMenu),
       children: [jsxs(Link, {
-        to: generateMenuPath(item?.path, routeParams),
-        className: `flex items-center justify-between w-full px-4 py-2 hover:bg-gray-100 text-sm cursor-pointer transition-colors rounded-md mx-1 my-0.5`,
+        to: hasChildren && collapsed && !isHoverMenu ? '#' : generateMenuPath(item?.path, routeParams),
+        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 ? 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: `flex-shrink-0`,
             style: {
               color: isActive ? settings?.primaryColor : ''
             },
             children: item.icon
           }) : collapsed && !isHoverMenu ? jsx("span", {
-            className: "w-8 h-8 flex items-center justify-center rounded-full bg-gray-100",
+            className: "flex items-center justify-center flex-shrink-0",
             style: {
               color: isActive ? settings?.primaryColor : ''
             },
             children: getFirstLetter(item.name)
           }) : null, (!collapsed || isHoverMenu) && jsx("span", {
-            className: "font-medium whitespace-nowrap",
+            className: "font-medium whitespace-nowrap overflow-hidden text-ellipsis",
             style: {
               color: isActive ? settings?.primaryColor : ''
             },
@@ -72,21 +160,23 @@ import {jsx,jsxs}from'react/jsx-runtime';import {useState}from'react';import {Li
           style: {
             color: isActive ? settings?.primaryColor : ''
           },
-          children: isOpen ? jsx(ChevronDownIcon, {
+          className: "flex-shrink-0 ml-1",
+          children: isOpen ? jsx(ChevronUpIcon, {
             className: "h-4 w-4"
-          }) : jsx(ChevronRightIcon, {
+          }) : jsx(ChevronDownIcon, {
             className: "h-4 w-4"
           })
         })]
-      }), hasChildren && (isOpen && !collapsed || collapsed && isHovered) && jsx("div", {
-        className: `transition-all duration-200 ease-in-out ${collapsed && !isHoverMenu ? 'absolute left-full top-0 ml-2 bg-white shadow-lg rounded-md py-2 min-w-[200px] z-50' : ''}`,
-        children: item.children.map(child => renderMenuItem(child, depth + 1, collapsed && !isHoverMenu))
+      }), collapsed && hasChildren && isHovered && !isHoverMenu && item.children.length > 0 && renderPopupMenu(item, depth), hasChildren && isOpen && !collapsed && jsx("div", {
+        className: "transition-all duration-200 ease-in-out",
+        children: item.children.map(child => renderMenuItem(child, depth + 1))
       })]
     }, item.path);
   };
   return jsx("div", {
+    className: "overflow-hidden",
     children: jsx("nav", {
-      className: `mt-2 ${collapsed ? 'px-1' : 'px-2'}`,
+      className: `mt-2 ${collapsed ? 'px-1' : 'px-2'} overflow-x-hidden`,
       children: menuData.map(item => renderMenuItem(item))
     })
   });

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":[],"mappings":"6PAOO,MAAM,WAAW,GAA+B,CAAC;UAC9C;aACW;UACX;AACN,EAAA;MAEM;QACF,CAAC,gBAAe,EAAG,mBAAA,CAAA,GAAA,QAAA,CAAA,EAAA,CAAA;AACnB,EAAA,MAAA,CAAA,UAAa,EAAA,aAAA,CAAA,GAAA,QAAA,CAAA,YAAA,CAAA;oBAAS,EAAA,cAAA,CAAA,GAAA,QAAA,CAAA,IAAA,CAAA;AAEtB,EAAA,MAAA;AACI,IAAA,eAAO;AACP,IAAA;AACH,GAAA,GAAA,KAAE;AACP,EAAA,MAAE,UAAA,GAAA,CAAA,IAAA,EAAA,KAAA,EAAA,CAAA,KAAA;IAEF,CAAM,CAAA,cAAA,EAAA;AACF,IAAA,IAAA,SAAe,EAAA;AACX,IAAA,mBAAW,CAAI,IAAA;SAClB,IAAA;eAAO,IAAA,CAAA,KAAA,CAAA,KAAA,IAAA,GAAA,IAAA,GAAA;;;AAGZ,EAAA,MAAE,eAAA,GAAA,CAAA,IAAA,EAAA,WAAA,EAAA,KAAA,EAAA,CAAA,KAAA;AAEF,IAAA,IAAA,WAAoB,IAAA,CAAA,WAAoB;gBAC7B,CAAA,IAAW,EAAA,KAAE,EAAE,CAAW,CAAA;AACrC,KAAC,MAAC;AAEF,MAAA,aAAoB,CAAA,IAAA,CAAA;AAChB;;AAEA,EAAA,MAAA,cAAc,GAAG,IAAA,IAAA;AACjB,IAAA,OAAA,YAAe,CAAG,CAAA,CAAA,WAAW;AAC7B,GAAA;QACA,cAAgB,GAAA,CAAA,IAAA,EAAA,KAAA,GAAA,CAAA,EAAmB,WAAsB,GAAA,KAAA,KAAE;AAE3D,IAAA,MAAA,WACI,GAAA,IAAA,CAAA,QAEa,IAAA,wBAAwB;AA+CjB,IAAA,MAAA,MAAA,GAAA,gBAAuF,CAAA,KAAA,CAAA,KAAA,IAAA,CAAA,IAAA;AACvF,IAAA,MAAA,QAAA,GAAA,UAGP,KAAA,IAAA,CAAA,IAAA;AAKrB,IAAA,MAAE,SAAA,GAAA,WAAA,KAAA,IAAA,CAAA,IAAA;AAEF,IAAA,MAAA,WACI,GAAA,CAAA,EAAA,KAAA,GAAA,CACI,CAAK,GAAA,CAAA;AAGjB,IAAE,MAAA,OAAA,GAAA,kBAAA,CAAA,QAAA,EAAA,YAAA,EAAA,IAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"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;AAqDpG,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;AAG3E,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAwB,MAAM,aAAa,CAAC;AAsEvF,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,14 +1,22 @@
-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';function BasicLayoutWithAuthorities(props) {
+import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout/client';import {userSelector}from'@adminide-stack/user-auth0-client';import {useMachine}from'@xstate/react';import React__default,{useMemo,useCallback}from'react';import {connect,useSelector}from'react-redux';import {settingsMachine}from'../../machines/settingsMachine.js';import {ThemeProviderTailwind}from'../ThemeProvider/ThemeProvider.js';import {BasicLayout}from'./BasicLayout/index.js';function BasicLayoutWithAuthorities(props) {
   const userData = useSelector(userSelector);
   const {
     settings,
     setSettings
   } = useLayoutSettings();
-  // const { authenticated, user } = isUserAuthenticated();
-  const settingsActor = createActor(settingsMachine, {
-    systemId: 'settings'
-  }).start();
-  const state = useSelector$1(settingsActor, state => state);
+  const [state, send, settingsActor] = useMachine(settingsMachine.provide({
+    actions: {
+      updateReduxSettings: ({
+        context
+      }) => {
+        setSettings(context);
+      }
+    }
+  }), {
+    input: {
+      settings
+    }
+  });
   const settingXstate = state?.context;
   const {
     permissions
@@ -16,25 +24,27 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
   const mainHeaderProps = useMemo(() => ({
     picture: userData ? userData?.profile?.picture : null
   }), [userData]);
-  const onSettingChange = config => {
-    (async () => {
-      await setSettings(config);
-    })();
-  };
+  const onSettingChange = useCallback(config => {
+    // Update Redux first
+    setSettings(config);
+  }, [setSettings]);
   //@ts-ignore
   const {
     routeParams: {
       orgName
     } = {}
   } = props;
-  return jsx(BasicLayout, {
-    routeParams: orgName,
-    authorities: permissions?.resolveConfiguration ?? permissions,
-    onSettingChange: onSettingChange,
-    mainHeaderProps: mainHeaderProps,
-    actor: settingsActor,
-    ...props,
-    settings: settingXstate
+  return jsx(ThemeProviderTailwind, {
+    settings: settingXstate,
+    children: jsx(BasicLayout, {
+      routeParams: orgName,
+      authorities: permissions?.resolveConfiguration ?? permissions,
+      onSettingChange: onSettingChange,
+      mainHeaderProps: mainHeaderProps,
+      actor: settingsActor,
+      ...props,
+      settings: settingXstate
+    })
   });
 }
 const mapState = ({

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

@@ -1 +1 @@
-{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"0bASA,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,WAAY,CAAA,MAAA,CAAA;AAUpB,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":[],"mappings":"ydAWA,SAAS,0BAA0B,CAAC,KAAgF,EAAA;AAChH,EAAA,MAAA,WAAiB,WAAA,CAAA,YAAY,CAAA;QACvB;AAEN,IAAA,QAAO;AAEC,IAAA;AACI,GAAA,GAAA,iBAAA,EAAA;gBACI,IAAW,EAAA,aAAQ,CAAC,GAAC,UAAA,CAAA,eAAA,CAAA,OAAA,CAAA;aACxB;AACJ,MAAA,mBAAA,EAAA,CAAA;AACJ,QACD;AACI,OAAA,KAAA;mBACY,CAAA,OAAA,CAAA;AACX;AACJ;AAGL,GAAA,CAAA,EAAA;AAEA,IAAA,KAAA,EAAQ;AAER,MAAA;AAEQ;AACH,GAAA,CAAA;AAIL,EAAA,MAAA,qBAAwB,EAAA,OAAA;QAEhB;;AAEJ,GAAA,GACA,KAAY;QAGJ,eAAA,GAAA,OAAA,CAAA,OAAA;IACZ,OAAM,EAAa,QAAA,GAAA,QAAI,EAAO,OAAO,EAAE,OAAG,GAAM;AAEhD,GAAA,CAAA,EAAA,CAAA,QACK,CAAA,CAAA;AAYT,EAAC,MAAA,eAAA,GAAA,WAAA,CAAA,MAAA,IAAA;AAED;IACI,WAAQ,CAAA,MAAA,CAAA;KACA,CAAA,WAAQ,CAAA,CAAA;AACnB;AAMD,EAAA;AAIA,IAAM,WAAA,EAAA;AAKN,MAAA;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -1,19 +1,4 @@
-import { MenuDataItem } from '../typings';
-import { ProSettings } from '../defaultSettings';
-export interface GetPageTitleProps {
-    pathname?: string;
-    breadcrumb?: {
-        [path: string]: MenuDataItem;
-    };
-    breadcrumbMap?: Map<string, MenuDataItem>;
-    menu?: ProSettings['menu'];
-    title?: ProSettings['title'];
-    pageName?: string;
-    formatMessage?: (data: {
-        id: any;
-        defaultMessage?: string;
-    }) => string;
-}
+import { GetPageTitleProps, MenuDataItem } from '@admin-layout/client';
 export declare const matchParamsPath: (pathname: string, breadcrumb?: {
     [path: string]: MenuDataItem;
 }, breadcrumbMap?: Map<string, MenuDataItem>) => MenuDataItem;

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

@@ -1 +1 @@
-{"version":3,"file":"getPageTitle.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/getPageTitle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;IAC9C,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC1C,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3B,KAAK,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,GAAG,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;CAC1E;AAED,eAAO,MAAM,eAAe,aACd,MAAM,eACH;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,kBAC7B,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,KAC1C,YAQF,CAAC;AAEF,QAAA,MAAM,gBAAgB,UACX,iBAAiB,eACX,OAAO,KACrB;IAEC,KAAK,EAAE,MAAM,CAAC;IAEd,EAAE,EAAE,MAAM,CAAC;IAEX,QAAQ,EAAE,MAAM,CAAC;CAiDpB,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"getPageTitle.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/getPageTitle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEvE,eAAO,MAAM,eAAe,GACxB,UAAU,MAAM,EAChB,aAAa;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;CAAE,EAC7C,gBAAgB,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,KAC1C,YAQF,CAAC;AAEF,QAAA,MAAM,gBAAgB,GAClB,OAAO,iBAAiB,EACxB,aAAa,OAAO,KACrB;IAEC,KAAK,EAAE,MAAM,CAAC;IAEd,EAAE,EAAE,MAAM,CAAC;IAEX,QAAQ,EAAE,MAAM,CAAC;CAiDpB,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/lib/components/Layout/getPageTitle.js

@@ -18,7 +18,7 @@ const getPageTitleInfo = (props, ignoreTile) => {
       locale: false
     }
   } = props;
-  const pageTitle = title || '';
+  const pageTitle = ignoreTile ? '' : title || '';
   const currRouterData = matchParamsPath(pathname, breadcrumb, breadcrumbMap);
   if (!currRouterData) {
     return {

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

@@ -1 +1 @@
-{"version":3,"file":"getPageTitle.js","sources":["../../../src/components/Layout/getPageTitle.ts"],"sourcesContent":[null],"names":[],"mappings":"yCAca,MAAA,eAAe,GAAG,CAC3B,QAAgB,EAChB,UAA6C,EAC7C,aAAyC,KAC3B;;MAEV,aAAA,EAAa;UACP,OAAA,GAAA,CAAO,GAAG,aAAI,CAAA,IAAc,EAAA,CAAA,CAAI,IAAI,CAAA,GAAI,IAAK,YAAiB,CAAA,GAAA,CAAA,CAAA,IAAI,CAAC,QAAM,CAAA,CAAA;QAC/E,OAAI,EAAA;AACA,MAAA,OAAA,yBAAyB,CAAA;;;AAGrC;AAEA,MAAM,gBAAgB,GAAG,CACrB,KAAwB,EACxB,UAAoB,KAQpB;AACA,EAAA,MAAA;AAOQ,IAAA,QAAA,MAAa;;AAGrB,IAAA,aAAe;IACf,aAAM;IACN,KAAK,GAAc,gBAAG;QAClB,GAAO;AACH,MAAA,MAAA,EAAA;AACA;AACA,GAAA,GAAA,KAAA;iBACF,GAAA,KAAA,IAAA,EAAA;QACL,cAAA,GAAA,eAAA,CAAA,QAAA,EAAA,UAAA,EAAA,aAAA,CAAA;AACD,EAAA,IAAA,CAAA,cAA6B,EAAA;AAE7B,IAAA,OAAQ;WACI,EAAA;AACJ,MAAA,EAAA,EAAA,EAAA;cACc,EAAA;AACjB,KAAA;;MAGD,QAAS,GAAA,cAAG,CAAA,IAAA;UACL,CAAA,MAAA,KAAA,KAAA,IAAA,cAAA,CAAA,MAAA,IAAA,aAAA,EAAA;AACH,IAAA,QAAA,GAAA,aAAgB,CAAA;AAChB,MAAA,EAAA,EAAA,cAAI,CAAA,MAAe,IAAA,EAAM;AACzB,MAAA,cAAQ,EAAE,cAAS,CAAA;;;AAG3B,EAAA,IAAA,CAAA,QAAc,EAAA;WACH;AACH,MAAA,KAAA,EAAA,SAAe;AACf,MAAA,EAAA,EAAA,cAAI,CAAA,MAAe,IAAA,EAAM;cACjB,EAAA;;;MAGT,CAAA,KAAA,EAAA;AACH,IAAA,OAAA;AACA,MAAA,KAAI,EAAA,QAAA;QACJ,EAAQ,cAAA,CAAA,MAAA,IAAA,EAAA;MACV;AACN,KAAE;AAEF;;;;;;"}
+{"version":3,"file":"getPageTitle.js","sources":["../../../src/components/Layout/getPageTitle.ts"],"sourcesContent":[null],"names":[],"mappings":"yCAGa,MAAA,eAAe,GAAG,CAC3B,QAAgB,EAChB,UAA6C,EAC7C,aAAyC,KAC3B;;MAEV,aAAA,EAAa;UACP,OAAA,GAAA,CAAO,GAAG,aAAI,CAAA,IAAc,EAAA,CAAA,CAAI,IAAI,CAAA,GAAI,IAAK,YAAiB,CAAA,GAAA,CAAA,CAAA,IAAI,CAAC,QAAM,CAAA,CAAA;QAC/E,OAAI,EAAA;AACA,MAAA,OAAA,yBAAyB,CAAA;;;AAGrC;AAEA,MAAM,gBAAgB,GAAG,CACrB,KAAwB,EACxB,UAAoB,KAQpB;AACA,EAAA,MAAA;AAOQ,IAAA,QAAA,MAAa;;AAGrB,IAAA,aAAe;IACf,aAAM;IACN,KAAK,GAAc,gBAAG;QAClB,GAAO;AACH,MAAA,MAAA,EAAA;AACA;AACA,GAAA,GAAA,KAAA;iBACF,GAAA,UAAA,GAAA,EAAA,GAAA,KAAA,IAAA,EAAA;QACL,cAAA,GAAA,eAAA,CAAA,QAAA,EAAA,UAAA,EAAA,aAAA,CAAA;AACD,EAAA,IAAA,CAAA,cAA6B,EAAA;AAE7B,IAAA,OAAQ;WACI,EAAA;AACJ,MAAA,EAAA,EAAA,EAAA;cACc,EAAA;AACjB,KAAA;;MAGD,QAAS,GAAA,cAAG,CAAA,IAAA;UACL,CAAA,MAAA,KAAA,KAAA,IAAA,cAAA,CAAA,MAAA,IAAA,aAAA,EAAA;AACH,IAAA,QAAA,GAAA,aAAgB,CAAA;AAChB,MAAA,EAAA,EAAA,cAAI,CAAA,MAAe,IAAA,EAAM;AACzB,MAAA,cAAQ,EAAE,cAAS,CAAA;;;AAG3B,EAAA,IAAA,CAAA,QAAc,EAAA;WACH;AACH,MAAA,KAAA,EAAA,SAAe;AACf,MAAA,EAAA,EAAA,cAAI,CAAA,MAAe,IAAA,EAAM;cACjB,EAAA;;;MAGT,CAAA,KAAA,EAAA;AACH,IAAA,OAAA;AACA,MAAA,KAAI,EAAA,QAAA;QACJ,EAAQ,cAAA,CAAA,MAAA,IAAA,EAAA;MACV;AACN,KAAE;AAEF;;;;;;"}

package/lib/components/Layout/slot-fill/AdditionalSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdditionalSettings.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/slot-fill/AdditionalSettings.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,kCAAkC,kCAAkC,CAAC;AAElF,eAAO,MAAM,sBAAsB,yDAElC,CAAC;AAEF,eAAO,MAAM,0BAA0B,yDAEtC,CAAC"}
+{"version":3,"file":"AdditionalSettings.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/slot-fill/AdditionalSettings.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,kCAAkC,kCAAkC,CAAC;AAElF,eAAO,MAAM,sBAAsB,GAAI,UAAK,4CAE3C,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAI,UAAK,4CAE/C,CAAC"}