From 7e6bcdfbe4387e3b040dcf05b8b8952e11dceab5 Mon Sep 17 00:00:00 2001
From: tanmoyopenroot <tanmoy.openroot@gmail.com>
Date: Tue, 28 Jan 2020 12:37:17 +0530
Subject: [PATCH] [Fix] `jsx-sort-props`: only use localeCompare when case is
 ignored

Fixes #2381. Fixes #2530.

Co-authored-by: tanmoyopenroot <tanmoy.openroot@gmail.com>
Co-authored-by: Jordan Harband <ljharb@gmail.com>
---
 lib/rules/jsx-sort-props.js       |  8 ++++++--
 tests/lib/rules/jsx-sort-props.js | 30 ++++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/lib/rules/jsx-sort-props.js b/lib/rules/jsx-sort-props.js
index c80116f4a7..7692302812 100644
--- a/lib/rules/jsx-sort-props.js
+++ b/lib/rules/jsx-sort-props.js
@@ -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);
+  if (aProp === bProp) {
+    return 0;
+  }
+  return aProp < bProp ? -1 : 1;
 }
 
 /**
@@ -342,7 +346,7 @@ 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',
diff --git a/tests/lib/rules/jsx-sort-props.js b/tests/lib/rules/jsx-sort-props.js
index 3d64788e3a..9144a9aa60 100644
--- a/tests/lib/rules/jsx-sort-props.js
+++ b/tests/lib/rules/jsx-sort-props.js
@@ -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},
@@ -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 />;',
@@ -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 />;',
@@ -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,