@admin-layout/tailwind-design-pro 12.0.16-alpha.49 → 12.0.16-alpha.50

package/lib/machines/settingsMachine.js

@@ -1,84 +1,32 @@
-import {cloneDeep,set}from'lodash-es';import {createMachine,assign}from'xstate';import {SearchBarBehavior}from'./types.js';import {setNestedValue}from'../utils/configOverrides.js';// Default route settings template
-const DEFAULT_LAYOUT = {
-  navigationMode: 'mixed',
-  sideMenuType: 'expanded',
-  contentWidth: 'fluid',
-  fixedHeader: true,
-  fixedSidebar: true,
-  splitMenus: false,
-  upperMenuDividerName: 'Navigation',
-  middleMenuDividerName: 'Dashboard',
-  lowerMenuDividerName: 'Admin'
-};
-// Default background settings
-const DEFAULT_BACKGROUND = {
-  type: 'color',
-  color: 'inherit',
-  image: '',
-  video: '',
-  videoThumbnail: ''
-};
-const DEFAULT_HEADER = {
-  showLogo: true,
-  showSearchSlot: true,
-  showRightContent: true,
-  showMenuToggle: true,
-  showBackButton: true,
-  showPageTitle: true,
-  showActionButtons: true,
-  position: 'fixed',
-  height: '64px',
-  elevation: 2,
-  showHeader: true,
-  showMenu: true,
-  menuHeaderRender: true,
-  searchBarRender: true,
-  searchBarBehavior: SearchBarBehavior.PERMANENT,
-  searchBarOverlay: true,
-  scrollThreshold: 50
-};
-// Shared view configuration similar to client's defaultSettings
-const SHARED_VIEW_CONFIG = {
-  layout: DEFAULT_LAYOUT,
-  regions: {
-    header: DEFAULT_HEADER,
-    footer: {
-      showFooter: true
-    },
-    background: DEFAULT_BACKGROUND
-  }
-};
-const defaultRouteSettings = {
-  layout: {
-    desktop: SHARED_VIEW_CONFIG.layout,
-    mobile: SHARED_VIEW_CONFIG.layout
-  },
-  regions: {
-    desktop: {
-      header: SHARED_VIEW_CONFIG.regions.header,
-      footer: SHARED_VIEW_CONFIG.regions.footer,
-      background: SHARED_VIEW_CONFIG.regions.background
-    },
-    mobile: {
-      header: SHARED_VIEW_CONFIG.regions.header,
-      footer: SHARED_VIEW_CONFIG.regions.footer,
-      background: SHARED_VIEW_CONFIG.regions.background
-    }
-  }
-};
-// Helper function to deep merge objects
-const deepMerge = (target, source) => {
-  const result = {
-    ...target
+import {cloneDeep,set}from'lodash-es';import {createMachine,assign}from'xstate';import {SearchBarBehavior}from'./types.js';import {setNestedValue}from'../utils/configOverrides.js';({
+  searchBarBehavior: SearchBarBehavior.PERMANENT});
+// Helper function to merge global settings with uiSettings overrides
+const createMergedSettings = (context, currentRoute, deviceType) => {
+  const merged = {
+    ...context
   };
-  for (const key in source) {
-    if (source[key] instanceof Object && key in target) {
-      result[key] = deepMerge(target[key], source[key]);
-    } else {
-      result[key] = source[key];
+  // Apply uiSettings overrides to the merged settings
+  if (context.uiSettings?.overrides) {
+    // Always merge global device overrides: [deviceType]
+    const deviceKey = `[${deviceType}]`;
+    const deviceOverride = context.uiSettings.overrides[deviceKey];
+    if (deviceOverride?.uilayout) {
+      // Merge global device-specific uilayout overrides (always applied)
+      Object.keys(deviceOverride.uilayout).forEach(key => {
+        merged[key] = deviceOverride.uilayout[key];
+      });
+    }
+    // Additionally merge route-specific overrides if they exist: [route][deviceType]
+    const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
+    const routeDeviceOverride = context.uiSettings.overrides[routeDeviceKey];
+    if (routeDeviceOverride?.uilayout) {
+      // Merge route-specific uilayout overrides (overrides global device settings)
+      Object.keys(routeDeviceOverride.uilayout).forEach(key => {
+        merged[key] = routeDeviceOverride.uilayout[key];
+      });
     }
   }
-  return result;
+  return merged;
 };
 const settingsMachine = createMachine({
   id: 'settings',
@@ -110,7 +58,7 @@ const settingsMachine = createMachine({
         bracketOverrides[key] = input.settings[key];
       }
     });
-    return {
+    const baseContext = {
       ...otherSettings,
       uiSettings: {
         ...uiSettings,
@@ -122,11 +70,13 @@ const settingsMachine = createMachine({
       currentRoute: input?.settings?.currentRoute || '/',
       hiddenMenuKeys: input?.settings?.hiddenMenuKeys || [],
       hiddenMenuCategories: input?.settings?.hiddenMenuCategories || [],
-      routeSettings: input?.settings?.routeSettings || {
-        '/': defaultRouteSettings
-      },
       changedSettings: {}
     };
+    // Add merged settings for immediate UI updates
+    const currentRoute = baseContext.currentRoute;
+    const deviceType = 'desktop'; // Default, will be updated by component
+    baseContext.mergedSettings = createMergedSettings(baseContext, currentRoute, deviceType);
+    return baseContext;
   },
   states: {
     idle: {
@@ -184,6 +134,8 @@ const settingsMachine = createMachine({
                 }
               }
             });
+            // Update merged settings after changes
+            newContext.mergedSettings = createMergedSettings(newContext, newContext.currentRoute, 'desktop');
             return newContext;
           }), 'updateReduxSettings']
         },
@@ -198,16 +150,9 @@ const settingsMachine = createMachine({
             const routePath = event.pathname || '/';
             // Update current route
             newContext.currentRoute = routePath;
-            // Get the route's saved settings from history or use default
-            const routeSettings = context.routeSettings[routePath];
-            // Initialize route settings if it doesn't exist
-            if (!newContext.routeSettings[routePath]) {
-              newContext.routeSettings[routePath] = cloneDeep({
-                ...defaultRouteSettings
-              });
-              return newContext;
-            }
-            newContext.routeSettings[routePath] = cloneDeep(routeSettings);
+            // Update merged settings with new route context
+            // This ensures only global [device] settings persist, route-specific [route][device] settings only apply on that route
+            newContext.mergedSettings = createMergedSettings(newContext, routePath, 'desktop');
             return newContext;
           }), 'updateReduxSettings']
         },
@@ -216,8 +161,8 @@ const settingsMachine = createMachine({
             context,
             event
           }) => ({
-            ...context,
-            routeSettings: deepMerge(context.routeSettings, event.settings)
+            ...context
+            // Route settings are now handled via uiSettings overrides
           })), 'updateReduxSettings']
         },
         RESET: {
@@ -229,9 +174,6 @@ const settingsMachine = createMachine({
             ...context,
             components: [],
             activeComponent: null,
-            routeSettings: {
-              '/': defaultRouteSettings
-            },
             changedSettings: {}
           })), 'updateReduxSettings']
         },
@@ -242,6 +184,20 @@ const settingsMachine = createMachine({
             ...context,
             changedSettings: {}
           }))]
+        },
+        UPDATE_DEVICE_TYPE: {
+          actions: [assign(({
+            context,
+            event
+          }) => {
+            const newContext = cloneDeep({
+              ...context
+            });
+            const deviceType = event.deviceType || 'desktop';
+            // Update merged settings with new device type
+            newContext.mergedSettings = createMergedSettings(newContext, newContext.currentRoute, deviceType);
+            return newContext;
+          }), 'updateReduxSettings']
         }
         // SAVE: {
         //     actions: ['updateReduxSettings'],

package/lib/machines/settingsMachine.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingsMachine.js","sources":["../../src/machines/settingsMachine.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"settingsMachine.js","sources":["../../src/machines/settingsMachine.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/machines/types.d.ts

@@ -43,6 +43,58 @@ export type RouteSettings = {
             lowerMenuDividerName?: string;
         };
     };
+    header?: {
+        desktop?: {
+            showLogo?: boolean;
+            showSearchSlot?: boolean;
+            showRightContent?: boolean;
+            showMenuToggle?: boolean;
+            showBackButton?: boolean;
+            showPageTitle?: boolean;
+            showActionButtons?: boolean;
+            position?: 'fixed' | 'static';
+            height?: string;
+            elevation?: number;
+            showHeader?: boolean;
+            showMenu?: boolean;
+            menuHeaderRender?: boolean;
+            searchBarRender?: boolean;
+            searchBarBehavior?: SearchBarBehavior;
+            searchBarOverlay?: boolean;
+            scrollThreshold?: number;
+        };
+        mobile?: {
+            showLogo?: boolean;
+            showSearchSlot?: boolean;
+            showRightContent?: boolean;
+            showMenuToggle?: boolean;
+            showBackButton?: boolean;
+            showPageTitle?: boolean;
+            showActionButtons?: boolean;
+            position?: 'fixed' | 'static';
+            height?: string;
+            elevation?: number;
+            showHeader?: boolean;
+            showMenu?: boolean;
+            menuHeaderRender?: boolean;
+            searchBarRender?: boolean;
+            searchBarBehavior?: SearchBarBehavior;
+            searchBarOverlay?: boolean;
+            scrollThreshold?: number;
+        };
+    };
+    footer?: {
+        desktop?: {
+            showFooter?: boolean;
+        };
+        mobile?: {
+            showFooter?: boolean;
+        };
+    };
+    background?: {
+        desktop?: BackgroundSettings;
+        mobile?: BackgroundSettings;
+    };
     regions?: {
         desktop?: {
             background?: BackgroundSettings;
@@ -127,7 +179,6 @@ export interface SettingsContext {
     components: ComponentSettings[];
     activeComponent?: string;
     currentRoute?: string;
-    routeSettings: Record<string, RouteSettings>;
     hiddenMenuKeys?: string[];
     hiddenMenuCategories?: string[];
     changedSettings?: Record<string, any>;
@@ -139,6 +190,7 @@ export interface SettingsContext {
         overrides?: Record<string, any>;
     };
     overrides?: Record<string, any>;
+    mergedSettings?: Record<string, any>;
 }
 export type UpdateEvent = {
     type: 'UPDATE';
@@ -184,5 +236,8 @@ export type MachineEvent = {
 } | {
     type: 'UPDATE_ROUTE_SETTINGS';
     settings: Record<string, Partial<SettingsContext>>;
+} | {
+    type: 'UPDATE_DEVICE_TYPE';
+    deviceType: 'desktop' | 'mobile';
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/machines/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/machines/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;AAChH,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;AAC5D,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,WAAW,GAAG,eAAe,CAAC;AACtE,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,OAAO,CAAC;AAE7C,oBAAY,iBAAiB;IACzB,SAAS,cAAc;IACvB,SAAS,cAAc;CAC1B;AAED,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,aAAa,GAAG;IACxB,MAAM,CAAC,EAAE;QACL,OAAO,EAAE;YACL,cAAc,EAAE,cAAc,CAAC;YAC/B,YAAY,EAAE,YAAY,CAAC;YAC3B,YAAY,EAAE,YAAY,CAAC;YAC3B,WAAW,EAAE,OAAO,CAAC;YACrB,YAAY,EAAE,OAAO,CAAC;YACtB,UAAU,EAAE,OAAO,CAAC;YACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;YAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;YAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;SACjC,CAAC;QACF,MAAM,EAAE;YACJ,cAAc,EAAE,cAAc,CAAC;YAC/B,YAAY,EAAE,YAAY,CAAC;YAC3B,YAAY,EAAE,YAAY,CAAC;YAC3B,WAAW,EAAE,OAAO,CAAC;YACrB,YAAY,EAAE,OAAO,CAAC;YACtB,UAAU,EAAE,OAAO,CAAC;YACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;YAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;YAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;SACjC,CAAC;KACL,CAAC;IACF,OAAO,CAAC,EAAE;QACN,OAAO,CAAC,EAAE;YACN,UAAU,CAAC,EAAE,kBAAkB,CAAC;YAChC,MAAM,CAAC,EAAE;gBACL,QAAQ,CAAC,EAAE,OAAO,CAAC;gBACnB,cAAc,CAAC,EAAE,OAAO,CAAC;gBACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;gBAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;gBACzB,cAAc,CAAC,EAAE,OAAO,CAAC;gBACzB,aAAa,CAAC,EAAE,OAAO,CAAC;gBACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;gBAC5B,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;gBAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;gBAChB,SAAS,CAAC,EAAE,MAAM,CAAC;gBACnB,UAAU,CAAC,EAAE,OAAO,CAAC;gBACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;gBACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;gBAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;gBAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;gBACtC,gBAAgB,CAAC,EAAE,OAAO,CAAC;gBAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;aAC5B,CAAC;YACF,MAAM,CAAC,EAAE;gBACL,UAAU,CAAC,EAAE,OAAO,CAAC;aACxB,CAAC;SACL,CAAC;QACF,MAAM,CAAC,EAAE;YACL,UAAU,CAAC,EAAE,kBAAkB,CAAC;YAChC,MAAM,CAAC,EAAE;gBACL,QAAQ,CAAC,EAAE,OAAO,CAAC;gBACnB,cAAc,CAAC,EAAE,OAAO,CAAC;gBACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;gBAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;gBACzB,cAAc,CAAC,EAAE,OAAO,CAAC;gBACzB,aAAa,CAAC,EAAE,OAAO,CAAC;gBACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;gBAC5B,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;gBAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;gBAChB,SAAS,CAAC,EAAE,MAAM,CAAC;gBACnB,UAAU,CAAC,EAAE,OAAO,CAAC;gBACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;gBACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;gBAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;gBAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;gBACtC,gBAAgB,CAAC,EAAE,OAAO,CAAC;gBAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;aAC5B,CAAC;YACF,MAAM,CAAC,EAAE;gBACL,UAAU,CAAC,EAAE,OAAO,CAAC;aACxB,CAAC;SACL,CAAC;KACL,CAAC;CACL,CAAC;AAEF,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE,OAAO,GAAG,MAAM,GAAG,UAAU,CAAC;IACxC,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,yBAAyB,EAAE,MAAM,CAAC;IAClC,uBAAuB,EAAE,MAAM,CAAC;IAChC,wBAAwB,EAAE,OAAO,CAAC;IAClC,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAE7C,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAEhC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEtC,UAAU,CAAC,EAAE;QACT,QAAQ,CAAC,EAAE;YACP,MAAM,CAAC,EAAE,GAAG,CAAC;YACb,OAAO,CAAC,EAAE,GAAG,CAAC;SACjB,CAAC;QAEF,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnC,CAAC;IAGF,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,cAAc,GACpB;IACI,IAAI,EAAE,oBAAoB,CAAC;IAC3B,SAAS,EAAE,iBAAiB,CAAC;CAChC,GACD;IACI,IAAI,EAAE,2BAA2B,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC,GACD;IACI,IAAI,EAAE,kBAAkB,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACvB,GACD;IACI,IAAI,EAAE,2BAA2B,CAAC;CACrC,CAAC;AAER,MAAM,MAAM,YAAY,GAClB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;CAAE,GACnD;IAAE,IAAI,EAAE,oBAAoB,CAAC;IAAC,SAAS,EAAE,GAAG,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,2BAA2B,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAAE,GACzE;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,IAAI,EAAE,2BAA2B,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,wBAAwB,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,uBAAuB,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;CAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/machines/types.ts"],"names":[],"mappings":"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"}

package/lib/utils/settingsUtils.d.ts

@@ -0,0 +1,70 @@
+/**
+ * Utility functions for handling settings with the new uilayout structure
+ * No more routeSettings, regions, or layout nested structures
+ */
+export interface SettingsMergeResult {
+    deviceSettings: any;
+    layoutSettings: any;
+}
+/**
+ * Helper function to get value from uilayout with route/device override support
+ * @param path - Dot-notation path to the setting (e.g., 'header.showLogo')
+ * @param settings - Main settings object
+ * @param currentRoute - Current route path
+ * @param deviceType - Device type (mobile/desktop)
+ * @returns The setting value
+ */
+export declare const getUILayoutValue: (path: string, settings: any, currentRoute: string, deviceType: string) => any;
+/**
+ * Builds device settings from uilayout
+ * @param settings - Main settings object
+ * @param currentRoute - Current route path
+ * @param deviceType - Device type (mobile/desktop)
+ * @returns Device settings object
+ */
+export declare const buildDeviceSettings: (settings: any, currentRoute: string, deviceType: string) => {
+    header: any;
+    background: any;
+    footer: any;
+};
+/**
+ * Builds layout settings from uilayout
+ * @param settings - Main settings object
+ * @param currentRoute - Current route path
+ * @param deviceType - Device type (mobile/desktop)
+ * @returns Layout settings object
+ */
+export declare const buildLayoutSettings: (settings: any, currentRoute: string, deviceType: string) => {
+    contentWidth: any;
+    navigationMode: any;
+    sideMenuType: any;
+    fixedHeader: any;
+    fixedSidebar: any;
+    splitMenus: any;
+    upperMenuDividerName: any;
+    middleMenuDividerName: any;
+    lowerMenuDividerName: any;
+};
+/**
+ * Merges uiSettings overrides with uilayout settings
+ * @param currentRoute - Current route path
+ * @param deviceType - Device type (mobile/desktop)
+ * @param settings - Main settings object
+ * @param fallbackDeviceSettings - Fallback device settings (unused, for backward compatibility)
+ * @param fallbackLayoutSettings - Fallback layout settings (unused, for backward compatibility)
+ * @returns Merged device and layout settings
+ */
+export declare const mergeSettingsWithUIOverrides: (currentRoute: string, deviceType: string, settings: any, fallbackDeviceSettings?: any, fallbackLayoutSettings?: any) => SettingsMergeResult;
+/**
+ * @deprecated No longer using routeSettings structure. Use buildDeviceSettings/buildLayoutSettings instead.
+ */
+export declare const getRouteSettings: (currentRoute: string, settings: any) => any;
+/**
+ * @deprecated No longer using regions structure. Use buildDeviceSettings instead.
+ */
+export declare const getDeviceSettingsFromRoute: (routeSettings: any, deviceType: string) => {};
+/**
+ * @deprecated No longer using layout nested structure. Use buildLayoutSettings instead.
+ */
+export declare const getLayoutSettingsFromRoute: (routeSettings: any, deviceType: string) => {};
+//# sourceMappingURL=settingsUtils.d.ts.map

package/lib/utils/settingsUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settingsUtils.d.ts","sourceRoot":"","sources":["../../src/utils/settingsUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,mBAAmB;IAChC,cAAc,EAAE,GAAG,CAAC;IACpB,cAAc,EAAE,GAAG,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,EAAE,UAAU,GAAG,EAAE,cAAc,MAAM,EAAE,YAAY,MAAM,QAYrG,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAI,UAAU,GAAG,EAAE,cAAc,MAAM,EAAE,YAAY,MAAM;;;;CAM1F,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAI,UAAU,GAAG,EAAE,cAAc,MAAM,EAAE,YAAY,MAAM;;;;;;;;;;CAY1F,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,GACrC,cAAc,MAAM,EACpB,YAAY,MAAM,EAClB,UAAU,GAAG,EACb,yBAAyB,GAAG,EAC5B,yBAAyB,GAAG,KAC7B,mBAKF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAAI,cAAc,MAAM,EAAE,UAAU,GAAG,QAEnE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GAAI,eAAe,GAAG,EAAE,YAAY,MAAM,OAEhF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,GAAI,eAAe,GAAG,EAAE,YAAY,MAAM,OAEhF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/tailwind-design-pro",
-    "version": "12.0.16-alpha.49",
+    "version": "12.0.16-alpha.50",
     "description": "Sample core for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -22,14 +22,14 @@
     },
     "dependencies": {
         "@admin-layout/assets": "12.0.16-alpha.36",
-        "@admin-layout/client": "12.0.16-alpha.48",
-        "@admin-layout/tailwind-ui": "12.0.16-alpha.48",
+        "@admin-layout/client": "12.0.16-alpha.50",
+        "@admin-layout/tailwind-ui": "12.0.16-alpha.50",
         "react-favicon": "^0.0.23",
         "react-intl": "^6.1.1",
         "react-responsive": "^10.0.0"
     },
     "devDependencies": {
-        "@adminide-stack/extension-api": "^12.0.4-alpha.293",
+        "@adminide-stack/extension-api": "^12.0.4-alpha.296",
         "@tailwindcss/aspect-ratio": "^0.4.2",
         "@tailwindcss/forms": "^0.5.4",
         "@tailwindcss/typography": "^0.5.9",
@@ -53,5 +53,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "31f2fb841c8a5ae00338ce2abe8312136b41d036"
+    "gitHead": "b42c179bb818432cec66d77c4d3b5ddf74ec7b54"
 }