Merge pull request #4224 from GordonSmith/PIE_SORT

feat: Add "sortByValue" PP to Pie Chart
hpcc-systems · Aug 22, 2024 · a83d84f · a83d84f
2 parents 4b70fa2 + e098c43
commit a83d84f
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 7 deletions.
diff --git a/packages/chart/src/Pie.ts b/packages/chart/src/Pie.ts
@@ -8,6 +8,9 @@ import { arc as d3Arc, pie as d3Pie } from "d3-shape";
 
 import "../src/Pie.css";
 
+const sortAscending = (a, b) => a[1] - b[1] > 0 ? 1 : -1;
+const sortDescending = (a, b) => a[1] - b[1] > 0 ? -1 : 1;
+
 export class Pie extends SVGWidget {
     static __inputs: InputField[] = [{
         id: "label",
@@ -186,9 +189,15 @@ export class Pie extends SVGWidget {
             ;
 
         this._quadIdxArr = [[], [], [], []];
-        const data = [...this.data()].sort((a, b) => {
-            return a[1] - b[1] > 0 ? -1 : 1;
-        });
+        const data = [...this.data()];
+        switch (this.sortDataByValue()) {
+            case "ascending":
+                data.sort(sortAscending);
+                break;
+            case "descending":
+                data.sort(sortDescending);
+                break;
+        }
         const arc = this._slices.selectAll(".arc").data(this.d3Pie(data), d => d.data[0]);
 
         this._labelPositions = [];
@@ -407,13 +416,22 @@ export class Pie extends SVGWidget {
 
     updateD3Pie() {
         const startAngle = normalizeRadians(degreesToRadians(this.startAngle()));
+
+        switch (this.sortDataByValue()) {
+            case "ascending":
+                this.d3Pie.sort(sortAscending);
+                break;
+            case "descending":
+                this.d3Pie.sort(sortDescending);
+                break;
+            default:
+                this.d3Pie.sort(null);
+        }
+
         this.d3Pie
             .padAngle(0.0025)
             .startAngle(startAngle)
             .endAngle(2 * Math.PI + startAngle)
-            .sort(function (b, a) {
-                return a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : 0;
-            })
             .value(function (d) {
                 return d[1];
             })
@@ -468,6 +486,8 @@ export interface Pie {
     seriesPercentageFormat(_: string): this;
     showLabels(): boolean;
     showLabels(_: boolean): this;
+    sortDataByValue(): "none" | "ascending" | "descending";
+    sortDataByValue(_: "none" | "ascending" | "descending"): this;
 }
 Pie.prototype.publish("showLabels", true, "boolean", "If true, wedge labels will display");
 Pie.prototype.publish("showSeriesValue", false, "boolean", "Append data series value next to label", null, { disable: w => !w.showLabels() });
@@ -480,3 +500,4 @@ Pie.prototype.publish("innerRadius", 0, "number", "Sets inner pie hole radius as
 Pie.prototype.publish("minOuterRadius", 20, "number", "Minimum outer radius (pixels)");
 Pie.prototype.publish("startAngle", 0, "number", "Starting angle of the first (and largest) wedge (degrees)");
 Pie.prototype.publish("labelHeight", 12, "number", "Font size of labels (pixels)", null, { disable: w => !w.showLabels() });
+Pie.prototype.publish("sortDataByValue", "descending", "set", "Sort data by value", ["none", "ascending", "descending"]);
diff --git a/packages/chart/src/__tests__/index.ts b/packages/chart/src/__tests__/index.ts
@@ -1,3 +1,3 @@
-export { Test } from "./stat";
+export { Test } from "./pie";
 // export { Test3 as Test } from "./test3";
 // export { StdDevTest as Test } from "./heat";
diff --git a/packages/chart/src/__tests__/pie.ts b/packages/chart/src/__tests__/pie.ts
@@ -0,0 +1,20 @@
+import { Pie } from "../Pie";
+
+export class Test extends Pie {
+
+    constructor() {
+        super();
+        this
+            .columns(["Subject", "Result"])
+            .data([
+                ["English", 45],
+                ["Irish", 28],
+                ["Math", 98],
+                ["Geography", 48],
+                ["Science", 82]
+            ])
+            .sortDataByValue("none")
+            .lazyRender()
+            ;
+    }
+}