@weaverse/hydrogen 5.10.0 → 5.11.0

package/dist/index.d.mts

@@ -549,7 +549,7 @@ type HydrogenThemeSchema = {
         urlStructure: 'url-path' | 'subdomain' | 'top-level-domain';
         defaultLocale: WeaverseI18n;
         shopLocales: WeaverseI18n[];
-        staticContent: Record<string, unknown>;
+        staticContent?: Record<string, unknown>;
     };
 };
 type FetchProjectRequestBody = {

package/dist/index.d.ts

@@ -549,7 +549,7 @@ type HydrogenThemeSchema = {
         urlStructure: 'url-path' | 'subdomain' | 'top-level-domain';
         defaultLocale: WeaverseI18n;
         shopLocales: WeaverseI18n[];
-        staticContent: Record<string, unknown>;
+        staticContent?: Record<string, unknown>;
     };
 };
 type FetchProjectRequestBody = {

package/dist/index.js

@@ -83,7 +83,11 @@ function ThemeTextProvider({
 }
 function useThemeText() {
   const ctx = react$1.useContext(ThemeTextContext);
-  if (!ctx) throw new Error("useThemeText must be used within <ThemeTextProvider>. Wrap your app with withWeaverse().");
+  if (!ctx) {
+    throw new Error(
+      "useThemeText must be used within <ThemeTextProvider>. Wrap your app with withWeaverse()."
+    );
+  }
   return ctx;
 }
 function createFlatDataContext(matches) {
@@ -404,7 +408,6 @@ var ThemeSettingsStore = class {
       }
     }
   };
-  // Method to properly clean up the store
   destroy = () => {
     if (this.isDestroyed) {
       return;
@@ -416,12 +419,37 @@ var ThemeSettingsStore = class {
     }
   };
 };
+var ThemeSettingsStoreContext = react$1.createContext(null);
+ThemeSettingsStoreContext.displayName = "ThemeSettingsStoreContext";
+function useCreateThemeSettingsStore() {
+  const data = reactRouter.useRouteLoaderData("root");
+  const storeRef = react$1.useRef(null);
+  if (!storeRef.current) {
+    storeRef.current = new ThemeSettingsStore(data?.weaverseTheme);
+  }
+  const theme = data?.weaverseTheme?.theme;
+  react$1.useEffect(() => {
+    if (storeRef.current && theme) {
+      storeRef.current.updateThemeSettings(theme);
+    }
+  }, [theme]);
+  return storeRef.current;
+}
 function useThemeSettingsStore() {
+  const fromContext = react$1.useContext(ThemeSettingsStoreContext);
   const data = reactRouter.useRouteLoaderData("root");
-  if (react.isBrowser && window.__weaverseThemeSettingsStore) {
-    return window.__weaverseThemeSettingsStore;
+  const fallbackRef = react$1.useRef(null);
+  if (!(fallbackRef.current || fromContext)) {
+    fallbackRef.current = new ThemeSettingsStore(data?.weaverseTheme);
   }
-  return new ThemeSettingsStore(data?.weaverseTheme);
+  const store = fromContext ?? fallbackRef.current;
+  const theme = data?.weaverseTheme?.theme;
+  react$1.useEffect(() => {
+    if (!fromContext && theme) {
+      store.updateThemeSettings(theme);
+    }
+  }, [fromContext, store, theme]);
+  return store;
 }
 
 // src/utils/use-studio.ts
@@ -613,14 +641,11 @@ var WeaverseHydrogenRoot = react$1.memo(
     );
   }
 );
-var ThemeSettingsProvider = react$1.createContext(null);
-ThemeSettingsProvider.displayName = "WeaverseThemeSettingsProvider";
 function withWeaverse(Component, options) {
   return (props) => {
-    const themeSettingsStore = useThemeSettingsStore();
-    const { settings } = themeSettingsStore;
+    const themeSettingsStore = useCreateThemeSettingsStore();
     const themeTextData = useThemeTextData();
-    return /* @__PURE__ */ jsxRuntime.jsx(ThemeSettingsProvider.Provider, { value: settings, children: /* @__PURE__ */ jsxRuntime.jsx(
+    return /* @__PURE__ */ jsxRuntime.jsx(ThemeSettingsStoreContext.Provider, { value: themeSettingsStore, children: /* @__PURE__ */ jsxRuntime.jsx(
       ThemeTextProvider,
       {
         merchantOverrides: themeTextData.merchantOverrides,