apply pr feedback

Widen · Jan 13, 2025 · 722368b · 722368b
1 parent 25a81d9
commit 722368b
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 15 deletions.
diff --git a/packages/eslint-config-widen-emotion/src/rules/no-conditional-css-prop.ts b/packages/eslint-config-widen-emotion/src/rules/no-conditional-css-prop.ts
@@ -1,24 +1,44 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Rule } from 'eslint'
 
+function detectConditionalExpression(
+  expression: any,
+  context: Rule.RuleContext,
+  node: any,
+) {
+  if (expression) {
+    if (
+      expression.type === 'ConditionalExpression' ||
+      (expression.type === 'LogicalExpression' &&
+        (expression.operator === '&&' || expression.operator === '||'))
+    ) {
+      context.report({
+        message:
+          'Avoid using conditionals within the css prop, move them to style.',
+        node: node,
+      })
+    }
+  }
+}
+
 export default {
   create(context) {
     return {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       JSXAttribute(node: any) {
-        if (
-          node.name.name === 'css' &&
-          node.value &&
-          node.value.type === 'JSXExpressionContainer' &&
-          (node.value.expression.type === 'ConditionalExpression' ||
-            (node.value.expression.type === 'LogicalExpression' &&
-              (node.value.expression.operator === '&&' ||
-                node.value.expression.operator === '||')))
-        ) {
-          context.report({
-            message:
-              'Avoid using conditionals within the css prop, move them to style.',
-            node,
-          })
+        if (node.name.name === 'css') {
+          if (node.value && node.value.type === 'JSXExpressionContainer') {
+            const expression = node.value.expression
+
+            // Check if it's an array
+            if (expression.type === 'ArrayExpression') {
+              expression.elements.forEach((element: any) => {
+                detectConditionalExpression(element, context, node)
+              })
+            } else {
+              // Check single expressions
+              detectConditionalExpression(expression, context, node)
+            }
+          }
         }
       },
     }
@@ -27,6 +47,13 @@ export default {
     docs: {
       category: 'Best Practices',
       description: 'Disallow conditionals within the css prop in components',
+      example: `
+      // Before
+      <div css={[randomDivStyle, isRed ? {color: "red"} : null]} />
+
+      // After
+      <div css={randomDivStyle} style={isRed ? {color: "red"}} />
+      `,
       recommended: false,
     },
     schema: [],

diff --git a/packages/eslint-config-widen-emotion/test/no-conditional-css-prop.test.js b/packages/eslint-config-widen-emotion/test/no-conditional-css-prop.test.js
@@ -42,6 +42,15 @@ ruleTester.run('no-conditional-css-prop', rule, {
         },
       ],
     },
+    {
+      code: '<div css={[{color: `red`}, true && {background: `black`}]} />',
+      errors: [
+        {
+          message:
+            'Avoid using conditionals within the css prop, move them to style.',
+        },
+      ],
+    },
   ],
   valid: [
     {
@@ -53,5 +62,8 @@ ruleTester.run('no-conditional-css-prop', rule, {
     {
       code: '<div css={`color: ${someVariable}`} />',
     },
+    {
+      code: '<div css={[{color: `red`}, {background: `black`}]} />',
+    },
   ],
 })