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

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

@@ -1,5 +1,4 @@
-import {jsx,jsxs}from'react/jsx-runtime';import {useState,useRef,useEffect}from'react';import {Sidebar}from'../Sidebar/Sidebar.js';import {GlobalHeader}from'../GlobalHeader/Header.js';import {useLocation,Outlet}from'@remix-run/react';import warning from'warning';import {omit}from'lodash-es';import {SettingDrawer}from'../../SettingDrawer/SettingDrawer.js';import {defaultSettings,useComponentSize,getMenuSeparation,getThemeColors}from'@admin-layout/client';import isBrowser from'../../../utils/isBrowser/index.js';import {getPageTitleInfo}from'../getPageTitle.js';import {GlobalFooter}from'../GlobalFooter/Footer.js';import {ThemeProvider}from'../../ThemeProvider/ThemeProvider.js';const useHorizontalScroll = ({
-  scrolled,
+import {jsxs,jsx}from'react/jsx-runtime';import React__default,{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 {useTheme}from'../../ThemeProvider/ThemeProvider.js';import {MainHeader}from'../GlobalHeader/MainHeader.js';import'../GlobalHeader/Logo.js';import'react-router';import'../../../helpers/DynamicIcon.js';import'@app/dialog/WrappedDialogsSwitch';import'@common-stack/components-pro';import {FooterSlot}from'../slot-fill/Footer.js';import'reflect-metadata';import'@admin-layout/client/lib/constants/layout.js';import {config}from'../../../config/env-config.js';import {useScrollThreshold}from'../../../hooks/useScrollThreshold.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import'../../../hooks/use-get-current-lat-long.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';const useHorizontalScroll = ({
   setScrolled,
   setSearchOptionsShown,
   onScrollReachEnd
@@ -11,7 +10,9 @@ import {jsx,jsxs}from'react/jsx-runtime';import {useState,useRef,useEffect}from'
       const onWheel = e => {
         if (e.deltaY == 0) return;
         e.preventDefault();
-        setSearchOptionsShown(false);
+        // if (!isMobileView) {
+        //     setSearchOptionsShown(false);
+        // }
         if (window.scrollY > 50) {
           setScrolled(true);
         }
@@ -62,19 +63,8 @@ const BasicLayout = props => {
   const [scrolled, setScrolled] = useState(false);
   const [collapsed, setCollapsed] = useState(false);
   const {
-    children,
-    onCollapse: propsOnCollapse,
-    // contentStyle,
-    defaultCollapsed,
     menuData,
-    // style,
-    // disableContentMargin,
-    siderWidth = 208,
-    menu,
-    // isChildrenLayout: propsIsChildrenLayout,
-    menuDataRender,
-    loading,
-    // location,
+    location,
     routeParams,
     settings,
     authorities,
@@ -84,15 +74,59 @@ const BasicLayout = props => {
     actor
   } = propsWithSettings;
   const [isSideMenuOpen, setIsSideMenuOpen] = useState(false);
-  useState(false);
-  const location = useLocation();
   const [scrollEnd, setScrollEnd] = useState(false);
   const [searchOptionsShown, setSearchOptionsShown] = useState(false);
+  const {
+    picture
+  } = mainHeaderProps;
+  const {
+    LAYOUT_ROOT
+  } = config;
+  const {
+    theme,
+    isDarkMode
+  } = useTheme();
+  const {
+    isMobile
+  } = useMediaQuery();
+  // Effect to disable scrolling when search modal is open in mobile view
+  useEffect(() => {
+    if (searchOptionsShown && isMobile) {
+      // Save the current scroll position
+      const scrollY = window.scrollY;
+      // Add the no-scroll class to the body
+      document.body.style.position = 'fixed';
+      document.body.style.top = `-${scrollY}px`;
+      document.body.style.width = '100%';
+      document.body.style.overflow = 'hidden';
+      return () => {
+        // Remove the no-scroll class when component unmounts or modal closes
+        document.body.style.position = '';
+        document.body.style.top = '';
+        document.body.style.width = '';
+        document.body.style.overflow = '';
+        // Restore scroll position
+        window.scrollTo(0, scrollY);
+      };
+    }
+  }, [searchOptionsShown, isMobile]);
+  // Get current route settings with proper fallback
+  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] || {};
+  const backgroundSettings = deviceSettings?.background || {
+    type: 'color',
+    color: 'inherit',
+    image: '',
+    video: ''
+  };
   const onScrollReachEnd = () => {
     setScrollEnd(prevScrollEnd => !prevScrollEnd);
   };
-  useHorizontalScroll({
-    scrolled,
+  const horizontalScrollRef = useHorizontalScroll({
     setScrolled,
     setSearchOptionsShown,
     onScrollReachEnd
@@ -100,13 +134,20 @@ const BasicLayout = props => {
   const defaultProps = omit({
     ...propsWithSettings
   }, ['layout']);
-  defaultPageTitleRender({
+  const pageTitleInfo = defaultPageTitleRender({
     pathname: location?.pathname,
     ...defaultProps
   }, propsWithSettings);
   const settingRef = useRef(settings);
+  const scrollThreshold = deviceSettings?.header?.scrollThreshold || 50;
+  const {
+    componentVisibility
+  } = useScrollThreshold([{
+    threshold: scrollThreshold,
+    id: 'search-bar',
+    useWindowScroll: true
+  }]);
   useEffect(() => {
-    // Only update if the primaryColor actually needs to change
     if (settingRef.current?.primaryColor === '#3FA541C' && primaryColor !== '#3FA541C') {
       const newState = {
         ...settingRef.current,
@@ -115,6 +156,15 @@ const BasicLayout = props => {
       onSettingChange(newState);
     }
   }, [primaryColor, isBrowser, settingRef]);
+  // Update settings when route changes
+  useEffect(() => {
+    if (actor && location?.pathname) {
+      actor.send({
+        type: 'ROUTE_CHANGE',
+        pathname: location?.pathname
+      });
+    }
+  }, [location?.pathname, actor]);
   const {
     ref: refHeader,
     height: heightHeader
@@ -139,11 +189,48 @@ const BasicLayout = props => {
   const closeSideMenu = () => {
     setIsSideMenuOpen(false);
   };
-  return jsx(ThemeProvider, {
-    settings: settings,
-    children: jsxs("div", {
-      className: "flex h-screen bg-background font-sans",
-      children: [settings?.layout.navigationMode !== 'topbar' && settings?.regions.showMenu && !settings?.layout.splitMenus && jsx(Sidebar, {
+  const backgroundColor = isDarkMode ? theme.colors.background.dark : theme.colors.background.light;
+  // Calculate background styles based on the background settings
+  const backgroundStyles = React__default.useMemo(() => {
+    const baseStyles = {
+      backgroundColor: backgroundColor
+    };
+    // Add background styles based on the background settings
+    if (backgroundSettings.type === 'color' && backgroundSettings.color !== 'inherit') {
+      baseStyles.backgroundColor = backgroundSettings.color;
+    } else if (backgroundSettings.type === 'image' && backgroundSettings.image) {
+      baseStyles.backgroundImage = `url(${backgroundSettings.image})`;
+      baseStyles.backgroundSize = 'cover';
+      baseStyles.backgroundPosition = 'center';
+      baseStyles.backgroundAttachment = 'fixed';
+    }
+    return baseStyles;
+  }, [backgroundColor, backgroundSettings]);
+  return jsxs("div", {
+    className: "flex flex-col h-screen bg-background font-sans relative",
+    ref: horizontalScrollRef,
+    style: backgroundStyles,
+    children: [deviceSettings?.header?.showHeader && LAYOUT_ROOT != '/' && jsx(GlobalHeader, {
+      toggleSideMenu: toggleSideMenu,
+      settings: settings,
+      upperMenus: getMenuSeparation(menuData).upperMenus,
+      routeParams: routeParams,
+      collapsed: collapsed,
+      ...props
+    }), LAYOUT_ROOT === '/' && deviceSettings?.header?.showHeader && jsx(MainHeader, {
+      scrolled: scrolled,
+      location: location,
+      menuData: menuData,
+      settings: settings,
+      pageTitleInfo: pageTitleInfo,
+      onSettingChange: onSettingChange,
+      searchOptionsShown: searchOptionsShown,
+      setSearchOptionsShown: setSearchOptionsShown,
+      authorities: authorities,
+      picture: picture,
+      componentVisibility: componentVisibility
+    }), jsxs("div", {
+      children: [layoutSettings?.navigationMode !== 'topbar' && deviceSettings?.header?.showMenu && LAYOUT_ROOT != '/' && jsx(Sidebar, {
         isSideMenuOpen: isSideMenuOpen,
         closeSideMenu: closeSideMenu,
         menuData: menuData,
@@ -152,26 +239,43 @@ const BasicLayout = props => {
         routeParams: routeParams,
         settings: settings
       }), jsxs("div", {
-        className: "flex flex-col flex-1 w-full",
-        children: [settings?.regions.showHeader && jsx(GlobalHeader, {
-          toggleSideMenu: toggleSideMenu,
-          settings: settings,
-          upperMenus: getMenuSeparation(menuData).upperMenus,
-          routeParams: routeParams,
-          collapsed: collapsed
-        }), jsx(SettingDrawer, {
+        className: "flex flex-col flex-1",
+        style: {
+          marginLeft: layoutSettings?.navigationMode !== 'topbar' && deviceSettings?.header?.showMenu && layoutSettings?.fixedSidebar && !isMobile && LAYOUT_ROOT != '/' ? collapsed ? '64px' : '256px' : '0px'
+        },
+        children: [jsx(SettingDrawer, {
           primaryColor: primaryColor,
           settings: settings,
-          onSettingChange: onSettingChange,
+          onSettingChange: newSettings => {
+            if (actor) {
+              actor.send({
+                type: 'UPDATE',
+                value: newSettings
+              });
+            }
+            onSettingChange?.(newSettings);
+          },
           actor: actor,
-          colorList: getThemeColors(settings?.theme)
-        }), jsx("main", {
-          children: jsx(Outlet, {})
-        }), jsx(GlobalFooter, {
-          settings: settings,
-          active: settings?.regions?.showFooter
+          colorList: getThemeColors(settings?.theme),
+          ...props
+        }), jsxs("main", {
+          className: "relative",
+          children: [searchOptionsShown && deviceSettings?.header?.searchBarOverlay && jsx("div", {
+            className: "fixed inset-0 bg-black bg-opacity-50 z-30 cursor-pointer",
+            onClick: e => {
+              e.stopPropagation();
+              setSearchOptionsShown(false);
+            }
+          }), jsx(Outlet, {})]
+        }), deviceSettings?.footer?.showFooter && jsx("div", {
+          ref: refFooter,
+          className: footerFixed ? 'fixed bottom-0 w-full' : '',
+          children: jsx(FooterSlot, {
+            settings: settings,
+            active: deviceSettings?.footer?.showFooter
+          })
         })]
       })]
-    })
+    })]
   });
 };export{BasicLayout,useHorizontalScroll};//# sourceMappingURL=index.js.map

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

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

package/lib/components/Layout/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,+FAStB,CAAC;AAEF,eAAO,MAAM,WAAW,4BAUvB,CAAC;AAGF,eAAO,MAAM,kBAAkB,UAAW,MAAM,WAAW,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;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"}

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

@@ -1,4 +1,4 @@
-import {jsxs,jsx}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'react-router-dom';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",

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

@@ -1,12 +1,5 @@
 import * as React from 'react';
-export interface BottomMenuDropDownProps {
-    menus: any;
-    collapsed: boolean;
-    routeParams: {
-        orgName?: string;
-        [key: string]: string;
-    };
-}
+import { BottomMenuDropDownProps } from '../../typings';
 declare const BottomMenuDropDown: React.FC<BottomMenuDropDownProps>;
 export default BottomMenuDropDown;
 //# sourceMappingURL=BottomMenuDropdown.d.ts.map

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;AAK/B,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;CACL;AAED,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,CA2EzD,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

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":"kOAcA,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,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"Copyright.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalFooter/Copyright.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,SAAS;;6CAId,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"Copyright.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalFooter/Copyright.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,SAAS,GAAI;;CAAS,4CAI3B,CAAC;AAEF,eAAe,SAAS,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"Footer.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalFooter/Footer.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY;;;6CAexB,CAAC"}
+{"version":3,"file":"Footer.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalFooter/Footer.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,GAAI;;;CAAoB,4CAehD,CAAC"}

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

@@ -1,18 +1,5 @@
 import React from 'react';
-import { ProSettings } from '@admin-layout/client';
-export interface GlobalHeaderRightProps {
-    theme?: string;
-    layout?: any;
-    upperMenus: any;
-    routeParams: {
-        orgName?: string;
-        [key: string]: string;
-    };
-    formatMessage?: any;
-    collapsed?: boolean;
-    settings?: ProSettings;
-    toggleSideMenu?: any;
-}
-export declare const GlobalHeader: React.FC<GlobalHeaderRightProps | any>;
+import { GlobalHeaderRightProps } from '../../typings';
+export declare const GlobalHeader: React.FC<GlobalHeaderRightProps>;
 export default GlobalHeader;
 //# sourceMappingURL=Header.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Header.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,MAAM,WAAW,sBAAsB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,WAAW,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACzB,CAAC;IACF,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,cAAc,CAAC,EAAE,GAAG,CAAC;CACxB;AAED,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,GAAG,GAAG,CAwE/D,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"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,CA6GzD,CAAC;AAEF,eAAe,YAAY,CAAC"}

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

@@ -1,4 +1,4 @@
-import {jsx,jsxs}from'react/jsx-runtime';import React__default from'react';import {Link}from'@remix-run/react';import {RightContent}from'./RightContent.js';import {icons}from'../../../icons.js';const GlobalHeader = props => {
+import {jsx,jsxs}from'react/jsx-runtime';import React__default from'react';import {Link}from'@remix-run/react';import {useDispatch,useSelector}from'react-redux';import {RightContent}from'./RightContent.js';import {icons}from'../../../icons.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import'../../../hooks/use-get-current-lat-long.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';import {SearchBar}from'./SearchBar.js';const GlobalHeader = props => {
   const {
     theme,
     layout,
@@ -6,58 +6,90 @@ import {jsx,jsxs}from'react/jsx-runtime';import React__default from'react';impor
     routeParams,
     collapsed,
     settings,
-    toggleSideMenu
+    toggleSideMenu,
+    location
   } = props;
   const {
-    MenuIcon,
-    SearchIcon
+    MenuIcon
   } = icons;
+  const {
+    isMobile
+  } = useMediaQuery();
+  useDispatch();
+  const {
+    searchQuery,
+    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] || {};
+  const headerSettings = deviceSettings?.header || {};
+  const backgroundSettings = deviceSettings?.background || {
+    type: 'color',
+    color: 'inherit',
+    image: '',
+    video: ''
+  };
   // Calculate header styles
-  const headerStyles = React__default.useMemo(() => ({
-    backgroundColor: settings?.navTheme === 'realDark' ? '#222' : '',
-    color: settings?.navTheme === 'realDark' ? '#fff' : ''
-  }), [settings]);
-  if (!settings?.regions?.showHeader) return null;
+  const headerStyles = React__default.useMemo(() => {
+    const baseStyles = {
+      color: settings?.navTheme === 'realDark' ? '#fff' : ''
+    };
+    // Add background styles based on the background settings
+    if (backgroundSettings.type === 'color') {
+      // Default color if not set
+      const defaultColor = settings?.navTheme === 'realDark' ? '#222' : 'white';
+      baseStyles.backgroundColor = backgroundSettings.color === 'inherit' ? defaultColor : backgroundSettings.color;
+    } else if (backgroundSettings.type === 'image' && backgroundSettings.image) {
+      baseStyles.backgroundImage = `url(${backgroundSettings.image})`;
+      baseStyles.backgroundSize = 'cover';
+      baseStyles.backgroundPosition = 'center';
+    } else if (backgroundSettings.type === 'video' && backgroundSettings.video) {
+      // Fallback to a color for video background (video will be handled in a separate element)
+      baseStyles.backgroundColor = 'transparent';
+    }
+    return baseStyles;
+  }, [settings?.navTheme, backgroundSettings]);
+  // Early return if header is disabled
+  if (!headerSettings?.showHeader) return null;
+  // Determine if search bar should be shown
+  const showSearchBar = headerSettings?.showSearchSlot && headerSettings?.searchBarRender;
+  // Determine if right content should be shown
+  const showRightContent = headerSettings?.showRightContent && layoutSettings?.navigationMode !== 'sidebar';
   return jsx("header", {
-    className: "z-10 py-4  dark:bg-gray-800",
+    className: `z-10 py-4 dark:bg-gray-800 top-0 border-b border-gray-200 relative ${layoutSettings?.fixedHeader ? 'sticky' : 'relative'}`,
     style: headerStyles,
     children: jsxs("div", {
-      className: "container flex items-center justify-end h-full px-6 mx-auto text-gray-700 dark:text-gray-200",
-      children: [jsx("button", {
-        className: "p-1 mr-5 -ml-1 rounded-md md:hidden focus:outline-none focus:shadow-outline-purple",
+      className: "flex items-center justify-between h-full px-4 sm:px-6 mx-auto text-gray-700 dark:text-gray-200 relative z-10",
+      children: [isMobile && headerSettings?.showMenuToggle && jsx("button", {
+        className: "p-1 -ml-1 rounded-md md:hidden focus:outline-none focus:shadow-outline-purple",
         onClick: toggleSideMenu,
         "aria-label": "Menu",
         children: jsx(MenuIcon, {
           className: "w-6 h-6"
         })
-      }), settings?.layout?.navigationMode === 'topbar' || settings?.layout.splitMenus ? jsxs(Link, {
-        to: "/",
-        className: "ml-6 flex items-center gap-2.5 text-lg font-bold text-gray-800 dark:text-gray-200",
-        style: headerStyles,
-        children: [jsx("img", {
-          src: settings?.logo,
-          className: "w-[28px]"
-        }), "Cdebase"]
-      }) : '', settings?.regions?.searchBarRender && jsx("div", {
-        className: "flex justify-center flex-1 lg:mr-32",
-        style: headerStyles,
-        children: jsxs("div", {
-          className: "relative w-full max-w-xl mr-6 focus-within:text-purple-500",
+      }), headerSettings?.showLogo && jsx("div", {
+        children: jsxs(Link, {
+          to: "/",
+          className: "ml-6 flex items-center gap-2.5 text-lg font-bold text-gray-800 dark:text-gray-200",
           style: headerStyles,
-          children: [jsx("div", {
-            className: "absolute inset-y-0 flex items-center pl-2",
-            children: jsx(SearchIcon, {
-              className: "w-4 h-4"
-            })
-          }), jsx("input", {
-            className: "w-full pl-8 pr-2 text-sm text-gray-700 placeholder-gray-600 bg-gray-100 border-0 rounded-md dark:placeholder-gray-500 dark:focus:shadow-outline-gray dark:focus:placeholder-gray-600 dark:bg-gray-700 dark:text-gray-200 focus:placeholder-gray-500 focus:bg-white focus:border-purple-300 focus:outline-none focus:shadow-outline-purple form-input",
-            type: "text",
-            placeholder: "Search",
-            "aria-label": "Search",
-            style: headerStyles
+          children: [typeof settings?.logo === 'string' ? jsx("img", {
+            src: settings.logo,
+            alt: "Logo",
+            className: "w-[28px]"
+          }) : settings?.logo, !isMobile && headerSettings?.showPageTitle && jsx("span", {
+            children: settings?.title
           })]
         })
-      }), settings?.layout?.navigationMode != 'sidebar' && jsx(RightContent, {
+      }), showSearchBar && jsx("div", {
+        className: "flex-1 max-w-xl mx-4 hidden md:block",
+        style: headerStyles,
+        children: jsx(SearchBar, {
+          style: headerStyles
+        })
+      }), showRightContent && jsx(RightContent, {
         upperMenus: upperMenus,
         collapsed: collapsed,
         routeParams: routeParams,

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":"kMAqBa,MAAA,YAAY,GAA2C,KAAC,IAAS;AAC1E,EAAA,MAAA;AACA,IAAA,KAAA;IAEA,MAA0B;IAC1B,UAAM;AAGM,IAAA,WAAA;AACA,IAAA,SAAK;AACgB,IAAA,QACpB;AAGb,IAAA;AAAoC,GAAA,GAAA,KAAA;AACpC,EAAA,MAAA;AAyDJ,IAAE,QAAA;AAEF,IAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Header.js","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"sourcesContent":[null],"names":["React"],"mappings":"ieASa,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;QAEwB;AAC1B,IAAA;AACI,IAAA;AACI,GAAA,GAAA,WAAK,CAAE,KAAA,IAAQ,KAAE,CAAA,MAAa,CAAA;oBACT,GAAA,QAAA,EAAA,QAAA,IAAA,GAAA;QAEzB,aAAyD,GAAA,QAAA,EAAA,aAAA,GAAA,YAAA,CAAA,IAAA,QAAA,EAAA,aAAA,GAAA,GAAA,CAAA,IAAA,QAAA;AACzD,EAAA,MAAA,wBAAuB,QAAS,GAAA,SAAU;sBACX,GAAA,aAAA,EAAA,OAAA,GAAA,UAAA,CAAA,IAAA,EAAA;AAC3B,EAAA,MAAA,cAAkB,GAAA,aAAW,EAAA,mBAAe,CAAA,IAAA,EAAU;AACtD,EAAA,MAAA,cAAU,GAAgB,cAAA,EAAA,MAAA,IAAA,EAAA;AACtB,EAAA,MAAA,kBAAA,GAAA,cAA6B,EAAA,UAAU,IAAc;QAC7D,EAAC,OAAA;oBAAU;aACG;AACV,IAAA,KAAA,EAAA;AACA,GAAA;;oBACO,GAAAA,cAAA,CAAA,OAAmB,CAAA,MAAS;oBACsD,GAAA;AACzF,MAAA,KAAA,EAAA,QAAA,EAAW,QAAA,KAAA,UAAkB,GAAA,MAAc,GAAA;;AAG/C;IACJ,IAAI,kBAAkB,CAAE,IAAA,KAAA,OAAA,EAAA;;MAGpB,MAAe,YAAA,GAAY,QAAA,EAAA,QAAA,KAAA,UAAA,GAAA,MAAA,GAAA,OAAA;AAAE,MAAA,0BAAY,GAAA,kBAAA,CAAA,KAAA,KAAA,SAAA,GAAA,YAAA,GAAA,kBAAA,CAAA,KAAA;KAEH,MAAA,IAAA,kBAAA,CAAA,IAAA,KAAA,OAAA,IAAA,kBAAA,CAAA,KAAA,EAAA;MACpC,UAAA,CAAA,eAA8B,GAAA,CAAA,IAAA,EAAE,kBAAkB,CAAA,KAAA,CAAA,CAAA,CAAA;MAEX,UAAA,CAAA,cAAA,GAAA,OAAA;MACvC,UAAA,CAAA,kBAAmB,GAAA,QAAgB;AAEzC,KAAA,MAAO,IAEC,kBAAA,CAAA,IAAS,KACL,OAAA,IAAA,kBAAA,CAAA,KAAA,EAAA;AAqDhB;AAEA,MAAA,0BAA4B,GAAA,aAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -0,0 +1,4 @@
+import React from 'react';
+import { ILogoProps } from '../../typings';
+export declare const Logo: React.FC<ILogoProps>;
+//# sourceMappingURL=Logo.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Logo.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/Logo.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AA4B3C,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAsJrC,CAAC"}