refactor(omi): props.children have lower priority and coverage mode

Tencent · Jan 12, 2024 · d2580cc · d2580cc
1 parent a3143a0
commit d2580cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/packages/omi/package.json b/packages/omi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "omi",
-  "version": "7.5.5",
+  "version": "7.5.6",
   "scripts": {
     "start": "vite",
     "dev-vite": "vite",

diff --git a/packages/omi/src/index.ts b/packages/omi/src/index.ts
@@ -18,4 +18,4 @@ export { Signal } from './signal'
 export { css } from './css-tag'
 export { mixin } from './options'
 export { registerDirective } from './directive'
-export const version = '7.5.5'
+export const version = '7.5.6'
diff --git a/packages/omi/src/vdom.ts b/packages/omi/src/vdom.ts
@@ -43,9 +43,6 @@ export function createElement(
   ...restChildren: VNode[] | unknown[]
 ): VNode | VNode[] {
   let children: VNode[] | undefined
-  if (arguments.length > 2) {
-    children = restChildren.flat() as VNode[]
-  }
 
   // jsx 嵌套的元素自动忽略  attrs
   if (attributes) {
@@ -54,12 +51,10 @@ export function createElement(
     attributes = { ignoreAttrs: true }
   }
 
-  if (attributes.children != null) {
-    if (children) {
-      children.push(...(attributes.children as VNode[]))
-    } else {
-      children = attributes.children as VNode[]
-    }
+  if (arguments.length > 2) {
+    children = restChildren.flat() as VNode[]
+  } else if (attributes.children != null) {
+    children = attributes.children as VNode[]
     delete attributes.children
   }