From 25a6429f4e090438027920bb8c459c2ece367e76 Mon Sep 17 00:00:00 2001 From: Adam Prins Date: Wed, 9 Jun 2021 11:53:33 -0400 Subject: [PATCH 1/2] Pie Charts no longer sort This means that the passing component is always displayed first --- frontend/src/useArcs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/useArcs.js b/frontend/src/useArcs.js index ac1f4f4b32..c810799713 100644 --- a/frontend/src/useArcs.js +++ b/frontend/src/useArcs.js @@ -7,7 +7,7 @@ export function useArcs({ padAngle = 0, valueAccessor = (d) => d, }) { - const pie = Pie().value(valueAccessor)(data) + const pie = Pie().value(valueAccessor).sort(null)(data) const arc = Arc() .innerRadius(innerRadius) .outerRadius(outerRadius) From fdf752f7c169949c697b7fcd95de3bd350ca12a3 Mon Sep 17 00:00:00 2001 From: Adam Prins Date: Wed, 9 Jun 2021 12:20:38 -0400 Subject: [PATCH 2/2] Update useArcs.test.js Paths are different now that arcs aren't sorted --- frontend/src/__tests__/useArcs.test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/__tests__/useArcs.test.js b/frontend/src/__tests__/useArcs.test.js index 48198e3266..05fd754382 100644 --- a/frontend/src/__tests__/useArcs.test.js +++ b/frontend/src/__tests__/useArcs.test.js @@ -22,14 +22,14 @@ describe('useArcs', () => { { count: 1, d: - 'M-88.02332027547081,47.45413667618336A100,100,0,0,1,-2.915172261501782,-99.95749982210324L-2.91517226150181,-59.92913957905428A60,60,0,0,0,-53.357743433155356,27.43995655465887Z', + 'M2.915172261501814,-99.95749982210324A100,100,0,0,1,88.02332027547082,47.45413667618332L53.35774343315538,27.43995655465884A60,60,0,0,0,2.9151722615018025,-59.92913957905428Z', name: 'bad', percentage: 1, }, { count: 2, d: - 'M2.915172261501814,-99.95749982210324A100,100,0,1,1,-85.10814801396899,52.503363145919955L-50.442571171653555,32.48918302439545A60,60,0,1,0,2.9151722615018025,-59.92913957905428Z', + 'M85.10814801396903,52.5033631459199A100,100,0,1,1,-2.915172261501782,-99.95749982210324L-2.91517226150181,-59.92913957905428A60,60,0,1,0,50.442571171653576,32.48918302439542Z', name: 'good', percentage: 1, }, @@ -52,12 +52,12 @@ describe('useArcs', () => { { value: 1, d: - 'M-86.60254037844385,50.000000000000036A100,100,0,0,1,-1.8369701987210297e-14,-100L-1.1021821192326178e-14,-60A60,60,0,0,0,-51.961524227066306,30.00000000000002Z', + 'M6.123233995736766e-15,-100A100,100,0,0,1,86.60254037844388,49.999999999999986L51.96152422706632,29.99999999999999A60,60,0,0,0,3.67394039744206e-15,-60Z', }, { value: 2, d: - 'M6.123233995736766e-15,-100A100,100,0,1,1,-86.60254037844385,50.000000000000036L-51.961524227066306,30.00000000000002A60,60,0,1,0,3.67394039744206e-15,-60Z', + 'M86.60254037844388,49.999999999999986A100,100,0,1,1,-1.8369701987210297e-14,-100L-1.1021821192326178e-14,-60A60,60,0,1,0,51.96152422706632,29.99999999999999Z', }, ]) })