zova-jsx 1.1.34 → 1.1.35

package/dist/index.js

@@ -1,7 +1,6 @@
 import { compose } from '@cabloy/compose';
 import { celEnvBase, getProperty, evaluateExpressions, isEmptyObject, isNil, isPromise } from '@cabloy/utils';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
-import { classes } from 'typestyle';
 import { h, createTextVNode } from 'vue';
 import { BeanSimple, objectAssignReactive, cast, BeanControllerIdentifier } from 'zova-core';
 
@@ -267,9 +266,9 @@ class ZovaJsx extends BeanSimple {
     // props
     this.renderJsxProps(componentJsx.props, props, celScope, renderContext);
     // style
-    if (_isZovaComponent && cast(props).style) {
+    if (cast(props).class || cast(props).style) {
       const controller = this.ctx.bean._getBeanSyncOnly(BeanControllerIdentifier);
-      cast(props).class = classes(cast(props).class, controller.$style(cast(props).style));
+      cast(props).class = controller.$cssMerge(cast(props).class, controller.$style(cast(props).style));
       delete cast(props).style;
     }
     // children
@@ -312,11 +311,8 @@ class ZovaJsx extends BeanSimple {
     const keys = Object.keys(jsxProps).filter(item => !renderFieldJsxPropsSystem.includes(item));
     if (keys.length === 0) return props;
     for (const key of keys) {
-      let keyValue = this.renderJsxOrCel(jsxProps[key], undefined, celScope, renderContext);
+      const keyValue = this.renderJsxOrCel(jsxProps[key], undefined, celScope, renderContext);
       const propName = normalizePropName(key);
-      if (propName === 'class') {
-        keyValue = classes(props[propName], keyValue);
-      }
       props[propName] = keyValue;
     }
     return props;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.34",
-  "gitHead": "ddec2a32e5fd0e85af5967caa29e4d0e5e0f6117",
+  "version": "1.1.35",
+  "gitHead": "106d9830a06a019121adf3af44e0ae22063aed55",
   "description": "Zova JSX",
   "keywords": [
     "ioc",