feat(renderer-core): optimize the judgment of whether leaf hoc has children

liujuping · JackLian · commit f10b694c42ae · 2023-06-01T09:34:29.000+08:00
diff --git a/packages/renderer-core/src/hoc/leaf.tsx b/packages/renderer-core/src/hoc/leaf.tsx
@@ -521,16 +521,11 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
     }
 
     get hasChildren(): boolean {
-      let { children } = this.props;
-      if (this.state.childrenInState) {
-        children = this.state.nodeChildren;
-      }
-
-      if (Array.isArray(children)) {
-        return Boolean(children && children.length);
+      if (!this.state.childrenInState) {
+        return 'children' in this.props;
       }
 
-      return Boolean(children);
+      return true;
     }
 
     get children(): any {
@@ -576,7 +571,11 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
 
       delete compProps.__inner__;
 
-      return engine.createElement(Comp, compProps, this.hasChildren ? this.children : null);
+      if (this.hasChildren) {
+        return engine.createElement(Comp, compProps, this.children);
+      }
+
+      return engine.createElement(Comp, compProps);
     }
   }
 
diff --git a/packages/renderer-core/tests/hoc/leaf.test.tsx b/packages/renderer-core/tests/hoc/leaf.test.tsx
@@ -504,6 +504,41 @@ describe('onChildrenChange', () => {
     DivNode.emitChildrenChange();
     makeSnapshot(component);
   });
+
+  it('children is 0', () => {
+    DivNode.schema.children = 0
+    DivNode.emitChildrenChange();
+    const componentInstance = component.root;
+    expect(componentInstance.findByType(components.Div).props.children).toEqual(0);
+  });
+
+  it('children is false', () => {
+    DivNode.schema.children = false
+    DivNode.emitChildrenChange();
+    const componentInstance = component.root;
+    expect(componentInstance.findByType(components.Div).props.children).toEqual(false);
+  });
+
+  it('children is []', () => {
+    DivNode.schema.children = []
+    DivNode.emitChildrenChange();
+    const componentInstance = component.root;
+    expect(componentInstance.findByType(components.Div).props.children).toEqual([]);
+  });
+
+  it('children is null', () => {
+    DivNode.schema.children = null
+    DivNode.emitChildrenChange();
+    const componentInstance = component.root;
+    expect(componentInstance.findByType(components.Div).props.children).toEqual(null);
+  });
+
+  it('children is undefined', () => {
+    DivNode.schema.children = undefined;
+    DivNode.emitChildrenChange();
+    const componentInstance = component.root;
+    expect(componentInstance.findByType(components.Div).props.children).toEqual(undefined);
+  });
 });
 
 describe('not render leaf', () => {

Original file line number	Diff line number	Diff line change
`@@ -521,16 +521,11 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`get hasChildren(): boolean {`
`524`		`- let { children } = this.props;`
`525`		`- if (this.state.childrenInState) {`
`526`		`- children = this.state.nodeChildren;`
`527`		`- }`
`528`		`-`
`529`		`- if (Array.isArray(children)) {`
`530`		`- return Boolean(children && children.length);`
	`524`	`+ if (!this.state.childrenInState) {`
	`525`	`+ return 'children' in this.props;`
`531`	`526`	`}`
`532`	`527`
`533`		`- return Boolean(children);`
	`528`	`+ return true;`
`534`	`529`	`}`
`535`	`530`
`536`	`531`	`get children(): any {`
`@@ -576,7 +571,11 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {`
`576`	`571`
`577`	`572`	`delete compProps.__inner__;`
`578`	`573`
`579`		`- return engine.createElement(Comp, compProps, this.hasChildren ? this.children : null);`
	`574`	`+ if (this.hasChildren) {`
	`575`	`+ return engine.createElement(Comp, compProps, this.children);`
	`576`	`+ }`
	`577`	`+`
	`578`	`+ return engine.createElement(Comp, compProps);`
`580`	`579`	`}`
`581`	`580`	`}`
`582`	`581`