Skip to content

Commit 0e11b3c

Browse files
authored
Upgrade all d3 depencencies (#1466)
* upgrade all d3 dependencies * update yarn.lock * add transformIgnorePatterns * add regenerator-runtime * fix long dash in unit test * fix contour * fix sankey diagram
1 parent 6849e0b commit 0e11b3c

File tree

12 files changed

+135
-80
lines changed

12 files changed

+135
-80
lines changed

packages/react-vis/jest.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ module.exports = {
77
},
88
setupFilesAfterEnv: ['./jest.setup.js'],
99
snapshotSerializers: ['enzyme-to-json/serializer'],
10-
transformIgnorePatterns: ['/node_modules/(?!d3-color)']
10+
transformIgnorePatterns: [
11+
'/node_modules/(?!(d3-color|d3-scale|d3-interpolate|d3-hierarchy|d3-format|d3-shape|d3-array|d3-contour|d3-path|internmap|d3-time|d3-geo))'
12+
]
1113
};

packages/react-vis/jest.setup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*eslint-env node*/
2+
import 'regenerator-runtime/runtime';
23
import jsdom from 'jsdom';
34
import Enzyme from 'enzyme';
45
import Adapter from 'enzyme-adapter-react-16';

packages/react-vis/package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@
3333
"prettier": "prettier --write $(git ls-files | grep '.js$')"
3434
},
3535
"dependencies": {
36-
"d3-array": "^1.2.0",
37-
"d3-collection": "^1.0.3",
36+
"d3-array": "^3.2.1",
37+
"d3-collection": "^1.0.7",
3838
"d3-color": "^3.1.0",
39-
"d3-contour": "^1.1.0",
40-
"d3-format": "^1.2.0",
41-
"d3-geo": "^1.6.4",
39+
"d3-contour": "^4.0.0",
40+
"d3-format": "^3.1.0",
41+
"d3-geo": "^3.1.0",
4242
"d3-hexbin": "^0.2.2",
43-
"d3-hierarchy": "^1.1.4",
44-
"d3-interpolate": "^1.1.4",
45-
"d3-sankey": "^0.7.1",
46-
"d3-scale": "^1.0.5",
47-
"d3-shape": "^1.1.0",
48-
"d3-voronoi": "^1.1.2",
43+
"d3-hierarchy": "^3.1.2",
44+
"d3-interpolate": "^3.0.1",
45+
"d3-sankey": "^0.12.3",
46+
"d3-scale": "^4.0.2",
47+
"d3-shape": "^3.2.0",
48+
"d3-voronoi": "^1.1.4",
4949
"deep-equal": "^1.0.1",
5050
"global": "^4.3.1",
5151
"prop-types": "^15.5.8",
@@ -81,6 +81,7 @@
8181
"react-dom": "^16.0.0",
8282
"react-test-renderer": "^16.13.1",
8383
"react-vis-showcase": "^0.1.0",
84+
"regenerator-runtime": "^0.13.11",
8485
"stylelint": "^7.7.1",
8586
"stylelint-config-standard": "^15.0.1",
8687
"uglify-js": "^2.8.22"

packages/react-vis/src/sankey/index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,17 @@ function Sankey(props) {
6060
style,
6161
width
6262
} = props;
63+
// d3-sankey sankeyInstance no longer accepts empty nodes array, return empty XYPlot by default
64+
if (nodes.length === 0) {
65+
return (
66+
<XYPlot
67+
{...props}
68+
yType="literal"
69+
className={getCombinedClassName('rv-sankey', className)}
70+
/>
71+
);
72+
}
73+
6374
const nodesCopy = [...new Array(nodes.length)].map((e, i) => ({
6475
...nodes[i]
6576
}));

packages/react-vis/tests/components/arc-series.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe('ArcSeries', () => {
1313
<ArcSeriesExample />
1414
</svg>
1515
);
16-
expect($.text()).toBe('UPDATE-4-2024-4-2024');
16+
expect($.text()).toBe('UPDATE−4−2024−4−2024');
1717
// multiplied by two to account for shadow listeners
1818
expect($.find('.rv-xy-plot__series--arc').length).toBe(4);
1919
expect($.find('.rv-xy-plot__series--arc path').length).toBe(2 * 8);

packages/react-vis/tests/components/bar-series.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ describe('BarSeries', () => {
100100

101101
test('Showcase Example - DifferenceChart', () => {
102102
const $ = mount(<DifferenceChart />);
103-
expect($.text()).toBe('TOGGLE TO CANVAS02468101214-4-20246810');
103+
expect($.text()).toBe('TOGGLE TO CANVAS02468101214−4−20246810');
104104
expect($.find('.rv-xy-plot__series--bar rect').length).toBe(15);
105105
expect($.find('.rv-xy-plot__series').length).toBe(1);
106106

packages/react-vis/tests/components/circular-grid-lines.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('CircularGridLines', () => {
99

1010
test('Showcase Example - FauxRadialScatterplot', () => {
1111
const $ = mount(<FauxRadialScatterplot />);
12-
expect($.text()).toBe('-3-2-10123-3-2-10123');
12+
expect($.text()).toBe('−3−2−10123−3−2−10123');
1313
expect($.find('.rv-xy-plot__circular-grid-lines__line').length).toBe(7);
1414
});
1515
});

packages/react-vis/tests/components/contour-series.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ describe('ContourSeries', () => {
1111
const $ = mount(<ContourSeriesExample />);
1212
expect($.text()).toBe('4045505560657075808590951002345678UPDATE');
1313
expect($.find('.rv-xy-plot__series--contour').length).toBe(1);
14-
expect($.find('.rv-xy-plot__series--contour-line').length).toBe(28);
14+
expect($.find('.rv-xy-plot__series--contour-line').length).toBe(17);
1515
});
1616
});

packages/react-vis/tests/components/decorative-axis.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('DecorativeAxis', () => {
2020
test('Showcase Example - DecorativeAxisCrissCross', () => {
2121
const $ = mount(<DecorativeAxisCrissCross />);
2222
expect($.text()).toBe(
23-
'-101.01223344556677889100¡1000!¡990!¡980!¡970!¡960!¡950!¡940!¡930!¡920!¡910!¡900!'
23+
'101.01223344556677889100¡1000!¡990!¡980!¡970!¡960!¡950!¡940!¡930!¡920!¡910!¡900!'
2424
);
2525
expect($.find('.rv-xy-manipulable-axis').length).toBe(2);
2626
expect($.find('.rv-xy-plot__axis__tick__line').length).toBe(22);

packages/react-vis/tests/components/highlight.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('Highlight', () => {
5858
test('ZoomableChartExample', () => {
5959
const $ = mount(<ZoomableChartExample />);
6060
const initialText =
61-
'-5051015200102030405060708090Reset ZoomLast Draw AreaN/A';
61+
'5051015200102030405060708090Reset ZoomLast Draw AreaN/A';
6262
expect($.text()).toBe(initialText);
6363

6464
// brush in a drag area
@@ -76,7 +76,7 @@ describe('Highlight', () => {
7676
nativeEvent: {offsetX: 200, offsetY: 200}
7777
});
7878
expect($.text()).toBe(
79-
'-5051015200102030405060708090Reset ZoomLast Draw AreaTop: 11.083578425950623Right: 34.98Bottom: -0.5863163548405383Left: 13.2'
79+
'5051015200102030405060708090Reset ZoomLast Draw AreaTop: 11.083578425950623Right: 34.98Bottom: -0.5863163548405383Left: 13.2'
8080
);
8181
});
8282

0 commit comments

Comments
 (0)