fix: 修复 style 属性为 null 时报错的问题 (#1066)

fix #1065
remaxjs · Jun 10, 2020 · ff83df3 · ff83df3 · vercel · Jun 10, 2020
1 parent f795944
commit ff83df3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 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__/__snapshots__/propsAlias.test.ts.snap b/packages/remax-runtime/src/__tests__/__snapshots__/propsAlias.test.ts.snap
@@ -5,3 +5,9 @@ Object {
  "style": "color:#ffffff;height:2rpx;-webkit-flex:1;--color:red;--textColor:blue;background-color:var(--textColor);",
 }
 `;
+
+exports[`props alias transform style prop correctly 2`] = `
+Object {
+ "style": null,
+}
+`;
diff --git a/packages/remax-runtime/src/__tests__/propsAlias.test.ts b/packages/remax-runtime/src/__tests__/propsAlias.test.ts
@@ -42,6 +42,15 @@ describe('props alias', () => {
  'any'
  )
  ).toMatchSnapshot();
+
+ expect(
+ propsAlias(
+ {
+ style: null,
+ },
+ 'any'
+ )
+ ).toMatchSnapshot();
  });
 
  it('transform props by component type correctly', () => {

diff --git a/packages/remax-runtime/src/propsAlias.ts b/packages/remax-runtime/src/propsAlias.ts
@@ -17,7 +17,7 @@ export function getAlias(prop: string, type: string) {
 }
 
 function getValue(prop: string, value: any): any {
- if (prop.toLowerCase().endsWith('style') && typeof value === 'object') {
+ if (prop.toLowerCase().endsWith('style') && Object.prototype.toString.call(value) === '[object Object]') {
  return plainStyle(value);
  }