Skip to content

Layout animations for container array'd objects #1081

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 10 commits into from
Oct 25, 2016
Merged

Layout animations for container array'd objects #1081

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
891af3b
Change layout update to use new logic
rreusser Oct 25, 2016
726cbf0
Slightly improve transition redraw/interrupt behavior
rreusser Oct 25, 2016
b20371c
The linter, again
rreusser Oct 25, 2016
c137464
Add test for annotations actually moving
rreusser Oct 25, 2016
2bcc266
Add test for annotations actually moving
rreusser Oct 25, 2016
63cd19b
Merge branch 'annotation-animation' of github.com:plotly/plotly.js in…
rreusser Oct 25, 2016
03d19bc
Tweak images to handle animation a bit better
rreusser Oct 25, 2016
30929dc
Test that shapes are updated by transitions
rreusser Oct 25, 2016
b72e36d
Test more attributes of shape transitions on redraw
rreusser Oct 25, 2016
43b95d8
Swap image source
rreusser Oct 25, 2016
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
18 changes: 15 additions & 3 deletions src/plots/plots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,10 +1558,25 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
gd._transitioningWithDuration = true;
}


// If another transition is triggered, this callback will be executed simply because it's
// in the interruptCallbacks queue. If this transition completes, it will instead flush
// that queue and forget about this callback.
gd._transitionData._interruptCallbacks.push(function() {
aborted = true;
});

if(frameOpts.redraw) {
gd._transitionData._interruptCallbacks.push(function () {
return Plotly.redraw(gd);
Copy link
Contributor

@etpinard etpinard Oct 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice use of Plotly.redraw

});
}

// Emit this and make sure it happens last:
gd._transitionData._interruptCallbacks.push(function() {
gd.emit('plotly_transitioninterrupted', []);
});

// Construct callbacks that are executed on transition end. This ensures the d3 transitions
// are *complete* before anything else is done.
var numCallbacks = 0;
Expand Down Expand Up @@ -1633,14 +1648,11 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
}

function interruptPreviousTransitions() {
gd.emit('plotly_transitioninterrupted', []);

// If a transition is interrupted, set this to false. At the moment, the only thing that would
// interrupt a transition is another transition, so that it will momentarily be set to true
// again, but this determines whether autorange or dragbox work, so it's for the sake of
// cleanliness:
gd._transitioning = false;
gd._transtionWithDuration = false;

return executeCallbacks(gd._transitionData._interruptCallbacks);
}
Expand Down