@admin-layout/tailwind-design-pro 10.0.9-alpha.46 → 10.0.9-alpha.47
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.
|
@@ -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;AAE3E,OAAO,
|
|
1
|
+
{"version":3,"file":"TailwindLayout.d.ts","sourceRoot":"","sources":["../../../src/components/Layout/TailwindLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,sBAAsB,CAAC;AAE3E,OAAO,KAAwD,MAAM,OAAO,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAwB,MAAM,aAAa,CAAC;AAkFvF,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,10 +1,9 @@
|
|
|
1
|
-
import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout/client';import {userSelector}from'@adminide-stack/user-auth0-client';import React__default,{useMemo}from'react';import {connect,useSelector}from'react-redux';import {BasicLayout}from'./BasicLayout/index.js';import {settingsMachine}from'../../machines/settingsMachine.js';import {createActor}from'xstate';import {useSelector as useSelector$1}from'@xstate/react';import {ThemeProviderTailwind}from'../ThemeProvider/ThemeProvider.js';function BasicLayoutWithAuthorities(props) {
|
|
1
|
+
import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout/client';import {userSelector}from'@adminide-stack/user-auth0-client';import React__default,{useRef,useEffect,useMemo,useCallback}from'react';import {connect,useSelector}from'react-redux';import {BasicLayout}from'./BasicLayout/index.js';import {settingsMachine}from'../../machines/settingsMachine.js';import {createActor}from'xstate';import {useSelector as useSelector$1}from'@xstate/react';import {ThemeProviderTailwind}from'../ThemeProvider/ThemeProvider.js';import {isEqual}from'lodash-es';function BasicLayoutWithAuthorities(props) {
|
|
2
2
|
const userData = useSelector(userSelector);
|
|
3
3
|
const {
|
|
4
4
|
settings,
|
|
5
5
|
setSettings
|
|
6
6
|
} = useLayoutSettings();
|
|
7
|
-
// const { authenticated, user } = isUserAuthenticated();
|
|
8
7
|
const settingsActor = createActor(settingsMachine, {
|
|
9
8
|
systemId: 'settings'
|
|
10
9
|
}).start();
|
|
@@ -13,14 +12,30 @@ import {jsx}from'react/jsx-runtime';import {useLayoutSettings}from'@admin-layout
|
|
|
13
12
|
const {
|
|
14
13
|
permissions
|
|
15
14
|
} = props;
|
|
15
|
+
// Track the last settings we processed to avoid loops
|
|
16
|
+
const lastProcessedSettingsRef = useRef(settings);
|
|
17
|
+
// Monitor external settings changes and update xstate context
|
|
18
|
+
useEffect(() => {
|
|
19
|
+
// Skip initial render
|
|
20
|
+
if (!settings) return;
|
|
21
|
+
// Skip if this is the same settings object we just processed
|
|
22
|
+
if (isEqual(settings, lastProcessedSettingsRef.current)) return;
|
|
23
|
+
// Update our reference to prevent processing the same settings again
|
|
24
|
+
lastProcessedSettingsRef.current = settings;
|
|
25
|
+
// Update the xstate context with the new settings
|
|
26
|
+
settingsActor.send({
|
|
27
|
+
type: 'UPDATE',
|
|
28
|
+
value: settings
|
|
29
|
+
});
|
|
30
|
+
}, [settings, settingsActor]);
|
|
16
31
|
const mainHeaderProps = useMemo(() => ({
|
|
17
32
|
picture: userData ? userData?.profile?.picture : null
|
|
18
33
|
}), [userData]);
|
|
19
|
-
const onSettingChange = config => {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
};
|
|
34
|
+
const onSettingChange = useCallback(config => {
|
|
35
|
+
// Just update the settings through the normal channel
|
|
36
|
+
// Our useEffect will detect this change and update xstate
|
|
37
|
+
setSettings(config);
|
|
38
|
+
}, [setSettings]);
|
|
24
39
|
//@ts-ignore
|
|
25
40
|
const {
|
|
26
41
|
routeParams: {
|
|
@@ -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":["useXstateSelector","_jsx"],"mappings":"6jBAWA,SAAS,0BAA0B,CAAC,KAAgF,EAAA;AAChH,EAAA,MAAA,WAAiB,WAAA,CAAA,YAAY,CAAA;QACvB;AAEN,IAAA,QAAmB;AACf,IAAA;MACF,iBAAS,EAAA;AAEX,EAAA,MAAA,aAA+B,GAAA,WAAA,CAAC,eAAe,EAAC;AAChD,IAAA,QAAmB,EAAA;AACnB,GAAA,CAAA,CAAA,KAAM,EAAE;QAE8C,KAAA,GAAAA,aAAA,CAAA,aAAA,EAAA,KAAA,IAAA,KAAA,CAAA;AACtD,EAAA,MAAA,8BAAiC;QAE6B;IAC9D;WAC0B;AACtB;gCAAsB,GAAA,MAAA,CAAA,QAAA,CAAA;;AAGtB,EAAA,SAAA,CAAI;;QAEJ,CAAqE,QAAA,EAAA;AACrE;QAEA,OAAkD,CAAA,QAAA,EAAA,wBAAA,CAAA,OAAA,CAAA,EAAA;;AAE9C,IAAA,wBAAc,CAAA,OAAA,GAAA,QAAA;AACd;AACH,IAAA,aAAE,CAAA,IAAA,CAAA;AACP,UAAI,EAAA,QAAuB;AAE3B,MAAA;AAEQ,KAAA,CAAA;AACH,GAAA,EAAA,CAAC,QACO,EAAA,aACX,CAAA,CAAA;AAEF,EAAA,MAAA,kBAAwB,OAAA,CAAA,OACnB;WACyD,EAAA,QAAA,GAAA,QAAA,EAAA,OAAA,EAAA,OAAA,GAAA;eACI,CAAA,CAAA;QAC1D,eAAkB,GAAA,WAAE,CAAA,MAAA,IAAA;AACxB;;IAKJ,WAAmB,CAAA,MAAA,CAAA;AAEnB,GAAA,EAAA,CAAA,WACK,CAAA,CAAA;AAYT;AAEA,EAAM,MAAA;IACF,WAAQ,EAAA;MACA;AACX,KAAE,GAAA;AAMH,GAAA,GAAM;AAIN,EAAM,OAAAC,GAAA,CAAA,qBAGF,EAAS;AAEb,IAAA,QAAA,EAAA;;;;;;;;;;;;;;;;;;;;"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@admin-layout/tailwind-design-pro",
|
|
3
|
-
"version": "10.0.9-alpha.
|
|
3
|
+
"version": "10.0.9-alpha.47",
|
|
4
4
|
"description": "Sample core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
},
|
|
61
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "dfc20e5f7bfd2e4f1e2d57442076baf14cacb2b3",
|
|
62
62
|
"typescript": {
|
|
63
63
|
"definition": "lib/index.d.ts"
|
|
64
64
|
}
|