Merge pull request #126 from sharmalab/chart-sort-order

use intl collator sort for bar charts
sharmalab · Oct 16, 2024 · 68f363c · 68f363c
2 parents b4663af + cbd96e7
commit 68f363c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/source/components/VisualTools/Chart/BarChart.js b/source/components/VisualTools/Chart/BarChart.js
@@ -24,8 +24,12 @@ const transform = (data, field, isList = false) => {
   if (isList) {
     return transformList(data, field);
   }
+  const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
+  function collSort(a, b) {
+    return collator.compare(a, b);
+  }
   return d3.nest().key((d) => d[field])
-    .sortKeys(d3.ascending)
+    .sortKeys(collSort)
     .rollup((v) => v.length)
     .entries(data);
 };

diff --git a/source/components/VisualTools/Chart/HorizontalBarChart.js b/source/components/VisualTools/Chart/HorizontalBarChart.js
@@ -24,10 +24,14 @@ const transform = (data, field, isList = false) => {
   if (isList) {
     return transformList(data, field);
   }
+  const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' });
+  function collSort(a, b) {
+    return collator.compare(a, b);
+  }
   return d3
     .nest()
     .key((d) => d[field])
-    .sortKeys(d3.ascending)
+    .sortKeys(collSort)
     .rollup((v) => v.length)
     .entries(data);
 };