fix(bump): fix points keys & motion and code formatting

plouc · Dec 18, 2019 · d92a965 · d92a965
1 parent 5098e53
commit d92a965
Show file tree

Hide file tree

Showing 41 changed files with 207 additions and 121 deletions.
diff --git a/examples/typescript/src/components/ScatterPlot.tsx b/examples/typescript/src/components/ScatterPlot.tsx
@@ -14,11 +14,19 @@ export default class ScatterPlot extends React.Component {
         const data = [
             {
                 id: 'group A',
-                data: [{ x: 0, y: 0 }, { x: 2, y: 7 }, { x: 7, y: 23 }],
+                data: [
+                    { x: 0, y: 0 },
+                    { x: 2, y: 7 },
+                    { x: 7, y: 23 },
+                ],
             },
             {
                 id: 'group B',
-                data: [{ x: 3, y: 13 }, { x: 5, y: 7 }, { x: 6, y: 19 }],
+                data: [
+                    { x: 3, y: 13 },
+                    { x: 5, y: 7 },
+                    { x: 6, y: 19 },
+                ],
             },
         ]
 

diff --git a/packages/annotations/src/compute.js b/packages/annotations/src/compute.js
@@ -137,7 +137,11 @@ export const computeAnnotation = ({
     }
 
     return {
-        points: [[computedX, computedY], [computedNoteX, computedNoteY], [noteLineX, noteLineY]],
+        points: [
+            [computedX, computedY],
+            [computedNoteX, computedNoteY],
+            [noteLineX, noteLineY],
+        ],
         text: [textX, textY],
         angle: angle + 90,
     }

diff --git a/packages/bar/tests/Bar.test.js b/packages/bar/tests/Bar.test.js
@@ -17,7 +17,11 @@ it('should render a basic bar chart', () => {
         <Bar
             width={500}
             height={300}
-            data={[{ id: 'one', value: 10 }, { id: 'two', value: 20 }, { id: 'three', value: 30 }]}
+            data={[
+                { id: 'one', value: 10 },
+                { id: 'two', value: 20 },
+                { id: 'three', value: 30 },
+            ]}
         />
     )
 
@@ -31,7 +35,11 @@ it('should allow to disable labels', () => {
             width={500}
             height={300}
             enableLabel={false}
-            data={[{ id: 'one', value: 10 }, { id: 'two', value: 20 }, { id: 'three', value: 30 }]}
+            data={[
+                { id: 'one', value: 10 },
+                { id: 'two', value: 20 },
+                { id: 'three', value: 30 },
+            ]}
         />
     )
 
@@ -46,7 +54,11 @@ it('should allow grouped mode', () => {
             height={300}
             enableLabel={false}
             groupMode="grouped"
-            data={[{ id: 'one', value: 10 }, { id: 'two', value: 20 }, { id: 'three', value: 30 }]}
+            data={[
+                { id: 'one', value: 10 },
+                { id: 'two', value: 20 },
+                { id: 'three', value: 30 },
+            ]}
         />
     )
 
@@ -61,7 +73,11 @@ it('should allow horizontal layout', () => {
             height={300}
             enableLabel={false}
             layout="horizontal"
-            data={[{ id: 'one', value: 10 }, { id: 'two', value: 20 }, { id: 'three', value: 30 }]}
+            data={[
+                { id: 'one', value: 10 },
+                { id: 'two', value: 20 },
+                { id: 'three', value: 30 },
+            ]}
         />
     )
 
@@ -77,7 +93,11 @@ it('should allow grouped horizontal layout', () => {
             enableLabel={false}
             groupMode="grouped"
             layout="horizontal"
-            data={[{ id: 'one', value: 10 }, { id: 'two', value: 20 }, { id: 'three', value: 30 }]}
+            data={[
+                { id: 'one', value: 10 },
+                { id: 'two', value: 20 },
+                { id: 'three', value: 30 },
+            ]}
         />
     )
 
@@ -90,7 +110,10 @@ it(`should reverse legend items if chart layout is vertical`, () => {
         <Bar
             width={500}
             height={300}
-            data={[{ id: 'one', A: 10, B: 13 }, { id: 'two', A: 12, B: 9 }]}
+            data={[
+                { id: 'one', A: 10, B: 13 },
+                { id: 'two', A: 12, B: 9 },
+            ]}
             keys={['A', 'B']}
             layout="vertical"
             legends={[
@@ -118,7 +141,10 @@ it(`should not reverse legend items if chart layout is vertical reversed`, () =>
         <Bar
             width={500}
             height={300}
-            data={[{ id: 'one', A: 10, B: 13 }, { id: 'two', A: 12, B: 9 }]}
+            data={[
+                { id: 'one', A: 10, B: 13 },
+                { id: 'two', A: 12, B: 9 },
+            ]}
             keys={['A', 'B']}
             layout="vertical"
             reverse={true}
@@ -147,7 +173,10 @@ it(`should not reverse legend items if chart layout is horizontal`, () => {
         <Bar
             width={500}
             height={300}
-            data={[{ id: 'one', A: 10, B: 13 }, { id: 'two', A: 12, B: 9 }]}
+            data={[
+                { id: 'one', A: 10, B: 13 },
+                { id: 'two', A: 12, B: 9 },
+            ]}
             keys={['A', 'B']}
             layout="horizontal"
             legends={[
@@ -175,7 +204,10 @@ it(`should reverse legend items if chart layout is horizontal reversed`, () => {
         <Bar
             width={500}
             height={300}
-            data={[{ id: 'one', A: 10, B: 13 }, { id: 'two', A: 12, B: 9 }]}
+            data={[
+                { id: 'one', A: 10, B: 13 },
+                { id: 'two', A: 12, B: 9 },
+            ]}
             keys={['A', 'B']}
             layout="horizontal"
             reverse={true}

diff --git a/packages/bump/src/bump/Points.js b/packages/bump/src/bump/Points.js
@@ -51,7 +51,7 @@ const Points = ({ pointComponent, points }) => {
                             key,
                             data: point.data,
                             x: style.x,
-                            y: point.y,
+                            y: style.y,
                             isActive: point.isActive,
                             isInactive: point.isInactive,
                             size: Math.max(style.size, 0),

diff --git a/packages/bump/src/bump/compute.js b/packages/bump/src/bump/compute.js
@@ -46,7 +46,7 @@ export const computeSeries = ({ width, height, data, xPadding, xOuterPadding, yO
                 y = yScale(datum.y)
             }
             const point = {
-                id: `${rawSerie.id}.${datum.x}`,
+                id: `${rawSerie.id}.${i}`,
                 serie: rawSerie,
                 data: datum,
                 x,

diff --git a/packages/chord/src/ChordLabels.js b/packages/chord/src/ChordLabels.js
@@ -27,9 +27,7 @@ const ChordLabels = ({ arcs, radius, rotation, getColor }) => {
                     return (
                         <text
                             key={arc.id}
-                            transform={`translate(${textProps.x}, ${textProps.y}) rotate(${
-                                textProps.rotate
-                            })`}
+                            transform={`translate(${textProps.x}, ${textProps.y}) rotate(${textProps.rotate})`}
                             style={{
                                 ...theme.labels.text,
                                 pointerEvents: 'none',
@@ -69,9 +67,7 @@ const ChordLabels = ({ arcs, radius, rotation, getColor }) => {
                         return (
                             <text
                                 key={key}
-                                transform={`translate(${textProps.x}, ${textProps.y}) rotate(${
-                                    textProps.rotate
-                                })`}
+                                transform={`translate(${textProps.x}, ${textProps.y}) rotate(${textProps.rotate})`}
                                 style={{
                                     ...theme.labels.text,
                                     pointerEvents: 'none',

diff --git a/packages/circle-packing/tests/Bubble.test.js b/packages/circle-packing/tests/Bubble.test.js
@@ -15,11 +15,17 @@ const sampleData = {
         },
         {
             id: 'line',
-            children: [{ id: 'svg', value: 43 }, { id: 'canvas', value: 27 }],
+            children: [
+                { id: 'svg', value: 43 },
+                { id: 'canvas', value: 27 },
+            ],
         },
         {
             id: 'pie',
-            children: [{ id: 'svg', value: 17 }, { id: 'canvas', value: 23 }],
+            children: [
+                { id: 'svg', value: 17 },
+                { id: 'canvas', value: 23 },
+            ],
         },
     ],
 }

diff --git a/packages/colors/src/ordinalColorScale.js b/packages/colors/src/ordinalColorScale.js
@@ -60,9 +60,7 @@ export const getOrdinalColorScale = (instruction, identity) => {
                     (instruction.size < 3 || instruction.size > 11)
                 ) {
                     throw new Error(
-                        `Invalid size '${instruction.size}' for diverging color scheme '${
-                            instruction.scheme
-                        }', must be between 3~11`
+                        `Invalid size '${instruction.size}' for diverging color scheme '${instruction.scheme}', must be between 3~11`
                     )
                 }
 
@@ -81,9 +79,7 @@ export const getOrdinalColorScale = (instruction, identity) => {
                     (instruction.size < 3 || instruction.size > 9)
                 ) {
                     throw new Error(
-                        `Invalid size '${instruction.size}' for sequential color scheme '${
-                            instruction.scheme
-                        }', must be between 3~9`
+                        `Invalid size '${instruction.size}' for sequential color scheme '${instruction.scheme}', must be between 3~9`
                     )
                 }
 

diff --git a/packages/colors/tests/inheritedColor.test.js b/packages/colors/tests/inheritedColor.test.js
@@ -92,7 +92,10 @@ describe(`from datum`, () => {
     it(`should be able to chain several modifiers on inherited color`, () => {
         const getColor = getInheritedColorGenerator({
             from: 'color',
-            modifiers: [['darker', 2], ['opacity', 0.5]],
+            modifiers: [
+                ['darker', 2],
+                ['opacity', 0.5],
+            ],
         })
 
         const expectedColor = rgb('#ff0099').darker(2)

diff --git a/packages/colors/tests/ordinalColorScale.test.js b/packages/colors/tests/ordinalColorScale.test.js
@@ -65,18 +65,14 @@ it(`should throw if trying to generate a scale from diverging colors with a size
     expect(() => {
         getOrdinalColorScale({ scheme: divergingColorSchemeIds[0], size: 2 })
     }).toThrow(
-        `Invalid size '2' for diverging color scheme '${
-            divergingColorSchemeIds[0]
-        }', must be between 3~11`
+        `Invalid size '2' for diverging color scheme '${divergingColorSchemeIds[0]}', must be between 3~11`
     )
 })
 it(`should throw if trying to generate a scale from diverging colors with a size greater than 11`, () => {
     expect(() => {
         getOrdinalColorScale({ scheme: divergingColorSchemeIds[0], size: 13 })
     }).toThrow(
-        `Invalid size '13' for diverging color scheme '${
-            divergingColorSchemeIds[0]
-        }', must be between 3~11`
+        `Invalid size '13' for diverging color scheme '${divergingColorSchemeIds[0]}', must be between 3~11`
     )
 })
 
@@ -100,18 +96,14 @@ it(`should throw if trying to generate a scale from sequential colors with a siz
     expect(() => {
         getOrdinalColorScale({ scheme: sequentialColorSchemeIds[0], size: 2 })
     }).toThrow(
-        `Invalid size '2' for sequential color scheme '${
-            sequentialColorSchemeIds[0]
-        }', must be between 3~9`
+        `Invalid size '2' for sequential color scheme '${sequentialColorSchemeIds[0]}', must be between 3~9`
     )
 })
 it(`should throw if trying to generate a scale from sequential colors with a size greater than 9`, () => {
     expect(() => {
         getOrdinalColorScale({ scheme: sequentialColorSchemeIds[0], size: 11 })
     }).toThrow(
-        `Invalid size '11' for sequential color scheme '${
-            sequentialColorSchemeIds[0]
-        }', must be between 3~9`
+        `Invalid size '11' for sequential color scheme '${sequentialColorSchemeIds[0]}', must be between 3~9`
     )
 })
 

diff --git a/packages/core/src/components/cartesian/markers/CartesianMarkersItem.js b/packages/core/src/components/cartesian/markers/CartesianMarkersItem.js
@@ -204,9 +204,7 @@ const CartesianMarkersItem = ({
         })
         legendNode = (
             <text
-                transform={`translate(${legendProps.x}, ${legendProps.y}) rotate(${
-                    legendProps.rotation
-                })`}
+                transform={`translate(${legendProps.x}, ${legendProps.y}) rotate(${legendProps.rotation})`}
                 textAnchor={legendProps.textAnchor}
                 dominantBaseline="central"
                 style={textStyle}

diff --git a/packages/core/tests/lib/getLabelGenerator.test.js b/packages/core/tests/lib/getLabelGenerator.test.js
@@ -32,7 +32,10 @@ describe('getLabelGenerator()', () => {
     })
 
     it(`should handle custom access & formatting functions`, () => {
-        const getLabel = getLabelGenerator(d => d.value[1], v => v + 10)
+        const getLabel = getLabelGenerator(
+            d => d.value[1],
+            v => v + 10
+        )
         expect(getLabel({ value: [18, 19] })).toBe(29)
     })
 })
diff --git a/packages/core/tests/lib/polar/utils.test.js b/packages/core/tests/lib/polar/utils.test.js
@@ -54,9 +54,7 @@ const boundingBoxCases = [
 for (let boundingBoxCase of boundingBoxCases) {
     const { args, expected } = boundingBoxCase
 
-    test(`computeArcBoundingBox() for position ${args[0]}, ${args[1]} with radius ${
-        args[2]
-    }, starting at ${args[3]}°, ending at ${args[4]}°`, () => {
+    test(`computeArcBoundingBox() for position ${args[0]}, ${args[1]} with radius ${args[2]}, starting at ${args[3]}°, ending at ${args[4]}°`, () => {
         const box = computeArcBoundingBox(...args)
 
         for (let prop in expected) {