@admin-layout/tailwind-design-pro 12.0.16-alpha.6 → 12.0.16-alpha.61

package/README.md

@@ -104,6 +104,12 @@ The design system provides theme-aware CSS classes that automatically adapt to t
 ```css
 .bg-background          /* Main background */
 /* Main background */
+/* Main background */
+/* Main background */
+/* Main background */
+/* Main background */
+/* Main background */
+/* Main background */
 .bg-card               /* Card background */
 .bg-popover            /* Popover background */
 .bg-muted              /* Muted background */
@@ -115,6 +121,12 @@ The design system provides theme-aware CSS classes that automatically adapt to t
 ```css
 .text-foreground        /* Primary text */
 /* Primary text */
+/* Primary text */
+/* Primary text */
+/* Primary text */
+/* Primary text */
+/* Primary text */
+/* Primary text */
 .text-muted-foreground  /* Secondary text */
 .text-primary           /* Primary brand color */
 .text-secondary         /* Secondary brand color */
@@ -126,6 +138,12 @@ The design system provides theme-aware CSS classes that automatically adapt to t
 ```css
 .text-success           /* Success text */
 /* Success text */
+/* Success text */
+/* Success text */
+/* Success text */
+/* Success text */
+/* Success text */
+/* Success text */
 .text-warning           /* Warning text */
 .text-error             /* Error text */
 .text-info              /* Info text */
@@ -140,6 +158,12 @@ The design system provides theme-aware CSS classes that automatically adapt to t
 ```css
 .themed-button          /* Theme-aware button */
 /* Theme-aware button */
+/* Theme-aware button */
+/* Theme-aware button */
+/* Theme-aware button */
+/* Theme-aware button */
+/* Theme-aware button */
+/* Theme-aware button */
 .themed-card            /* Theme-aware card */
 .themed-input           /* Theme-aware input */
 .themed-modal           /* Theme-aware modal */
@@ -152,6 +176,12 @@ The design system provides theme-aware CSS classes that automatically adapt to t
 ```css
 .interactive-hover      /* Hover effects */
 /* Hover effects */
+/* Hover effects */
+/* Hover effects */
+/* Hover effects */
+/* Hover effects */
+/* Hover effects */
+/* Hover effects */
 .focus-themed           /* Focus states */
 .rounded-themed         /* Theme-aware border radius */
 .shadow-themed-sm       /* Theme-aware shadows */

package/lib/cdm-locales/en/menu.json

@@ -110,6 +110,7 @@
         "dict": "Dict",
         "config": "Config",
         "system_log": "System Log",
-        "login_info": "Login Info"
+        "login_info": "Login Info",
+        "tenant_management": "Tenant Management"
     }
 }

package/lib/cdm-locales/es/menu.json

@@ -110,6 +110,7 @@
         "dict": "Diccionario",
         "config": "Configuración",
         "system_log": "Registro del Sistema",
-        "login_info": "Información de Inicio de Sesión"
+        "login_info": "Información de Inicio de Sesión",
+        "tenant_management": "Gestión de Inquilinos"
     }
 }

package/lib/cdm-locales/index.d.ts

@@ -0,0 +1,2 @@
+export * from '@admin-layout/client/src/graphql/link';
+//# sourceMappingURL=index.d.ts.map

package/lib/cdm-locales/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cdm-locales/index.ts"],"names":[],"mappings":"AAAA,cAAc,uCAAuC,CAAC"}

package/lib/cdm-locales/index.ts

@@ -0,0 +1 @@
+export * from '@admin-layout/client/src/graphql/link';

package/lib/components/LanguageMenu/LanguageMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LanguageMenu.d.ts","sourceRoot":"","sources":["../../../src/components/LanguageMenu/LanguageMenu.tsx"],"names":[],"mappings":"AAQA,eAAO,MAAM,YAAY,+CAyFxB,CAAC"}
+{"version":3,"file":"LanguageMenu.d.ts","sourceRoot":"","sources":["../../../src/components/LanguageMenu/LanguageMenu.tsx"],"names":[],"mappings":"AAQA,eAAO,MAAM,YAAY,+CAoGxB,CAAC"}

package/lib/components/LanguageMenu/LanguageMenu.js

@@ -1,9 +1,12 @@
-import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {useTranslation}from'react-i18next';import {useMediaQuery}from'react-responsive';import {useAppDispatch,languages,CHANGE_LANGUAGE}from'@admin-layout/client';import {Globe}from'lucide-react';import config from'@app/cde-webconfig.json';const LanguageMenu = () => {
+import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {useTranslation}from'react-i18next';import {useMediaQuery}from'react-responsive';import {useLayoutSettings,languages}from'@admin-layout/client';import {Globe}from'lucide-react';import config from'@app/cde-webconfig.json';const LanguageMenu = () => {
   const isMobile = useMediaQuery({
     maxWidth: 767
   });
-  const [locale, setLocale] = useState('en');
-  const dispatch = useAppDispatch();
+  const {
+    settings,
+    setSettings
+  } = useLayoutSettings();
+  const [locale, setLocale] = useState(settings?.language || 'en');
   const {
     i18n
   } = useTranslation();
@@ -19,12 +22,16 @@ import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'
   const [isOpen, setIsOpen] = useState(false);
   const dropdownRef = useRef(null);
   const filteredLanguages = languages.filter(language => i18nextInstance.supportedLngs.includes(language.key));
+  // Initialize currentLang from settings
   useEffect(() => {
-    dispatch({
-      type: CHANGE_LANGUAGE,
-      payload: locale
-    });
-  }, [locale, dispatch]);
+    if (settings?.language && settings.language !== locale) {
+      setLocale(settings.language);
+      const lang = languages.find(l => l.key === settings.language);
+      if (lang) {
+        setCurrentLang(lang);
+      }
+    }
+  }, [settings?.language]);
   useEffect(() => {
     const handleClickOutside = event => {
       if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
@@ -45,6 +52,11 @@ import {jsxs,jsx}from'react/jsx-runtime';import {useState,useRef,useEffect}from'
     });
     i18n.changeLanguage(language.key);
     setLocale(language.key);
+    // Update settings through useLayoutSettings hook
+    setSettings({
+      ...settings,
+      language: language.key
+    });
     setIsOpen(false);
   };
   const toggleDropdown = () => {

package/lib/components/LanguageMenu/LanguageMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"LanguageMenu.js","sources":["../../../src/components/LanguageMenu/LanguageMenu.tsx"],"sourcesContent":[null],"names":[],"mappings":"wUAQO,MAAM,YAAY,GAAG,MAAK;QACvB,QAAA,GAAW,aAAA,CAAA;IACjB,QAAa,EAAA;AACb,GAAA,CAAA;AACA,EAAA,MAAA,CAAA,MAAY,EAAA,SAAK,CAAA,GAAA,QAAiB,CAAA,IAAA,CAAA;AAClC,EAAA,MAAA,QAAY,iBAAiB,EAAE;AAC/B,EAAA,MAAA;AACI,IAAA;AACA,GAAA,GAAA,cAAgB,EAAA;AAChB,EAAA,MAAA;AACA,IAAA,IAAA,EAAA;AACH,GAAA,GAAC,MAAC;QACG,CAAA,WAAkB,EAAA,cAAY,CAAA,GAAA,QAAQ,CAAA;AAC5C,IAAA,GAAA,EAAA;IAEA,KAAM,EAAA,SAAA;IAEN,IAAS,EAAA;AACL,IAAA,MAAA,EAAA;AACI,GAAA,CAAA;AACA,EAAA,MAAA,CAAA,MAAA,EAAA,SAAe,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AAClB,EAAA,MAAA,WAAE,GAAA,MAAA,CAAA,IAAA,CAAA;AACP,EAAA,MAAI,iBAAiB,GAAE,SAAA,CAAA,MAAA,CAAA,QAAA,IAAA,eAAA,CAAA,aAAA,CAAA,QAAA,CAAA,QAAA,CAAA,GAAA,CAAA,CAAA;WAEd,CAAA,MAAM;AACX,IAAA,QAAA,CAAA;AACI,MAAA,IAAA,EAAA,eAAe;;;AAGnB,GAAA,EAAA,CAAA,MAAE,EAAA,QAAA,CAAA,CAAA;AAEF,EAAA,SAAA,CAAA,MAAyB;AACzB,IAAA,MAAA,kBAAY,GAAA,KAAA,IAAA;AACR,MAAA,IAAA,WAAS,CAAmB,OAAA,IAAA,CAAA,mBAAc,CAAA,QAAA,CAAA,KAAA,CAAA,MAAoB,CAAA,EAAA;AAClE,QAAA,SAAE,CAAA,KAAA,CAAA;;AAGN,KAAA;AACI,IAAA,QAAA,CAAA,gBAAe,CAAA,WAAA,EAAA,kBAAA,CAAA;iBACN;cACA,CAAA,mBAAgB,CAAA,WAAA,EAAA,kBAAA,CAAA;;;AAGxB,EAAA,MAAA,oBAAE,GAAA,QAAA,IAAA;AACH,IAAA,cAAmB,CAAA;AACnB,MAAA,GAAA,EAAA,QAAU,CAAA,GAAA;WACD,EAAA,QAAM,CAAA,KAAE;AACrB,MAAE,IAAA,EAAA,QAAA,CAAA,IAAA;MAEI,MAAA,EAAA,QAAA,CAAA;AACF,KAAA,CAAA;AACJ,IAAA,IAAE,CAAA,cAAA,CAAA,QAAA,CAAA,GAAA,CAAA;AAEF,IAAA,SACS,CAAA,QAAA,CAAA,GAAA,CAAA;AAmCb,IAAE,SAAA,CAAA,KAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"LanguageMenu.js","sources":["../../../src/components/LanguageMenu/LanguageMenu.tsx"],"sourcesContent":[null],"names":[],"mappings":"2TAQO,MAAM,YAAY,GAAG,MAAK;QAC7B,QAAM,GAAQ,aAAG,CAAA;IACjB,QAAQ;AACR,GAAA,CAAA;AACA,EAAA,MAAA;AACA,IAAA,QAAQ;AACR,IAAA;AACI,GAAA,GAAA,iBAAS,EAAA;AACT,EAAA,MAAA,CAAA,MAAO,EAAA,SAAS,CAAA,GAAA,QAAA,CAAA,QAAA,EAAA,QAAA,IAAA,IAAA,CAAA;AAChB,EAAA,MAAA;AACA,IAAA;AACH,GAAA,GAAC,cAAC,EAAA;QACH;AACA,IAAA,IAAA,EAAM;MAEN,MAAM;QAEN,CAAA,WAAA,EAAA,cAAA,CAAA,GAAA,QAAuC,CAAA;IACvC,GAAA,EAAA,IAAS;SACL,EAAA,SAAY;AACR,IAAA,IAAA,EAAA,MAAA;AACA,IAAA,MAAA,EAAA;;iBAEI,SAAA,CAAA,GAAc,QAAO,CAAA,KAAA,CAAA;mBACxB,GAAA,MAAA,CAAA,IAAA,CAAA;QACL,iBAAC,GAAA,SAAA,CAAA,MAAA,CAAA,QAAA,IAAA,eAAA,CAAA,aAAA,CAAA,QAAA,CAAA,QAAA,CAAA,GAAA,CAAA,CAAA;AACL;WAEA,CAAA,MAAa;AACT,IAAA,IAAA,QAAM,EAAA,QAAA,IAAA,QAAsB,CAAA,QAAS,KAAA,MAAA,EAAA;AACjC,MAAA,SAAA,CAAI,iBAAY,CAAA;gBACZ,GAAA,SAAU,CAAA,IAAO,CAAA,CAAA,IAAA,CAAA,CAAA,GAAA,KAAA,QAAA,CAAA,QAAA,CAAA;cACpB,EAAA;AACL,QAAA,cAAE,CAAA,IAAA,CAAA;AAEF,MAAA;AACA,IAAA;AACI,EAAA,CAAA,EAAA,CAAA,QAAA,EAAA,QAAS,CAAA,CAAA;AACb,EAAA,SAAE,CAAA,MAAA;IACN,MAAM,kBAAC,GAAA,KAAA,IAAA;AAEP,MAAA,IAAM,WAAA,CAAA,OAAA,IAAuB,CAAC,WAAU,CAAE,OAAA,CAAA,QAAA,CAAA,KAAA,CAAA,MAAA,CAAA,EAAA;AACtC,QAAA,SAAA,CAAA,KAAe,CAAA;;;YAGX,CAAA,gBAAe,CAAA,WAAI,EAAA,kBAAA,CAAA;iBACnB;AACH,MAAA,QAAE,CAAA,mBAAA,CAAA,WAAA,EAAA,kBAAA,CAAA;AACH,IAAA,CAAA;AACA,EAAA,CAAA,EAAA,EAAA,CAAA;QAEA,oBAAA,GAAA,QAAA,IAAA;AACA,IAAA,cAAA,CAAW;AACP,MAAA,GAAA,EAAA,QAAG,CAAA,GAAQ;aACX,QAAQ,CAAE,KAAA;AACb,MAAA,IAAC,EAAC,QAAA,CAAA,IAAA;YAEH,EAAA,QAAU,CAAK;AACnB,KAAC,CAAC;IAEF,IAAA,CAAA,cAAM,CAAc,QAAQ,CAAA,GAAA,CAAA;AACxB,IAAA,SAAA,CAAA,QAAW,CAAA,GAAO,CAAC;AACvB;AAEA,IAAA,WACI,CAAA;AAmCR,MAAE,GAAA,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -1,5 +1,5 @@
-import React from 'react';
 import { BasicLayoutProps, GlobalHeaderProps } from '@admin-layout/client';
+import React from 'react';
 export declare const useHorizontalScroll: ({ setScrolled, setSearchOptionsShown, onScrollReachEnd }: {
     setScrolled: any;
     setSearchOptionsShown: any;
@@ -8,5 +8,6 @@ export declare const useHorizontalScroll: ({ setScrolled, setSearchOptionsShown,
 export declare const BasicLayout: React.FC<BasicLayoutProps & GlobalHeaderProps & {
     routeParams?: any;
     children?: React.ReactNode;
+    routePattern?: string;
 }>;
 //# 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,EAIpB,MAAM,sBAAsB,CAAC;AAS9B,eAAO,MAAM,mBAAmB,GAAI;;;;CAAwD,sCAkC3F,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,CAgR3F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAIhB,iBAAiB,EAEpB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAA4D,MAAM,OAAO,CAAC;AAcjF,eAAO,MAAM,mBAAmB,GAAI;;;;CAAwD,sCAkC3F,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,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAwWlH,CAAC"}

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

@@ -1,4 +1,4 @@
-import {jsxs,jsx}from'react/jsx-runtime';import {useState,useEffect,useRef}from'react';import {Sidebar}from'../Sidebar/Sidebar.js';import {GlobalHeader}from'../GlobalHeader/Header.js';import {Outlet}from'@remix-run/react';import warning from'warning';import {omit}from'lodash-es';import {SettingDrawer}from'../../SettingDrawer/SettingDrawer.js';import {defaultSettings,useComponentSize,getMenuSeparation,getThemeColors}from'@admin-layout/client';import isBrowser from'../../../utils/isBrowser/index.js';import {getPageTitleInfo}from'../getPageTitle.js';import {MainHeader}from'../GlobalHeader/MainHeader.js';import'../GlobalHeader/Logo.js';import'react-router';import'../../../helpers/DynamicIcon.js';import'@app/dialog/WrappedDialogsSwitch';import'@common-stack/components-pro';import {FooterSlot}from'../slot-fill/Footer.js';import'reflect-metadata';import'@admin-layout/client/lib/constants/layout.js';import {config}from'../../../config/env-config.js';import {useScrollThreshold}from'../../../hooks/useScrollThreshold.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import'../../../hooks/use-get-current-lat-long.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';const useHorizontalScroll = ({
+import {jsxs,jsx}from'react/jsx-runtime';import {useComponentSize,getMenuSeparation,getThemeColors}from'@admin-layout/client';import {Outlet}from'@remix-run/react';import {omit}from'lodash-es';import {useState,useEffect,useRef,useCallback,useMemo}from'react';import warning from'warning';import {config}from'../../../config/env-config.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';import {useScrollThreshold}from'../../../hooks/useScrollThreshold.js';import {SettingDrawer}from'../../SettingDrawer/SettingDrawer.js';import {getPageTitleInfo}from'../getPageTitle.js';import {MainHeader}from'../GlobalHeader/MainHeader.js';import'@remix-run/router';import'../../../helpers/DynamicIcon.js';import'@app/dialog/WrappedDialogsSwitch';import {GlobalHeader}from'../GlobalHeader/Header.js';import {MainSidebar}from'../Sidebar/MainSidebar.js';import {PerplexSidebar}from'../Sidebar/PerplexSidebar.js';import'@common-stack/components-pro';import {FooterSlot}from'../slot-fill/Footer.js';import'reflect-metadata';import'@admin-layout/client/lib/constants/layout.js';const useHorizontalScroll = ({
   setScrolled,
   setSearchOptionsShown,
   onScrollReachEnd
@@ -56,14 +56,22 @@ const defaultPageTitleRender = (pageProps, props) => {
   return pageTitleInfo;
 };
 const BasicLayout = props => {
-  const propsWithSettings = {
-    ...defaultSettings,
-    ...props
-  };
+  // Settings are already passed from TailwindLayout via props
+  // No need to subscribe to Redux again - it causes double re-renders
+  const propsWithSettings = props;
   const [scrolled, setScrolled] = useState(false);
   const [collapsed, setCollapsed] = useState(false);
+  const [siderPinned, setSiderPinned] = useState(false);
   const {
+    children,
+    onCollapse: propsOnCollapse,
+    defaultCollapsed,
     menuData,
+    fullMenuData,
+    siderWidth = 208,
+    menu,
+    menuDataRender,
+    loading,
     location,
     routeParams,
     settings,
@@ -106,13 +114,44 @@ const BasicLayout = props => {
       };
     }
   }, [searchOptionsShown, isMobile]);
-  // Get current route settings with proper fallback
+  // Get current route and device type
   const currentRoute = location?.pathname || '/';
-  const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
-  // Get device-specific 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 - use route pattern if available
+    const routeForBracket = props.routePattern || currentRoute;
+    const routeDeviceKey = `[${routeForBracket}][${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'),
+    footer: getUILayoutValue('footer')
+  };
+  // 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')
+  };
+  // Helper function to get override value (for backward compatibility)
+  const getOverrideValue = path => {
+    return path.split('.').reduce((obj, key) => obj?.[key], deviceSettings);
+  };
   const backgroundSettings = deviceSettings?.background || {
     type: 'color',
     color: 'inherit',
@@ -149,16 +188,22 @@ const BasicLayout = props => {
       };
       onSettingChange(newState);
     }
-  }, [primaryColor, isBrowser, settingRef]);
+    // Only depend on primaryColor - settingRef and isBrowser are stable/unnecessary
+  }, [primaryColor, onSettingChange]);
   // Update settings when route changes
-  useEffect(() => {
+  // Memoize the send callback to prevent creating new event objects
+  const sendRouteChange = useCallback(() => {
     if (actor && location?.pathname) {
       actor.send({
-        type: 'ROUTE_CHANGE',
-        pathname: location?.pathname
+        type: 'UISETTING_ROUTE_CHANGE',
+        pathname: location?.pathname,
+        routePattern: props.routePattern
       });
     }
-  }, [location?.pathname, actor]);
+  }, [actor, location?.pathname, props.routePattern]);
+  useEffect(() => {
+    sendRouteChange();
+  }, [sendRouteChange]);
   const {
     ref: refHeader,
     height: heightHeader
@@ -191,6 +236,20 @@ const BasicLayout = props => {
     }
     return classes;
   };
+  // Derived layout flags for clarity
+  const isSidebarLayout = layoutSettings?.navigationMode !== 'topbar';
+  const showMenu = deviceSettings?.header?.showMenu;
+  const showHeader = deviceSettings?.header?.showHeader;
+  const hasFixedSidebar = layoutSettings?.fixedSidebar;
+  const isPerplexLayout = settings?.sideMenuType === 'perplexLayout';
+  const isAppShell = LAYOUT_ROOT != '/';
+  const shouldApplySidebarMargin = isSidebarLayout && showMenu && hasFixedSidebar && !isMobile;
+  const shouldShowSidebar = isSidebarLayout && showMenu;
+  const sideBarMarginTop = !isAppShell && showHeader ? '5rem' : '';
+  // Compute margin-left based on layout type and state
+  const computedMarginLeft = shouldApplySidebarMargin ? !isPerplexLayout ? collapsed ? '64px' : '256px' : !siderPinned ? '92px' : '316px' : '0px';
+  const memoizedMenuData = useMemo(() => menuData, [menuData]); // Only recompute if menuData changes
+  const memoizedRouteParams = useMemo(() => routeParams, [routeParams]); // Stable reference for routeParams
   return jsxs("div", {
     className: getBackgroundClasses(),
     ref: horizontalScrollRef,
@@ -202,14 +261,14 @@ const BasicLayout = props => {
     children: [deviceSettings?.header?.showHeader && LAYOUT_ROOT != '/' && jsx(GlobalHeader, {
       toggleSideMenu: toggleSideMenu,
       settings: settings,
-      upperMenus: getMenuSeparation(menuData).upperMenus,
-      routeParams: routeParams,
+      upperMenus: getMenuSeparation(memoizedMenuData).upperMenus,
+      routeParams: memoizedRouteParams,
       collapsed: collapsed,
       ...props
     }), LAYOUT_ROOT === '/' && deviceSettings?.header?.showHeader && jsx(MainHeader, {
       scrolled: scrolled,
       location: location,
-      menuData: menuData,
+      menuData: memoizedMenuData,
       settings: settings,
       pageTitleInfo: pageTitleInfo,
       onSettingChange: onSettingChange,
@@ -217,21 +276,50 @@ const BasicLayout = props => {
       setSearchOptionsShown: setSearchOptionsShown,
       authorities: authorities,
       picture: picture,
-      componentVisibility: componentVisibility
+      componentVisibility: componentVisibility,
+      showMenu: showMenu
     }), jsxs("div", {
       className: "bg-background",
-      children: [layoutSettings?.navigationMode !== 'topbar' && deviceSettings?.header?.showMenu && LAYOUT_ROOT != '/' && jsx(Sidebar, {
-        isSideMenuOpen: isSideMenuOpen,
-        closeSideMenu: closeSideMenu,
-        menuData: menuData,
-        collapsed: collapsed,
-        setCollapsed: setCollapsed,
-        routeParams: routeParams,
-        settings: settings
+      children: [shouldShowSidebar && !isPerplexLayout && jsx("div", {
+        style: {
+          marginTop: sideBarMarginTop
+        },
+        children: jsx(MainSidebar, {
+          isSideMenuOpen: isSideMenuOpen,
+          closeSideMenu: closeSideMenu,
+          menuData: memoizedMenuData,
+          collapsed: collapsed,
+          setCollapsed: setCollapsed,
+          routeParams: memoizedRouteParams,
+          settings: settings,
+          siderPinned: siderPinned,
+          setSiderPinned: setSiderPinned,
+          showHeader: showHeader
+        })
+      }), shouldShowSidebar && isPerplexLayout && jsx("div", {
+        style: {
+          marginTop: sideBarMarginTop
+        },
+        children: jsx(PerplexSidebar, {
+          isSideMenuOpen: isSideMenuOpen,
+          closeSideMenu: closeSideMenu,
+          menuData: memoizedMenuData,
+          collapsed: collapsed,
+          setCollapsed: setCollapsed,
+          routeParams: memoizedRouteParams,
+          settings: settings,
+          layoutSettings: layoutSettings,
+          deviceSettings: deviceSettings,
+          siderPinned: siderPinned,
+          setSiderPinned: setSiderPinned,
+          actor: actor,
+          sideBarMarginTop: sideBarMarginTop,
+          showHeader: showHeader
+        })
       }), jsxs("div", {
         className: "flex flex-col flex-1 bg-background",
         style: {
-          marginLeft: layoutSettings?.navigationMode !== 'topbar' && deviceSettings?.header?.showMenu && layoutSettings?.fixedSidebar && !isMobile && LAYOUT_ROOT != '/' ? collapsed ? '64px' : '256px' : '0px',
+          marginLeft: computedMarginLeft,
           padding: LAYOUT_ROOT != '/' ? '24px' : '0px'
         },
         children: [config.ENABLE_SETTING_DRAWER && jsx(SettingDrawer, {
@@ -240,7 +328,7 @@ const BasicLayout = props => {
           onSettingChange: newSettings => {
             if (actor) {
               actor.send({
-                type: 'UPDATE',
+                type: 'UISETTING_UPDATE',
                 value: newSettings
               });
             }
@@ -248,6 +336,8 @@ const BasicLayout = props => {
           },
           actor: actor,
           colorList: getThemeColors(settings?.theme),
+          fullMenuData: fullMenuData,
+          routePattern: props.routePattern,
           ...props
         }), jsxs("main", {
           className: "relative",
@@ -258,12 +348,12 @@ const BasicLayout = props => {
               setSearchOptionsShown(false);
             }
           }), jsx(Outlet, {})]
-        }), deviceSettings?.footer?.showFooter && jsx("div", {
+        }), getOverrideValue('footer.showFooter') && jsx("div", {
           ref: refFooter,
           className: footerFixed ? 'fixed bottom-0 w-full' : '',
           children: jsx(FooterSlot, {
             settings: settings,
-            active: deviceSettings?.footer?.showFooter
+            active: getOverrideValue('footer.showFooter')
           })
         })]
       })]

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"wsCAwBO,MAAM,mBAAmB,GAAG,CAAC;AAChC,EAAA,WAAW;uBAEI;AACX,EAAA;;AAEI,EAAA,MAAA,KAAA,GAAA,MAAa,EAAA;AACT,EAAA,SAAA,CAAA,MAAA;oBAAmB,CAAO,OAAA,IAAA,IAAA;;mBAGgC,GAAA,CAAA,IAAA;oBACpD,IAAA,CAAA,EAAA;wBACiB,EAAA;AAIvB;;;AAGA,QAAA,IAAA,MAAA,CAAA,OAAU,GAAC,EAAA,EAAA;qBACI,CAAA,IAAA,CAAA;;AAEf,QAAA,IAAA,MAAA,CAAA,OAAU,GAAY,EAAA,EAAA;AAClB,UAAA,WAAA,CAAA,KAAA,CAAA;;AAER,QAAA,IAAA,MAAE,CAAA,WAAA,GAAA,MAAA,CAAA,OAAA,IAAA,QAAA,CAAA,IAAA,CAAA,YAAA,EAAA;AAEF,UAAA,gBAAuB,EAAA;AACvB;AACI,OAAA;AACJ,MAAA,MAAA,CAAC,gBAAC,CAAA,QAAA,EAAA,OAAA,CAAA;aACL,MAAA;QACA,MAAE,CAAA,mBAAA,CAAA,QAAA,EAAA,OAAA,CAAA;AACP,OAAA;AACJ;AAEA,GAAA,EAAA;AAQI,EAAA,OAAA,KAAQ;AACR;AACA,MAAA,sBAAwB,GAAK,CAAA,SAAG,EAAA,KAAA,KAAA;QAC5B;AACI,IAAA;AACA,GAAA,GAAA,KAAA;AACA,EAAA,MAAA,gBAAY,gBAAA,CAAA,SAAA,CAAA;qBACd,KAAA,KAAA,EAAA;IACN,OAAC;MACG,KAAA,EAAA,KAAA,CAAA,SAAkB,EAAA;AAClB,MAAA,EAAA,EAAA,EAAA;AACA,MAAA,QAAW,EAAA;;AAEH;qBACK,EAAA;eACP,GAAA,eAAA,CAAA,SAAA,EAAA,aAAA,CAAA,KAAA,EAAA,aAAA,CAAA;QACN,OAAC,KAAA,KAAA,QAAA,EAAA;aACM;QACV,GAAA,aAAA;AACD,QAAA;AACJ,OAAE;AAEF;IAGI,OAAM,CAAA,OAAA,KAAA,4EAA0D,CAAA;;SAE1D,aAAY;AAClB,CAAA;AAmBqB,MAAA,WAAA,GAAE,KAAiB,IAAA;QAClC,iBAAwB,GAAA;IAC9B,GAAM,eAAmB;AACzB,IAAA,GAAA;AACA,GAAA;AAEA,EAAA,MAAA,CAAA,QAAgB,EAAA,WAAK,CAAA,GAAA,QAAgB,CAAA,KAAA,CAAA;QAEkC,CAAA,SAAA,EAAA,YAAA,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;QAC9D;AACL,YAII;IAMA,QAAA;;;;gBAII;mBACQ;mBAEkB;AAC1B,IAAA;AACJ,GAAA,GAAA,iBAAE;QACN,CAAC,cAAA,EAAA,iBAAA,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AACL,EAAA,MAAI,CAAA,SAAA,EAAA,YAA4B,CAAA,GAAA,QAAG,CAAA,KAAA,CAAA;QAEe,CAAA,kBAAA,EAAA,qBAAA,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AAClD,EAAA,MAAA;AACA,IAAA;MAE+B,eAAA;QACzB;IACN;MACM,MAAA;AACN,EAAA,MAAA;AACI,IAAA;AACA,GAAA,GAAA,aAAgB,EAAA;AAChB;AACA,EAAA,SAAA,CAAA,MAAS;QACX,kBAAA,IAAA,QAAA,EAAA;;YAGc,OAAA,GAAE,MAAa,CAAA,OAAA;AAC/B;MAEM,QAAA,CAAA,IAAA,CAAA,KAAA,CAAA,QAAsB,GAAA,OAAA;cACb,CAAA,IAAA,CAAA,KAAA,CAAA,GAAA,GAAA,CAAA,CAAA,EAAA,OAAA,CAAA,EAAA,CAAA;cACU,CAAA,IAAA,CAAA,KAAA,CAAA,KAAA,GAAA,MAAA;cACL,CAAA,IAAA,CAAA,KAAA,CAAA,QAAA,GAAA,QAAA;AACnB,MAAC,OAAC,MAAA;;AAIK,QAAA,QAAoB,CAAA,IAAA,CAAA,KAAA,CAAA,QAAA,GAAA,EAAA;AACvB,QACA,QAAQ,CAAC,IACZ,CAAA,KAAA,CAAA,GAAA,GAAA,EAAA;QACI,QAAA,CAAA,IAAA,CAAA,KAAgB,CAAA,KAAA,GAAA,EAAA;QAEd,QAAQ,CAAA,IAAU,CAAA,KAAA,CAAE,QAAQ,GAAA,EAAA;AAC5B;QAEJ,MAAA,CAAA,QAAA,CAAiB,CACpB,EAAC,OAAA,CAAA;AAEF,OAAA;;AAIA,GAAA,EAAA,CAAA,kBAAQ,EAAA,QAAqB,CAAA,CAAG;AAC5B;AACI,EAAA,MAAA,YAAA,GAAW,QAAe,EAAA,QAAA,IAAA,GAAA;AAC1B,EAAA,MAAA,aAAgB,GAAA,QAAA,EAAA,aAAA,GAAA,YAAA,CAAA,IAAA,QAAA,EAAA,aAAA,GAAA,GAAA,CAAA,IAAA,QAAA;AAChB;AACH,EAAA,MAAA,UAAA,GAAA,QAAA,GAAA,QAAA,GAAA,SAAA;AACJ,EAAA,MAAE,cAAA,GAAA,aAAA,EAAA,OAAA,GAAA,UAAA,CAAA,IAAA,EAAA;QAEM,cAAM,GAAA,aAAA,EAAA,MAAA,GAAA,UAAA,CAAA,IAAA,EAAA;AACX,EAAA,MAAA,kBAAsB,GAAA,cAAc,EAAA,UAAe,IAAA;iBACzC;oBACS;SAClB,EAAA;QAII,gBAAM,GAAA,MAAA;AACX,IAAA,aAAS,aAAc,IAAA,CAAA,aAAW,CAAA;;AAE1B,EAAA,MAAA,mBAAoB,GAAA,mBAAA,CAAA;;AAEvB,IAAA,qBAAE;;IAEX;AAEA,EAAA,MAAA,YAAa,GAAA,IAAW,CAAA;AACxB,IAAA,GAAA;AACA,GAAA,EAAA,CAAA,QAAQ,CAAG,CAAE;QACP,aAAY,GAAE,sBAA0B,CAAA;IAE9C,QAAS,EAAC,QAAK,EAAA,QAAA;AACX,IAAA,GAAA;sBACQ,CAAA;kBAA6E,GAAA,MAAA,CAAA,QAAM,CAAC;;;;MAG/F;IAED,SAAM,EAAA,eAAoB;AACtB,IAAA,EAAA,EAAA,YAAA;AACJ,IAAA,eAAE,EAAA;IAEF,CAAM;WACe,CAAA,MAAA;AACrB,IAAA,IAAE,UAAA,CAAA,OAAA,EAAA,YAAA,KAAA,UAAA,IAAA,YAAA,KAAA,UAAA,EAAA;MAE+C,MAAA,QAAA,GAAA;QAC3C,GAAA,UAAA,CAAA,OAAA;QACF;;qBAGW,CAAA;;AAGX,GAAA,EAAA,CAAA,uBAAe,EAAA,UAAA,CAAA,CAAA;AACnB;WAEO,CACH;AAKY,IAAA,IAAA,KAAC,IAAC,QAAA,EAAA,QAAA,EAAA;AACI,MAAA,KAAA,CAAA,IAAA,CAAA;AACH,QAAA,IAAA,EAAA,cAAA;gBACiB,EAAA,QAAA,EAAA;AACpB,OAAA,CAAA;;AAEG,GAAA,EAAA,CAAA,QAAA,EAAA,QAAA,EAAA,KAAA,CAAA,CAAA;;;AAoCH,IAAA,MAAA,EAAA;AAgBI,GAAA,GAAA,gBAAA,EAAA;;AAGI,IAAA,GAAA,EAAA,OAAA;AACA,IAAA,MAAA,EAAA;AACA,GAAA,GAAA,gBAAA,EAAA;AACI,EAAA,MAAA;AACI,IAAA,GAAA,EAAA,SAAA;AACA,IAAA,MAAA,EAAA;AACJ,GAAA,GAAA,gBAAA,EAAA;oCACD,CAAE,GAAW,QAAA,CAAA,KAAO,CAAA;;sCAQf,YAAQ,EAAA;yCACH,GAAA,YAAM,GAAA,YAAA,EAAA,cAAA,CAAA,IAAA,CAAA,CAAA,KAAA,cAAA,CAAA,KAAA,CAAA;AACP;AACA,GAAA,EAAA,CAAA,YAAA,EAAA,UAAA,EAAA,YAAA,CAAA,CAAA;AACH,EAAA,MAAA,cAAA,GAAA,MAAA;qCACJ,CAAA;AACD,GAAA;AACJ,EAAA,MAAA,aAAA,GAAA,MAAA;;;;AA2B5B,EAAE,MAAA,oBAAA,GAAA,MAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}

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

@@ -2,10 +2,12 @@ import * as React from 'react';
 export declare const defaultFooterDom: import("react/jsx-runtime").JSX.Element;
 export declare const UserView: React.NamedExoticComponent<{
     collapsed: boolean;
+    layoutSettings: any;
 }>;
 export declare const FooterSubMenuItemRender: React.NamedExoticComponent<{
     item: any;
     collapsed: boolean;
+    layoutSettings: any;
 }>;
 export declare const handleMenuPopup: () => void;
 export declare const itemRender: (route: any, params: any, routes: any, paths: any) => import("react/jsx-runtime").JSX.Element;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,eAAO,MAAM,gBAAgB,yCAwB5B,CAAC;AAEF,eAAO,MAAM,QAAQ;eAA2B,OAAO;EAyD7C,CAAC;AAEX,eAAO,MAAM,uBAAuB;UAAsB,GAAG;eAAa,OAAO;EAK/E,CAAC;AAEH,eAAO,MAAM,eAAe,YAU3B,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,UAAK,EAAE,WAAM,EAAE,WAAM,EAAE,UAAK,4CAStD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,eAAY,UAUvC,CAAC;AAGF,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,EAAE,SAAS,MAAM,WAchE,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAK/B,eAAO,MAAM,gBAAgB,yCAwB5B,CAAC;AAEF,eAAO,MAAM,QAAQ;eAA2B,OAAO;oBAAkB,GAAG;EAyDlE,CAAC;AAEX,eAAO,MAAM,uBAAuB;UAAsB,GAAG;eAAa,OAAO;oBAAkB,GAAG;EAOrG,CAAC;AAEF,eAAO,MAAM,eAAe,YAU3B,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,UAAK,EAAE,WAAM,EAAE,WAAM,EAAE,UAAK,4CAStD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,eAAY,UAUvC,CAAC;AAGF,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,EAAE,SAAS,MAAM,WAchE,CAAC"}

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

@@ -1,4 +1,4 @@
-import {jsx,jsxs}from'react/jsx-runtime';import*as React from'react';import {Link}from'react-router-dom';import {isEmpty}from'lodash-es';import {useAppSelector,useLayoutSettings}from'@admin-layout/client';jsxs("footer", {
+import {jsx,jsxs}from'react/jsx-runtime';import*as React from'react';import {Link}from'@remix-run/react';import {isEmpty}from'lodash-es';import {useAppSelector,useLayoutSettings}from'@admin-layout/client';jsxs("footer", {
   className: "flex flex-col items-center justify-center py-4",
   children: [jsxs("div", {
     className: "flex space-x-8 mb-2",
@@ -28,20 +28,21 @@ import {jsx,jsxs}from'react/jsx-runtime';import*as React from'react';import {Lin
   })]
 });
 const UserView = React.memo(({
-  collapsed
+  collapsed,
+  layoutSettings
 }) => {
   const {
     profile = {}
   } = useAppSelector(state => state?.user || {});
-  const {
-    settings
-  } = useLayoutSettings();
   const {
     isTest,
     mock,
     nickname,
     picture
   } = profile || {};
+  const {
+    settings
+  } = useLayoutSettings();
   if (isEmpty(profile) || isTest || mock) {
     return jsx("div", {
       className: "flex",
@@ -84,31 +85,33 @@ const UserView = React.memo(({
     id: !isEmpty(profile) || isTest || mock ? `cde-user-placeholder` : 'cde-user',
     className: `${settings?.themeType === 'dark' ? 'text-white' : ''}`,
     children: jsxs("div", {
-      className: "flex items-center",
+      className: `flex items-center ${layoutSettings?.sideMenuType === 'perplexLayout' ? 'flex-col' : ''}`,
       children: [jsx("div", {
         className: "w-8 h-8 rounded-full bg-gray-300 flex items-center justify-center overflow-hidden ml-1 mb-1",
         children: picture ? jsx("img", {
           src: picture,
-          alt: nickname || 'Guest',
+          alt: "Account",
           className: "w-full h-full object-cover"
         }) : jsx("span", {
           className: "text-sm",
-          children: (nickname || 'Guest').charAt(0)
+          children: 'Account'.charAt(0)
         })
       }), !collapsed && jsx("span", {
-        className: "pl-2",
-        children: nickname || 'Guest'
+        className: "pl-2 text-sm",
+        children: "Account"
       })]
     })
   });
 });
 const FooterSubMenuItemRender = React.memo(({
   item,
-  collapsed
+  collapsed,
+  layoutSettings
 }) => {
-  if (item?.key === 'usermenu') {
+  if (item?.key === 'usermenu' || item?.key === 'account') {
     return jsx(UserView, {
-      collapsed: collapsed
+      collapsed: collapsed,
+      layoutSettings: layoutSettings
     });
   }
   return jsx("span", {

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../../src/components/Layout/BasicLayout/utils.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"6MAKgCA,IAC5B,CAAA,QAAA,EAAA;AAyBJ,EAAA,SAAO,EAAM,gDAAiE;AAC1E,EAAA,QAAM,EAAE,CAAOA,IAAA,CAAA,KAAK,EAAE;AACtB,IAAA,SAAgB,EAAA,qBAAK;AACrB,IAAA,QAAQ,EAAA,CAAAC,GAAQ,CAAA,GAAA,EAAM;MAElB,IAAA,EAAA,qBAA0B;YACnB,EAAA,QACE;MA8BZ,GAAA,EAAA,qBAAA;MAEM,SAEY,EAAA,qDACS;AAehC,MAAW,QAAA,EAAA;AAEX,KAAA,CAAM,EAACA,GAAA,CAAM,GAAuB,EAAA;AAChC,MAAA,MAAQ,4BAAuB;AAC3B,MAAA,MAAA,EAAA,QAAgB;MACnB,GAAA,EAAA,qBAAA;AACD,MAAA,SAAc,EAAA,qDAAmB;AACrC,MAAG,QAAA,EAAAA,GAAA,CAAA,KAAA,EAAA;AAEH,QAAO,SAAqB,EAAA,SAAA;AACxB,QAAI,IAAO,EAAA,cAAY;AACvB,QAAA,OAAkB,EAAA;QACd,UAAUA,GAAA,CAAA,MAAA,EAAA;UACN,CAAA,EAAA;SACD;;AAEC,KAAA,CAAA;SACH,CAAA,KAAA,EAAA;IACL,SAAC,EAAA,uBAAA;AACL,IAAE,QAAA,EAAA,CAAA,EAAA,IAAA,IAAA,EAAA,CAAA,WAAA,EAAA,CAAA,eAAA;AAEF,GAAA,CAAA;;sBAGa,CAAA,IAAG,CAAA,CAAA;AAMhB,EAAE;AAEF,CAAM,KAAA;AACF,EAAA,MAAI;WACO,GAAA;AACH,GAAA,GAAA,cAAA,CAAA,KAAA,IAAA,KAAA,EAAA,IAAA,IAAA,EAAA,CAAA;AACI,EAAA,MAAA;AACA,IAAA;AACH,GAAA,GAAA,iBAAA,EAAA;AACD,EAAA,MAAA;UACF;IACN,IAAC;AACL,IAAE,QAAA;AAEF,IAAwD;AACxD,GAAM,GAAA,OAAO,IAAkB,EAAA;AAC3B,EAAA,IAAA,OAAgB,CAAA,OAAC,KAAK,MAAM,IAAI,IAAI,EAAE;AACtC,IAAA,OAAKA,GAAW,CAAA,KAAC;AACjB,MAAA,SAAgB,EAAA;AAEhB,MAAK,QAAK,EAAAA,GAAM,CAAC,KAAG,EAAI;AACxB,QAAK,SAAK,EAAK,UAAU;AACzB,QAAK,QAAK,EAAAD,IAAU,CAAA,IAAI,EAAI;YAEpB,EAAC,QAAU;kBACL,EAAE,CAAG,CAAA,SAAE,IAAAA,IAAA,CAAA,QAAA,EAAA;YACb,SAAW,EAAA,qGAAE;AAErB,oBAAuB,EAAA,CAAAC,GAAA,CAAC;AAC5B,cAAE,SAAA,EAAA,cAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"utils.js","sources":["../../../../src/components/Layout/BasicLayout/utils.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"6MAKgCA,IAC5B,CAAA,QAAA,EAAA;AAyBJ,EAAA,SAAO,EAAM,gDAAkF;AAC3F,EAAA,QAAM,EAAE,CAAAA,IAAA,CAAO,KAAK,EAAE;AACtB,IAAA,SAAQ,EAAA,qBAAwB;AAChC,IAAA,QAAQ,EAAA,CAAAC,GAAA,CAAQ,GAAE,EAAG;MAErB,IAAI,EAAA,qBAAoB;YACpB,EAAA,QACI;MA8BP,GAAA,EAAA,qBAAA;MAED,SACI,EAAA,qDAEwB;AAehC,MAAW,QAAA,EAAA;AAEX,KAAA,CAAM,EAACA,GAAA,CAAM,GAAA,EAAA;AAEL,MAAA,IAAI,EAAI,4BAA4B;YAChC,EAAA,QAAQ;MACX,GAAA,EAAA,qBAAA;AACD,MAAA,SAAO,EAAA,qDAA0B;AACrC,MACF,QAAA,EAAAA,GAAA,CAAA,KAAA,EAAA;AAEF,QAAO,SAAM,EAAA,SAAe;AACxB,QAAI,IAAA,EAAA,cAAmB;AACvB,QAAA,OAAU,EAAA;QACN,UAAUA,GAAA,CAAA,MAAA,EAAA;UACV,CAAA,EAAI;SACJ;;AAEI,KAAA,CAAA;SACH,CAAA,KAAA,EAAA;IACL,SAAC,EAAA,uBAAA;AACL,IAAE,QAAA,EAAA,CAAA,EAAA,IAAA,IAAA,EAAA,CAAA,WAAA,EAAA,CAAA,eAAA;AAEF,GAAA,CAAA;;sBAGa,CAAA,IAAC,CAAE,CAAA;AAMhB,EAAE,SAAA;AAEF,EAAA;AACI,CAAA,KAAA;QACI;AACI,IAAA,OAAA,GAAA;AACI,GAAA,GAAA,cAAI,MAAK,IAAA,KAAA,EAAA,IAAA,IAAA,EAAA,CAAA;AACT,EAAA,MAAA;AACH,IAAA,MAAA;AACD,IAAA,IAAA;YACF;IACN;AACJ,GAAE,GAAA,OAAA,IAAA,EAAA;AAEF,EAAA,MAAA;AACA,IAAA;AACI,GAAA,GAAA;AACA,EAAA,IAAA,OAAQ,CAAA,OAAS,KAAK,MAAM,IAAI,IAAI,EAAE;AACtC,IAAA,OAAKA,GAAG,CAAA,KAAS;AAEjB,MAAC,SAAS,EAAA,MAAO;AACjB,MAAC,QAAS,EAAAA,GAAM,CAAC,KAAG,EAAI;AACxB,QAAC,SAAS,EAAK,UAAU;QAErB,QAAQ,EAAED,IAAK,CAAC,IAAC,EAAA;YACb,EAAC,QAAO;kBACF,EAAE,CAAA,CAAA,SAAK,IAAAA,IAAA,CAAA,QAAA,EAAA;AAErB,qBAAe,EAAA,qGAAkG;AACrH,YAAE,QAAA,EAAA,CAAAC,GAAA,CAAA,KAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/Layout/GlobalFooter/Account.d.ts

@@ -0,0 +1,4 @@
+import * as React from 'react';
+declare const Account: React.FC<any>;
+export default Account;
+//# sourceMappingURL=Account.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalFooter/Account.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,CAiJ1B,CAAC;AAEF,eAAe,OAAO,CAAC"}