Merge pull request alibaba#2705 from owenchen1004/main

1ncounter · web-flow · commit a8051aefc3f8 · 2023-11-28T11:21:21.000+08:00
fix: executeLifeCycleMethod return bug in renderer
diff --git a/packages/renderer-core/src/renderer/base.tsx b/packages/renderer-core/src/renderer/base.tsx
@@ -182,7 +182,8 @@ export default function baseRendererFactory(): IBaseRenderComponent {
     __afterInit(_props: IBaseRendererProps) { }
 
     static getDerivedStateFromProps(props: IBaseRendererProps, state: any) {
-      return executeLifeCycleMethod(this, props?.__schema, 'getDerivedStateFromProps', [props, state], props.thisRequiredInJSE);
+      const result = executeLifeCycleMethod(this, props?.__schema, 'getDerivedStateFromProps', [props, state], props.thisRequiredInJSE);
+      return result === undefined ? null : result;
     }
 
     async getSnapshotBeforeUpdate(...args: any[]) {

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,8 @@ export default function baseRendererFactory(): IBaseRenderComponent {`
`182`	`182`	`__afterInit(_props: IBaseRendererProps) { }`
`183`	`183`
`184`	`184`	`static getDerivedStateFromProps(props: IBaseRendererProps, state: any) {`
`185`		`- return executeLifeCycleMethod(this, props?.__schema, 'getDerivedStateFromProps', [props, state], props.thisRequiredInJSE);`
	`185`	`+ const result = executeLifeCycleMethod(this, props?.__schema, 'getDerivedStateFromProps', [props, state], props.thisRequiredInJSE);`
	`186`	`+ return result === undefined ? null : result;`
`186`	`187`	`}`
`187`	`188`
`188`	`189`	`async getSnapshotBeforeUpdate(...args: any[]) {`