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-sort-props: only use localeCompare when case is ignored #2556

Merged
merged 1 commit into from
May 12, 2020
Merged

[Fix] jsx-sort-props: only use localeCompare when case is ignored #2556

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
15 changes: 13 additions & 2 deletions lib/rules/jsx-sort-props.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,12 @@ function contextCompare(a, b, options) {
if (options.ignoreCase) {
aProp = aProp.toLowerCase();
bProp = bProp.toLowerCase();
return aProp.localeCompare(bProp);
}
return aProp.localeCompare(bProp);
ljharb marked this conversation as resolved.
Show resolved Hide resolved
if (aProp === bProp) {
return 0;
}
return aProp < bProp ? -1 : 1;
}

/**
Expand Down Expand Up @@ -342,7 +346,14 @@ module.exports = {
}
}

if (!noSortAlphabetically && previousPropName.localeCompare(currentPropName) > 0) {
if (
!noSortAlphabetically
&& (
ignoreCase
? previousPropName.localeCompare(currentPropName) > 0
: previousPropName > currentPropName
)
) {
context.report({
node: decl.name,
message: 'Props should be sorted alphabetically',
Expand Down
30 changes: 22 additions & 8 deletions tests/lib/rules/jsx-sort-props.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,18 @@ ruleTester.run('jsx-sort-props', rule, {
{code: '<App a="c" b="b" c="a" />;'},
{code: '<App {...this.props} a="c" b="b" c="a" />;'},
{code: '<App c="a" {...this.props} a="c" b="b" />;'},
{code: '<App a A />;'},
{code: '<App aa aB />;'},
{code: '<App A a />;'},
{code: '<App aB aa/>;'},
{code: '<App aA aB />;'},
{code: '<App aaa aB />;'},
{code: '<App a aa aB />;'},
{code: '<App aB aaa />;'},
{code: '<App a aB aa />;'},
{code: '<App Number="2" name="John" />;'},
// Ignoring case
{code: '<App a A />;', options: ignoreCaseArgs},
{code: '<App aa aB />;', options: ignoreCaseArgs},
{code: '<App a B c />;', options: ignoreCaseArgs},
{code: '<App A b C />;', options: ignoreCaseArgs},
{code: '<App name="John" Number="2" />;', options: ignoreCaseArgs},
// Sorting callbacks below all other props
{code: '<App a z onBar onFoo />;', options: callbacksLastArgs},
{code: '<App z onBar onFoo />;', options: ignoreCaseAndCallbackLastArgs},
Expand Down Expand Up @@ -175,9 +178,14 @@ ruleTester.run('jsx-sort-props', rule, {
output: '<App a aB />;'
},
{
code: '<App A a />;',
code: '<App fistName="John" tel={5555555} name="John Smith" lastName="Smith" Number="2" />;',
errors: [expectedError, expectedError, expectedError],
output: '<App Number="2" fistName="John" lastName="Smith" name="John Smith" tel={5555555} />;'
},
{
code: '<App aa aB />;',
errors: [expectedError],
output: '<App a A />;'
output: '<App aB aa />;'
},
{
code: '<App aB aA />;',
Expand All @@ -191,8 +199,8 @@ ruleTester.run('jsx-sort-props', rule, {
},
{
code: '<App aaB aaa aA a />;',
errors: [expectedError, expectedError, expectedError],
output: '<App a aA aaa aaB />;'
errors: [expectedError, expectedError],
output: '<App a aA aaB aaa />;'
},
{
code: '<App {...this.props} b a />;',
Expand All @@ -204,6 +212,12 @@ ruleTester.run('jsx-sort-props', rule, {
errors: [expectedError],
output: '<App c {...this.props} a b />;'
},
{
code: '<App fistName="John" tel={5555555} name="John Smith" lastName="Smith" Number="2" />;',
options: ignoreCaseArgs,
errors: [expectedError, expectedError, expectedError],
output: '<App fistName="John" lastName="Smith" name="John Smith" Number="2" tel={5555555} />;'
},
{
code: '<App B a />;',
options: ignoreCaseArgs,
Expand Down