zova-module-a-style 5.0.29 → 5.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-style",
-  "version": "5.0.29",
+  "version": "5.0.32",
   "title": "a-style",
   "zovaModule": {
     "capabilities": {
@@ -37,5 +37,5 @@
     "tsc:publish": "npm run clean && tsc -b",
     "prepublishOnly": "npm run tsc:publish"
   },
-  "gitHead": "624a81d8b0a58c276dd081ab612e7dcf37bd7f71"
+  "gitHead": "5fd1484d04f43c3f32e49c989fc55373087a1957"
 }

package/src/bean/bean.theme.ts

@@ -42,9 +42,8 @@ export class BeanTheme extends BeanModelBase<ScopeModule> {
         persister: {
           maxAge: this.scope.config.model.themename.persister.maxAge,
           deserialize: (value, deserializeDefault) => {
-            value = deserializeDefault(value);
-            if (cookieThemeDark && value === 'auto') return cookieThemeDarkDefault;
-            return value;
+            if (cookieThemeDark && value === 'auto') value = cookieThemeDarkDefault;
+            return deserializeDefault(value);
           },
         },
         defaultData: cookieThemeDark ? cookieThemeDarkDefault : 'auto',
@@ -63,7 +62,7 @@ export class BeanTheme extends BeanModelBase<ScopeModule> {
       this._applyTheme();
     });
     // not use watch.immediate for await done
-    await this._applyTheme();
+    await this._applyThemeWrapper();
   }
 
   protected __dispose__() {
@@ -74,6 +73,14 @@ export class BeanTheme extends BeanModelBase<ScopeModule> {
     this._dark = this._getDarkFromDarkMode(this.darkMode);
   }
 
+  async _applyThemeWrapper() {
+    await this._applyTheme();
+    if (process.env.SERVER && !this.app.config.ssr.cookieThemeDark) {
+      this.toggleDark();
+      await this._applyTheme();
+    }
+  }
+
   async _applyTheme() {
     const name = this.name;
     const dark = this._dark;