mcp/carbon-components-svelte
1
0
Fork 0
mirror of https://github.com/carbon-design-system/carbon-components-svelte.git synced 2025-09-15 02:11:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #356 from albertms10/datatable-sort-fix

Browse source 
fix(datatable): fix sort parameters
This commit is contained in:
Eric Liu 2020-10-24 15:03:09 -07:00 • committed by GitHub
commit f22dfd52a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/DataTable/DataTable.svelte
View file

@ -166,22 +166,19 @@
if ($sortHeader.sortDirection === "none") { if ($sortHeader.sortDirection === "none") {
sortedRows = rows; sortedRows = rows;
} else { } else {
sortedRows = [...rows].sort( sortedRows = [...rows].sort((a, b) => {
$sortHeader.sort
? $sortHeader.sort
: (a, b) => {
const itemA = ascending ? a[sortKey] : b[sortKey]; const itemA = ascending ? a[sortKey] : b[sortKey];
const itemB = ascending ? b[sortKey] : a[sortKey]; const itemB = ascending ? b[sortKey] : a[sortKey];
if (typeof itemA === "number" && typeof itemB === "number") { if ($sortHeader.sort) return $sortHeader.sort(itemA, itemB);
if (typeof itemA === "number" && typeof itemB === "number")
return itemA - itemB; return itemA - itemB;
}
return itemA return itemA
.toString() .toString()
.localeCompare(itemB.toString(), "en", { numeric: true }); .localeCompare(itemB.toString(), "en", { numeric: true });
} });
);
} }
} }
</script> </script>