Skip to content

Commit d4e8011

Browse files
committed
fix: fix disabling styled components when using css func
1 parent c8b2fa4 commit d4e8011

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

rules/sort-objects.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,19 @@ export default createEslintRule<Options, MESSAGE_ID>({
154154
let isStyledCallExpression = (identifier: TSESTree.Expression) =>
155155
identifier.type === 'Identifier' && identifier.name === 'styled'
156156

157+
let isCssCallExpression = (identifier: TSESTree.Expression) =>
158+
identifier.type === 'Identifier' && identifier.name === 'css'
159+
157160
let isStyledComponents = (
158161
styledNode: TSESTree.Node | undefined,
159162
): boolean =>
160163
styledNode !== undefined &&
161164
styledNode.type === 'CallExpression' &&
162-
((styledNode.callee.type === 'MemberExpression' &&
163-
isStyledCallExpression(styledNode.callee.object)) ||
165+
(isCssCallExpression(styledNode.callee) ||
166+
(styledNode.callee.type === 'MemberExpression' &&
167+
isStyledCallExpression(styledNode.callee.object)) ||
164168
(styledNode.callee.type === 'CallExpression' &&
165169
isStyledCallExpression(styledNode.callee.callee)))
166-
167170
if (
168171
!options.styledComponents &&
169172
(isStyledComponents(node.parent) ||

test/sort-objects.test.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2754,6 +2754,22 @@ describe(RULE_NAME, () => {
27542754
},
27552755
],
27562756
},
2757+
{
2758+
code: dedent`
2759+
const headerClass = css({
2760+
display: 'flex',
2761+
alignItems: 'center',
2762+
justifyContent: 'space-between',
2763+
marginTop: '3',
2764+
gridGap: '8',
2765+
});
2766+
`,
2767+
options: [
2768+
{
2769+
styledComponents: false,
2770+
},
2771+
],
2772+
},
27572773
],
27582774
invalid: [],
27592775
},

0 commit comments

Comments
 (0)