From d0750d1fa23a8e1136e69ca4f60b880004dbe4ff Mon Sep 17 00:00:00 2001
From: albert <albertmasa2@gmail.com>
Date: Fri, 23 Oct 2020 16:08:02 +0200
Subject: [PATCH] fix(datatable): fix sort parameters

---
 src/DataTable/DataTable.svelte | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/DataTable/DataTable.svelte b/src/DataTable/DataTable.svelte
index 02815b9a..63503ad8 100644
--- a/src/DataTable/DataTable.svelte
+++ b/src/DataTable/DataTable.svelte
@@ -128,22 +128,19 @@
     if ($sortHeader.sortDirection === "none") {
       sortedRows = rows;
     } else {
-      sortedRows = [...rows].sort(
-        $sortHeader.sort
-          ? $sortHeader.sort
-          : (a, b) => {
-              const itemA = ascending ? a[sortKey] : b[sortKey];
-              const itemB = ascending ? b[sortKey] : a[sortKey];
+      sortedRows = [...rows].sort((a, b) => {
+        const itemA = ascending ? a[sortKey] : b[sortKey];
+        const itemB = ascending ? b[sortKey] : a[sortKey];
 
-              if (typeof itemA === "number" && typeof itemB === "number") {
-                return itemA - itemB;
-              }
+        if ($sortHeader.sort) return $sortHeader.sort(itemA, itemB);
 
-              return itemA
-                .toString()
-                .localeCompare(itemB.toString(), "en", { numeric: true });
-            }
-      );
+        if (typeof itemA === "number" && typeof itemB === "number")
+          return itemA - itemB;
+
+        return itemA
+          .toString()
+          .localeCompare(itemB.toString(), "en", { numeric: true });
+      });
     }
   }
 </script>