@admin-layout/tailwind-design-pro 12.0.16-alpha.55 → 12.0.16-alpha.57
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 +45 -29
- package/lib/components/Layout/BasicLayout/index.js.map +1 -1
- package/lib/components/Layout/BasicLayout/utils.js +4 -4
- package/lib/components/Layout/BasicLayout/utils.js.map +1 -1
- package/lib/components/Layout/GlobalFooter/Account.d.ts +4 -0
- package/lib/components/Layout/GlobalFooter/Account.d.ts.map +1 -0
- package/lib/components/Layout/GlobalFooter/Account.js +147 -0
- package/lib/components/Layout/GlobalFooter/Account.js.map +1 -0
- package/lib/components/Layout/GlobalFooter/BottomMenuDropdown.d.ts.map +1 -1
- package/lib/components/Layout/GlobalFooter/BottomMenuDropdown.js +3 -10
- package/lib/components/Layout/GlobalFooter/BottomMenuDropdown.js.map +1 -1
- package/lib/components/Layout/GlobalHeader/Header.js +1 -1
- package/lib/components/Layout/GlobalHeader/Header.js.map +1 -1
- package/lib/components/Layout/GlobalHeader/MainHeader.d.ts +0 -2
- package/lib/components/Layout/GlobalHeader/MainHeader.d.ts.map +1 -1
- package/lib/components/Layout/GlobalHeader/MainHeader.js +16 -75
- package/lib/components/Layout/GlobalHeader/MainHeader.js.map +1 -1
- package/lib/components/Layout/GlobalHeader/index.d.ts +0 -1
- package/lib/components/Layout/GlobalHeader/index.d.ts.map +1 -1
- package/lib/components/Layout/Sidebar/MainSidebar.d.ts.map +1 -1
- package/lib/components/Layout/Sidebar/MainSidebar.js +9 -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 +12 -15
- package/lib/components/Layout/Sidebar/PerplexSidebar.js.map +1 -1
- package/lib/components/Layout/Sidebar/PerplexSidebarMenu.d.ts.map +1 -1
- package/lib/components/Layout/Sidebar/PerplexSidebarMenu.js +6 -18
- package/lib/components/Layout/Sidebar/PerplexSidebarMenu.js.map +1 -1
- package/lib/components/Layout/TailwindLayout.d.ts.map +1 -1
- package/lib/components/Layout/TailwindLayout.js +39 -11
- package/lib/components/Layout/TailwindLayout.js.map +1 -1
- package/lib/components/Layout/slot-fill/Logo.d.ts +4 -0
- package/lib/components/Layout/slot-fill/Logo.d.ts.map +1 -0
- package/lib/components/Layout/slot-fill/Logo.js +7 -0
- package/lib/components/Layout/slot-fill/Logo.js.map +1 -0
- package/lib/components/SettingDrawer/CheckBoxTheme.d.ts.map +1 -1
- package/lib/components/SettingDrawer/CheckBoxTheme.js +4 -20
- 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 +5 -16
- 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 +11 -43
- package/lib/components/SettingDrawer/LayoutChange.js.map +1 -1
- package/lib/components/SettingDrawer/NavigationsModes.d.ts.map +1 -1
- package/lib/components/SettingDrawer/NavigationsModes.js +8 -47
- 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 +29 -50
- 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 +88 -99
- 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 +3 -17
- package/lib/components/SettingDrawer/ThemeColor.js.map +1 -1
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.d.ts.map +1 -1
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.js +15 -5
- package/lib/components/UpdateSettingsResource/UpdateSettingsResource.server.js.map +1 -1
- package/lib/components/index.js +1 -1
- package/lib/components/typings.d.ts +3 -0
- package/lib/components/typings.d.ts.map +1 -1
- package/lib/config/env-config.d.ts +1 -0
- package/lib/config/env-config.d.ts.map +1 -1
- package/lib/config/env-config.js +3 -0
- package/lib/config/env-config.js.map +1 -1
- package/lib/machines/settingsMachine.d.ts +7 -2
- package/lib/machines/settingsMachine.d.ts.map +1 -1
- package/lib/machines/settingsMachine.js +141 -122
- package/lib/machines/settingsMachine.js.map +1 -1
- package/lib/machines/types.d.ts +69 -7
- package/lib/machines/types.d.ts.map +1 -1
- package/lib/utils/configOverrides.js +1 -265
- package/lib/utils/configOverrides.js.map +1 -1
- package/lib/utils/settingsUtils.d.ts.map +1 -1
- package/lib/utils/settingsUtils.js +17 -8
- package/lib/utils/settingsUtils.js.map +1 -1
- package/package.json +4 -4
- package/lib/components/Layout/GlobalHeader/Logo.d.ts +0 -4
- package/lib/components/Layout/GlobalHeader/Logo.d.ts.map +0 -1
- package/lib/components/Layout/GlobalHeader/Logo.js +0 -130
- package/lib/components/Layout/GlobalHeader/Logo.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainSidebar.js","sources":["../../../../src/components/Layout/Sidebar/MainSidebar.tsx"],"sourcesContent":[null],"names":[],"mappings":"skBAWO,MAAM,WAAW,GAA2B,KAAC,IAAO;
|
|
1
|
+
{"version":3,"file":"MainSidebar.js","sources":["../../../../src/components/Layout/Sidebar/MainSidebar.tsx"],"sourcesContent":[null],"names":[],"mappings":"skBAWO,MAAM,WAAW,GAA2B,KAAC,IAAO;QACvD;AAWA,IAAA,cAAO;IACP,aAAW;AACX,IAAA,QAAQ;AACR,IAAA,SAAQ;AACR,IAAA;IACA,QAAM;IAEN,YAAA;AACA,IAAA,QAAM;;AAEF,GAAA,GAAA,KAAA;QACA,CAAA,UAAM,EAAA,aAAa,CAAQ,0BAAe,CAAA,IAAA,CAAA;QAE1C;;;AAE6B,GAAA,GAAA,cAAA,CAAA,OAAY;QACzC;;mBAGW,EAAC;AAChB,EAAA,MAAE;IAEF,eAAA;AACA,IAAA;AACI,GAAA,GAAA,KAAA;AACA,EAAA,MAAA,YAAY,GAAE,QAAA,EAAA,QAAiB,IAAA,GAAA;AAC/B,EAAA,MAAA,UAAA,GAAY,QAAE,GAAA,QAAiB,GAAA,SAAA;AAC/B;AACA,EAAA,MAAA,gBAAc,GAAA,IAAA,IAAA;AACd;AACA,IAAA,MAAA,cAAA,GAAA,CAAoB,CAAA,EAAE,YAAA,CAAA,EAAgB,EAAC,UAAA,CAAA,CAAA,CAAA;AACvC,IAAA,MAAA,UAAA,GAAA,QAAuB,EAAA,UAAA,GAAA,cAAiB,CAAA;AACxC,IAAA,IAAA,UAAA,EAAA;MACF,MAAA,KAAA,GAAA,IAAA,CAAA,KAAA,CAAA,GAAA,CAAA,CAAA,MAAA,CAAA,CAAA,GAAA,EAAA,GAAA,KAAA,GAAA,GAAA,GAAA,CAAA,EAAA,UAAA,CAAA;MAEF,IAAA,UAAe,SAAA,EAAA,OAAA,KAAA;;;gBAGH,KAAA,CAAA,GAAA,CAAA,CAAA,MAAc,CAAA,CAAA,GAAQ,EAAA,GAAA,KAAA,GAAA,GAAA,GAAA,CAAA,EAAA,QAAA,CAAA;AAC1B,EAAA,CAAA;;QAEL,YAAI,GAAA;IACP,cAAM,EAAA,gBAAuB,CAAA,gBAAA,CAAA;gBACrB,EAAA,gBAAW,CAAA,cAAA,CAAA;AACX,IAAA,YAAA,EAAA,gBAAgB,CAAA,cAAA,CAAA;eACnB,EAAA,gBAAA,CAAA,aAAA,CAAA;gBAAO,EAAA,gBAAA,CAAA,cAAA,CAAA;AACJ,IAAA,UAAA,EAAA,gBAAc,CAAA,YAAW,CAAA;wBAC5B,EAAA,gBAAA,CAAA,sBAAA,CAAA;AACL,IAAA,qBAAE,EAAA,gBAAA,CAAA,uBAAA,CAAA;IAEF,oBAAA,EAAA,gBAAA,CAAA,sBAAgD;;AAE5C,EAAA,SAAA,CAAA,MAAM;mBACI,EAAA;AACN,MAAA,OAAA,kBAAgB,CAAA,CAAA,IAAQ,CAAA,MAAQ,IAAC;AAC7B,QAAA,aAAA,CAAA,MAAA,CAAa;;AAErB,IAAA;AAEA,EAAA,CAAA,EAAA,EAAA,CAAA;AACA,EAAA,MAAA,eAAY,GAAA,MAAA;AACR,IAAA,IAAA,QAAA,EAAA;AACJ,MAAA,aAAE,EAAA;AACN,IAAA,CAAC,MAAG;MAEJ,YAAA,CAAA,CAAA,SAAA,CAAA;IACA;AACI,EAAA,CAAA;;AAEQ,EAAA,SAAA,CAAA,MAAA;4BACH,GAAA,KAAA,IAAA;AACL,MAAA,MAAE,OAAA,GAAA,QAAA,CAAA,cAAA,CAAA,gBAAA,CAAA;AAEF,MAAA,IAAA,OAAS,IAAA,CAAA,OAAA,CAAA,cAA0B,CAAE,MAAA,CAAA,IAAA,cAAc,EAAA;AACnD,QAAA,aAAY,EAAA;AACR,MAAA;AACJ,IAAA,CAAA;AACJ,IAAA,QAAI,CAAA,gBAAgB,CAAA,WAAgB,EAAA,kBAAA,CAAA;AAEpC,IAAA,aAAQ;AACR,MAAA,wCAAyC,EAAE,kBAAA,CAAA;;AACM,EAAA,CAAA,EAAA,CAAA,gBAAU,aAAA,CAAA,CAAA;AACvD;AACI,EAAA,SAAA,CAAA,MAAM;AACF,IAAA,MAAA,YAAG,GAAI,KAAA,IAAA;AACP,MAAA,IAAA,KAAA,CAAA,GAAA,KAAQ,YAAU,cAAA,EAAA;qBACd;;AAER,IAAA,CAAA;uCAC2B,EAAA,YAAA,CAAe;iBACzC;AAED,MAAA,QAAA,CAAA,mBAAmB,CAAA,SAAA,EAAA,YAAA,CAAA;AACvB,IAAA,CAAA;AACJ,EAAA,CAAA,EAAC,CAAC,cAAA,EAAA,aAAA,CAAA,CAAA;QACF;IAEA,UAAA;IACA,WAAM;cACE;AAEJ,IAAA;uBACe;QACf,eAAC,GAAA,CAAA,SAAA,GAAA,EAAA,KAAA;QAED,CAAA,SAAI,IAAU,MAAG,CAAA,OAAA,CAAA,SAAA,CAAA,EAAA,OAAA,EAAA;oBACN,CAAA;YACV,WAAA,GAAA;QACD,GAAA,IAAK;YACD,EAAA,CAAA,CAAA,IAAO,CAAA;QACX,IAAC,EAAA,UAAA,IAAA,IAAA,CAAA,IAAA,GAAA,UAAA,CAAA,iBAAA,CAAA,IAAA,CAAA,IAAA,CAAA,GAAA;AAED,OAAA;AACJ,MAAE,IAAA,WAAA,CAAA,QAAA,EAAA;QACF,WAAM,CAAA,QAAgB,GAAK,eAEnB,CAAC,WAAA,CAAA,QAAA,CAAA;AACG,MAAA;AACA,MAAA,OAAK,WAAU;AACM,IAAA,CAAA,CAAA;;AAKjC,EAAA,MAAA,eAAM,GAAe;YACb,EAAC,eAAc,CAAA,WAAU;AAAE,GAAA;;AASnC,EAAA,MAAE,iBAAA,GAAA,MAAA;IAEF,IAAA,OAAM,GAAA,CAAA,qDAA4B,CAAA;QAC9B,QACI,eAAK,UAAS;AAuDtB,MAAE,OAAA,IAAA,iBAAA;AAEF,IAAA;AAoCJ,IAAE,IAAA,UAAA,EAAA;AAEF,MAAA,OAAA,kBAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"PerplexSidebar.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAI7C,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAqOjD,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {jsxs,jsx}from'react/jsx-runtime';import React__default,{
|
|
1
|
+
import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useEffect}from'react';import {useTranslation}from'react-i18next';import {getMenuSeparation}from'@admin-layout/client';import {Divider}from'./Divider.js';import {PerplexSidebarMenu}from'./PerplexSidebarMenu.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../../hooks/useMediaQuery.js';import Account from'../GlobalFooter/Account.js';const PerplexSidebar = props => {
|
|
2
2
|
const {
|
|
3
3
|
isSideMenuOpen,
|
|
4
4
|
closeSideMenu,
|
|
@@ -6,15 +6,15 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
|
|
|
6
6
|
collapsed,
|
|
7
7
|
routeParams,
|
|
8
8
|
settings,
|
|
9
|
-
setCollapsed,
|
|
10
9
|
location,
|
|
11
10
|
siderPinned,
|
|
12
11
|
setSiderPinned,
|
|
13
12
|
layoutSettings,
|
|
14
13
|
deviceSettings,
|
|
15
|
-
actor
|
|
14
|
+
actor,
|
|
15
|
+
sideBarMarginTop,
|
|
16
|
+
showHeader
|
|
16
17
|
} = props;
|
|
17
|
-
const [isPagesMenuOpen, setIsPagesMenuOpen] = useState(false);
|
|
18
18
|
const [iconModule, setIconModule] = React__default.useState(null);
|
|
19
19
|
const {
|
|
20
20
|
t,
|
|
@@ -82,7 +82,6 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
|
|
|
82
82
|
};
|
|
83
83
|
}, [isSideMenuOpen, closeSideMenu]);
|
|
84
84
|
const {
|
|
85
|
-
upperMenus,
|
|
86
85
|
middleMenus,
|
|
87
86
|
lowerMenus,
|
|
88
87
|
bottomMenus
|
|
@@ -106,10 +105,16 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
|
|
|
106
105
|
};
|
|
107
106
|
// Use CSS classes instead of theme-based styling
|
|
108
107
|
const getSidebarClasses = () => {
|
|
109
|
-
let classes =
|
|
108
|
+
let classes = `text-gray-500 dark:text-gray-400 h-full flex flex-col`;
|
|
110
109
|
if (settings?.navTheme === 'realDark') {
|
|
111
110
|
classes += ' themed-sidebar';
|
|
112
111
|
}
|
|
112
|
+
if (showHeader) {
|
|
113
|
+
classes += ' md:h-[92vh]';
|
|
114
|
+
}
|
|
115
|
+
if (!showHeader) {
|
|
116
|
+
classes += ' md:h-[100vh]';
|
|
117
|
+
}
|
|
113
118
|
return classes;
|
|
114
119
|
};
|
|
115
120
|
const SidebarStyles = React__default.useMemo(() => ({
|
|
@@ -159,18 +164,10 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useEffe
|
|
|
159
164
|
actor: actor,
|
|
160
165
|
deviceSettings: deviceSettings
|
|
161
166
|
})]
|
|
162
|
-
}), jsx("div", {
|
|
163
|
-
className: "p-4",
|
|
164
|
-
children: deviceLayout?.navigationMode === 'sidebar' && jsx(RightContent, {
|
|
165
|
-
upperMenus: upperMenus,
|
|
166
|
-
collapsed: collapsed,
|
|
167
|
-
routeParams: routeParams,
|
|
168
|
-
settings: settings
|
|
169
|
-
})
|
|
170
167
|
})]
|
|
171
168
|
}), jsx("div", {
|
|
172
169
|
className: "flex-shrink-0 p-4 border-t border-border",
|
|
173
|
-
children: jsx(
|
|
170
|
+
children: jsx(Account, {
|
|
174
171
|
menus: bottomMenusData,
|
|
175
172
|
collapsed: collapsed,
|
|
176
173
|
routeParams: routeParams,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PerplexSidebar.js","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebar.tsx"],"sourcesContent":[null],"names":["React"],"mappings":"
|
|
1
|
+
{"version":3,"file":"PerplexSidebar.js","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebar.tsx"],"sourcesContent":[null],"names":["React"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PerplexSidebarMenu.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebarMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"PerplexSidebarMenu.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebarMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAgazD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useRef
|
|
1
|
+
import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useRef}from'react';import {useSelector}from'@xstate/react';import {useLocation,Link}from'@remix-run/react';import {generateMenuPath}from'@admin-layout/client';import {icons}from'../../../icons.js';const PerplexSidebarMenu = ({
|
|
2
2
|
menuData,
|
|
3
3
|
routeParams,
|
|
4
4
|
settings,
|
|
@@ -16,7 +16,6 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useRef,
|
|
|
16
16
|
height: 0
|
|
17
17
|
});
|
|
18
18
|
const [menuTransition, setMenuTransition] = useState('opening');
|
|
19
|
-
const [headerOffset, setHeaderOffset] = useState(0);
|
|
20
19
|
const [flyoutVisible, setFlyoutVisible] = useState(false);
|
|
21
20
|
const hoverCloseTimeout = React__default.useRef(null);
|
|
22
21
|
const hoverOpenTimeout = React__default.useRef(null);
|
|
@@ -110,7 +109,7 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useRef,
|
|
|
110
109
|
// If a different top-level item is hovered while pinned, update pinnedPath
|
|
111
110
|
if (depth === 0 && pinnedPath) {
|
|
112
111
|
actor?.send({
|
|
113
|
-
type: '
|
|
112
|
+
type: 'UISETTING_UPDATE',
|
|
114
113
|
value: {
|
|
115
114
|
'sidebar.pinnedPath': item.path
|
|
116
115
|
}
|
|
@@ -145,23 +144,12 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useRef,
|
|
|
145
144
|
}, 300); // Extended delay to give more time to move between items
|
|
146
145
|
}
|
|
147
146
|
};
|
|
148
|
-
// Measure global header height so the rail starts below it
|
|
149
|
-
useEffect(() => {
|
|
150
|
-
const computeHeaderOffset = () => {
|
|
151
|
-
const headerEl = document.querySelector('header');
|
|
152
|
-
const measured = headerEl ? headerEl.getBoundingClientRect().height : 0;
|
|
153
|
-
setHeaderOffset(measured || 0);
|
|
154
|
-
};
|
|
155
|
-
computeHeaderOffset();
|
|
156
|
-
window.addEventListener('resize', computeHeaderOffset);
|
|
157
|
-
return () => window.removeEventListener('resize', computeHeaderOffset);
|
|
158
|
-
}, []);
|
|
159
147
|
const toggleSiderPinned = (e, path) => {
|
|
160
148
|
e.preventDefault();
|
|
161
149
|
e.stopPropagation();
|
|
162
150
|
const nextPinned = pinnedPath === path ? null : path;
|
|
163
151
|
actor?.send({
|
|
164
|
-
type: '
|
|
152
|
+
type: 'UISETTING_UPDATE',
|
|
165
153
|
value: {
|
|
166
154
|
'sidebar.pinnedPath': nextPinned
|
|
167
155
|
}
|
|
@@ -199,8 +187,8 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useRef,
|
|
|
199
187
|
className: `fixed border border-border z-[999] overflow-hidden bg-background menu-${menuTransition}`,
|
|
200
188
|
style: {
|
|
201
189
|
left: `${sidebarWidth}px`,
|
|
202
|
-
top: !showHeader ? '0px' :
|
|
203
|
-
height: !showHeader ? '100vh' :
|
|
190
|
+
top: !showHeader ? '0px' : '5rem',
|
|
191
|
+
height: !showHeader ? '100vh' : 'calc(100vh - 5rem)',
|
|
204
192
|
width: '228px',
|
|
205
193
|
maxWidth: 'calc(100vw - 100px)',
|
|
206
194
|
pointerEvents: menuTransition === 'closing' ? 'none' : 'auto'
|
|
@@ -263,7 +251,7 @@ import {jsxs,jsx}from'react/jsx-runtime';import React__default,{useState,useRef,
|
|
|
263
251
|
}), jsx("div", {
|
|
264
252
|
className: "overflow-y-auto overflow-x-hidden py-1",
|
|
265
253
|
style: {
|
|
266
|
-
height: !showHeader ? 'calc(100vh - 44px)' :
|
|
254
|
+
height: !showHeader ? 'calc(100vh - 44px)' : 'calc(100vh - 5rem - 44px)'
|
|
267
255
|
},
|
|
268
256
|
children: item.children?.map(child => jsx("div", {
|
|
269
257
|
className: "w-full min-w-max",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PerplexSidebarMenu.js","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebarMenu.tsx"],"sourcesContent":[null],"names":["React","_jsxs","_jsx"],"mappings":"
|
|
1
|
+
{"version":3,"file":"PerplexSidebarMenu.js","sources":["../../../../src/components/Layout/Sidebar/PerplexSidebarMenu.tsx"],"sourcesContent":[null],"names":["React","_jsxs","_jsx"],"mappings":"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"}
|
|
@@ -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;AA4HvF,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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout/client';import {TailwindThemeProvider}from'@admin-layout/tailwind-ui';import {userSelector}from'@adminide-stack/user-auth0-client';import {useRouteLoaderData}from'@remix-run/react';import {useMachine}from'@xstate/react';import React__default,{useMemo,useCallback}from'react';import {connect,useSelector}from'react-redux';import {settingsMachine}from'../../machines/settingsMachine.js';import {BasicLayout}from'./BasicLayout/index.js';function BasicLayoutWithAuthorities(props) {
|
|
1
|
+
import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout/client';import {TailwindThemeProvider}from'@admin-layout/tailwind-ui';import {userSelector}from'@adminide-stack/user-auth0-client';import {useLocation,useRouteLoaderData}from'@remix-run/react';import {useMachine}from'@xstate/react';import React__default,{useMemo,useCallback}from'react';import {connect,useSelector}from'react-redux';import {settingsMachine}from'../../machines/settingsMachine.js';import {BasicLayout}from'./BasicLayout/index.js';function BasicLayoutWithAuthorities(props) {
|
|
2
2
|
const userData = useSelector(userSelector);
|
|
3
|
+
const location = useLocation();
|
|
3
4
|
const {
|
|
4
5
|
settings: settingsFromLoader
|
|
5
6
|
} = useRouteLoaderData('root');
|
|
@@ -19,32 +20,59 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
19
20
|
reduxShowSettingPanel: reduxSettings?.showSettingPanel,
|
|
20
21
|
usingSettings: initialSettings ? 'provided' : 'none',
|
|
21
22
|
initialSettingsKeys: initialSettings ? Object.keys(initialSettings) : [],
|
|
22
|
-
initialShowSettingPanel: initialSettings?.showSettingPanel
|
|
23
|
+
initialShowSettingPanel: initialSettings?.showSettingPanel,
|
|
24
|
+
hasUilayoutInLoader: !!settingsFromLoader?.uilayout,
|
|
25
|
+
hasUilayoutInRedux: !!reduxSettings?.uilayout
|
|
23
26
|
});
|
|
27
|
+
// Log the actual keys when count is 42 (after settings panel update)
|
|
28
|
+
if (reduxSettings && Object.keys(reduxSettings).length > 20) {
|
|
29
|
+
console.log('🚨 Redux has too many keys (42):', Object.keys(reduxSettings));
|
|
30
|
+
console.log('🚨 Redux settings structure:', reduxSettings);
|
|
31
|
+
}
|
|
24
32
|
const [state, send, settingsActor] = useMachine(settingsMachine.provide({
|
|
25
33
|
actions: {
|
|
26
34
|
updateReduxSettings: ({
|
|
27
35
|
context,
|
|
28
36
|
event
|
|
29
37
|
}) => {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
38
|
+
console.log('🔥 updateReduxSettings called:', {
|
|
39
|
+
eventType: event?.type,
|
|
40
|
+
contextKeys: context ? Object.keys(context).slice(0, 15) : [],
|
|
41
|
+
hasUilayout: !!context?.uilayout,
|
|
42
|
+
logo: context?.logo,
|
|
43
|
+
navTheme: context?.navTheme
|
|
44
|
+
});
|
|
45
|
+
// Filter out machine internal properties before sending to Redux
|
|
46
|
+
const {
|
|
47
|
+
configModel,
|
|
48
|
+
deviceType,
|
|
49
|
+
currentRoute,
|
|
50
|
+
changedSettings,
|
|
51
|
+
...settingsOnly
|
|
52
|
+
} = context;
|
|
53
|
+
console.log('🔥 Sending to Redux setSettings:', {
|
|
54
|
+
originalKeys: context ? Object.keys(context).slice(0, 15) : [],
|
|
55
|
+
filteredKeys: Object.keys(settingsOnly).slice(0, 15),
|
|
56
|
+
hasConfigModel: !!settingsOnly.configModel,
|
|
57
|
+
settingsOnly: settingsOnly
|
|
58
|
+
});
|
|
59
|
+
setSettings(settingsOnly);
|
|
34
60
|
}
|
|
35
61
|
}
|
|
36
62
|
}), {
|
|
37
63
|
input: {
|
|
38
|
-
settings: initialSettings
|
|
64
|
+
settings: initialSettings,
|
|
65
|
+
currentRoute: location.pathname
|
|
39
66
|
}
|
|
40
67
|
});
|
|
41
68
|
const settingXstate = state?.context;
|
|
42
69
|
console.log('🔧 XState Context after initialization:', {
|
|
43
70
|
showSettingPanel: settingXstate?.showSettingPanel,
|
|
44
71
|
hasAllKeys: !!settingXstate,
|
|
45
|
-
contextKeys: settingXstate ? Object.keys(settingXstate).slice(0,
|
|
72
|
+
contextKeys: settingXstate ? Object.keys(settingXstate).slice(0, 15) : [],
|
|
46
73
|
navTheme: settingXstate?.navTheme,
|
|
47
|
-
primaryColor: settingXstate?.primaryColor
|
|
74
|
+
primaryColor: settingXstate?.primaryColor,
|
|
75
|
+
hasUilayout: !!settingXstate?.uilayout
|
|
48
76
|
});
|
|
49
77
|
const {
|
|
50
78
|
permissions
|
|
@@ -62,8 +90,8 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
62
90
|
orgName
|
|
63
91
|
} = {}
|
|
64
92
|
} = props;
|
|
65
|
-
// Use
|
|
66
|
-
const mergedSettings = settingXstate
|
|
93
|
+
// Use base settings directly (overrides are already applied to the context)
|
|
94
|
+
const mergedSettings = settingXstate;
|
|
67
95
|
return jsx(TailwindThemeProvider, {
|
|
68
96
|
settings: mergedSettings,
|
|
69
97
|
actor: settingsActor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TailwindLayout.js","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Logo.d.ts","sourceRoot":"","sources":["../../../../src/components/Layout/slot-fill/Logo.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAE/C,eAAO,MAAM,QAAQ,GAAI,UAAK,4CAE7B,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,UAAK,4CAE7B,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import {jsx}from'react/jsx-runtime';import {Slot}from'@common-stack/components-pro';const LOGO_SLOT_FILL_NAME = 'logo-fill';
|
|
2
|
+
const LogoSlot = props => {
|
|
3
|
+
return jsx(Slot, {
|
|
4
|
+
name: LOGO_SLOT_FILL_NAME,
|
|
5
|
+
fillProps: props
|
|
6
|
+
});
|
|
7
|
+
};export{LOGO_SLOT_FILL_NAME,LogoSlot};//# sourceMappingURL=Logo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Logo.js","sources":["../../../../src/components/Layout/slot-fill/Logo.tsx"],"sourcesContent":[null],"names":["_jsx"],"mappings":"oFAEO,MAAM,mBAAmB,GAAG;AAE5B,MAAM,QAAQ,GAAG,KAAC,IAAO;SAC5BA,GAAO,CAAA,IAAC,EAAI;AAChB,IAAE,IAAA,EAAA,mBAAA;AAEF,IAAA,SAAa,EAAA;IACT;AACJ"}
|
|
@@ -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;AAwD9C,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,mBAAmB,2CAuC/D"}
|
|
@@ -1,4 +1,4 @@
|
|
|
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 = [{
|
|
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';import {getSettingValue}from'../../utils/settingsUtils.js';const themelist = [{
|
|
2
2
|
key: 'light',
|
|
3
3
|
title: 'Light',
|
|
4
4
|
svg: jsxs("svg", {
|
|
@@ -102,24 +102,8 @@ function CheckBoxTheme(props) {
|
|
|
102
102
|
} = useMediaQuery();
|
|
103
103
|
const currentRoute = location?.pathname || '/';
|
|
104
104
|
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
105
|
-
//
|
|
106
|
-
const
|
|
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
|
-
};
|
|
105
|
+
// Use getSettingValue to get the correct navTheme based on applyToAllRoutes
|
|
106
|
+
const navThemeValue = getSettingValue(settings, 'navTheme', applyToAllRoutes, currentRoute, deviceType, 'light');
|
|
123
107
|
return jsx("div", {
|
|
124
108
|
className: "flex flex-row gap-4",
|
|
125
109
|
children: themelist.map((themeItems, index) => {
|
|
@@ -133,7 +117,7 @@ function CheckBoxTheme(props) {
|
|
|
133
117
|
changeSetting('primaryColor', settings?.primaryColor);
|
|
134
118
|
},
|
|
135
119
|
children: jsxs("div", {
|
|
136
|
-
children: [themeItems.svg,
|
|
120
|
+
children: [themeItems.svg, navThemeValue === themeItems.key && jsx("svg", {
|
|
137
121
|
className: "absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-6 h-6 text-blue-500",
|
|
138
122
|
viewBox: "0 0 24 24",
|
|
139
123
|
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":"kQAKA,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;AACA,KAAA,CAAA,EAAAA;AACA,MAAA,CAAA,EAAA,GACI;AAEQ,MAAA,CAAA,EAAA,GAAA;AAMY,MAAA,KAAA,EAAA,IAAA;AACA,MAAA,MAAA,EAAA,IAAA;AACJ,MAAA,EAAA,EAAA,GAAA;UAiBV,EAAA,SAER;AACN,MAAC,MAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"InvitationSettings.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/InvitationSettings.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAI/C,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,KAAK,EAAE,oBAAoB,GAAG,GAAG,2CAsE3E"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {jsxs,jsx}from'react/jsx-runtime';import {useTranslation}from'react-i18next';import {Switch}from'./Switch/index.js';import'
|
|
1
|
+
import {jsxs,jsx}from'react/jsx-runtime';import*as React from'react';import {useTranslation}from'react-i18next';import {Switch}from'./Switch/index.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../hooks/useMediaQuery.js';import {getSettingValue}from'../../utils/settingsUtils.js';function InvitationSettings(props) {
|
|
2
2
|
const {
|
|
3
3
|
settings,
|
|
4
4
|
changeSetting,
|
|
@@ -13,21 +13,10 @@ import {jsxs,jsx}from'react/jsx-runtime';import {useTranslation}from'react-i18ne
|
|
|
13
13
|
} = useMediaQuery();
|
|
14
14
|
const currentRoute = location?.pathname || '/';
|
|
15
15
|
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
16
|
-
// Get organization invitations
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
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
|
-
}
|
|
16
|
+
// Get organization invitations using the utility function
|
|
17
|
+
const invitations = React.useMemo(() => {
|
|
18
|
+
return getSettingValue(settings, 'organization.members.invitations', applyToAllRoutes, currentRoute, deviceType, {});
|
|
19
|
+
}, [settings, applyToAllRoutes, currentRoute, deviceType]);
|
|
31
20
|
const handleInvitationChange = (key, value) => {
|
|
32
21
|
if (!changeSetting) return;
|
|
33
22
|
const newInvitations = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InvitationSettings.js","sources":["../../../src/components/SettingDrawer/InvitationSettings.tsx"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"InvitationSettings.js","sources":["../../../src/components/SettingDrawer/InvitationSettings.tsx"],"sourcesContent":[null],"names":[],"mappings":"kWAOc,SAAU,kBAAkB,CAAC,KAAiC,EAAA;AACxE,EAAA,MAAA;IACA,QAAQ;AACR,IAAA,aAAQ;AACR,IAAA;IACA,gBAAgB,GAAG;MAEnB,KAAA;AACA,EAAA,MAAA;AACI,IAAA;MAQH,cAAa,CAAA,UAAA,CAAA;AAEd,EAAA,MAAA;AACI,IAAA;mBAA2B,EAAA;AAC3B,EAAA,MAAA,uBAAuB,EAAA,QAAA,IAAA,GAAA;AACnB,EAAA,MAAA,UAAG,GAAA,QAAW,GAAA,QAAA,GAAA,SAAA;;mBAEhB,GAAA,KAAA,CAAA,OAAA,CAAA,MAAA;AAEF,IAAA,OAAA,eAAc,CAAA,QAAA,EAAA,kCAAoC,EAAe,gBAAC,EAAA,YAAA,EAAA,UAAA,EAAA,EAAA,CAAA;AACtE,EAAA,CAAA,EAAC,CAAC,QAAA,EAAA,gBAAA,EAAA,YAAA,EAAA,UAAA,CAAA,CAAA;AAEF,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,2CAwIrE"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {jsxs,jsx,Fragment}from'react/jsx-runtime';import {useMemo}from'react';import {useTranslation}from'react-i18next';import {Switch}from'./Switch/index.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../hooks/useMediaQuery.js';import {
|
|
1
|
+
import {jsxs,jsx,Fragment}from'react/jsx-runtime';import {useMemo}from'react';import {useTranslation}from'react-i18next';import {Switch}from'./Switch/index.js';import'@react-icons/all-files/fa/FaMoon.js';import'@react-icons/all-files/fa/FaSun.js';import {useMediaQuery}from'../../hooks/useMediaQuery.js';import {getSettingValue}from'../../utils/settingsUtils.js';function LayoutChange(props) {
|
|
2
2
|
const {
|
|
3
3
|
settings,
|
|
4
4
|
changeSetting,
|
|
@@ -16,51 +16,19 @@ import {jsxs,jsx,Fragment}from'react/jsx-runtime';import {useMemo}from'react';im
|
|
|
16
16
|
navTheme
|
|
17
17
|
} = settings || {};
|
|
18
18
|
const deviceType = isMobile ? 'mobile' : 'desktop';
|
|
19
|
-
//
|
|
20
|
-
const getConfigValue$1 = (configKey, defaultValue) => {
|
|
21
|
-
// If applyToAllRoutes is true, use global settings only
|
|
22
|
-
if (applyToAllRoutes) {
|
|
23
|
-
return getConfigValue(settings, configKey, {}, defaultValue);
|
|
24
|
-
}
|
|
25
|
-
// Otherwise, check for route-specific overrides first
|
|
26
|
-
if (settings?.uiSettings?.overrides) {
|
|
27
|
-
const contextKey = `[${currentRoute}][${deviceType}]`;
|
|
28
|
-
const overrideSettings = settings.uiSettings.overrides[contextKey];
|
|
29
|
-
if (overrideSettings) {
|
|
30
|
-
// Handle the uilayout wrapper in override structure
|
|
31
|
-
const overrideData = overrideSettings.uilayout || overrideSettings;
|
|
32
|
-
const value = getNestedValue(overrideData, configKey);
|
|
33
|
-
if (value !== undefined) {
|
|
34
|
-
return value;
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
// Fallback to regular settings
|
|
39
|
-
return getConfigValue(settings, configKey, {
|
|
40
|
-
route: currentRoute,
|
|
41
|
-
device: deviceType
|
|
42
|
-
}, defaultValue);
|
|
43
|
-
};
|
|
44
|
-
// Get layout values using override system
|
|
19
|
+
// Get layout values using the utility function
|
|
45
20
|
const layoutValues = useMemo(() => ({
|
|
46
|
-
fixedHeader:
|
|
47
|
-
fixedSidebar:
|
|
48
|
-
splitMenus:
|
|
49
|
-
upperMenuDividerName:
|
|
50
|
-
middleMenuDividerName:
|
|
51
|
-
lowerMenuDividerName:
|
|
52
|
-
}), [settings, currentRoute, deviceType]);
|
|
21
|
+
fixedHeader: getSettingValue(settings, 'fixedHeader', applyToAllRoutes, currentRoute, deviceType, true),
|
|
22
|
+
fixedSidebar: getSettingValue(settings, 'fixedSidebar', applyToAllRoutes, currentRoute, deviceType, true),
|
|
23
|
+
splitMenus: getSettingValue(settings, 'splitMenus', applyToAllRoutes, currentRoute, deviceType, false),
|
|
24
|
+
upperMenuDividerName: getSettingValue(settings, 'upperMenuDividerName', applyToAllRoutes, currentRoute, deviceType, 'Navigation'),
|
|
25
|
+
middleMenuDividerName: getSettingValue(settings, 'middleMenuDividerName', applyToAllRoutes, currentRoute, deviceType, 'Dashboard'),
|
|
26
|
+
lowerMenuDividerName: getSettingValue(settings, 'lowerMenuDividerName', applyToAllRoutes, currentRoute, deviceType, 'Admin')
|
|
27
|
+
}), [settings, applyToAllRoutes, currentRoute, deviceType]);
|
|
53
28
|
const handleLayoutChange = (key, value) => {
|
|
54
29
|
if (!changeSetting) return;
|
|
55
|
-
//
|
|
56
|
-
|
|
57
|
-
route: currentRoute,
|
|
58
|
-
device: deviceType
|
|
59
|
-
};
|
|
60
|
-
// Use setConfigOverride to get the properly formatted key
|
|
61
|
-
const override = setConfigOverride(key, value, context);
|
|
62
|
-
// Send the flat key with override identifier to the backend
|
|
63
|
-
changeSetting(`${override.contextKey}.${override.path}`, value);
|
|
30
|
+
// Pass simple key - handleSettingChange in SettingDrawer will decide if it's global or route-specific
|
|
31
|
+
changeSetting(key, value);
|
|
64
32
|
};
|
|
65
33
|
const textColor = {
|
|
66
34
|
color: navTheme === 'dark' ? '#ffff' : 'black'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LayoutChange.js","sources":["../../../src/components/SettingDrawer/LayoutChange.tsx"],"sourcesContent":[null],"names":[
|
|
1
|
+
{"version":3,"file":"LayoutChange.js","sources":["../../../src/components/SettingDrawer/LayoutChange.tsx"],"sourcesContent":[null],"names":[],"mappings":"2WAQc,SAAU,YAAY,CAAC,KAAiC,EAAA;AAClE,EAAA,MAAA;IACA,QAAQ;AACR,IAAA,aAAQ;AACR,IAAA;AACA,IAAA,gBAAgB;AAChB,GAAA,GAAA,KAAM;QAEN;AACA,IAAA;AAEQ,GAAA,GAAA,cAAW,CAAE,UAAA,CAAA;AACb,EAAA,MAAA;AACA,IAAA;AACA,GAAA,GAAA,aAAA,EAAA;AAQA,EAAA,MAAA,YAAA,GAAA,QAAuB,EAAA,QAAA,IAAA,GACnB;AAOJ,EAAA,MAAA;;AAYR,GAAA,GAAA;AACI,EAAA,MAAA,UAAK,GAAA,QAAa,GAAA,QAAA,GAAA,SAAA;;QAClB,YAAA,GAAA,OAAA,CAAA,OAAA;AACA,IAAA,WAAA,EAAA,eAAwB,CAAC,QAAC,EAAA,aAAA,EAAA,gBAAA,EAAA,YAAA,EAAA,UAAA,EAAA,IAAA,CAAA;AAC9B,IAAA,YAAE,EAAA,eAAA,CAAA,QAAA,EAAA,cAAA,EAAA,gBAAA,EAAA,YAAA,EAAA,UAAA,EAAA,IAAA,CAAA;AAEF,IAAA,2BAA2B,SAAQ,EAAA,YAAc,EAAA,gBAAmB,EAAC,YAAA,EAAA,UAAA,EAAA,KAAA,CAAA;IAErE,oBACI,EAAA,eACI,CAAA,QAAA,EAAA,wCAAuC,EAAA,YACnC,EAAA,UAAG,EAAA,YAAiB;mDAgDA,EAAA,yCAA6C,EAAO,YAAO,EAAA,UAAA,EAAA,WAAA,CAAA;AAC/D,IAAA,oBAAA,EAAA,eAAC,SAGT,wBAAc,EAAC,gBAAe,EAAA,YAC1B,EAAA,UAAA,EAAO;+CAQC,EAAA,UAAA,CAAA,CAAA;AACJ,EAAA,MAAA,kBAAA,GAAA,CAAA,GAAA,EAAA,KAAA,KACF;;AAYE;AAQhC,IAAC,aAAA,CAAA,GAAA,EAAA,KAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NavigationsModes.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/NavigationsModes.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAgG/C,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACpC,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,gBAAwB,GAC3B,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"NavigationsModes.d.ts","sourceRoot":"","sources":["../../../src/components/SettingDrawer/NavigationsModes.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAgG/C,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EACpC,aAAa,EACb,QAAQ,EACR,QAAQ,EACR,gBAAwB,GAC3B,EAAE,oBAAoB,2CA+FtB"}
|