fix(jsx-to-stylesheet): 修复 css module 行内使用 Object.assign 等callExpress…

…ion问题 (#11706)
NervJS · Apr 24, 2022 · 71c900f · 71c900f
1 parent 0ca8117
commit 71c900f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/__tests__/index.spec.js b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/__tests__/index.spec.js
@@ -607,7 +607,7 @@ class App extends Component {
   render() {
     const a = Object.assign({}, styleSheet.red);
     const b = Object.assign({}, a);
-    return <div className={a}><span className={b} /></div>;
+    return <div className={a}><span className={b} /><span className={Object.assign({}, b)} /></div>;
   }
 }`, false, { enableCSSModule: true })).toBe(`import { createElement, Component } from 'rax';
 import styleSheet from './app.module.scss';
@@ -617,7 +617,7 @@ class App extends Component {
   render() {
     const a = Object.assign({}, styleSheet.red);
     const b = Object.assign({}, a);
-    return <div style={a}><span style={b} /></div>;
+    return <div style={a}><span style={b} /><span style={Object.assign({}, b)} /></div>;
   }\n
 }`)
   })

diff --git a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/src/index.ts b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/src/index.ts
@@ -145,15 +145,7 @@ export default function (babel: {
         const binding = astPath.scope.getBinding(expression.name)
         if (binding) {
           const { node } = binding.path
-          // some call expression args references like Object.assign or @babel/runtime/helpers/extends
-          if (t.isCallExpression(node.init)) {
-            const { arguments: args } = node.init
-            for (const arg of args) {
-              if (isCSSMemberOrBindings(arg, cssModuleStylesheets, astPath)) {
-                return true
-              }
-            }
-          } else if (isCSSMemberOrBindings(node.init, cssModuleStylesheets, astPath)) {
+          if (isCSSMemberOrBindings(node.init, cssModuleStylesheets, astPath)) {
             return true
           }
         }
@@ -196,6 +188,17 @@ export default function (babel: {
         }
       }
     }
+
+    // 函数调用
+    // some call expression args references like Object.assign or @babel/runtime/helpers/extends
+    if (t.isCallExpression(expression)) {
+      const { arguments: args } = expression
+      for (const arg of args) {
+        if (isCSSMemberOrBindings(arg, cssModuleStylesheets, astPath)) {
+          return true
+        }
+      }
+    }
   }
 
   function isJSXCSSModuleExpression (value, cssModuleStylesheets, astPath) {