Skip to content

Roll out General Update Pattern utils to parcoords and sankey #2065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2017
Merged

Roll out General Update Pattern utils to parcoords and sankey #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/traces/parcoords/calc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
var hasColorscale = require('../../components/colorscale/has_colorscale');
var calcColorscale = require('../../components/colorscale/calc');
var Lib = require('../../lib');

var wrap = require('../../lib/gup').wrap;

module.exports = function calc(gd, trace) {
var cs = !!trace.line.colorscale && Lib.isArray(trace.line.color);
Expand All @@ -22,8 +22,8 @@ module.exports = function calc(gd, trace) {
calcColorscale(trace, trace.line.color, 'line', 'c');
}

return [{
return wrap({
lineColor: color,
cscale: cscale
}];
});
};
11 changes: 3 additions & 8 deletions src/traces/parcoords/parcoords.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ var c = require('./constants');
var Lib = require('../../lib');
var d3 = require('d3');
var Drawing = require('../../components/drawing');

function keyFun(d) {return d.key;}

function repeat(d) {return [d];}
var keyFun = require('../../lib/gup').keyFun;
var repeat = require('../../lib/gup').repeat;
var unwrap = require('../../lib/gup').unwrap;

function visible(dimension) {return !('visible' in dimension) || dimension.visible;}

Expand Down Expand Up @@ -126,10 +125,6 @@ function unitToColorScale(cscale) {
};
}

function unwrap(d) {
return d[0]; // plotly data structure convention
}

function model(layout, d, i) {
var cd0 = unwrap(d),
trace = cd0.trace,
Expand Down
5 changes: 3 additions & 2 deletions src/traces/sankey/calc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

var tarjan = require('strongly-connected-components');
var Lib = require('../../lib');
var wrap = require('../../lib/gup').wrap;

function circularityPresent(nodeList, sources, targets) {

Expand Down Expand Up @@ -44,8 +45,8 @@ module.exports = function calc(gd, trace) {
trace.node.color = [];
}

return [{
return wrap({
link: trace.link,
node: trace.node
}];
});
};
7 changes: 3 additions & 4 deletions src/traces/sankey/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ var Drawing = require('../../components/drawing');
var d3sankey = require('@plotly/d3-sankey').sankey;
var d3Force = require('d3-force');
var Lib = require('../../lib');
var keyFun = require('../../lib/gup').keyFun;
var repeat = require('../../lib/gup').repeat;
var unwrap = require('../../lib/gup').unwrap;

// basic data utilities

function keyFun(d) {return d.key;}
function repeat(d) {return [d];} // d3 data binding convention
function unwrap(d) {return d[0];} // plotly data structure convention

function persistOriginalPlace(nodes) {
var i, distinctLayerPositions = [];
for(i = 0; i < nodes.length; i++) {
Expand Down