fix(ali): 修复条件渲染 JSX 可能导致报错的问题 (#1092)

remaxjs · Jun 16, 2020 · 309bc5b · 309bc5b · vercel · Jun 16, 2020
1 parent 6b9c0a1
commit 309bc5b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/lifeCycle/expected/remax-vendors.js b/packages/remax-cli/src/__tests__/integration/fixtures/lifeCycle/expected/remax-vendors.js
diff --git a/...ges/remax-cli/src/__tests__/integration/fixtures/runtime-plugin/expected/remax-vendors.js b/...ges/remax-cli/src/__tests__/integration/fixtures/runtime-plugin/expected/remax-vendors.js
diff --git a/packages/remax-runtime/src/__tests__/hostConfig/diffProperties.test.ts b/packages/remax-runtime/src/__tests__/hostConfig/diffProperties.test.ts
@@ -43,5 +43,14 @@ describe('diffProperties', () => {
  ).toBeFalsy();
 
  expect(!!diffProperties({ children: '1' }, { children: 1 })).toBeTruthy();
+
+ expect(diffProperties({ className: 'foo' }, { style: { width: 5 } })).toEqual([
+ 'className',
+ '',
+ 'style',
+ null,
+ 'style',
+ { width: 5 },
+ ]);
  });
 });
diff --git a/packages/remax-runtime/src/hostConfig/diffProperties.ts b/packages/remax-runtime/src/hostConfig/diffProperties.ts
@@ -1,5 +1,6 @@
 const STYLE = 'style';
 const CHILDREN = 'children';
+const CLASS_NAME = 'className';
 
 export default function diffProperties(
  lastRawProps: Record<string, any> | null | undefined,
@@ -35,7 +36,7 @@ export default function diffProperties(
  } else {
  // For all other deleted properties we add it to the queue. We use
  // the whitelist in the commit phase instead.
- (updatePayload = updatePayload || []).push(propKey, null);
+ (updatePayload = updatePayload || []).push(propKey, propKey === CLASS_NAME ? '' : null);
  }
  }