zova-module-a-style 5.0.37 → 5.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-style",
-  "version": "5.0.37",
+  "version": "5.0.40",
   "title": "a-style",
   "zovaModule": {
     "capabilities": {
@@ -37,5 +37,9 @@
     "tsc:publish": "npm run clean && tsc -b",
     "_prepublishOnly": "npm run tsc:publish"
   },
-  "gitHead": "b87bdd8540395b181993a617d33cad57b3c4d446"
+  "dependencies": {
+    "csx": "^10.0.2",
+    "typestyle": "^2.4.0"
+  },
+  "gitHead": "200ff5791bd6362080428f5b6c6c8f2a82c7d9d0"
 }

package/src/bean/bean.theme.ts

@@ -87,7 +87,7 @@ export class BeanTheme extends BeanModelBase<ScopeModule> {
   async _applyTheme() {
     const name = this.name;
     const dark = this._dark;
-    const theme = (await this.bean._getBean(name as any, true)) as ThemeBase;
+    const theme = await this._loadThemeBean(name);
     if (!theme) {
       this.name = this.scope.config.defaultTheme;
       await this._applyTheme();
@@ -102,6 +102,12 @@ export class BeanTheme extends BeanModelBase<ScopeModule> {
     }
   }
 
+  async _loadThemeBean(name: string): Promise<ThemeBase | undefined> {
+    const moduleName = name.split('.')[0];
+    if (!this.app.meta.module.exists(moduleName)) return;
+    return await this.bean._getBean(name as any, true);
+  }
+
   toggleDark() {
     this.darkMode = !this._dark;
     this._updateDark(); // immediate

package/src/config/config.ts

@@ -2,8 +2,8 @@ import { IBeanRecord, ZovaApplication } from 'zova';
 
 export const config = (_app: ZovaApplication) => {
   return {
-    defaultStyle: 'home-style.style.default' as keyof IBeanRecord,
-    defaultTheme: 'home-theme.theme.default' as keyof IBeanRecord,
+    defaultStyle: 'home-base.style.default' as keyof IBeanRecord,
+    defaultTheme: 'home-base.theme.default' as keyof IBeanRecord,
     defaultThemeHandler: '' as keyof IBeanRecord,
     model: {
       themename: {

package/src/monkey.ts

@@ -8,7 +8,7 @@ export class Monkey extends BeanSimple implements IMonkeySystem {
   private _beanStyleDefault: any;
   private _styleInstance: TypeStyle;
 
-  async appInitialize(_bean: BeanContainer) {
+  async appInitialize() {
     if (process.env.SERVER) {
       this._styleInstance = createTypeStyle();
       this.ctx.meta.ssr.context.onRendered(() => {
@@ -23,14 +23,14 @@ export class Monkey extends BeanSimple implements IMonkeySystem {
       });
     }
   }
-  async appInitialized(bean: BeanContainer) {
+  async appInitialized() {
     // theme
-    this._beanTheme = await bean._getBean(BeanTheme, true);
+    this._beanTheme = await this.bean._getBean(BeanTheme, true);
     // style default
-    const scope: ScopeModule = await bean.getScope(__ThisModule__);
-    this._beanStyleDefault = await bean._getBean(scope.config.defaultStyle, true);
+    const scope: ScopeModule = await this.bean.getScope(__ThisModule__);
+    this._beanStyleDefault = await this.bean._getBean(scope.config.defaultStyle, true);
   }
-  async appReady(_bean: BeanContainer) {}
+  async appReady() {}
   async beanInit(bean: BeanContainer, beanInstance: BeanBase) {
     const self = this;
     bean.defineProperty(beanInstance, '$style', {