fix(Axis): tick index = post-filtered index (#818)

* fix(Axis): tick index = post-filtered index * test(Axis): fix hideZero test * fix(demo/threshold): undo oops commit
airbnb · Sep 30, 2020 · db9c81e · db9c81e
1 parent 09ce16f
commit db9c81e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/visx-axis/src/axis/Axis.tsx b/packages/visx-axis/src/axis/Axis.tsx
@@ -47,8 +47,8 @@ export default function Axis<Scale extends AxisScale>({
   );
 
   const filteredTickValues = (tickValues ?? getTicks(scale, numTicks))
-    .map((value, index) => ({ value, index }))
-    .filter(({ value }) => !hideZero || (value !== 0 && value !== '0'));
+    .filter(value => !hideZero || (value !== 0 && value !== '0'))
+    .map((value, index) => ({ value, index }));
 
   const ticks = filteredTickValues.map(({ value, index }) => {
     const scaledValue = coerceNumber(tickPosition(value));

diff --git a/packages/visx-axis/test/Axis.test.tsx b/packages/visx-axis/test/Axis.test.tsx
@@ -118,7 +118,7 @@ describe('<Axis />', () => {
         .find('.visx-axis-tick')
         .at(0)
         .key(),
-    ).toBe('visx-tick-1-1');
+    ).toBe('visx-tick-1-0');
   });
 
   test('it should SHOW an axis line if hideAxisLine is false', () => {