zova-module-a-style 5.0.14 → 5.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-style",
-  "version": "5.0.14",
+  "version": "5.0.16",
   "title": "a-style",
   "zovaModule": {
     "capabilities": {
@@ -34,5 +34,5 @@
     "tsc:publish": "npm run clean && tsc -b",
     "prepublishOnly": "npm run tsc:publish"
   },
-  "gitHead": "6e879538e3d741f0c87136ad404eb0fe90c2bd7f"
+  "gitHead": "e59fa627f7bdd1f308c4bd5ae36c45ec4a2648b2"
 }

package/src/bean/{store.theme.ts → bean.theme.ts}

@@ -1,11 +1,11 @@
-import { BeanBase, Cast, IBeanRecord, Store } from 'zova';
+import { Bean, BeanBase, Cast, IBeanRecord } from 'zova';
 import { ScopeModule } from '../resource/this.js';
 import { ThemeBase, ThemeHandler } from '../types.js';
 
 export type ThemeDarkMode = 'auto' | boolean;
 
-@Store()
-export class StoreTheme extends BeanBase<ScopeModule> {
+@Bean({ containerScope: 'app' })
+export class BeanTheme extends BeanBase<ScopeModule> {
   private _name: string;
   public get name(): string {
     return this._name;
@@ -42,8 +42,9 @@ export class StoreTheme extends BeanBase<ScopeModule> {
     const theme = (await this.bean._getBean(this.name as any, true)) as ThemeBase;
     const res = await theme.apply({ name: this.name, dark: this.dark });
     this.token = Cast(res).token;
-    if (res.handler) {
-      const themeHandler = (await this.bean._getBean(res.handler, true)) as unknown as ThemeHandler;
+    const handler = res.handler ?? this.scope.config.defaultThemeHandler;
+    if (handler) {
+      const themeHandler = (await this.bean._getBean(handler, true)) as unknown as ThemeHandler;
       await themeHandler.apply({ name: this.name, dark: this.dark, token: this.token } as any);
     }
   }

package/src/config/config.ts

@@ -4,5 +4,6 @@ export const config = (_app: ZovaApplication) => {
   return {
     defaultStyle: 'home-style.style.default' as keyof IBeanRecord,
     defaultTheme: 'home-theme.theme.default' as keyof IBeanRecord,
+    defaultThemeHandler: '' as keyof IBeanRecord,
   };
 };

package/src/monkey.ts

@@ -1,20 +1,20 @@
 import { style } from 'typestyle';
 import { BeanBase, BeanContainer, BeanSimple, IMonkeySystem, SymbolModuleName, useComputed } from 'zova';
 import { ScopeModule, __ThisModule__ } from './resource/this.js';
-import { StoreTheme } from './bean/store.theme.js';
+import { BeanTheme } from './bean/bean.theme.js';
 
 export class Monkey extends BeanSimple implements IMonkeySystem {
-  private _storeTheme: StoreTheme;
-  private _storeStyleDefault: any;
+  private _beanTheme: BeanTheme;
+  private _beanStyleDefault: any;
 
-  async appInitialize(bean: BeanContainer) {
+  async appInitialize(_bean: BeanContainer) {}
+  async appInitialized(bean: BeanContainer) {
     // theme
-    this._storeTheme = await bean._getBean(StoreTheme, true);
+    this._beanTheme = await bean._getBean(BeanTheme, true);
     // style default
     const scope: ScopeModule = await bean.getScope(__ThisModule__);
-    this._storeStyleDefault = await bean._getBean(scope.config.defaultStyle, true);
+    this._beanStyleDefault = await bean._getBean(scope.config.defaultStyle, true);
   }
-  async appInitialized(_bean: BeanContainer) {}
   async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
     const self = this;
     bean.defineProperty(beanInstance, '$style', {
@@ -30,21 +30,21 @@ export class Monkey extends BeanSimple implements IMonkeySystem {
       enumerable: false,
       configurable: true,
       get() {
-        return self._storeStyleDefault;
+        return self._beanStyleDefault;
       },
     });
     bean.defineProperty(beanInstance, '$theme', {
       enumerable: false,
       configurable: true,
       get() {
-        return self._storeTheme;
+        return self._beanTheme;
       },
     });
     bean.defineProperty(beanInstance, '$token', {
       enumerable: false,
       configurable: true,
       get() {
-        return useComputed(() => self._storeTheme.token);
+        return useComputed(() => self._beanTheme.token);
       },
     });
   }

package/src/resource/beans.ts

@@ -1,8 +1,8 @@
-export * from '../bean/store.theme.js';
-import { StoreTheme } from '../bean/store.theme.js';
+export * from '../bean/bean.theme.js';
+import { BeanTheme } from '../bean/bean.theme.js';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecord {
-    'a-style.store.theme': StoreTheme;
+    'a-style.bean.theme': BeanTheme;
   }
 }

package/src/types.ts

@@ -1,11 +1,11 @@
 import { style } from 'typestyle';
 import 'zova';
-import { StoreTheme } from './bean/store.theme.js';
+import { BeanTheme } from './bean/bean.theme.js';
 import { IBeanRecord } from 'zova';
 declare module 'zova' {
   export interface BeanBase {
     $style: typeof style;
-    $theme: StoreTheme;
+    $theme: BeanTheme;
   }
 }