diff --git a/package-lock.json b/package-lock.json index b936c2e605a..cddba4ed851 100644 --- a/package-lock.json +++ b/package-lock.json @@ -114,6 +114,17 @@ "d3-shape": "^1.2.0" } }, + "@plotly/d3-sankey-circular": { + "version": "0.33.1", + "resolved": "https://registry.npmjs.org/@plotly/d3-sankey-circular/-/d3-sankey-circular-0.33.1.tgz", + "integrity": "sha512-FgBV1HEvCr3DV7RHhDsPXyryknucxtfnLwPtCKKxdolKyTFYoLX/ibEfX39iFYIL7DYbVeRtP43dbFcrHNE+KQ==", + "requires": { + "d3-array": "^1.2.1", + "d3-collection": "^1.0.4", + "d3-shape": "^1.2.0", + "elementary-circuits-directed-graph": "^1.0.4" + } + }, "@types/bluebird": { "version": "3.5.25", "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.25.tgz", @@ -2357,17 +2368,6 @@ "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.3.tgz", "integrity": "sha1-rHmH4+I/6AWpkPKOG1DTj8uCJDg=" }, - "d3-sankey-circular": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/d3-sankey-circular/-/d3-sankey-circular-0.33.0.tgz", - "integrity": "sha512-sn6Nuoc1lgZ5PYrxqJ0G3ZbInHM4ZP+lrg5SMc0AolgenQ9CBERf3gVliQzxeXyo2kSU7QgewUZwjvddEzT/JA==", - "requires": { - "d3-array": "^1.2.1", - "d3-collection": "^1.0.4", - "d3-shape": "^1.2.0", - "elementary-circuits-directed-graph": "^1.0.4" - } - }, "d3-shape": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.4.tgz", diff --git a/package.json b/package.json index bcab01a9489..ed5789664cf 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "d3-force": "^1.0.6", "d3-hierarchy": "^1.1.8", "d3-interpolate": "1", - "d3-sankey-circular": "0.33.0", + "@plotly/d3-sankey-circular": "0.33.1", "delaunay-triangulate": "^1.1.6", "es6-promise": "^3.0.2", "fast-isnumeric": "^1.1.2", diff --git a/src/traces/sankey/render.js b/src/traces/sankey/render.js index 4cf93a539fc..ac2fdfcf30d 100644 --- a/src/traces/sankey/render.js +++ b/src/traces/sankey/render.js @@ -14,7 +14,7 @@ var tinycolor = require('tinycolor2'); var Color = require('../../components/color'); var Drawing = require('../../components/drawing'); var d3Sankey = require('@plotly/d3-sankey'); -var d3SankeyCircular = require('d3-sankey-circular'); +var d3SankeyCircular = require('@plotly/d3-sankey-circular'); var d3Force = require('d3-force'); var Lib = require('../../lib'); var gup = require('../../lib/gup'); diff --git a/test/image/baselines/sankey_circular_process.png b/test/image/baselines/sankey_circular_process.png index 438062a1dd1..3be8d36284a 100644 Binary files a/test/image/baselines/sankey_circular_process.png and b/test/image/baselines/sankey_circular_process.png differ diff --git a/test/image/baselines/sankey_circular_simple2.png b/test/image/baselines/sankey_circular_simple2.png new file mode 100644 index 00000000000..61e8c1571e3 Binary files /dev/null and b/test/image/baselines/sankey_circular_simple2.png differ diff --git a/test/image/mocks/sankey_circular_simple2.json b/test/image/mocks/sankey_circular_simple2.json new file mode 100644 index 00000000000..9be523e5590 --- /dev/null +++ b/test/image/mocks/sankey_circular_simple2.json @@ -0,0 +1,17 @@ +{ + "data": [{ + "link": { + "source": [2, 2, 4, 2, 3, 0, 1, 0], + "target": [0, 4, 2, 3, 2, 4, 2, 1], + "value": [1, 1, 1, 1, 1, 1, 1, 1] + }, + "node": { + "label": ["A", "B", "C", "D", "E"] + }, + "type": "sankey" + }], + "layout": { + "width": 800, + "height": 800 + } +} diff --git a/test/jasmine/tests/sankey_test.js b/test/jasmine/tests/sankey_test.js index cc597b1f311..ad4b0bebbb2 100644 --- a/test/jasmine/tests/sankey_test.js +++ b/test/jasmine/tests/sankey_test.js @@ -3,7 +3,7 @@ var attributes = require('@src/traces/sankey/attributes'); var Lib = require('@src/lib'); var d3 = require('d3'); var d3sankey = require('@plotly/d3-sankey'); -var d3SankeyCircular = require('d3-sankey-circular'); +var d3SankeyCircular = require('@plotly/d3-sankey-circular'); var mock = require('@mocks/sankey_energy.json'); var mockDark = require('@mocks/sankey_energy_dark.json'); var mockCircular = require('@mocks/sankey_circular.json');