fix(render-core): fix when designMode is false & loop is null, isUseLoop should return true

liujuping · JackLian · commit 11b929b42fb3 · 2023-06-13T10:52:47.000+08:00
diff --git a/packages/renderer-core/jest.config.js b/packages/renderer-core/jest.config.js
@@ -13,6 +13,7 @@ const jestConfig = {
   // testMatch: ['**/*/base.test.tsx'],
   // testMatch: ['**/utils/common.test.ts'],
   // testMatch: ['**/*/leaf.test.tsx'],
+  // testMatch: ['**/*/is-use-loop.test.ts'],
   transformIgnorePatterns: [
     `/node_modules/(?!${esModules})/`,
   ],
diff --git a/packages/renderer-core/src/utils/is-use-loop.ts b/packages/renderer-core/src/utils/is-use-loop.ts
@@ -8,13 +8,13 @@ export default function isUseLoop(loop: null | any[] | IPublicTypeJSExpression,
     return true;
   }
 
-  if (!Array.isArray(loop)) {
-    return false;
-  }
-
   if (!isDesignMode) {
     return true;
   }
 
+  if (!Array.isArray(loop)) {
+    return false;
+  }
+
   return loop.length > 0;
 }
diff --git a/packages/renderer-core/tests/utils/is-use-loop.test.ts b/packages/renderer-core/tests/utils/is-use-loop.test.ts
@@ -5,6 +5,9 @@ describe('base test', () => {
   it('designMode is true', () => {
     expect(isUseLoop([], true)).toBeFalsy();
     expect(isUseLoop([{}], true)).toBeTruthy();
+    expect(isUseLoop(null, true)).toBeFalsy();
+    expect(isUseLoop(undefined, true)).toBeFalsy();
+    expect(isUseLoop(0, true)).toBeFalsy();
   });
 
   it('loop is expression', () => {
@@ -21,5 +24,8 @@ describe('base test', () => {
   it('designMode is false', () => {
     expect(isUseLoop([], false)).toBeTruthy();
     expect(isUseLoop([{}], false)).toBeTruthy();
+    expect(isUseLoop(null, false)).toBeTruthy();
+    expect(isUseLoop(undefined, false)).toBeTruthy();
+    expect(isUseLoop(0, false)).toBeTruthy();
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@ export default function isUseLoop(loop: null \| any[] \| IPublicTypeJSExpression,`
`8`	`8`	`return true;`
`9`	`9`	`}`
`10`	`10`
`11`		`- if (!Array.isArray(loop)) {`
`12`		`- return false;`
`13`		`- }`
`14`		`-`
`15`	`11`	`if (!isDesignMode) {`
`16`	`12`	`return true;`
`17`	`13`	`}`
`18`	`14`
	`15`	`+ if (!Array.isArray(loop)) {`
	`16`	`+ return false;`
	`17`	`+ }`
	`18`	`+`
`19`	`19`	`return loop.length > 0;`
`20`	`20`	`}`