@admin-layout/tailwind-design-pro 12.0.16-alpha.7 → 12.0.16-alpha.70

package/lib/components/Layout/GlobalFooter/Account.js

@@ -0,0 +1,147 @@
+import {jsxs,jsx}from'react/jsx-runtime';import*as React from'react';import {useAppSelector,generateMenuPath}from'@admin-layout/client';import {useNavigate,Link}from'@remix-run/react';import {FooterSubMenuItemRender}from'../BasicLayout/utils.js';const Account = props => {
+  const {
+    menus,
+    collapsed,
+    routeParams,
+    layoutSettings
+  } = props;
+  useNavigate();
+  const [isOpen, setIsOpen] = React.useState(false);
+  const [activeProfile, setActiveProfile] = React.useState('main');
+  const dropdownRef = React.useRef(null);
+  const {
+    profile = {}
+  } = useAppSelector(state => state?.user || {});
+  const {
+    nickname,
+    picture
+  } = profile || {};
+  React.useEffect(() => {
+    const handleClickOutside = event => {
+      if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
+        setIsOpen(false);
+      }
+    };
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, []);
+  const handleToggleDropdown = () => {
+    setIsOpen(!isOpen);
+  };
+  const handleProfileSwitch = profileType => {
+    setActiveProfile(profileType);
+    // Here you could add logic to switch user context or session
+    console.log(`Switched to ${profileType} profile`);
+  };
+  const accountMenuItems = menus?.menuData?.find(menu => menu.key === 'account');
+  return jsxs("div", {
+    className: "relative",
+    ref: dropdownRef,
+    children: [jsx("div", {
+      className: "cursor-pointer",
+      onClick: handleToggleDropdown,
+      onContextMenu: e => {
+        e.preventDefault();
+        handleToggleDropdown();
+      },
+      children: jsx(FooterSubMenuItemRender, {
+        item: accountMenuItems,
+        collapsed: collapsed,
+        layoutSettings: layoutSettings
+      })
+    }), isOpen && jsxs("div", {
+      className: "absolute bottom-full left-0 mb-2 bg-white border border-gray-200 rounded-lg shadow-xl z-50 w-80 overflow-hidden",
+      children: [jsx("div", {
+        className: "py-2",
+        children: accountMenuItems?.children?.map(item => jsxs(Link, {
+          className: "flex items-center justify-between px-4 py-2 text-sm text-gray-700 hover:bg-gray-50 cursor-pointer transition-colors",
+          to: generateMenuPath(item.path, routeParams),
+          children: [jsxs("div", {
+            className: "flex items-center",
+            children: [jsx("span", {
+              className: "mr-3 text-base",
+              children: item.icon
+            }), jsx("span", {
+              children: item.name
+            })]
+          }), item.hasNotification && jsx("div", {
+            className: "w-2 h-2 bg-blue-500 rounded-full"
+          })]
+        }, item.key))
+      }), jsxs("div", {
+        className: "border-t border-gray-100 py-2",
+        children: [jsxs("div", {
+          className: `flex items-center justify-between px-4 py-2 hover:bg-gray-50 cursor-pointer transition-colors ${activeProfile === 'main' ? 'bg-blue-50' : ''}`,
+          onClick: () => handleProfileSwitch('main'),
+          children: [jsxs("div", {
+            className: "flex items-center",
+            children: [jsx("div", {
+              className: "w-8 h-8 rounded-full bg-red-500 flex items-center justify-center overflow-hidden mr-3",
+              children: picture ? jsx("img", {
+                src: picture,
+                alt: nickname || 'Guest',
+                className: "w-full h-full object-cover"
+              }) : jsx("span", {
+                className: "text-white text-sm font-medium",
+                children: (nickname || 'Guest').charAt(0).toUpperCase()
+              })
+            }), jsx("span", {
+              className: "text-sm font-medium",
+              children: nickname || 'Guest'
+            })]
+          }), activeProfile === 'main' && jsx("div", {
+            className: "w-4 h-4 bg-green-500 rounded-full flex items-center justify-center",
+            children: jsx("svg", {
+              className: "w-2 h-2 text-white",
+              fill: "currentColor",
+              viewBox: "0 0 20 20",
+              children: jsx("path", {
+                fillRule: "evenodd",
+                d: "M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z",
+                clipRule: "evenodd"
+              })
+            })
+          })]
+        }), jsxs("div", {
+          className: `flex items-center justify-between px-4 py-2 hover:bg-gray-50 cursor-pointer transition-colors ${activeProfile === 'incognito' ? 'bg-blue-50' : ''}`,
+          onClick: () => handleProfileSwitch('incognito'),
+          children: [jsxs("div", {
+            className: "flex items-center",
+            children: [jsx("div", {
+              className: "w-8 h-8 rounded-full bg-gray-800 flex items-center justify-center mr-3",
+              children: jsxs("svg", {
+                className: "w-4 h-4 text-white",
+                fill: "currentColor",
+                viewBox: "0 0 20 20",
+                children: [jsx("path", {
+                  fillRule: "evenodd",
+                  d: "M3.707 2.293a1 1 0 00-1.414 1.414l14 14a1 1 0 001.414-1.414l-1.473-1.473A10.014 10.014 0 0019.542 10C18.268 5.943 14.478 3 10 3a9.958 9.958 0 00-4.512 1.074l-1.78-1.781zm4.261 4.26l1.514 1.515a2.003 2.003 0 012.45 2.45l1.514 1.514a4 4 0 00-5.478-5.478z",
+                  clipRule: "evenodd"
+                }), jsx("path", {
+                  d: "M12.454 16.697L9.75 13.992a4 4 0 01-3.742-3.741L2.335 6.578A9.98 9.98 0 00.458 10c1.274 4.057 5.065 7 9.542 7 .847 0 1.669-.105 2.454-.303z"
+                })]
+              })
+            }), jsx("span", {
+              className: "text-sm font-medium",
+              children: "Incognito"
+            })]
+          }), activeProfile === 'incognito' && jsx("div", {
+            className: "w-4 h-4 bg-gray-300 rounded-full flex items-center justify-center",
+            children: jsx("svg", {
+              className: "w-2 h-2 text-gray-600",
+              fill: "currentColor",
+              viewBox: "0 0 20 20",
+              children: jsx("path", {
+                fillRule: "evenodd",
+                d: "M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z",
+                clipRule: "evenodd"
+              })
+            })
+          })]
+        })]
+      })]
+    })]
+  });
+};export{Account as default};//# sourceMappingURL=Account.js.map

package/lib/components/Layout/GlobalFooter/Account.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Account.js","sources":["../../../../src/components/Layout/GlobalFooter/Account.tsx"],"sourcesContent":[null],"names":[],"mappings":"sPAMA,MAAM,OAAO,GAAkB,KAAC,IAAO;QACnC;AACA,IAAA,KAAA;AACA,IAAA,SAAO;AACP,IAAA,WAAO;IACP;AACA,GAAA,GAAA;;AAGA,EAAA,MAAA,CAAK,MAAC,EAAA,SAAe,CAAA,GAAA,KAAA,CAAA,QAAA,CAAA,KAAA,CAAA;AACjB,EAAA,MAAA,CAAA,aAAM,EAAA,gBAAsB,CAAiB,GAAE,KAAE,CAAA,QAAA,CAAA,MAAA,CAAA;AAC7C,EAAA,MAAA,mBAAe,CAAC,MAAA,CAAO,IAAI,CAAC;;cAE3B;AACL,GAAA,GAAA,cAAE,CAAA,KAAA,IAAA,KAAA,EAAA,IAAA,IAAA,EAAA,CAAA;AAEF,EAAA,MAAA;AACA,IAAA,QAAA;AACI,IAAA;AACJ,GAAA,GAAA,OAAE,IAAA,EAAA;OACH,CAAA,SAAI,CAAA,MAAA;IAEP,MAAM,kBAAA,GAAoB,KAAM,IAAE;AAC9B,MAAA,IAAA,WAAW,CAAA,OAAQ,IAAA,CAAA,WAAA,CAAA,OAAA,CAAA,QAAA,CAAA,KAAA,CAAA,MAAA,CAAA,EAAA;AACvB,QAAE,SAAA,CAAA,KAAA,CAAA;AAEF,MAAA;;YAEI,CAAA,gBAAA,CAAA,WAAA,EAAA,kBAAA,CAAA;AACA,IAAA,OAAA,MAAQ;AACZ,MAAE,QAAA,CAAA,mBAAA,CAAA,WAAA,EAAA,kBAAA,CAAA;AAEF,IAAA,CAAA;KAEA,EAAA,CAAA;4BAMkB,GAAA,MAAc;AAChB,IAAA,SAAA,CAAA,CAAA,MAAA,CAAA;AACJ,EAAA,CAAA;AAuGhB,EAAE,MAAA,mBAAA,GAAA,WAAA,IAAA;AAEF,IAAA,4BAAuB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/Layout/GlobalFooter/BottomMenuDropdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BottomMenuDropdown.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalFooter/BottomMenuDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CA2EzD,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"BottomMenuDropdown.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalFooter/BottomMenuDropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAwEzD,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/lib/components/Layout/GlobalFooter/BottomMenuDropdown.js

@@ -2,7 +2,8 @@ import {jsxs,jsx}from'react/jsx-runtime';import*as React from'react';import {gen
   const {
     menus,
     collapsed,
-    routeParams
+    routeParams,
+    layoutSettings
   } = props;
   const navigate = useNavigate();
   const [isOpen, setIsOpen] = React.useState(false);
@@ -32,14 +33,7 @@ import {jsxs,jsx}from'react/jsx-runtime';import*as React from'react';import {gen
   const handleToggleDropdown = () => {
     setIsOpen(!isOpen);
   };
-  const menuItems = menus?.menuData[0]?.children?.map(menu => {
-    return {
-      label: menu.name,
-      key: menu.key,
-      path: menu.path,
-      icon: menu.icon
-    };
-  });
+  const menuItems = menus?.menuData?.find(menu => menu.key === 'usermenu');
   return jsxs("div", {
     className: "relative",
     ref: dropdownRef,
@@ -52,19 +46,20 @@ import {jsxs,jsx}from'react/jsx-runtime';import*as React from'react';import {gen
       },
       children: jsx(FooterSubMenuItemRender, {
         item: menus.menuData[0],
-        collapsed: collapsed
+        collapsed: collapsed,
+        layoutSettings: layoutSettings
       })
     }), isOpen && jsx("div", {
       className: "absolute bottom-full left-0 mb-1 bg-white border border-gray-200 rounded shadow-lg z-10 min-w-40",
       children: jsx("div", {
         className: "py-1",
-        children: menuItems?.map(item => jsxs("div", {
+        children: menuItems?.children?.map(item => jsxs("div", {
           className: "flex items-center px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 cursor-pointer",
           onClick: () => handleClick(item.key),
           children: [item.icon && jsx("span", {
             className: "mr-2",
             children: item.icon
-          }), item.label]
+          }), item.name]
         }, item.key))
       })
     })]

package/lib/components/Layout/GlobalFooter/BottomMenuDropdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"BottomMenuDropdown.js","sources":["../../../../src/components/Layout/GlobalFooter/BottomMenuDropdown.tsx"],"sourcesContent":[null],"names":["_jsxs"],"mappings":"kOAMA,MAAM,kBAAkB,GAAsC,KAAC,IAAS;QAC9D;AACN,IAAA,KAAA;AACA,IAAA,SAAO;IACP;AAEA,GAAA,GAAA,KAAM;AACF,EAAA,MAAA,QAAwB,GAAA,WAAA,EAAA;AACpB,EAAA,MAAA,CAAA,MAAA,YAAe,GAAC,KAAO,CAAI,eAAY;mBAC1B,GAAA,KAAM,CAAA,MAAE,CAAA,IAAA,CAAA;iBACpB,CAAA,MAAA;AACL,IAAA,MAAE,kBAAA,GAAA,KAAA,IAAA;AAEF,MAAA,IAAA,WAAyB,CAAA,OAAA,IAAA,CAAC,WAAW,CAAE,OAAA,CAAA,QAAA,CAAA,KAAoB,CAAA,MAAA,CAAA,EAAA;AAC3D,QAAA,UAAU,KAAE,CAAA;AACR;AACJ,KAAA;IACJ,QAAO,CAAA,gBAAA,CAAA,WAAA,EAAA,kBAAA,CAAA;AAEP,IAAA,OAAiB,MAAA;cACT,CAAA,mBAAU,CAAA,WAAA,EAAA,kBAAA,CAAA;AACd,KAAA;AACI,GAAA,EAAA,EAAA,CAAA;AACI,EAAA,MAAA,WAAA,GAAO,GAAA,IAAA;iBACD;aACT,OAAA,IAAA,KAAA,CAAA,QAAA,CAAA,CAAA,CAAA,CAAA,QAAA,EAAA;UACJ,OAAA,CAAA,GAAA,KAAA,GAAA,EAAA;QACD,IAAQ,GAAA;QACR;AACJ;;AAGI,IAAA,QAAA,CAAA,gBAAmB,CAAA,IAAA,EAAA,WAAA,CAAA,CAAA;AACvB,IAAA,SAAE,CAAA,KAAA,CAAA;AAEF,GAAA;QACI,oBAAO,GAAA,MAAA;aACE,CAAA,CAAA,MAAM,CAAA;;iBAEP,GAAM,KAAK,EAAA,QAAA,CAAA,CAAA,CAAA,EAAA,QAAA,EAAA,GAAA,CAAA,IAAA,IAAA;;WAEjB,EAAA,IAAA,CAAA,IAAA;AACN,MAAE,GAAC,EAAA,IAAA,CAAA,GAAA;MAEI,IAAA,EACH,IAAK,CAAA,IAAA;;AAMO,KAAA;AACJ,GAAA,CAAA;AAuBhB,EAAE,OAAAA,IAAA,CAAA,KAAA,EAAA;AAEF,IAAA,SAAA,EAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"BottomMenuDropdown.js","sources":["../../../../src/components/Layout/GlobalFooter/BottomMenuDropdown.tsx"],"sourcesContent":[null],"names":["_jsxs"],"mappings":"kOAMA,MAAM,kBAAkB,GAAsC,KAAC,IAAO;QAClE;AACA,IAAA,KAAA;AACA,IAAA,SAAO;IACP,WAAM;AAEN,IAAA;AACI,GAAA,GAAA,KAAA;AACI,EAAA,MAAA,QAAI,cAAY,EAAA;iBACZ,SAAU,CAAA,GAAA,KAAO,CAAA,QAAA,CAAA,KAAA,CAAA;mBACpB,GAAA,KAAA,CAAA,MAAA,CAAA,IAAA,CAAA;AACL,EAAA,KAAA,CAAA,SAAE,CAAA,MAAA;AAEF,IAAA,MAAA,kBAAS,GAAA;AACT,MAAA,IAAA,WAAY,CAAA,OAAA,IAAA,CAAA,WAAA,CAAA,OAAA,CAAA,QAAA,CAAA,KAAA,CAAA,MAAA,CAAA,EAAA;AACR,QAAA,SAAA,CAAA,KAAS,CAAA;AACb,MAAA;IACJ,CAAC;AAED,IAAA,QAAM,CAAA,iBAA4B,WAAE,EAAA,kBAAA,CAAA;WAChC,MAAQ;AACR,MAAA,QAAK,CAAA,mBAAqB,CAAA,WAAY,EAAA,kBAAW,CAAA;AAC7C,IAAA,CAAA;AACI,EAAA,CAAA,EAAA,EAAA,CAAA;mBACA,GAAM,GAAA,IAAA;YACV,GAAC,EAAA;SACJ,IAAA,OAAA,IAAA,KAAA,CAAA,QAAA,CAAA,CAAA,CAAA,CAAA,QAAA,EAAA;UACD,OAAS;QACT,IAAA,GAAA,OAAU,CAAK,IAAE;AACrB,QAAE;MAEF;AACI,IAAA;AACJ,IAAA,QAAE,CAAA,gBAAA,CAAA,IAAA,EAAA,WAAA,CAAA,CAAA;AAEF,IAAA,eAAe,CAAA;;4BAQG,GAAA,MAAc;AAChB,IAAA,SAAA,CAAA,CAAA,MAAA,CAAA;;AA4BpB,EAAE,MAAA,SAAA,GAAA,KAAA,EAAA,QAAA,EAAA,IAAA,CAAA,IAAA,IAAA,IAAA,CAAA,GAAA,KAAA,UAAA,CAAA;AAEF,EAAA,OAAAA,IAAA,CAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAIvD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAqHzD,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;AAK1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAIvD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAgJzD,CAAC;AAEF,eAAe,YAAY,CAAC"}

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

@@ -21,18 +21,41 @@ import {jsx,jsxs}from'react/jsx-runtime';import {Link}from'@remix-run/react';imp
     isSearching
   } = useSelector(state => state.search);
   const currentRoute = location?.pathname || '/';
-  const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
   const deviceType = isMobile ? 'mobile' : 'desktop';
-  const deviceSettings = routeSettings?.regions?.[deviceType] || {};
-  const layoutSettings = routeSettings?.layout?.[deviceType] || {};
+  // Helper function to get value from uilayout with route/device override support
+  const getUILayoutValue = path => {
+    // Check for route/device-specific override first
+    const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
+    const uiOverride = settings?.uiSettings?.[routeDeviceKey];
+    if (uiOverride) {
+      const value = path.split('.').reduce((obj, key) => obj?.[key], uiOverride);
+      if (value !== undefined) return value;
+    }
+    // Fallback to settings (flattened uilayout from configuration-registries)
+    return path.split('.').reduce((obj, key) => obj?.[key], settings);
+  };
+  // Get device settings directly from uilayout
+  const deviceSettings = {
+    header: getUILayoutValue('header'),
+    background: getUILayoutValue('background')
+  };
+  // Get layout settings directly from uilayout
+  const layoutSettings = {
+    contentWidth: getUILayoutValue('contentWidth'),
+    navigationMode: getUILayoutValue('navigationMode'),
+    sideMenuType: getUILayoutValue('sideMenuType'),
+    fixedHeader: getUILayoutValue('fixedHeader'),
+    fixedSidebar: getUILayoutValue('fixedSidebar'),
+    splitMenus: getUILayoutValue('splitMenus'),
+    upperMenuDividerName: getUILayoutValue('upperMenuDividerName'),
+    middleMenuDividerName: getUILayoutValue('middleMenuDividerName'),
+    lowerMenuDividerName: getUILayoutValue('lowerMenuDividerName')
+  };
   const headerSettings = deviceSettings?.header || {};
-  const backgroundSettings = deviceSettings?.background || {
-    type: 'color',
-    color: 'inherit',
-    image: ''};
+  const backgroundSettings = deviceSettings?.background || {};
   // Use CSS classes instead of theme-based styling
   const getHeaderClasses = () => {
-    let classes = `z-10 py-4 top-0 border-b border-border relative ${layoutSettings?.fixedHeader ? 'sticky' : 'relative'}`;
+    let classes = `z-10 py-4 top-0 border-b border-border header-container relative ${layoutSettings?.fixedHeader ? 'sticky' : 'relative'}`;
     if (backgroundSettings.type === 'image' && backgroundSettings.image) {
       classes += ' bg-cover bg-center';
     }

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":"0ZASa,MAAA,YAAY,GAAqC,KAAC,IAAS;AACpE,EAAA,MAAA;AACA,IAAA,KAAA;AACA,IAAA,MAAM;AACN,IAAA,UAAc;AACd,IAAA,WAAmB;AAEnB,IAAA;AACA,IAAA;IACA,cAAM;IACN;MACM,KAAA;AACN,EAAA,MAAA;AACA,IAAA;AACI,GAAA,GAAA,KAAA;AACA,EAAA,MAAA;AACA,IAAA;AACA,GAAA,GAAA,aAAS,EAAA;EACX,WAAA;QAE+C;IACjD,WAAM;AACF,IAAA;iBAII,CAAA,KAAA,IAAA,KAAmB,CAAA,MAAS,CAAA;oBACrB,GAAI,sBAAsB,GAAA;QACrC,aAAC,GAAA,QAAA,EAAA,aAAA,GAAA,YAAA,CAAA,IAAA,QAAA,EAAA,aAAA,GAAA,GAAA,CAAA,IAAA,QAAA;AAED,EAAA,MAAA,qBAAe,GAAA,QAAA,GAAA,SAAA;AACnB,EAAA,MAAE,cAAA,GAAA,aAAA,EAAA,OAAA,GAAA,UAAA,CAAA,IAAA,EAAA;QAEI,cAAA,GAAe,aAAQ,EAAA,MAAA,GAAA,UAAA,CAAA,IAAA,EAAA;QACzB,cAAM,GAAkC,cAAG,EAAA,MAAA,IAAA,EAAA;QAE3C,kBAAI,GAAA,cAA4B,EAAA,UAA6B,IAAA;iBAC/C;SACb,EAAA,SAAA;AAAM,IAAA,KAAA,EAAA;;AAKP,EAAA,MAAA,gBAAuB,GAAA,MAAa;AAChC,IAAA,IAAA,OAAA,GAAA,CAAA,gDAAoC,EAAA,cAAA,EAAA,WAAA,GAAA,QAAA,GAAA,UAAA,CAAA,CAAA;AACpC,IAAA,IAAA,kBAAW,CAAA,IAAQ,KAAA,OAAA,IAAA,kBAAkB,CAAA,KAAA,EAAA;aACxC,IAAA,qBAAA;AAED;AACJ,IAAA,OAAE,OAAA;;QAGE,eAAe,GAAY,MAAA;AAAE,IAAA,MAAA,UAAY,GAAA,EAAA;IAE7C,IAA0C,kBAAA,CAAA,IAAA,KAAA,OAAA,IAAA,kBAAA,CAAA,KAAA,EAAA;MACpC,UAAA,CAAA,eAA8B,GAAA,CAAA,IAAA,EAAE,kBAAkB,CAAA,KAAA,CAAA,CAAA,CAAA;KAEX,MAAA,IAAA,kBAAA,CAAA,IAAA,KAAA,OAAA,IAAA,kBAAA,CAAA,KAAA,KAAA,SAAA,EAAA;MACvC,UAAA,CAAA,eAAmB,GAAA,kBAAgB,CAAA,KAAA;;AA2D7C;AAEA,IAAA,IAAA,uBAA4B,UAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Header.js","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}

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

@@ -1,6 +1,4 @@
 import * as React from 'react';
 import { MainHeaderProps, PrivateHeaderProps } from '../../typings';
-export declare const defaultRenderLogo: (logo: () => React.ReactElement, animation: any, scrolled: any, settings: any, location: any) => React.ReactNode;
-export declare const defaultRenderLogoAndTitle: (props: any, animation: any, renderKey?: string) => React.ReactNode;
 export declare const MainHeader: React.FC<MainHeaderProps & PrivateHeaderProps>;
 //# sourceMappingURL=MainHeader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"MainHeader.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAW/B,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAUpE,eAAO,MAAM,iBAAiB,GAC1B,MAAM,MAAM,KAAK,CAAC,YAAY,EAC9B,WAAW,GAAG,EACd,aAAQ,EACR,UAAU,GAAG,EACb,UAAU,GAAG,KACd,KAAK,CAAC,SAQR,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAClC,OAAO,GAAG,EACV,cAAS,EACT,YAAW,MAA2B,KACvC,KAAK,CAAC,SAkCR,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG,kBAAkB,CA0MrE,CAAC"}
+{"version":3,"file":"MainHeader.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAMpE,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG,kBAAkB,CA6NrE,CAAC"}

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

@@ -1,70 +1,4 @@
-import {jsx,jsxs}from'react/jsx-runtime';import*as React from'react';import {getMenuSeparation}from'@admin-layout/client';import {keyframes}from'@emotion/react';import {useLocation,Link}from'@remix-run/react';import {RightMenu}from'./RightMenu.js';import'@common-stack/components-pro';import {HeaderSearchBarSlot}from'../slot-fill/HeaderSearchBar.js';import {HeaderSearchButtonSlot}from'../slot-fill/HeaderSearchButton.js';import {RightContentSlot}from'../slot-fill/RightContent.js';import {SearchBarBehavior}from'../../../machines/types.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';import {Logo}from'./Logo.js';const spin = keyframes`
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
-`;
-const defaultRenderLogo = (logo, animation, scrolled, settings, location) => {
-  if (typeof logo === 'string') {
-    return jsx(Logo, {
-      logo: undefined,
-      settings: settings,
-      scrolled: scrolled,
-      location: location
-    });
-  }
-  if (typeof logo === 'function') {
-    return logo();
-  }
-  return logo;
-};
-const defaultRenderLogoAndTitle = (props, animation, renderKey = 'menuHeaderRender') => {
-  const {
-    settings,
-    layout,
-    pageTitleInfo,
-    scrolled,
-    location
-  } = props;
-  const {
-    fontFamily,
-    titleFontSize,
-    titleFontWeight,
-    titleHeight,
-    titleColor,
-    letterSpacing,
-    logo,
-    title
-  } = settings || {};
-  const renderFunction = props[renderKey || ''];
-  if (renderFunction === false) {
-    return null;
-  }
-  const logoDom = defaultRenderLogo(logo, animation, scrolled, settings, location);
-  const titleDom = jsx("h1", {
-    className: `text-2xl ${settings?.navTheme === 'dark' ? 'text-[#F9FBFF]' : titleColor || 'text-gray-900'}`,
-    style: {
-      fontFamily: fontFamily,
-      fontWeight: titleFontWeight,
-      height: titleHeight,
-      letterSpacing: letterSpacing,
-      fontSize: titleFontSize
-    },
-    children: title
-  });
-  if (renderFunction) {
-    const {
-      isMobile
-    } = useMediaQuery();
-    return renderFunction(logoDom, isMobile ? null : titleDom, props);
-  }
-  if (layout === 'mix' && renderKey === 'menuHeaderRender') {
-    return null;
-  }
-  return jsx("div", {
-    className: "flex space-x-2 w-[200px] md:w-[200px] h-[60px]",
-    children: logoDom
-  });
-};
-const MainHeader = props => {
+import {jsx,jsxs}from'react/jsx-runtime';import*as React from'react';import {getMenuSeparation}from'@admin-layout/client';import {Link}from'@remix-run/react';import {RightMenu}from'./RightMenu.js';import'@common-stack/components-pro';import {HeaderSearchBarSlot}from'../slot-fill/HeaderSearchBar.js';import {HeaderSearchButtonSlot}from'../slot-fill/HeaderSearchButton.js';import {RightContentSlot}from'../slot-fill/RightContent.js';import {LogoSlot}from'../slot-fill/Logo.js';import {SearchBarBehavior}from'../../../machines/types.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';const MainHeader = props => {
   const {
     rightContentRender,
     setSettingToggle,
@@ -75,7 +9,6 @@ const MainHeader = props => {
     layout,
     location,
     showSettings,
-    onSettingChange,
     settings,
     primaryColor,
     pageTitleInfo,
@@ -84,15 +17,30 @@ const MainHeader = props => {
     setSearchOptionsShown,
     authorities,
     picture,
-    componentVisibility
+    componentVisibility,
+    showMenu
   } = props;
   const {
     isMobile
   } = useMediaQuery();
   const currentRoute = location?.pathname || '/';
-  const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
   const deviceType = isMobile ? 'mobile' : 'desktop';
-  const deviceRegions = routeSettings?.regions?.[deviceType] || {};
+  // Helper function to get value from uilayout with route/device override support
+  const getUILayoutValue = path => {
+    // Check for route/device-specific override first
+    const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
+    const uiOverride = settings?.uiSettings?.[routeDeviceKey];
+    if (uiOverride) {
+      const value = path.split('.').reduce((obj, key) => obj?.[key], uiOverride);
+      if (value !== undefined) return value;
+    }
+    // Fallback to settings (flattened uilayout from configuration-registries)
+    return path.split('.').reduce((obj, key) => obj?.[key], settings);
+  };
+  // Get device regions directly from uilayout
+  const deviceRegions = {
+    header: getUILayoutValue('header')
+  };
   const headerSettings = deviceRegions?.header || {};
   // State to track reduced motion preference
   const [prefersReducedMotion, setPrefersReducedMotion] = React.useState(false);
@@ -128,26 +76,20 @@ const MainHeader = props => {
   // const toggleSettings = () => {
   //     setSettingToggle(!settingToggle);
   // };
-  const {
-    pathname
-  } = useLocation();
-  // Use the state variable for animation
-  const animation = prefersReducedMotion ? undefined : `${spin} infinite 20s linear`;
-  const headerDom = defaultRenderLogoAndTitle({
-    scrolled,
-    ...props
-  }, animation, layout === 'mix' ? 'headerTitleRender' : undefined);
   // Use CSS classes instead of theme-based styling
   const getHeaderClasses = () => {
-    let classes = `${isMobile ? headerSettings?.position || 'fixed' : scrolled ? 'fixed' : 'absolute'} w-full top-0 z-10 px-[8%] transition-all duration-1000 ease-in-out group`;
+    let classes = ` ${isMobile ? headerSettings?.position || 'fixed' : scrolled ? 'fixed' : 'absolute'} w-full top-0 z-[100] px-[8%] transition-all duration-1000 ease-in-out group`;
     if (scrolled) {
       classes += ' py-2 shadow-themed-md';
     } else {
-      classes += ' py-5';
+      classes += ' py-2';
     }
     if (searchOptionsShown) {
       classes += ' pb-8';
     }
+    if (showMenu) {
+      classes += ' border-b';
+    }
     return classes;
   };
   const getHeaderStyles = () => {
@@ -178,7 +120,13 @@ const MainHeader = props => {
         children: [headerSettings?.showLogo && jsx(Link, {
           to: "/",
           className: "text-foreground",
-          children: headerDom
+          children: jsx(LogoSlot, {
+            settings: settings,
+            scrolled: scrolled,
+            location: location,
+            prefersReducedMotion: prefersReducedMotion,
+            layout: layout
+          })
         }), jsx("div", {
           className: "flex-grow"
         }), headerSettings?.showSearchSlot && jsxs("div", {
@@ -225,4 +173,4 @@ const MainHeader = props => {
       })
     })
   });
-};export{MainHeader,defaultRenderLogo,defaultRenderLogoAndTitle};//# sourceMappingURL=MainHeader.js.map
+};export{MainHeader};//# sourceMappingURL=MainHeader.js.map

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

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

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

@@ -1,4 +1,4 @@
-import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {Link}from'react-router-dom';import {useTranslation}from'react-i18next';import {generateMenuPath}from'@admin-layout/client';const OrganizationDropDown = props => {
+import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {Link}from'@remix-run/react';import {useTranslation}from'react-i18next';import {generateMenuPath}from'@admin-layout/client';const OrganizationDropDown = props => {
   const {
     theme,
     layout,

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

@@ -1 +1 @@
-{"version":3,"file":"OrganizationDropdown.js","sources":["../../../../src/components/Layout/GlobalHeader/OrganizationDropdown.tsx"],"sourcesContent":[null],"names":[],"mappings":"0NAMA,MAAM,oBAAoB,GAAqC,KAAC,IAAS;AACrE,EAAA,MAAA;IACA,KAAM;IACN,MAAM;AACN,IAAA;IACA,WAAW;IAEX,SAAsB;IACtB;AACI,GAAA,GAAA,KAAA;QACA,CAA0B,uBAAA,EAAA,0BAAQ,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AACtC,EAAA,MAAE,CAAA,iBAAA,EAAA,oBAAA,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;QAE2C,WAAA,GAAA,MAAA,CAAA,IAAA,CAAA;QACpC;AACL,IAAA,CAAA;AACI,IAAA;oBACwB,CAAA,MAAA,CAAA;;AAE5B,EAAA,MAAA,iBAAE,GAAA,MAAA;AAEF,IAAA,oBAAyB,CAAA,CAAA;AACzB,IAAA,0BAAY,CAAA,KAAA,CAAA;AACR,GAAA;AACJ;WACG,CAAA,MAAA;IAEP,MAAsB,kBAAA,GAAA,KAAA,IAAA;MAChB,IAAA,WAAA,CAAA,OAAmB,IAAK,CAAA,WAAA,CAAA,OAAA,CAAA,QAAA,CAAA,KAAA,CAAA,MAAA,CAAA,EAAA;QAC1B,oBAAoB,CAAC,KAAK,CAAC;AAC/B;KAEM;YACkB,CAAA,gBAAC,CAAK,WAAE,EAAA,kBAAA,CAAA;AAChC,IAAA,OAAE,MAAA;AAEF,MAAA,QACI,CAAA,+BAAuB,EAAA,kBAAoB,CAAC;AAmB5B,KAAA;AAexB,GAAE,EAAA,EAAA,CAAA;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"OrganizationDropdown.js","sources":["../../../../src/components/Layout/GlobalHeader/OrganizationDropdown.tsx"],"sourcesContent":[null],"names":[],"mappings":"0NAMA,MAAM,oBAAoB,GAAqC,KAAC,IAAO;AACnE,EAAA,MAAA;IACA,KAAA;IACA,MAAM;AACN,IAAA;IACA,WAAW;IAEX,SAAA;IACA;AACI,GAAA,GAAA,KAAA;QACA,CAAA,uBAAA,EAA0B,0BAAQ,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AACtC,EAAA,MAAE,CAAA,iBAAA,EAAA,oBAAA,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;QAEF,WAAA,GAAA,MAAA,CAAA,IAAA,CAAA;QACA;AACI,IAAA,CAAA;AACI,IAAA;oBACI,CAAA,MAAA,CAAA;;AAER,EAAA,MAAA,iBAAE,GAAA,MAAA;AAEF,IAAA,oBAAS,CAAA,CAAA;AACT,IAAA,0BAAY,CAAA,KAAA,CAAA;AACR,EAAA,CAAA;AACJ;WACG,CAAA,MAAA;IAEP,MAAA,kBAAsB,GAAA,KAAA,IAAA;MACtB,IAAM,WAAA,CAAA,OAAmB,IAAG,CAAE,WAAA,CAAA,OAAA,CAAA,QAAA,CAAA,KAAA,CAAA,MAAA,CAAA,EAAA;QAC1B,oBAAoB,CAAC,KAAK,CAAC;AAC/B,MAAE;IAEF,CAAA;YACI,CAAA,gBAAqB,CAAA,WAAO,EAAA,kBAAA,CAAA;AAChC,IAAA,OAAE,MAAA;AAEF,MAAA,QACI,CAAA,+BAAuB,EAAA,kBAAoB,CAAA;AAmB3B,IAAA,CAAA;AAexB,EAAE,CAAA,EAAA,EAAA,CAAA;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -1,4 +1,5 @@
 import * as React from 'react';
 import { GlobalHeaderRightProps } from '../../typings';
+export declare const useHorizontalScroll: () => React.MutableRefObject<HTMLDivElement>;
 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;AAI/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CA+BzD,CAAC"}
+{"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,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAEvD,eAAO,MAAM,mBAAmB,8CAsB/B,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CA8EzD,CAAC"}

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

@@ -1,13 +1,80 @@
-import {jsxs,jsx}from'react/jsx-runtime';import {LanguageMenu}from'../../LanguageMenu/LanguageMenu.js';import OrganizationDropDown from'./OrganizationDropdown.js';const RightContent = props => {
+import {jsxs,jsx}from'react/jsx-runtime';import {useState,useEffect,useRef}from'react';import {LanguageMenu}from'../../LanguageMenu/LanguageMenu.js';import OrganizationDropDown from'./OrganizationDropdown.js';const useHorizontalScroll = () => {
+  const elRef = useRef(null);
+  useEffect(() => {
+    const el = elRef.current;
+    if (el) {
+      const onWheel = e => {
+        if (e.deltaY === 0) return;
+        e.preventDefault();
+        el.scrollTo({
+          left: el.scrollLeft + e.deltaY,
+          behavior: 'smooth'
+        });
+      };
+      el.addEventListener('wheel', onWheel);
+      return () => {
+        el.removeEventListener('wheel', onWheel);
+      };
+    }
+  }, []);
+  return elRef;
+};
+const RightContent = props => {
   const {
-    routeParams,
+    theme,
+    layout,
     upperMenus,
-    settings,
-    collapsed
+    routeParams,
+    collapsed,
+    settings
   } = props;
+  const [navBarItems, setNavBarItems] = useState([]);
+  const scrollRef = useHorizontalScroll();
+  // TODO: uncomment this once the extension API is updated
+  // const controller: any = useExtensionController();
+  // useEffect(() => {
+  //     if (controller) {
+  //         const subscription = controller.services.contribution.getContributions().subscribe(({ pageNavBar }) => {
+  //             setNavBarItems(pageNavBar || []);
+  //         });
+  //         return () => subscription.unsubscribe();
+  //     }
+  // }, [controller]);
+  useEffect(() => {
+    const ele = document.getElementById('item-wrapper');
+    if (ele) {
+      if (check(ele)) {
+        ele.style.boxShadow = 'inset 0 0 5px #e2e2e2';
+      } else {
+        ele.style.boxShadow = 'none';
+      }
+    }
+  });
+  const check = el => {
+    const curOverflow = el.style.overflow;
+    if (!curOverflow || curOverflow === 'visible') {
+      el.style.overflow = 'hidden';
+    }
+    const isOverflowing = el.clientWidth < el.scrollWidth || el.clientHeight < el.scrollHeight;
+    el.style.overflow = curOverflow;
+    return isOverflowing;
+  };
   return jsxs("div", {
-    className: "flex items-center flex-shrink-0 space-x-6",
+    className: `flex items-center ${collapsed ? 'ml-2.5' : 'ml-0'}`,
     children: [jsx("div", {
+      id: "item-wrapper",
+      ref: scrollRef,
+      className: "flex overflow-x-auto scrollbar-hide whitespace-nowrap space-x-2 py-2 px-1",
+      children: navBarItems.map((item, index) => {
+        if (item.position === 'right' && item.component) {
+          return jsx("div", {
+            className: "flex-shrink-0",
+            children: item.component(props)
+          }, index);
+        }
+        return null;
+      })
+    }), jsx("div", {
       className: "relative",
       children: jsx(LanguageMenu, {})
     }), jsx("div", {
@@ -20,4 +87,4 @@ import {jsxs,jsx}from'react/jsx-runtime';import {LanguageMenu}from'../../Languag
       })
     })]
   });
-};export{RightContent};//# sourceMappingURL=RightContent.js.map
+};export{RightContent,useHorizontalScroll};//# sourceMappingURL=RightContent.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RightContent.js","sources":["../../../../src/components/Layout/GlobalHeader/RightContent.tsx"],"sourcesContent":[null],"names":[],"mappings":"mKAMa,MAAA,YAAY,GAAqC,KAAC,IAAS;QAC9D;AACN,IAAA,WACS;AA4Bb,IAAE,UAAA;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"RightContent.js","sources":["../../../../src/components/Layout/GlobalHeader/RightContent.tsx"],"sourcesContent":[null],"names":["_jsxs"],"mappings":"iNAOO,MAAM,mBAAmB,GAAG,MAAK;AACpC,EAAA,MAAA,QAAW,MAAG,CAAA,IAAuB,CAAA;WAErC,CAAA,MAAa;AACT,IAAA,MAAA,EAAA,GAAM,KAAK,CAAA;QACX,EAAA,EAAI;AACA,MAAA,MAAA,OAAM,GAAA,CAAA,IAAO;AACT,QAAA,IAAA,CAAA,CAAA,MAAI,KAAE,CAAA,EAAM;wBAAQ,EAAA;mBAClB,CAAA;gBACF,EAAE,CAAC,UAAS,GAAA,CAAA,CAAA,MAAA;AACR,UAAA,QAAA,EAAA;AACA,SAAA,CAAA;AACH,MAAA,CAAA;AACL,MAAA,EAAA,CAAA,gBAAE,CAAA,OAAA,EAAA,OAAA,CAAA;AACF,MAAA,OAAA,MAAG;AACH,QAAA,EAAA,CAAA,mBAAY,CAAA,OAAA,EAAA,OAAA,CAAA;AACR,MAAA,CAAA;AACJ,IAAA;QACJ;SACC,KAAE;AAEP;AACF,MAAA,YAAA,GAAA,KAAA,IAAA;AAEF,EAAA,MAAO;AACH,IAAA,KAAA;IACA,MAAM;AACN,IAAA,UAAM;IAEN,WAAA;IAEA,SAAA;IAEA;MACA,KAAA;QACA,CAAA,WAAA,EAAA,cAAA,CAAA,GAAA,QAAA,CAAA,EAAA,CAAA;QACA,SAAA,GAAA,mBAAA,EAAA;;;;;;;;AASQ;AACI;;kBACI;AACJ,IAAA,MAAA,GAAA,GAAA,QAAI,CAAK,6BAAoB,CAAA;aAChC;UACJ,KAAA,CAAA,GAAA,CAAA,EAAA;AACL,QAAG,GAAA,CAAA,KAAA,CAAA,SAAA,GAAA,uBAAA;AAEH,MAAA,CAAA,MAAM;AACF,QAAA,GAAA,CAAA,eAAiB,GAAK,MAAM;AAC5B,MAAA;AACI,IAAA;;AAEJ,EAAA,MAAA,KAAA;AACA,IAAA,MAAE,WAAO,GAAA,EAAQ,CAAA,cAAe;AAChC,IAAA,IAAA,CAAA,0BAAqB,KAAA,SAAA,EAAA;AACzB,MAAE,EAAA,CAAA,KAAA,CAAA,QAAA,GAAA,QAAA;IAEF;IACA,MAAI,aAAU,GAAM,EAAI,YAAW,GAAA,GAAO,WAAC,IAAA,EAAA,CAAA,YAAA,GAAA,EAAA,CAAA,YAAA;YACvC,CAAA,QAAA,GAAc;IAClB,OAAC,aAAA;AAED,EAAA,CAAA;AAgBY,EAAA,OAAAA,IAAA,CAAA,KAAE,EACA;AAiBlB,IAAE,SAAA,EAAA,CAAA,kBAAA,EAAA,SAAA,GAAA,QAAA,GAAA,MAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"RightMenu.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/RightMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgD,MAAM,OAAO,CAAC;AAOrE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAgBhD,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAuR/C,CAAC"}
+{"version":3,"file":"RightMenu.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/RightMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgD,MAAM,OAAO,CAAC;AAOrE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAgBhD,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAiR/C,CAAC"}