@admin-layout/tailwind-design-pro 12.0.16-alpha.49 → 12.0.16-alpha.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/Layout/BasicLayout/index.d.ts.map +1 -1
- package/lib/components/Layout/BasicLayout/index.js +31 -12
- package/lib/components/Layout/BasicLayout/index.js.map +1 -1
- package/lib/components/Layout/GlobalHeader/Header.d.ts.map +1 -1
- package/lib/components/Layout/GlobalHeader/Header.js +30 -7
- package/lib/components/Layout/GlobalHeader/Header.js.map +1 -1
- package/lib/components/Layout/GlobalHeader/Logo.js +1 -2
- package/lib/components/Layout/GlobalHeader/Logo.js.map +1 -1
- package/lib/components/Layout/GlobalHeader/MainHeader.d.ts.map +1 -1
- package/lib/components/Layout/GlobalHeader/MainHeader.js +17 -4
- package/lib/components/Layout/GlobalHeader/MainHeader.js.map +1 -1
- package/lib/components/Layout/Sidebar/MainSidebar.d.ts.map +1 -1
- package/lib/components/Layout/Sidebar/MainSidebar.js +24 -2
- package/lib/components/Layout/Sidebar/MainSidebar.js.map +1 -1
- package/lib/components/Layout/Sidebar/PerplexSidebar.d.ts.map +1 -1
- package/lib/components/Layout/Sidebar/PerplexSidebar.js +24 -2
- package/lib/components/Layout/Sidebar/PerplexSidebar.js.map +1 -1
- package/lib/components/Layout/TailwindLayout.d.ts.map +1 -1
- package/lib/components/Layout/TailwindLayout.js +4 -2
- package/lib/components/Layout/TailwindLayout.js.map +1 -1
- package/lib/components/SettingDrawer/CheckBoxTheme.d.ts.map +1 -1
- package/lib/components/SettingDrawer/CheckBoxTheme.js +28 -3
- package/lib/components/SettingDrawer/CheckBoxTheme.js.map +1 -1
- package/lib/components/SettingDrawer/InvitationSettings.d.ts.map +1 -1
- package/lib/components/SettingDrawer/InvitationSettings.js +18 -6
- package/lib/components/SettingDrawer/InvitationSettings.js.map +1 -1
- package/lib/components/SettingDrawer/LayoutChange.d.ts.map +1 -1
- package/lib/components/SettingDrawer/LayoutChange.js +39 -13
- package/lib/components/SettingDrawer/LayoutChange.js.map +1 -1
- package/lib/components/SettingDrawer/NavigationsModes.d.ts +1 -1
- package/lib/components/SettingDrawer/NavigationsModes.d.ts.map +1 -1
- package/lib/components/SettingDrawer/NavigationsModes.js +41 -10
- package/lib/components/SettingDrawer/NavigationsModes.js.map +1 -1
- package/lib/components/SettingDrawer/RegionalSettings.d.ts.map +1 -1
- package/lib/components/SettingDrawer/RegionalSettings.js +35 -185
- package/lib/components/SettingDrawer/RegionalSettings.js.map +1 -1
- package/lib/components/SettingDrawer/SettingDrawer.d.ts.map +1 -1
- package/lib/components/SettingDrawer/SettingDrawer.js +213 -55
- package/lib/components/SettingDrawer/SettingDrawer.js.map +1 -1
- package/lib/components/SettingDrawer/ThemeColor.d.ts.map +1 -1
- package/lib/components/SettingDrawer/ThemeColor.js +28 -3
- package/lib/components/SettingDrawer/ThemeColor.js.map +1 -1
- package/lib/components/SettingDrawer/types.d.ts +5 -0
- package/lib/components/SettingDrawer/types.d.ts.map +1 -1
- package/lib/components/typings.d.ts +0 -1
- package/lib/components/typings.d.ts.map +1 -1
- package/lib/machines/settingsMachine.d.ts +0 -1
- package/lib/machines/settingsMachine.d.ts.map +1 -1
- package/lib/machines/settingsMachine.js +53 -97
- package/lib/machines/settingsMachine.js.map +1 -1
- package/lib/machines/types.d.ts +56 -1
- package/lib/machines/types.d.ts.map +1 -1
- package/lib/utils/settingsUtils.d.ts +70 -0
- package/lib/utils/settingsUtils.d.ts.map +1 -0
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAIhB,iBAAiB,EAGpB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAA+C,MAAM,OAAO,CAAC;AAcpE,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,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,gBAAgB,EAIhB,iBAAiB,EAGpB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAA+C,MAAM,OAAO,CAAC;AAcpE,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,CA0V3F,CAAC"}
|
|
@@ -80,6 +80,7 @@ const BasicLayout = props => {
|
|
|
80
80
|
mainHeaderProps,
|
|
81
81
|
actor
|
|
82
82
|
} = propsWithSettings;
|
|
83
|
+
console.log('SETTINGS=========>', settings);
|
|
83
84
|
const [isSideMenuOpen, setIsSideMenuOpen] = useState(false);
|
|
84
85
|
const [scrollEnd, setScrollEnd] = useState(false);
|
|
85
86
|
const [searchOptionsShown, setSearchOptionsShown] = useState(false);
|
|
@@ -113,23 +114,41 @@ const BasicLayout = props => {
|
|
|
113
114
|
};
|
|
114
115
|
}
|
|
115
116
|
}, [searchOptionsShown, isMobile]);
|
|
116
|
-
// Get current route
|
|
117
|
+
// Get current route and device type
|
|
117
118
|
const currentRoute = location?.pathname || '/';
|
|
118
|
-
const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
|
|
119
|
-
// Get device-specific settings
|
|
120
119
|
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
121
|
-
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
const getOverrideValue = path => {
|
|
125
|
-
// Check new override format first
|
|
120
|
+
// Helper function to get value from uilayout with route/device override support
|
|
121
|
+
const getUILayoutValue = path => {
|
|
122
|
+
// Check for route/device-specific override first
|
|
126
123
|
const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
|
|
127
|
-
const
|
|
128
|
-
if (
|
|
129
|
-
const value = path.split('.').reduce((obj, key) => obj?.[key],
|
|
124
|
+
const uiOverride = settings?.uiSettings?.[routeDeviceKey];
|
|
125
|
+
if (uiOverride) {
|
|
126
|
+
const value = path.split('.').reduce((obj, key) => obj?.[key], uiOverride);
|
|
130
127
|
if (value !== undefined) return value;
|
|
131
128
|
}
|
|
132
|
-
// Fallback to
|
|
129
|
+
// Fallback to settings (flattened uilayout from configuration-registries)
|
|
130
|
+
return path.split('.').reduce((obj, key) => obj?.[key], settings);
|
|
131
|
+
};
|
|
132
|
+
// Get device settings directly from uilayout
|
|
133
|
+
const deviceSettings = {
|
|
134
|
+
header: getUILayoutValue('header'),
|
|
135
|
+
background: getUILayoutValue('background'),
|
|
136
|
+
footer: getUILayoutValue('footer')
|
|
137
|
+
};
|
|
138
|
+
// Get layout settings directly from uilayout
|
|
139
|
+
const layoutSettings = {
|
|
140
|
+
contentWidth: getUILayoutValue('contentWidth'),
|
|
141
|
+
navigationMode: getUILayoutValue('navigationMode'),
|
|
142
|
+
sideMenuType: getUILayoutValue('sideMenuType'),
|
|
143
|
+
fixedHeader: getUILayoutValue('fixedHeader'),
|
|
144
|
+
fixedSidebar: getUILayoutValue('fixedSidebar'),
|
|
145
|
+
splitMenus: getUILayoutValue('splitMenus'),
|
|
146
|
+
upperMenuDividerName: getUILayoutValue('upperMenuDividerName'),
|
|
147
|
+
middleMenuDividerName: getUILayoutValue('middleMenuDividerName'),
|
|
148
|
+
lowerMenuDividerName: getUILayoutValue('lowerMenuDividerName')
|
|
149
|
+
};
|
|
150
|
+
// Helper function to get override value (for backward compatibility)
|
|
151
|
+
const getOverrideValue = path => {
|
|
133
152
|
return path.split('.').reduce((obj, key) => obj?.[key], deviceSettings);
|
|
134
153
|
};
|
|
135
154
|
const backgroundSettings = deviceSettings?.background || {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"ssCAyBO,MAAM,mBAAmB,GAAG,CAAC;AAChC,EAAA,WAAM;uBAES;AACX,EAAA;;AAEI,EAAA,MAAA,KAAA,GAAA,MAAM,EAAA;AACF,EAAA,SAAA,CAAA,MAAA;oBAAmB,CAAA,OAAO,IAAA,IAAA;;mBAG1B,GAAA,CAAA,IAAA;oBACA,IAAM,CAAA,EAAA;wBACN,EAAA;AAIA;;;AAGA,QAAA,IAAA,MAAA,CAAA,OAAU,GAAC,EAAA,EAAA;qBACP,CAAA,IAAA,CAAA;;AAEJ,QAAA,IAAA,MAAA,CAAA,OAAU,GAAC,EAAA,EAAA;AACP,UAAA,WAAA,CAAA,KAAA,CAAA;;AAER,QAAA,IAAA,MAAE,CAAA,WAAA,GAAA,MAAA,CAAA,OAAA,IAAA,QAAA,CAAA,IAAA,CAAA,YAAA,EAAA;AAEF,UAAA,gBAAO,EAAA;AACP,QAAA;AACI,MAAA,CAAA;AACJ,MAAA,MAAA,CAAC,gBAAC,CAAA,QAAA,EAAA,OAAA,CAAA;aACL,MAAA;QACF,MAAI,CAAA,mBAAA,CAAA,QAAA,EAAA,OAAA,CAAA;AACP,MAAA,CAAA;AACJ,IAAE;AAEF,EAAA,CAAA,EAAA;AAQI,EAAA,OAAA,KAAQ;AACR;AACA,MAAA,sBAAwB,GAAA,CAAA,SAAQ,EAAA,KAAA,KAAA;QAC5B;AACI,IAAA;AACA,GAAA,GAAA,KAAA;AACA,EAAA,MAAA,gBAAY,gBAAA,CAAA,SAAA,CAAA;qBACd,KAAA,KAAA,EAAA;IACN,OAAC;MACD,KAAI,EAAA,KAAA,CAAA,SAAkB,EAAA;AAClB,MAAA,EAAA,EAAA,EAAA;AACA,MAAA,QAAI,EAAA;;AAEI,EAAA;qBACK,EAAA;eACP,GAAA,eAAA,CAAA,SAAA,EAAA,aAAA,CAAA,KAAA,EAAA,aAAA,CAAA;QACN,OAAC,KAAA,KAAA,QAAA,EAAA;aACD;QACH,GAAA,aAAA;AACD,QAAA;AACJ,OAAE;AAEF,IAAA;IAGI,OAAA,CAAA,OAAA,KAAA,KAAA,QAAgC,EAAA,6DAAA,CAAA;;SAGhC,aAAA;;AAEO,MAAA,WAAU,GAAA,KAAW,IAAI;;QAEhC;AACA,IAAA,QACI,EAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../src/components/Layout/BasicLayout/index.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
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,CAgJzD,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
|
@@ -21,15 +21,38 @@ import {jsx,jsxs}from'react/jsx-runtime';import {Link}from'@remix-run/react';imp
|
|
|
21
21
|
isSearching
|
|
22
22
|
} = useSelector(state => state.search);
|
|
23
23
|
const currentRoute = location?.pathname || '/';
|
|
24
|
-
const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
|
|
25
24
|
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
26
|
-
|
|
27
|
-
const
|
|
25
|
+
// Helper function to get value from uilayout with route/device override support
|
|
26
|
+
const getUILayoutValue = path => {
|
|
27
|
+
// Check for route/device-specific override first
|
|
28
|
+
const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
|
|
29
|
+
const uiOverride = settings?.uiSettings?.[routeDeviceKey];
|
|
30
|
+
if (uiOverride) {
|
|
31
|
+
const value = path.split('.').reduce((obj, key) => obj?.[key], uiOverride);
|
|
32
|
+
if (value !== undefined) return value;
|
|
33
|
+
}
|
|
34
|
+
// Fallback to settings (flattened uilayout from configuration-registries)
|
|
35
|
+
return path.split('.').reduce((obj, key) => obj?.[key], settings);
|
|
36
|
+
};
|
|
37
|
+
// Get device settings directly from uilayout
|
|
38
|
+
const deviceSettings = {
|
|
39
|
+
header: getUILayoutValue('header'),
|
|
40
|
+
background: getUILayoutValue('background')
|
|
41
|
+
};
|
|
42
|
+
// Get layout settings directly from uilayout
|
|
43
|
+
const layoutSettings = {
|
|
44
|
+
contentWidth: getUILayoutValue('contentWidth'),
|
|
45
|
+
navigationMode: getUILayoutValue('navigationMode'),
|
|
46
|
+
sideMenuType: getUILayoutValue('sideMenuType'),
|
|
47
|
+
fixedHeader: getUILayoutValue('fixedHeader'),
|
|
48
|
+
fixedSidebar: getUILayoutValue('fixedSidebar'),
|
|
49
|
+
splitMenus: getUILayoutValue('splitMenus'),
|
|
50
|
+
upperMenuDividerName: getUILayoutValue('upperMenuDividerName'),
|
|
51
|
+
middleMenuDividerName: getUILayoutValue('middleMenuDividerName'),
|
|
52
|
+
lowerMenuDividerName: getUILayoutValue('lowerMenuDividerName')
|
|
53
|
+
};
|
|
28
54
|
const headerSettings = deviceSettings?.header || {};
|
|
29
|
-
const backgroundSettings = deviceSettings?.background || {
|
|
30
|
-
type: 'color',
|
|
31
|
-
color: 'inherit',
|
|
32
|
-
image: ''};
|
|
55
|
+
const backgroundSettings = deviceSettings?.background || {};
|
|
33
56
|
// Use CSS classes instead of theme-based styling
|
|
34
57
|
const getHeaderClasses = () => {
|
|
35
58
|
let classes = `z-10 py-4 top-0 border-b border-border relative ${layoutSettings?.fixedHeader ? 'sticky' : 'relative'}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Header.js","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"sourcesContent":[null],"names":[],"mappings":"0ZASO,MAAM,YAAY,GAAqC,KAAC,IAAO;AAClE,EAAA,MAAA;AACA,IAAA,KAAA;AACA,IAAA,MAAM;AACN,IAAA,UAAM;AACN,IAAA,WAAQ;AAER,IAAA;
|
|
1
|
+
{"version":3,"file":"Header.js","sources":["../../../../src/components/Layout/GlobalHeader/Header.tsx"],"sourcesContent":[null],"names":[],"mappings":"0ZASO,MAAM,YAAY,GAAqC,KAAC,IAAO;AAClE,EAAA,MAAA;AACA,IAAA,KAAA;AACA,IAAA,MAAM;AACN,IAAA,UAAM;AACN,IAAA,WAAQ;AAER,IAAA;IACA,QAAM;IAEN,cAAA;AACA,IAAA;WACI;AACA,EAAA,MAAA;;WAGA;;;AAE6B,GAAA,GAAA,aAAA,EAAA;EAC5B,WAAA;QAED;eACO;AACX,IAAA;MAEA,WAAA,CAAA,KAAA,IAAA,KAAA,CAAA,MAAA,CAAA;AACA,EAAA,MAAA,uBAAuB,EAAA,QAAA,IAAA,GAAA;AACnB,EAAA,MAAA,UAAQ,GAAA,QAAA,GAAgB,QAAC,GAAS,SAAA;AAClC;QACF,gBAAA,GAAA,IAAA,IAAA;;AAGF,IAAA,MAAM,cAAc,GAAG,CAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,UAAA,CAAA,CAAA,CAAA;AACnB,IAAA,MAAA,UAAY,GAAE,QAAA,EAAA,UAAiB,GAAA,cAAe,CAAA;AAC9C,IAAA,IAAA,UAAA,EAAA;AACA,MAAA,MAAA,KAAA,GAAY,IAAE,CAAA,KAAA,CAAA,GAAA,CAAA,CAAA,MAAiB,CAAA,CAAA,GAAA,EAAA,GAAA,KAAe,GAAA,GAAA,GAAA,CAAA,EAAA,UAAA,CAAA;AAC9C,MAAA,IAAA,KAAA,KAAW,SAAE,EAAA,OAAiB,KAAA;AAC9B,IAAA;AACA;AACA,IAAA,OAAA,IAAA,CAAA,KAAA,CAAA,GAAA,CAAA,CAAA,MAAsB,CAAA,CAAA,GAAA,EAAA,GAAA,KAAiB,GAAA,GAAA,GAAA,CAAA,EAAA,QAAA,CAAsB;AAC7D,EAAA,CAAA;AACA;QACF,cAAA,GAAA;AAEF,IAAA,MAAM,kBAAiB,CAAA,QAAA,CAAA;AACvB,IAAA,4BAA2B,CAAA,YAAc;;;AAIrC,EAAA,MAAA,cAAc,GAAA;gBAIV,EAAA,gBAAmB,CAAI;kBACvB,EAAO,iCAA0B,CAAA;gBACpC,EAAA,gBAAA,CAAA,cAAA,CAAA;AAED,IAAA,WAAO,kBAAQ,CAAA,aAAA,CAAA;AACnB,IAAA,YAAE,EAAA,gBAAA,CAAA,cAAA,CAAA;IAEF,UAAM,EAAA,gBAAqB,CAAE,YAAA,CAAA;wBACT,EAAA,gBAA2B,CAAA,sBAAA,CAAA;yBAEvC,EAAA,gBAA4B,CAAA,uBAAW,CAAA;0CACV,CAAA;;AAC1B,EAAA,MAAA,cAAI,GAAA,cAAmB,EAAI,MAAK,IAAA,EAAO;AAC1C,EAAA,MAAA,kBAAW,GAAA,cAAkB,EAAA,UAAA,IAAkB;;QAGnD,gBAAA,GAAA,MAAyB;AACzB,IAAA,IAAA,2DAAiD,EAAA,cAAA,EAAA,WAAA,GAAA,QAAA,GAAA,UAAA,CAAA,CAAA;AAC7C,IAAA,IAAA,kBAAW,CAAA,IAAA,KAAA,OAAkB,IAAM,kBAAC,CAAA,KAAA,EAAA;AACpC,MAAA,OAAA,IAAA,qBAAmB;;AAGvB,IAAA,OAAA;AACJ,EAAA,CAAA;QAEA,eAAA,GAAA,MAAA;IACA,MAAK,UAAA,GAAc,EAAE;AAAY,IAAA,IAAA,kBAAY,CAAA,IAAA,KAAA,OAAA,IAAA,kBAAA,CAAA,KAAA,EAAA;MAE7C,UAAA,CAAA,eAAA,GAAA,CAAA,IAAA,EAAA,kBAA0C,CAAA,KAAA,CAAA,CAAA,CAAA;IAC1C,CAAA,MAAM,IAAA,kBAAgB,CAAA,IAAA,kCAAkC,CAAA,KAAgB,KAAA,SAAgB,EAAA;MAExF,UAAA,CAAA,eAAA,GAAA,kBAA6C,CAAA,KAAA;IAC7C;;AA2DJ,IAAE,IAAA,QAAA,EAAA,QAAA,KAAA,UAAA,EAAA;AAEF,MAAA,0BAA4B,GAAA,MAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logo.js","sources":["../../../../src/components/Layout/GlobalHeader/Logo.tsx"],"sourcesContent":[null],"names":["_jsxs"],"mappings":"gFAGA,SAAS,aAAa,GAAA;AAClB,EAAA,MAAA,CAAA,UAAO,EAAU,iBAAgB;AAC7B,IAAA,KAAA,EAAA,SAAO;AACP,IAAA,MAAA,EAAA;AACH,GAAA,CAAA;WACD,CAAA,MAAa;AACT,IAAA,SAAA,YAAS,GAAA;AACL,MAAA,aAAA,CAAA;qBACS,CAAA,UAAS;gBACd,MAAM,CAAA;AACT,OAAA,CAAA;;AAEL,IAAA,IAAA,OAAI,MAAO,KAAM,WAAK,EAAA;AAClB,MAAA,MAAA,CAAA,gBAAO,CAAA,sBAA2B,CAAA;AAClC,MAAA,YAAA,EAAA;aACA,MAAO,MAAM,CAAA,mBAAO,CAAA,QAAoB,EAAA,YAAU,CAAA;;KAEzD,EAAE,CAAA;AACH,EAAA,OAAA;AACJ;AAEO,MAAM,IAAI,GAAyB,KAAC,IAAO;
|
|
1
|
+
{"version":3,"file":"Logo.js","sources":["../../../../src/components/Layout/GlobalHeader/Logo.tsx"],"sourcesContent":[null],"names":["_jsxs"],"mappings":"gFAGA,SAAS,aAAa,GAAA;AAClB,EAAA,MAAA,CAAA,UAAO,EAAU,iBAAgB;AAC7B,IAAA,KAAA,EAAA,SAAO;AACP,IAAA,MAAA,EAAA;AACH,GAAA,CAAA;WACD,CAAA,MAAa;AACT,IAAA,SAAA,YAAS,GAAA;AACL,MAAA,aAAA,CAAA;qBACS,CAAA,UAAS;gBACd,MAAM,CAAA;AACT,OAAA,CAAA;;AAEL,IAAA,IAAA,OAAI,MAAO,KAAM,WAAK,EAAA;AAClB,MAAA,MAAA,CAAA,gBAAO,CAAA,sBAA2B,CAAA;AAClC,MAAA,YAAA,EAAA;aACA,MAAO,MAAM,CAAA,mBAAO,CAAA,QAAoB,EAAA,YAAU,CAAA;;KAEzD,EAAE,CAAA;AACH,EAAA,OAAA;AACJ;AAEO,MAAM,IAAI,GAAyB,KAAC,IAAO;QAC9C;AACA,IAAA,QAAM;AAEN,IAAA,IAAA;AAOgB,IAAA,QAAA;;AAEA,GAAA,GAAA,KAAA;AACA,EAAA,MAAA,IAAA,GAAA,aAAU,EAAI;AACd,EAAA,OAAAA,IAAA,CAAA,KAAA,EAAE;AACF,IAAA,KAAA,EAAA,MAAA;;;;;;;AAYF;AA+GlB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +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;AAU/B,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKpE,eAAO,MAAM,iBAAiB,GAC1B,MAAM,MAAM,KAAK,CAAC,YAAY,EAC9B,sBAAsB,OAAO,EAC7B,aAAQ,EACR,UAAU,GAAG,EACb,UAAU,GAAG,KACd,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"MainHeader.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAU/B,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKpE,eAAO,MAAM,iBAAiB,GAC1B,MAAM,MAAM,KAAK,CAAC,YAAY,EAC9B,sBAAsB,OAAO,EAC7B,aAAQ,EACR,UAAU,GAAG,EACb,UAAU,GAAG,KACd,KAAK,CAAC,SAQR,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAClC,OAAO,GAAG,EACV,sBAAsB,OAAO,EAC7B,YAAW,MAA2B,KACvC,KAAK,CAAC,SAkCR,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,GAAG,kBAAkB,CA0NrE,CAAC"}
|
|
@@ -4,8 +4,7 @@ import {jsx,jsxs}from'react/jsx-runtime';import*as React from'react';import {get
|
|
|
4
4
|
logo: undefined,
|
|
5
5
|
settings: settings,
|
|
6
6
|
scrolled: scrolled,
|
|
7
|
-
location: location
|
|
8
|
-
prefersReducedMotion: prefersReducedMotion
|
|
7
|
+
location: location
|
|
9
8
|
});
|
|
10
9
|
}
|
|
11
10
|
if (typeof logo === 'function') {
|
|
@@ -87,9 +86,23 @@ const MainHeader = props => {
|
|
|
87
86
|
isMobile
|
|
88
87
|
} = useMediaQuery();
|
|
89
88
|
const currentRoute = location?.pathname || '/';
|
|
90
|
-
const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
|
|
91
89
|
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
92
|
-
|
|
90
|
+
// Helper function to get value from uilayout with route/device override support
|
|
91
|
+
const getUILayoutValue = path => {
|
|
92
|
+
// Check for route/device-specific override first
|
|
93
|
+
const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
|
|
94
|
+
const uiOverride = settings?.uiSettings?.[routeDeviceKey];
|
|
95
|
+
if (uiOverride) {
|
|
96
|
+
const value = path.split('.').reduce((obj, key) => obj?.[key], uiOverride);
|
|
97
|
+
if (value !== undefined) return value;
|
|
98
|
+
}
|
|
99
|
+
// Fallback to settings (flattened uilayout from configuration-registries)
|
|
100
|
+
return path.split('.').reduce((obj, key) => obj?.[key], settings);
|
|
101
|
+
};
|
|
102
|
+
// Get device regions directly from uilayout
|
|
103
|
+
const deviceRegions = {
|
|
104
|
+
header: getUILayoutValue('header')
|
|
105
|
+
};
|
|
93
106
|
const headerSettings = deviceRegions?.header || {};
|
|
94
107
|
// State to track reduced motion preference
|
|
95
108
|
const [prefersReducedMotion, setPrefersReducedMotion] = React.useState(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainHeader.js","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"sourcesContent":[null],"names":["_jsx"],"mappings":"uqBAeO,MAAM,iBAAiB,GAAG,CAC7B,IAA8B,EAC9B,oBAA6B,EAC7B,QAAQ,EACR,QAAa,EACb,QAAa,KACI;AACjB,EAAA,IAAA,OAAI,IAAO,KAAI,QAAK,EAAQ;
|
|
1
|
+
{"version":3,"file":"MainHeader.js","sources":["../../../../src/components/Layout/GlobalHeader/MainHeader.tsx"],"sourcesContent":[null],"names":["_jsx"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainSidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/MainSidebar.tsx"],"names":[],"mappings":"AACA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAIzC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAM7C,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"MainSidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/MainSidebar.tsx"],"names":[],"mappings":"AACA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAIzC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAM7C,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAkO9C,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -22,9 +22,31 @@ import {jsxs,jsx}from'react/jsx-runtime';import {getMenuSeparation}from'@admin-l
|
|
|
22
22
|
ChevronRightIcon
|
|
23
23
|
} = icons;
|
|
24
24
|
const currentRoute = location?.pathname || '/';
|
|
25
|
-
const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
|
|
26
25
|
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
27
|
-
|
|
26
|
+
// Helper function to get value from settings with route/device override support
|
|
27
|
+
const getUILayoutValue = path => {
|
|
28
|
+
// Check for route/device-specific override first
|
|
29
|
+
const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
|
|
30
|
+
const uiOverride = settings?.uiSettings?.[routeDeviceKey];
|
|
31
|
+
if (uiOverride) {
|
|
32
|
+
const value = path.split('.').reduce((obj, key) => obj?.[key], uiOverride);
|
|
33
|
+
if (value !== undefined) return value;
|
|
34
|
+
}
|
|
35
|
+
// Fallback to settings (flattened uilayout from configuration-registries)
|
|
36
|
+
return path.split('.').reduce((obj, key) => obj?.[key], settings);
|
|
37
|
+
};
|
|
38
|
+
// Get layout settings from the new flat structure
|
|
39
|
+
const deviceLayout = {
|
|
40
|
+
navigationMode: getUILayoutValue('navigationMode'),
|
|
41
|
+
sideMenuType: getUILayoutValue('sideMenuType'),
|
|
42
|
+
contentWidth: getUILayoutValue('contentWidth'),
|
|
43
|
+
fixedHeader: getUILayoutValue('fixedHeader'),
|
|
44
|
+
fixedSidebar: getUILayoutValue('fixedSidebar'),
|
|
45
|
+
splitMenus: getUILayoutValue('splitMenus'),
|
|
46
|
+
upperMenuDividerName: getUILayoutValue('upperMenuDividerName'),
|
|
47
|
+
middleMenuDividerName: getUILayoutValue('middleMenuDividerName'),
|
|
48
|
+
lowerMenuDividerName: getUILayoutValue('lowerMenuDividerName')
|
|
49
|
+
};
|
|
28
50
|
useEffect(() => {
|
|
29
51
|
if (!iconModule) {
|
|
30
52
|
import('./DynamicIcon.js').then(module => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainSidebar.js","sources":["../../../../src/components/Layout/Sidebar/MainSidebar.tsx"],"sourcesContent":[null],"names":[
|
|
1
|
+
{"version":3,"file":"MainSidebar.js","sources":["../../../../src/components/Layout/Sidebar/MainSidebar.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PerplexSidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7C,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"PerplexSidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7C,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CA4OjD,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -24,9 +24,31 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
|
|
|
24
24
|
isMobile
|
|
25
25
|
} = useMediaQuery();
|
|
26
26
|
const currentRoute = location?.pathname || '/';
|
|
27
|
-
const routeSettings = settings?.routeSettings?.[currentRoute] || settings?.routeSettings?.['/'] || settings;
|
|
28
27
|
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
29
|
-
|
|
28
|
+
// Helper function to get value from settings with route/device override support
|
|
29
|
+
const getUILayoutValue = path => {
|
|
30
|
+
// Check for route/device-specific override first
|
|
31
|
+
const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
|
|
32
|
+
const uiOverride = settings?.uiSettings?.[routeDeviceKey];
|
|
33
|
+
if (uiOverride) {
|
|
34
|
+
const value = path.split('.').reduce((obj, key) => obj?.[key], uiOverride);
|
|
35
|
+
if (value !== undefined) return value;
|
|
36
|
+
}
|
|
37
|
+
// Fallback to settings (flattened uilayout from configuration-registries)
|
|
38
|
+
return path.split('.').reduce((obj, key) => obj?.[key], settings);
|
|
39
|
+
};
|
|
40
|
+
// Get layout settings from the new flat structure
|
|
41
|
+
const deviceLayout = {
|
|
42
|
+
navigationMode: getUILayoutValue('navigationMode'),
|
|
43
|
+
sideMenuType: getUILayoutValue('sideMenuType'),
|
|
44
|
+
contentWidth: getUILayoutValue('contentWidth'),
|
|
45
|
+
fixedHeader: getUILayoutValue('fixedHeader'),
|
|
46
|
+
fixedSidebar: getUILayoutValue('fixedSidebar'),
|
|
47
|
+
splitMenus: getUILayoutValue('splitMenus'),
|
|
48
|
+
upperMenuDividerName: getUILayoutValue('upperMenuDividerName'),
|
|
49
|
+
middleMenuDividerName: getUILayoutValue('middleMenuDividerName'),
|
|
50
|
+
lowerMenuDividerName: getUILayoutValue('lowerMenuDividerName')
|
|
51
|
+
};
|
|
30
52
|
useEffect(() => {
|
|
31
53
|
if (!iconModule) {
|
|
32
54
|
import('./DynamicIcon.js').then(module => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PerplexSidebar.js","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebar.tsx"],"sourcesContent":[null],"names":["React"],"mappings":"gzCAaO,MAAM,cAAc,GAA2B,KAAC,IAAO;AAC1D,EAAA,MAAA;IAeA,cAAO;AACP,IAAA,aAAO;IACP,QAAQ;AACR,IAAA,SAAQ;AACR,IAAA,WAAQ;AACR,IAAA;
|
|
1
|
+
{"version":3,"file":"PerplexSidebar.js","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebar.tsx"],"sourcesContent":[null],"names":["React"],"mappings":"gzCAaO,MAAM,cAAc,GAA2B,KAAC,IAAO;AAC1D,EAAA,MAAA;IAeA,cAAO;AACP,IAAA,aAAO;IACP,QAAQ;AACR,IAAA,SAAQ;AACR,IAAA,WAAQ;AACR,IAAA;IACA,YAAM;IAEN,QAAA;AACA,IAAA,WAAM;kBACF;AACA,IAAA;kBACM;;;0BAIY,kBAAS,CAAA,GAAA,QAAA,CAAA,KAAA,CAAA;AAAE,EAAA,MAAA,CAAA,UAAA,EAAA,aAAa,CAAA,GAAAA,cAAA,CAAA,QAAA,CAAA,IAAA,CAAA;QAC1C;;;AAIJ,GAAA,GAAE,cAAA,CAAA,MAAA,CAAA;QAEF;AACA,IAAA;AACI,GAAA,GAAA,aAAA,EAAA;AAKA,EAAA,MAAA,YAAY,GAAA,QAAA,EAAA,QAAiB,IAAA,GAAA;AAC7B,EAAA,MAAA,UAAA,GAAA,QAAoB,GAAE,QAAA,GAAA,SAAiB;AACvC;AACA,EAAA,MAAA,gBAAA,GAAA,IAAsB,IAAA;;IAG1B,MAAA,cAAe,GAAA,CAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,UAAA,CAAA,CAAA,CAAA;UACX,UAAK,GAAU,QAAG,EAAA,UAAA,GAAA,cAAA,CAAA;kBACR;iBACF,GAAA,IAAA,CAAA,KAAc,CAAA,GAAA,CAAA,CAAM,MAAE,CAAA,CAAA,GAAA,EAAA,GAAA,KAAA,GAAA,GAAA,GAAA,CAAA,EAAA,UAAA,CAAA;AAC1B,MAAA,IAAA,KAAG,KAAA,SAAA,EAAA,OAAA,KAAA;;;AAGX,IAAA,qBAAqB,CAAA,CAAA,MAAQ,CAAA,CAAA,GAAI,EAAA,GAAA,KAAA,GAAA,GAAA,GAAA,CAAA,EAAA,QAAA,CAAA;;;AAI7B,EAAA,MAAA,YAAM,GAAA;kBACI,EAAA,gBAAkB,CAAC,gBAAe,CAAA;AACxC,IAAA,YAAI,EAAA,gBAAY,CAAO,cAAU,CAAK;AAClC,IAAA,YAAA,EAAA,gBAAgB,CAAA,cAAA,CAAA;eACnB,EAAA,gBAAA,CAAA,aAAA,CAAA;AACL,IAAA,YAAE,EAAA,gBAAA,CAAA,cAAA,CAAA;AAEF,IAAA,UAAA,EAAQ,gBAAC,CAAgB,YAAY,CAAA;AACrC,IAAA,oBAAY,EAAA,gBAAA,CAAA,sBAAA,CAAA;AACR,IAAA,qBAAS,EAAA,wCAAiC,CAAA;AAC9C,IAAA,oBAAE,EAAA,gBAAA,CAAA,sBAAA;AACN,GAAA;WAEA,CAAA,MAAA;IACA,IAAA,CAAA,UAAe,EAAA;AACX,MAAA,OAAA,kBAAsB,CAAA,CAAA,IAAsB,CAAA,MAAE,IAAA;qBACjC,CAAC,MAAG,CAAA;AACT,MAAA,CAAA,CAAA;;AAER,EAAA,CAAA,EAAA,EAAA,CAAA;AAGA;AACI,EAAA,SAAA,CAAA,MAAA;AACJ,IAAA,MAAE,kBAAA,GAAA,KAAA,IAAA;AACN,YAAI,OAAA,GAAc,QAAE,CAAA,cAAgB,CAAA,gBAAA,CAAA;AAEpC,MAAA,IAAM,OAAE,IAAA,CAAU,OAAE,CAAA,qBAAyB,CAAA,IAAA;AAC7C,QAAA;;AACiD,IAAA,CAAA;AAC7C,IAAA,QAAA,CAAA,gBAAqB,CAAC,WAAQ,EAAA,kBAAA,CAAA;AAC1B,IAAA,OAAA,MAAA;AACI,MAAA,QAAA,CAAA,mBAAO,CAAA,WAAA,EAAA,kBAAA,CAAA;AACP,IAAA,CAAA;oBACI,EAAE,aAAU,CAAI,CAAA;;AAExB,EAAA,SAAA,CAAA,MAAI;sBACA,GAAA;eACH,CAAA,GAAA,KAAA,QAAA,IAAA,cAAA,EAAA;AAED,QAAA;AACJ,MAAA;AACJ,IAAA,CAAC;IACD,QAAM,CAAA,gBAAkB,CAAE,SAAQ;IAElC,OAAA,MAAA;MACA,QAAM,CAAA,mBAAuB,CAAE,SAAA,EAAA,YAAA,CAAA;;AAG3B,EAAA,CAAA,EAAA,CAAA,cAAY,EAAE,aAAa,CAAA,CAAA;;cAE1B;AAED,IAAA,WAAO;AACX,IAAA,UAAE;IACF;AAGY,GAAA,GAAA,iBAAe,CAAA,QAAE,IAAU,EAAA,CAAA;AAC3B,EAAA,MAAA,eAAe,GAAE,CAAA,SAAQ,GAAK,EAAA,KAAA;AACT,IAAA,IAC7B,CAAC,SAAS,IACZ,CAAA,KAAA,CAAA,OAAA,CAAA,SAAA,CAAA,EAAA,OAAA,EAAA;IAEF,OAAA,SAAA,CAAA,GAAA,CAAA,IAAA,IAAA;AACA,MAAA,MAAM,WAAA,GAAe;QACjB,GAAA,IAAK;AAA0B,QAAA,IAAA,EAAA,CAAA,CAAA,SAAY,CAAA;QAE3C,IAAA,EAAA,UAAgB,IACZ,IAAA,CAAA,IAAA,GAAA,UAAa,CAAA,iBAAC,CAAA,IAAA,CAAA,IAAwB,CAAG,GAC1C;AAKP,OAAE;MAEF,IAAM,WAAA,CAAA,QAAoB,EAAA;QACtB,uBACS,4BAA4B,QAAI,CAAK;AA4DlD,MAAE;AAEF,MAAA,OACI,WAAA;AA+BR,IAAE,CAAA,CAAA;AAEF,EAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,sBAAsB,CAAC;AAK3E,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAwB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"TailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,sBAAsB,CAAC;AAK3E,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAwB,MAAM,aAAa,CAAC;AAkGvF,KAAK,cAAc,GAAG,cAAc,CAAC,OAAO,SAAS,CAAC,CAAC;AAEvD,QAAA,MAAM,SAAS;;;0EAAoB,CAAC;AAEpC,KAAK,+BAA+B,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAEzE,QAAA,MAAM,mBAAmB,EAAE,kBAAkB,CACzC,KAAK,CAAC,mBAAmB,CAAC,CAAC,KAAK,EAAE,+BAA+B,KAAK,GAAG,CAAC,OAAO,CAAC,EAClF,GAAG,CAC8C,CAAC;AAEtD,eAAe,mBAAmB,CAAC"}
|
|
@@ -62,8 +62,10 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
62
62
|
orgName
|
|
63
63
|
} = {}
|
|
64
64
|
} = props;
|
|
65
|
+
// Use merged settings for immediate UI updates
|
|
66
|
+
const mergedSettings = settingXstate?.mergedSettings || settingXstate;
|
|
65
67
|
return jsx(TailwindThemeProvider, {
|
|
66
|
-
settings:
|
|
68
|
+
settings: mergedSettings,
|
|
67
69
|
actor: settingsActor,
|
|
68
70
|
children: jsx(BasicLayout, {
|
|
69
71
|
routeParams: orgName,
|
|
@@ -72,7 +74,7 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
72
74
|
mainHeaderProps: mainHeaderProps,
|
|
73
75
|
actor: settingsActor,
|
|
74
76
|
...props,
|
|
75
|
-
settings:
|
|
77
|
+
settings: mergedSettings
|
|
76
78
|
})
|
|
77
79
|
});
|
|
78
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"mgBAYA,SAAS,0BAA0B,CAAC,KAAqC,EAAA;AACrE,EAAA,MAAA,WAAc,WAAG,CAAA,YAAY,CAAA;QAC7B;IACA,QAAQ,EAAA;MAER,kBAAA,CAAA,MAAA,CAAA;QACA;AACA,IAAA,QAAM,EAAA,aAAe;AAErB,IAAA;uBACI,EAAA;;AAEA;AACA,EAAA,MAAA,eAAA,GAAiB,kBAAkB,IAAA,aAAY;SAC/C,CAAA,GAAA,CAAA,qCAA0C,EAAE;yBAC5C,EAAA,CAAA,CAAqB,kBAAiB;oBACtC,EAAa,CAAE;AACf,IAAA,kBAAA,EAAA,kBAAqB,GAAgB,MAAE,CAAA,IAAO,CAAA,kBAAqB,CAAC,GAAE,EAAE;qBACxE,EAAA,aAAyB,GAAA,MAAA,CAAA,IAAiB,CAAA,aAAA,CAAA,GAAgB,EAAA;AAC7D,IAAA,sBAAE,EAAA,kBAAA,EAAA,gBAAA;AAEH,IAAA,qBAAoB,EAAA,aAAc,EAAG,gBACjC;AACI,IAAA,aAAS,EAAA,eAAA,GAAA,UAAA,GAAA,MAAA;uBACL,EAAA,eAAwB,GAAO,MAAE,CAAK,IAAI,CAAA,eAAE,CAAA,GAAA,EAAA;AACxC,IAAA,uBAAW,EAAA,eAAS,EAAA;;gBAEpB,IAAC,EAAA,aAAA,CAAA,GAAA,UAAA,CAAA,eAAA,CAAA,OAAA,CAAA;;yBAEJ,EAAA,CAAA;AACJ,QAAA,OAAA;AACJ,QACD;AACI,OAAA,KAAA;AACI,QAAA,IAAA,KAAA,EAAA,IAAU,KAAA,cAAe,EAAA;AAC5B,UAAA;AACJ,QACH;AAEF,QAAA,WAAM,CAAA,OAAiB,CAAA;AAEvB,MAAA;;;SAGI,EAAA;cACA,EAAQ;;AAEX,GAAA,CAAA;AAED,EAAA,MAAA,aAAQ,GAAW,cAAW;AAC9B,EAAA,OAAA,CAAM,6CACK,EAAA;AACH,IAAA,gBAAS,EAAA,aAAiB,EAAE,gBAAe;cAE9C,EAAA,CAAQ,CAAA,aAAW;AAExB,IAAA,0BAAwB,GAAA,MAAW,CAC/B,IAAC,CAAA,aAAU,CAAA,CAAA,KAAA,CAAA,CAAA,EAAA,EAAA,CAAA,GAAA,EAAA;YACP,EAAA,aAAA,EAAqB,QAAA;gBACrB,EAAA,aAAoB,EAAA;AACxB,GAAA,CAAA;QAIJ;IACA;MAEA,
|
|
1
|
+
{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"mgBAYA,SAAS,0BAA0B,CAAC,KAAqC,EAAA;AACrE,EAAA,MAAA,WAAc,WAAG,CAAA,YAAY,CAAA;QAC7B;IACA,QAAQ,EAAA;MAER,kBAAA,CAAA,MAAA,CAAA;QACA;AACA,IAAA,QAAM,EAAA,aAAe;AAErB,IAAA;uBACI,EAAA;;AAEA;AACA,EAAA,MAAA,eAAA,GAAiB,kBAAkB,IAAA,aAAY;SAC/C,CAAA,GAAA,CAAA,qCAA0C,EAAE;yBAC5C,EAAA,CAAA,CAAqB,kBAAiB;oBACtC,EAAa,CAAE;AACf,IAAA,kBAAA,EAAA,kBAAqB,GAAgB,MAAE,CAAA,IAAO,CAAA,kBAAqB,CAAC,GAAE,EAAE;qBACxE,EAAA,aAAyB,GAAA,MAAA,CAAA,IAAiB,CAAA,aAAA,CAAA,GAAgB,EAAA;AAC7D,IAAA,sBAAE,EAAA,kBAAA,EAAA,gBAAA;AAEH,IAAA,qBAAoB,EAAA,aAAc,EAAG,gBACjC;AACI,IAAA,aAAS,EAAA,eAAA,GAAA,UAAA,GAAA,MAAA;uBACL,EAAA,eAAwB,GAAO,MAAE,CAAK,IAAI,CAAA,eAAE,CAAA,GAAA,EAAA;AACxC,IAAA,uBAAW,EAAA,eAAS,EAAA;;gBAEpB,IAAC,EAAA,aAAA,CAAA,GAAA,UAAA,CAAA,eAAA,CAAA,OAAA,CAAA;;yBAEJ,EAAA,CAAA;AACJ,QAAA,OAAA;AACJ,QACD;AACI,OAAA,KAAA;AACI,QAAA,IAAA,KAAA,EAAA,IAAU,KAAA,cAAe,EAAA;AAC5B,UAAA;AACJ,QACH;AAEF,QAAA,WAAM,CAAA,OAAiB,CAAA;AAEvB,MAAA;;;SAGI,EAAA;cACA,EAAQ;;AAEX,GAAA,CAAA;AAED,EAAA,MAAA,aAAQ,GAAW,cAAW;AAC9B,EAAA,OAAA,CAAM,6CACK,EAAA;AACH,IAAA,gBAAS,EAAA,aAAiB,EAAE,gBAAe;cAE9C,EAAA,CAAQ,CAAA,aAAW;AAExB,IAAA,0BAAwB,GAAA,MAAW,CAC/B,IAAC,CAAA,aAAU,CAAA,CAAA,KAAA,CAAA,CAAA,EAAA,EAAA,CAAA,GAAA,EAAA;YACP,EAAA,aAAA,EAAqB,QAAA;gBACrB,EAAA,aAAoB,EAAA;AACxB,GAAA,CAAA;QAIJ;IACA;MAEA,KAAA;AACA,EAAA,MAAA,kBAAoB,OAAG,CAAA;IAEvB,OAAO,UACF,EAAA,OAAA,EAAA,OAAqB;AAY9B,GAAC,CAAA,EAAA,CAAA,QAAA,EAAA,OAAA,EAAA,OAAA,CAAA,CAAA;AAED,EAAA,MAAM,eAAc,GAAA,WAAgB,CAAO,MAAM,IAAA;;IAE7C,WAAU,CAAA,MAAO,CAAA;AACpB,EAAC,CAAC,EAAA,CAAA,WAAA,CAAA,CAAA;AAMH;AAIA,EAAA,MAAM;AAKN,IAAA,WAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckBoxTheme.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/CheckBoxTheme.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"CheckBoxTheme.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/CheckBoxTheme.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAuD9C,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,mBAAmB,2CAwD/D"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {jsx,jsxs}from'react/jsx-runtime';const themelist = [{
|
|
1
|
+
import {jsx,jsxs}from'react/jsx-runtime';import'react';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../hooks/useMediaQuery.js';const themelist = [{
|
|
2
2
|
key: 'light',
|
|
3
3
|
title: 'Light',
|
|
4
4
|
svg: jsxs("svg", {
|
|
@@ -93,8 +93,33 @@ function CheckBoxTheme(props) {
|
|
|
93
93
|
const {
|
|
94
94
|
list,
|
|
95
95
|
changeSetting,
|
|
96
|
-
settings
|
|
96
|
+
settings,
|
|
97
|
+
location,
|
|
98
|
+
applyToAllRoutes = false
|
|
97
99
|
} = props;
|
|
100
|
+
const {
|
|
101
|
+
isMobile
|
|
102
|
+
} = useMediaQuery();
|
|
103
|
+
const currentRoute = location?.pathname || '/';
|
|
104
|
+
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
105
|
+
// Helper to get navTheme value with overrides applied
|
|
106
|
+
const getNavThemeValue = () => {
|
|
107
|
+
// If applyToAllRoutes is true, use global settings only
|
|
108
|
+
if (applyToAllRoutes) {
|
|
109
|
+
return settings?.navTheme || 'light';
|
|
110
|
+
}
|
|
111
|
+
// Otherwise, check for route-specific overrides
|
|
112
|
+
const contextKey = `[${currentRoute}][${deviceType}]`;
|
|
113
|
+
const overrideSettings = settings?.uiSettings?.overrides?.[contextKey];
|
|
114
|
+
if (overrideSettings) {
|
|
115
|
+
// Handle the uilayout wrapper in override structure
|
|
116
|
+
const overrideData = overrideSettings.uilayout || overrideSettings;
|
|
117
|
+
if (overrideData?.navTheme !== undefined) {
|
|
118
|
+
return overrideData.navTheme;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return settings?.navTheme || 'light';
|
|
122
|
+
};
|
|
98
123
|
return jsx("div", {
|
|
99
124
|
className: "flex flex-row gap-4",
|
|
100
125
|
children: themelist.map((themeItems, index) => {
|
|
@@ -108,7 +133,7 @@ function CheckBoxTheme(props) {
|
|
|
108
133
|
changeSetting('primaryColor', settings?.primaryColor);
|
|
109
134
|
},
|
|
110
135
|
children: jsxs("div", {
|
|
111
|
-
children: [themeItems.svg,
|
|
136
|
+
children: [themeItems.svg, getNavThemeValue() === themeItems.key && jsx("svg", {
|
|
112
137
|
className: "absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-6 h-6 text-blue-500",
|
|
113
138
|
viewBox: "0 0 24 24",
|
|
114
139
|
fill: "currentColor",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckBoxTheme.js","sources":["../../../src/components/SettingDrawer/CheckBoxTheme.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"
|
|
1
|
+
{"version":3,"file":"CheckBoxTheme.js","sources":["../../../src/components/SettingDrawer/CheckBoxTheme.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"uMAIA,MAAM,SAAS,GAAG,CAAA;AACd,EAAA,GAAA,EAAA,OAAA;AACI,EAAA,KAAA,EAAA,OAAK;AACL,EAAA,GAAA,EAAAA,IAAA,CAAK,KAAE,EAAA;SACP,EAAG,IACC;AASP,IAAA,MAAA,EAAA,IAAA;AACD,IAAA,OAAA,EAAA,WAAA;AACI,IAAA,KAAA,EAAG,4BAAY;AACf,IAAA,QAAA,GAAOC,GAAA,CAAA,MAAU,EAAA;cAEb,EAAAA,GAAA,CAAA,QAAK,EAAA;AAcZ,QAAA,EAAA,EAAA,YAAA;AACD,QAAA,CAAA,EAAA,MAAA;AACI,QAAA,CAAA,EAAG,MAAE;AACL,QAAA,KAAK,EAAE,MAAM;QACb,MACI,EAAA,MAAA;AAWP,QAAA,QAAA,EAAAA,GAAA,CAAA,cAAA,EAAA;UACH,EAAA,EAAA,GAAA;AAEF,UAAO,EAAA,EAAO,GAAA;AACV,UAAM,YAAQ,EAAA,GAAA;AACd,UAAM,UAAU,EAAE,SAAG;AACrB,UAAM,YAAY,EAAA;SAClB;OAEA;KACA,CAAA,EAAAA,GAAM,CAAA,MAAA,EAAA;SACF,GAAA;SACA,GAAI;AACA,MAAA,KAAA,EAAA,IAAA;YACH,EAAA,IAAA;QAED,EAAA,GAAA;AACA,MAAA,IAAA,EAAA;YACA,EAAM;;;AAGF,CAAA,EAAA;AACA,EAAA,GAAA,EAAA;mBACI;WACJ,CAAC,KAAA,EAAA;SACJ,EAAA,IAAA;AACD,IAAA,MAAA,EAAA,IAAO;AACX,IAAA,OAAE,EAAA,WAAA;AACF,IAAA,KAAA,EAAO;AAGK,IAAA,QAAA,EAAA,CAAAA,GAAO,CACH,MAAA,EAAA;AAKQ,MAAA,CAAA,EAAA,GAAA;AACA,MAAA,CAAA,EAAA,GAAA;AACJ,MAAA,KAAA,EAAA,IAAC;YAiBX,EAET,IAAC;AACN,MAAC,EAAA,EAAA,GAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InvitationSettings.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/InvitationSettings.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAG/C,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,KAAK,EAAE,oBAAoB,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"InvitationSettings.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/InvitationSettings.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAG/C,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,KAAK,EAAE,oBAAoB,GAAG,GAAG,2CA4E3E"}
|
|
@@ -2,7 +2,8 @@ import {jsxs,jsx}from'react/jsx-runtime';import {useTranslation}from'react-i18ne
|
|
|
2
2
|
const {
|
|
3
3
|
settings,
|
|
4
4
|
changeSetting,
|
|
5
|
-
location
|
|
5
|
+
location,
|
|
6
|
+
applyToAllRoutes = false
|
|
6
7
|
} = props;
|
|
7
8
|
const {
|
|
8
9
|
t
|
|
@@ -11,11 +12,22 @@ import {jsxs,jsx}from'react/jsx-runtime';import {useTranslation}from'react-i18ne
|
|
|
11
12
|
isMobile
|
|
12
13
|
} = useMediaQuery();
|
|
13
14
|
const currentRoute = location?.pathname || '/';
|
|
14
|
-
|
|
15
|
-
//
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
16
|
+
// Get organization invitations from override or default settings
|
|
17
|
+
let invitations = settings?.organization?.members?.invitations || {};
|
|
18
|
+
// If applyToAllRoutes is false, check for route/device-specific override
|
|
19
|
+
if (!applyToAllRoutes) {
|
|
20
|
+
const routeDeviceKey = `[${currentRoute}][${deviceType}]`;
|
|
21
|
+
const uiOverride = settings?.uiSettings?.overrides?.[routeDeviceKey];
|
|
22
|
+
if (uiOverride) {
|
|
23
|
+
// Handle the uilayout wrapper in override structure
|
|
24
|
+
const overrideData = uiOverride.uilayout || uiOverride;
|
|
25
|
+
const overrideOrganization = overrideData?.organization;
|
|
26
|
+
if (overrideOrganization?.members?.invitations) {
|
|
27
|
+
invitations = overrideOrganization.members.invitations;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
19
31
|
const handleInvitationChange = (key, value) => {
|
|
20
32
|
if (!changeSetting) return;
|
|
21
33
|
const newInvitations = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InvitationSettings.js","sources":["../../../src/components/SettingDrawer/InvitationSettings.tsx"],"sourcesContent":[null],"names":[],"mappings":"yRAMc,SAAU,kBAAkB,CAAC,KAAiC,EAAA;
|
|
1
|
+
{"version":3,"file":"InvitationSettings.js","sources":["../../../src/components/SettingDrawer/InvitationSettings.tsx"],"sourcesContent":[null],"names":[],"mappings":"yRAMc,SAAU,kBAAkB,CAAC,KAAiC,EAAA;AACxE,EAAA,MAAA;IACA,QAAQ;AACR,IAAA,aAAQ;AACR,IAAA;IACA,gBAAgB,GAAG;MAEnB,KAAA;QACI;IAEJ;MACA,cAAK,CAAA,UAAmB,CAAA;AACpB,EAAA,MAAA;;mBAGI,EAAA;oBACA,GAAA,QAAA,EAAA,QAAA,IAAA,GAAA;AACA,EAAA,MAAA,UAAM,cAAY,QAAG,GAAU,SAAS;AACxC;AACA,EAAA,IAAA,oCAA0B,EAAA,OAAS,EAAA,WAAc,IAAA,EAAA;AAC7C;uBACH,EAAA;UACJ,cAAA,GAAA,CAAA,CAAA,EAAA,YAAA,CAAA,EAAA,EAAA,UAAA,CAAA,CAAA,CAAA;IACL,MAAC,UAAA,GAAA,QAAA,EAAA,UAAA,EAAA,SAAA,GAAA,cAAA,CAAA;AAED,IAAA,IAAA;AACI;YAAoB,YAAO,GAAA,UAAA,CAAA,QAAA,IAAA,UAAA;AAC3B,MAAA,MAAA,oBAAuB,GAAA,YAAA,EAAA,YAAA;AACnB,MAAA,IAAA,oBAAc,EAAA,OAAA,EAAA,WAAA,EAAA;mBACP,GAAA,oBAAK,CAAA,OAAA,CAAA,WAAA;;AAGhB,IAAA;AACJ,EAAA;AAEA,EAAA,MAAA,sBAAyB,GAAE,CAAA,GAAA,EAAQ,KAAE,KAAQ;IAE7C,IAAA,CAAA,aACI,EAAA;AAsCR,IAAC,MAAA,cAAA,GAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LayoutChange.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/LayoutChange.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAI/C,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAK,EAAE,oBAAoB,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"LayoutChange.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/LayoutChange.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAI/C,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAK,EAAE,oBAAoB,GAAG,GAAG,2CAmJrE"}
|