@admin-layout/client 10.1.1-alpha.11 → 10.1.1-alpha.14

package/lib/components/LayoutCookieProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LayoutCookieProvider.d.ts","sourceRoot":"","sources":["../../src/components/LayoutCookieProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAA0B,MAAM,OAAO,CAAC;AAK/C,UAAU,yBAAyB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,KAAK,CAAC,YAAY,CAkBhG"}
+{"version":3,"file":"LayoutCookieProvider.d.ts","sourceRoot":"","sources":["../../src/components/LayoutCookieProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,UAAU,yBAAyB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC7B;AAED,wBAAgB,oBAAoB,CAAC,EAAE,QAAQ,EAAE,EAAE,yBAAyB,GAAG,KAAK,CAAC,YAAY,CA0BhG"}

package/lib/components/LayoutCookieProvider.js

@@ -1,16 +1,24 @@
-import {jsx,Fragment}from'react/jsx-runtime';import {useLoaderData}from'@remix-run/react';import {useLayoutEffect}from'react';import {useDispatch}from'react-redux';import {CHANGE_SETTINGS_ACTION}from'../constants/constants.js';function LayoutCookieProvider({ children }) {
+import {jsx,Fragment}from'react/jsx-runtime';import {useLoaderData}from'@remix-run/react';import {useRef,useEffect}from'react';import {useDispatch}from'react-redux';import {CHANGE_SETTINGS_ACTION}from'../constants/constants.js';function LayoutCookieProvider({ children }) {
     const { settings } = useLoaderData();
     const dispatch = useDispatch();
-    const changeSettings = () => {
-        if (settings) {
+    const hasDispatched = useRef(false);
+    // Handle both server and client side
+    useEffect(() => {
+        if (settings && !hasDispatched.current) {
             dispatch({
                 type: CHANGE_SETTINGS_ACTION,
                 payload: settings,
             });
+            hasDispatched.current = true;
         }
-    };
-    useLayoutEffect(() => {
-        changeSettings();
     }, [settings, dispatch]);
+    // Initial server-side dispatch
+    if (typeof window === 'undefined' && settings && !hasDispatched.current) {
+        dispatch({
+            type: CHANGE_SETTINGS_ACTION,
+            payload: settings,
+        });
+        hasDispatched.current = true;
+    }
     return jsx(Fragment, { children: children });
 }export{LayoutCookieProvider};//# sourceMappingURL=LayoutCookieProvider.js.map

package/lib/components/LayoutCookieProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"LayoutCookieProvider.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;"}
+{"version":3,"file":"LayoutCookieProvider.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/UpdateSettings/UpdateSettings.server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAY/C,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC;IACjF,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CA6BD;AAED,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,oEA8B7D,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE;;GAkB7D,CAAC"}
+{"version":3,"file":"UpdateSettings.server.d.ts","sourceRoot":"","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAY/C,wBAAsB,kBAAkB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC;IACjF,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC,CA6BD;AAED,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,oEAkC7D,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,aAAa;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE;;GAkB7D,CAAC"}

package/lib/components/UpdateSettings/UpdateSettings.server.js

@@ -36,18 +36,21 @@ const action = async ({ request }) => {
     try {
         const jsonData = await request.json();
         const payload = jsonData?.config || {};
+        assignDefaults(payload, defaultSettings);
         const cookieHeader = request.headers.get('Cookie');
         let existingSettings;
+        let mergedSettings;
         try {
             existingSettings = await settingsCookie.parse(cookieHeader);
-            assignDefaults(merge({}, payload, existingSettings), defaultSettings);
+            mergedSettings = merge({}, existingSettings, payload);
+            assignDefaults(mergedSettings, defaultSettings);
         }
         catch (error) {
             console.error('Error parsing settings cookie in action:', error);
             existingSettings = null;
         }
         // Merge everything together
-        const fullSettings = merge({}, defaultSettings, config.LAYOUT_SETTINGS, existingSettings || {}, payload);
+        const fullSettings = merge({}, config.LAYOUT_SETTINGS, mergedSettings);
         // Store only differences from default
         const diffSettings = await compareAndSaveSettingsDifferences(fullSettings, defaultSettings);
         // Create a new cookie with the diff settings

package/lib/components/UpdateSettings/UpdateSettings.server.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"uYAiBa,iBAAS,YAAA,CAAA,UAAA,EAAA;AACrB,IA6BA,MAAA,EAAA,EAAA,GAAA,EAAA,GAAA,EAAA,GAAA,EAAA;AAED,IAAO,QAAA,EAAA,KAAA;IAAqC,QAAO;AAAW,IAAA,IAAA,EAAA,GAAA;AAgC9D,IAAO,MAAA,EAAA,MAAA,CAAA,MAAY,GAAA,MAAuB,CAAA,UAAA,GAAA,SAAA;;AAAoB,eAAA,kBAAA,CAAA,EAAA,OAAA,EAAA,EAAA;;IAkB5D,IAAA,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"UpdateSettings.server.js","sources":["../../../src/components/UpdateSettings/UpdateSettings.server.ts"],"sourcesContent":[null],"names":[],"mappings":"uYAiBa,iBAAS,YAAA,CAAA,UAAA,EAAA;AACrB,IA6BA,MAAA,EAAA,EAAA,GAAA,EAAA,GAAA,EAAA,GAAA,EAAA;AAED,IAAO,QAAA,EAAA,KAAA;IAAqC,QAAO;AAAW,IAAA,IAAA,EAAA,GAAA;AAoC9D,IAAO,MAAA,EAAA,MAAA,CAAA,MAAY,GAAA,MAAuB,CAAA,UAAA,GAAA,SAAA;;AAAoB,eAAA,kBAAA,CAAA,EAAA,OAAA,EAAA,EAAA;;IAkB5D,IAAA,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/client",
-    "version": "10.1.1-alpha.11",
+    "version": "10.1.1-alpha.14",
     "description": "Sample client for higher packages to depend on",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -40,5 +40,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "ca5f3396d249806ac05fd1f01b36fcb27f096744"
+    "gitHead": "377421f92a20ac0db0d2d59a6c5df304669bc01e"
 }