Skip to content
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

Jump to bottom

[Fix] jsx-curly-brace-presence: disable disallowed JSX text chars check in props #2710

Merged
merged 1 commit into from Jul 28, 2020
Merged

[Fix] jsx-curly-brace-presence: disable disallowed JSX text chars check in props #2710

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/rules/jsx-curly-brace-presence.js
View file
Open in desktop
Expand Up @@ -100,11 +100,11 @@ module.exports = {
return rawStringValue.replace(/\\/g, '\\\\');
}

function needToEscapeCharacterForJSX(raw) {
function needToEscapeCharacterForJSX(raw, node) {
return (
containsBackslash(raw)
|| containsHTMLEntity(raw)
|| containsDisallowedJSXTextChars(raw)
|| (node.parent.type !== 'JSXAttribute' && containsDisallowedJSXTextChars(raw))
);
}

Expand Down Expand Up @@ -238,7 +238,7 @@ module.exports = {
(JSXExpressionNode.parent.type === 'JSXAttribute' && !isWhiteSpaceLiteral(expression))
|| !isLiteralWithTrailingWhiteSpaces(expression)
)
&& !needToEscapeCharacterForJSX(expression.raw) && (
&& !needToEscapeCharacterForJSX(expression.raw, JSXExpressionNode) && (
jsxUtil.isJSX(JSXExpressionNode.parent)
|| !containsQuoteCharacters(expression.value)
)
Expand All @@ -249,7 +249,7 @@ module.exports = {
&& expression.expressions.length === 0
&& expression.quasis[0].value.raw.indexOf('\n') === -1
&& !isStringWithTrailingWhiteSpaces(expression.quasis[0].value.raw)
&& !needToEscapeCharacterForJSX(expression.quasis[0].value.raw) && (
&& !needToEscapeCharacterForJSX(expression.quasis[0].value.raw, JSXExpressionNode) && (
jsxUtil.isJSX(JSXExpressionNode.parent)
|| !containsQuoteCharacters(expression.quasis[0].value.cooked)
)
Expand Down
42 changes: 34 additions & 8 deletions tests/lib/rules/jsx-curly-brace-presence.js
View file
Open in desktop
Expand Up @@ -244,14 +244,6 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
code: '<MyComponent>{"<Foo />"}</MyComponent>',
options: ['never']
},
{
code: '<MyComponent prop={"{ style: true }"}>bar</MyComponent>',
options: ['never']
},
{
code: '<MyComponent prop={"< style: true >"}>foo</MyComponent>',
options: ['never']
},
{
code: '<MyComponent prop={"Hello \\u1026 world"}>bar</MyComponent>',
options: ['never']
Expand Down Expand Up @@ -800,6 +792,40 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
{message: missingCurlyMessage}
],
options: [{children: 'always'}]
},
{
code: `
<Box mb={'1rem'} />
`,
output: `
<Box mb="1rem" />
`,
errors: [
{message: unnecessaryCurlyMessage}
],
options: [{props: 'never'}]
},
{
code: `
<Box mb={'1rem {}'} />
`,
output: `
<Box mb="1rem {}" />
`,
errors: [{message: unnecessaryCurlyMessage}],
options: ['never']
},
{
code: '<MyComponent prop={"{ style: true }"}>bar</MyComponent>',
output: '<MyComponent prop="{ style: true }">bar</MyComponent>',
errors: [{message: unnecessaryCurlyMessage}],
options: ['never']
},
{
code: '<MyComponent prop={"< style: true >"}>foo</MyComponent>',
output: '<MyComponent prop="< style: true >">foo</MyComponent>',
errors: [{message: unnecessaryCurlyMessage}],
options: ['never']
}
]
});