Skip to content

Commit b129c5d

Browse files
committed
no transition with uniformtext for now
1 parent 869b97b commit b129c5d

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/traces/bar/plot.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ function getXY(di, xa, ya, isHorizontal) {
5858
return isHorizontal ? [s, p] : [p, s];
5959
}
6060

61-
function transition(selection, opts, makeOnCompleteCallback) {
62-
if(hasTransition(opts)) {
61+
function transition(selection, fullLayout, opts, makeOnCompleteCallback) {
62+
if(!fullLayout.uniformtext.mode && hasTransition(opts)) {
6363
var onComplete;
6464
if(makeOnCompleteCallback) {
6565
onComplete = makeOnCompleteCallback();
@@ -212,13 +212,13 @@ function plot(gd, plotinfo, cdModule, traceLayer, opts, makeOnCompleteCallback)
212212
y1 = fixpx(y1, y0);
213213
}
214214

215-
var sel = transition(Lib.ensureSingle(bar, 'path'), opts, makeOnCompleteCallback);
215+
var sel = transition(Lib.ensureSingle(bar, 'path'), fullLayout, opts, makeOnCompleteCallback);
216216
sel
217217
.style('vector-effect', 'non-scaling-stroke')
218218
.attr('d', 'M' + x0 + ',' + y0 + 'V' + y1 + 'H' + x1 + 'V' + y0 + 'Z')
219219
.call(Drawing.setClipUrl, plotinfo.layerClipId, gd);
220220

221-
if(hasTransition(opts)) {
221+
if(!fullLayout.uniformtext.mode && hasTransition(opts)) {
222222
var styleFns = Drawing.makePointStyleFns(trace);
223223
Drawing.singlePointStyle(di, sel, trace, styleFns, gd);
224224
}
@@ -412,7 +412,7 @@ function appendBarText(gd, plotinfo, bar, cd, i, x0, x1, y0, y1, opts, makeOnCom
412412
recordMinTextSize(trace.type, transform, fullLayout);
413413
calcBar.transform = transform;
414414

415-
transition(textSelection, opts, makeOnCompleteCallback)
415+
transition(textSelection, fullLayout, opts, makeOnCompleteCallback)
416416
.attr('transform', Lib.getTextTransform(transform));
417417
}
418418

src/traces/sunburst/plot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ exports.plot = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback) {
3434
// If transition config is provided, then it is only a partial replot and traces not
3535
// updated are removed.
3636
var isFullReplot = !transitionOpts;
37-
var hasTransition = helpers.hasTransition(transitionOpts);
37+
var hasTransition = !fullLayout.uniformtext.mode && helpers.hasTransition(transitionOpts);
3838

3939
clearMinTextSize('sunburst', fullLayout);
4040

@@ -87,7 +87,7 @@ exports.plot = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback) {
8787

8888
function plotOne(gd, cd, element, transitionOpts) {
8989
var fullLayout = gd._fullLayout;
90-
var hasTransition = helpers.hasTransition(transitionOpts);
90+
var hasTransition = !fullLayout.uniformtext.mode && helpers.hasTransition(transitionOpts);
9191

9292
var gTrace = d3.select(element);
9393
var slices = gTrace.selectAll('g.slice');

src/traces/treemap/plot.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module.exports = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback)
4343

4444
join.order();
4545

46-
if(helpers.hasTransition(transitionOpts)) {
46+
if(!fullLayout.uniformtext.mode && helpers.hasTransition(transitionOpts)) {
4747
if(makeOnCompleteCallback) {
4848
// If it was passed a callback to register completion, make a callback. If
4949
// this is created, then it must be executed on completion, otherwise the
@@ -103,7 +103,7 @@ function plotOne(gd, cd, element, transitionOpts) {
103103
}
104104

105105
var isRoot = helpers.isHierarchyRoot(entry);
106-
var hasTransition = helpers.hasTransition(transitionOpts);
106+
var hasTransition = !fullLayout.uniformtext.mode && helpers.hasTransition(transitionOpts);
107107

108108
var maxDepth = helpers.getMaxDepth(trace);
109109
var hasVisibleDepth = function(pt) {

0 commit comments

Comments
 (0)