Skip to content

Commit ca4b385

Browse files
archmojarchmoj
committed
some refRect clean up and rename interpolator functions in sunburst and treemap
1 parent 65c0e02 commit ca4b385

File tree

4 files changed

+21
-41
lines changed

4 files changed

+21
-41
lines changed

‎src/traces/sunburst/plot.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function plotOne(gd, cd, element, transitionOpts) {
224224

225225
if(hasTransition) {
226226
slicePath.transition().attrTween('d', function(pt2) {
227-
var interp = makeUpdateSliceIntepolator(pt2);
227+
var interp = makeUpdateSliceInterpolator(pt2);
228228
return function(t) { return pathSlice(interp(t)); };
229229
});
230230
} else {
@@ -275,7 +275,7 @@ function plotOne(gd, cd, element, transitionOpts) {
275275

276276
if(hasTransition) {
277277
sliceText.transition().attrTween('transform', function(pt2) {
278-
var interp = makeUpdateTextInterpolar(pt2);
278+
var interp = makeUpdateTextInterpolator(pt2);
279279
return function(t) { return strTransform(interp(t), textBB); };
280280
});
281281
} else {
@@ -323,7 +323,7 @@ function plotOne(gd, cd, element, transitionOpts) {
323323
return d3.interpolate(prev, next);
324324
}
325325

326-
function makeUpdateSliceIntepolator(pt) {
326+
function makeUpdateSliceInterpolator(pt) {
327327
var prev0 = prevLookup[helpers.getPtId(pt)];
328328
var prev;
329329
var next = {x0: pt.x0, x1: pt.x1, rpx0: pt.rpx0, rpx1: pt.rpx1};
@@ -362,7 +362,7 @@ function plotOne(gd, cd, element, transitionOpts) {
362362
return d3.interpolate(prev, next);
363363
}
364364

365-
function makeUpdateTextInterpolar(pt) {
365+
function makeUpdateTextInterpolator(pt) {
366366
var prev0 = prevLookup[helpers.getPtId(pt)];
367367
var prev;
368368
var transform = pt.transform;

‎src/traces/treemap/draw_ancestors.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
2525
var barDifY = opts.barDifY;
2626
var width = opts.width;
2727
var height = opts.height;
28-
2928
var viewX = opts.viewX;
3029
var viewY = opts.viewY;
31-
32-
var refRect = opts.refRect;
3330
var pathSlice = opts.pathSlice;
3431
var toMoveInsideSlice = opts.toMoveInsideSlice;
35-
3632
var hasTransition = opts.hasTransition;
3733
var handleSlicesExit = opts.handleSlicesExit;
38-
var makeUpdateSliceIntepolator = opts.makeUpdateSliceIntepolator;
39-
var makeUpdateTextInterpolar = opts.makeUpdateTextInterpolar;
34+
var makeUpdateSliceInterpolator = opts.makeUpdateSliceInterpolator;
35+
var makeUpdateTextInterpolator = opts.makeUpdateTextInterpolator;
36+
var refRect = {};
4037

4138
var fullLayout = gd._fullLayout;
4239
var cd0 = cd[0];
@@ -111,7 +108,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
111108

112109
if(hasTransition) {
113110
slicePath.transition().attrTween('d', function(pt2) {
114-
var interp = makeUpdateSliceIntepolator(pt2, upDown, refRect, [width, height]);
111+
var interp = makeUpdateSliceInterpolator(pt2, upDown, refRect, [width, height]);
115112
return function(t) { return pathSlice(interp(t)); };
116113
});
117114
} else {
@@ -171,7 +168,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
171168

172169
if(hasTransition) {
173170
sliceText.transition().attrTween('transform', function(pt2) {
174-
var interp = makeUpdateTextInterpolar(pt2, upDown, refRect, [width, height]);
171+
var interp = makeUpdateTextInterpolator(pt2, upDown, refRect, [width, height]);
175172
return function(t) { return helpers.strTransform(interp(t)); };
176173
});
177174
} else {

‎src/traces/treemap/draw_descendants.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@ var upDown = false; // for Descendants
2525
module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
2626
var width = opts.width;
2727
var height = opts.height;
28-
2928
var viewX = opts.viewX;
3029
var viewY = opts.viewY;
31-
32-
var refRect = opts.refRect;
3330
var pathSlice = opts.pathSlice;
3431
var toMoveInsideSlice = opts.toMoveInsideSlice;
35-
3632
var hasTransition = opts.hasTransition;
3733
var handleSlicesExit = opts.handleSlicesExit;
38-
var makeUpdateSliceIntepolator = opts.makeUpdateSliceIntepolator;
39-
var makeUpdateTextInterpolar = opts.makeUpdateTextInterpolar;
34+
var makeUpdateSliceInterpolator = opts.makeUpdateSliceInterpolator;
35+
var makeUpdateTextInterpolator = opts.makeUpdateTextInterpolator;
36+
var refRect = {};
4037

4138
var fullLayout = gd._fullLayout;
4239
var cd0 = cd[0];
@@ -113,7 +110,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
113110

114111
if(hasTransition) {
115112
slicePath.transition().attrTween('d', function(pt2) {
116-
var interp = makeUpdateSliceIntepolator(pt2, upDown, getRefRect(), [width, height]);
113+
var interp = makeUpdateSliceInterpolator(pt2, upDown, getRefRect(), [width, height]);
117114
return function(t) { return pathSlice(interp(t)); };
118115
});
119116
} else {
@@ -171,7 +168,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
171168

172169
if(hasTransition) {
173170
sliceText.transition().attrTween('transform', function(pt2) {
174-
var interp = makeUpdateTextInterpolar(pt2, upDown, getRefRect(), [width, height]);
171+
var interp = makeUpdateTextInterpolator(pt2, upDown, getRefRect(), [width, height]);
175172
return function(t) { return helpers.strTransform(interp(t)); };
176173
});
177174
} else {

‎src/traces/treemap/plot.js

+7-21
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ function plotOne(gd, cd, element, transitionOpts) {
9898
var x0, x1, y0, y1;
9999

100100
if(upDown) {
101-
x0 = width; // always slide pathbar to the right, unless it is the root node
101+
x0 = width; // always slide pathbar to the right
102102
x1 = width;
103103
y0 = barDifY + 0;
104104
y1 = barDifY + height;
@@ -353,7 +353,7 @@ function plotOne(gd, cd, element, transitionOpts) {
353353
return d3.interpolate(prev, getOrigin(pt, upDown, refRect, size));
354354
};
355355

356-
var makeUpdateSliceIntepolator = function(pt, upDown, refRect, size) {
356+
var makeUpdateSliceInterpolator = function(pt, upDown, refRect, size) {
357357
var prev0 = getPrev(pt, upDown);
358358
var prev = {};
359359
var origin = getOrigin(pt, upDown, refRect, size);
@@ -378,7 +378,7 @@ function plotOne(gd, cd, element, transitionOpts) {
378378
});
379379
};
380380

381-
var makeUpdateTextInterpolar = function(pt, upDown, refRect, size) {
381+
var makeUpdateTextInterpolator = function(pt, upDown, refRect, size) {
382382
var prev0 = getPrev(pt, upDown);
383383
var prev = {};
384384
var origin = getOrigin(pt, upDown, refRect, size);
@@ -481,18 +481,11 @@ function plotOne(gd, cd, element, transitionOpts) {
481481
viewX: viewMapX,
482482
viewY: viewMapY,
483483

484-
refRect: {
485-
x0: vpw / 2,
486-
x1: vpw / 2,
487-
y0: vph / 2,
488-
y1: vph / 2
489-
},
490-
491484
pathSlice: pathDescendant,
492485
toMoveInsideSlice: toMoveInsideSlice,
493486

494-
makeUpdateSliceIntepolator: makeUpdateSliceIntepolator,
495-
makeUpdateTextInterpolar: makeUpdateTextInterpolar,
487+
makeUpdateSliceInterpolator: makeUpdateSliceInterpolator,
488+
makeUpdateTextInterpolator: makeUpdateTextInterpolator,
496489

497490
handleSlicesExit: handleSlicesExit,
498491
hasTransition: hasTransition
@@ -507,18 +500,11 @@ function plotOne(gd, cd, element, transitionOpts) {
507500
viewX: viewDirX,
508501
viewY: viewDirY,
509502

510-
refRect: {
511-
x0: barW / 2,
512-
x1: barW / 2,
513-
y0: barH / 2,
514-
y1: barH / 2
515-
},
516-
517503
pathSlice: pathAncestor,
518504
toMoveInsideSlice: toMoveInsideSlice,
519505

520-
makeUpdateSliceIntepolator: makeUpdateSliceIntepolator,
521-
makeUpdateTextInterpolar: makeUpdateTextInterpolar,
506+
makeUpdateSliceInterpolator: makeUpdateSliceInterpolator,
507+
makeUpdateTextInterpolator: makeUpdateTextInterpolator,
522508

523509
handleSlicesExit: handleSlicesExit,
524510
hasTransition: hasTransition

0 commit comments

Comments
 (0)