Merge pull request #288 from komarovalexander/dev

Fix case sensitive string sorting
komarovalexander · Mar 6, 2023 · 5245218 · 5245218
2 parents a592cce + 88bf3dc
commit 5245218
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ka-table",
-  "version": "7.11.0",
+  "version": "7.11.1",
   "license": "MIT",
   "repository": "github:komarovalexander/ka-table",
   "homepage": "https://komarovalexander.github.io/ka-table/#/overview",

diff --git a/src/lib/Utils/SortUtils.test.ts b/src/lib/Utils/SortUtils.test.ts
@@ -1,9 +1,15 @@
 import { DataType, SortDirection, SortingMode } from '../enums';
-import { Column } from '../Models/Column';
 import {
-  isMultipleSorting, isRemoteSorting, isSortingEnabled, isTripleStateSorting, sortColumns, sortData,
+  isMultipleSorting,
+  isRemoteSorting,
+  isSortingEnabled,
+  isTripleStateSorting,
+  sortColumns,
+  sortData,
 } from './SortUtils';
 
+import { Column } from '../Models/Column';
+
 const data: any[] = [
   { column: 1, id: 1 },
   { column: null, id: 6 },
@@ -20,6 +26,21 @@ const columns: Column[] = [
 ];
 
 describe('sortData', () => {
+  describe('strings', () => {
+    it('should be case insensitive', () => {
+      const stringData: any[] = [
+        { column: 'A', id: 1 },
+        { column: null, id: 6 },
+        { column: 'a', id: 2 },
+        { column: 'Bb', id: 3 },
+        { column: 'cC', id: 4 },
+        { column: 'aa', id: 5 },
+        { column: null, id: 7 },
+      ];
+      const newData = sortData(columns, stringData);
+      expect(newData).toMatchSnapshot();
+    });
+  });
   it('should not change original data', () => {
     const newData = sortData(columns, data);
     expect(newData).not.toBe(data);

diff --git a/src/lib/Utils/SortUtils.ts b/src/lib/Utils/SortUtils.ts
@@ -1,4 +1,5 @@
 import { SortDirection, SortingMode } from '../enums';
+
 import { Column } from '../Models/Column';
 import { SortFunc } from '../types';
 import { getValueByColumn } from './DataUtils';
@@ -47,6 +48,9 @@ const ascendSort = (sortedColumn: Column) => {
     } else if (bValue == null) {
         return 1;
     }
+    if (typeof aValue === 'string' && typeof bValue === 'string'){
+      return aValue.toLowerCase() < bValue.toLowerCase() ? -1 : 1;
+    }
     return aValue < bValue ? -1 : 1;
   };
 };
@@ -62,6 +66,9 @@ const descendSort = (sortedColumn: Column) => {
     } else if (bValue == null) {
         return -1;
     }
+    if (typeof aValue === 'string' && typeof bValue === 'string'){
+      return aValue.toLowerCase() > bValue.toLowerCase() ? -1 : 1;
+    }
     return aValue > bValue ? -1 : 1;
   };
 };

diff --git a/src/lib/Utils/__snapshots__/SortUtils.test.ts.snap b/src/lib/Utils/__snapshots__/SortUtils.test.ts.snap
@@ -131,3 +131,36 @@ Array [
   },
 ]
 `;
+
+exports[`sortData strings should be case insensitive 1`] = `
+Array [
+  Object {
+    "column": "cC",
+    "id": 4,
+  },
+  Object {
+    "column": "Bb",
+    "id": 3,
+  },
+  Object {
+    "column": "aa",
+    "id": 5,
+  },
+  Object {
+    "column": "A",
+    "id": 1,
+  },
+  Object {
+    "column": "a",
+    "id": 2,
+  },
+  Object {
+    "column": null,
+    "id": 6,
+  },
+  Object {
+    "column": null,
+    "id": 7,
+  },
+]
+`;