Skip to content

Update jsx-no-hardcoded-content to handle ternary and logical expressions #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mateus wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −0
Open

Update jsx-no-hardcoded-content to handle ternary and logical expressions #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/smooth-cows-drum.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/eslint-plugin': minor
---

extend jsx-no-hardcoded-content to handle ternary and logical expressions
6 changes: 6 additions & 0 deletions packages/eslint-plugin/lib/rules/jsx-no-hardcoded-content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ function checkContent(
!isEmptyString(contentNode.value)) ||
(!allowNumbers && typeof contentNode.value === 'number'))) ||
(contentNode.type === 'TemplateLiteral' && !allowStrings) ||
(contentNode.type === 'ConditionalExpression' &&
(isInvalidContent(contentNode.consequent) ||
isInvalidContent(contentNode.alternate))) ||
(contentNode.type === 'LogicalExpression' &&
(isInvalidContent(contentNode.left) ||
isInvalidContent(contentNode.right))) ||
(contentNode.type === 'JSXExpressionContainer' &&
isInvalidContent(contentNode.expression))
);
Expand Down
20 changes: 20 additions & 0 deletions packages/eslint-plugin/tests/lib/rules/jsx-no-hardcoded-content.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ ruleTester.run('jsx-no-hardcoded-content', rule, {
code: '<MyComponent foo={`bar`} />',
options: [{...checkProps, ...allowStrings}],
},
{
code: '<MyComponent>{foo ? "Content" : "Other Content"}</MyComponent>',
options: [{...checkProps, ...allowStrings}],
},
{
code: '<MyComponent>{foo && "Content"}</MyComponent>',
options: [{...checkProps, ...allowStrings}],
},
{
code: '<MyComponent>{42}</MyComponent>',
options: [
Expand Down Expand Up @@ -426,6 +434,18 @@ ruleTester.run('jsx-no-hardcoded-content', rule, {
options: [checkProps],
errors: errorsFor('MyComponent', 'foo'),
},
{
code: '<MyComponent>{foo ? "Content" : "Other Content"}</MyComponent>',
errors: errorsFor('MyComponent', 'children'),
},
{
code: '<MyComponent>{foo && "Content"}</MyComponent>',
errors: errorsFor('MyComponent', 'children'),
},
{
code: '<MyComponent>{foo || "Content"}</MyComponent>',
errors: errorsFor('MyComponent', 'children'),
},
{
code: `
import {MyComponent} from 'my-module';
Expand Down