Skip to content

Improved animation merging for layout and traces - #1041

Merged
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2
Oct 17, 2016
Merged

Improved animation merging for layout and traces#1041
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2

Conversation

@rreusser

@rreusserrreusser commented Oct 14, 2016

Copy link
Copy Markdown
Contributor

This PR adds some nuance to extendDeepNoArrays with Lib.extendTrace and Lib.extendLayout. It manually dives into container arrays to allow more animation compatibility. Specifically, it removes the blocker for transform animations:

Plotly.animate(gd,{'transforms[0].value': 7})

To do:

  • Make expandObjectPaths handle a couple more array corner cases. This functionality is unused at the moment, but it should be correct.
  • Test that it also works in Plotly.animate (arises in both Plots.transition and Plotly.animate)
  • Confirm existing tests pass

@rreusserrreusser added bug something broken feature something new status: in progress labels Oct 14, 2016
@rreusser

rreusser commented Oct 14, 2016

Copy link
Copy Markdown
ContributorAuthor

@etpinard A brief explanation of how merging frames works and why this exists.

  1. It copies the input frame with extendDeepNoArrays so that the original frame definitions don't get mangled.
  2. It expands paths in the copied input. That is, a frame with {'line.color': 'red'} gets expanded into {line: {color: 'red'}}
  3. It merges those changes into the destination trace using extendDeepNoArrays.

The reason for this PR: To get this process working with container arrays, it was not enough to simply recurse into container objects. expandObjectPaths did not previously know about array notation so that it was unable to expand things like {transforms[0].operation: '='}. Step 2 now expands arrays.

In case you're wondering, yes, it uses objectFromPath so it's not entirely duplicating functionality. I could have used objectFromPath to recurse slightly differently, but I think the result would be the same.

@etpinardetpinard added this to the v1.19.0 milestone Oct 17, 2016
Comment threadsrc/lib/index.js
var dottedPropertyRegex = /^([^\[\.]+)\.(.+)?/;
var indexedPropertyRegex = /^([^\.]+)\[([0-9]+)\](\.)?(.+)?/;

lib.expandObjectPaths = function(data) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks for reusing this method 🎉

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you're missing a few items here:

  • images
  • updatemenus
  • sliders

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, thanks! I didn't have a full list on hand, but yeah, designed it so should be trivial to add as needed. Will add.

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

More generally, I've been thinking about adding a preprocess step that would crawl through the plot schema and output this list of array container (as determined by _isLinkedToArray) to a json file in build/. That build/ file would then be required in the relevant plotly.js src file(s).

But, that will be for a different PR ...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sounds good. 👍


// TODO: This test is unimplemented since it's a currently-unused corner case.
// Getting the test to pass requires some extension (pun?) to extendDeepNoArrays
// that's intelligent enough to only selectively merge *some* arrays, in particular

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

those arrays are declared as info_array e.g. pie domain.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does

varinput={'marker[1].range': [4,5]};Lib.expandObjectPaths(input);// => {marker: [undefined, {range: [4, 5]}]}

??

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes, that one works. It's fairly robust when there's just one property. It's the merging of arrays that doesn't currently work.

On that note, found a simpler case that might not be okay:

Lib.expandObjectPaths({'marker.range[0]': 5,'marker.range[1]': 2})// => {marker: {range: [null, 2]}}

This happens because there's not a way for it to tell how deeply it should merge, i.e. whether range is an data_array or not.

Note that this case does work because the array merge is not deep:

Lib.expandObjectPaths({'range[0]': 5,'range[1]': 2}// => {range: [5, 2]}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

My best guess at a workaround was to flag arrays that have been expanded by this routine with {_extendDeepArrays: true}, and then modify the extendDeepNoArrays to optionally extend deep if that override is set.

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@etpinard I added these examples to test comments so that when we regroup and come up with a more complete solution, the cases that work vs. do not work should be readily apparent. There's no regression in functionality here (the opposite, in fact), so it doesn't bother me to consider this mergable even though it's not as complete a solution as I'd like.

Side note: I've still debated just making this a deep merge with arrays since the cost of iterating through ~500 array contents is still probably an order of magnitude or two less than the cost of SVG rendering ~500 elements, which kinda gets up to the limit of what you can animate nicely with SVG anyway.

Comment threadsrc/plots/plots.js
*
* The result is the original object reference with the new contents merged in.
*/
plots.extendTrace = function(destTrace, srcTrace) {

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For completeness, transforms is currently the only array containers found in data traces until perhaps #1031

👍

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rreusser looking good

After review:

@etpinardetpinard removed this from the v1.19.0 milestone Oct 17, 2016

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great work 💃

Comment threadsrc/plots/plots.js
'shapes',
'images',
'sliders',
'updatemenus'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

// Lib.expandObjectPaths({'marker.range[1]': 2})
//
// // => {marker: {range: [null, 2]}}
//

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rreusser@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Improved animation merging for layout and traces by rreusser · Pull Request #1041 · plotly/plotly.js · GitHub
Skip to content

Improved animation merging for layout and traces - #1041

Merged
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2
Oct 17, 2016
Merged

Improved animation merging for layout and traces#1041
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2

Conversation

@rreusser

@rreusserrreusser commented Oct 14, 2016

Copy link
Copy Markdown
Contributor

This PR adds some nuance to extendDeepNoArrays with Lib.extendTrace and Lib.extendLayout. It manually dives into container arrays to allow more animation compatibility. Specifically, it removes the blocker for transform animations:

Plotly.animate(gd,{'transforms[0].value': 7})

To do:

  • Make expandObjectPaths handle a couple more array corner cases. This functionality is unused at the moment, but it should be correct.
  • Test that it also works in Plotly.animate (arises in both Plots.transition and Plotly.animate)
  • Confirm existing tests pass

@rreusserrreusser added bug something broken feature something new status: in progress labels Oct 14, 2016
@rreusser

rreusser commented Oct 14, 2016

Copy link
Copy Markdown
ContributorAuthor

@etpinard A brief explanation of how merging frames works and why this exists.

  1. It copies the input frame with extendDeepNoArrays so that the original frame definitions don't get mangled.
  2. It expands paths in the copied input. That is, a frame with {'line.color': 'red'} gets expanded into {line: {color: 'red'}}
  3. It merges those changes into the destination trace using extendDeepNoArrays.

The reason for this PR: To get this process working with container arrays, it was not enough to simply recurse into container objects. expandObjectPaths did not previously know about array notation so that it was unable to expand things like {transforms[0].operation: '='}. Step 2 now expands arrays.

In case you're wondering, yes, it uses objectFromPath so it's not entirely duplicating functionality. I could have used objectFromPath to recurse slightly differently, but I think the result would be the same.

@etpinardetpinard added this to the v1.19.0 milestone Oct 17, 2016
Comment threadsrc/lib/index.js
var dottedPropertyRegex = /^([^\[\.]+)\.(.+)?/;
var indexedPropertyRegex = /^([^\.]+)\[([0-9]+)\](\.)?(.+)?/;

lib.expandObjectPaths = function(data) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks for reusing this method 🎉

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you're missing a few items here:

  • images
  • updatemenus
  • sliders

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, thanks! I didn't have a full list on hand, but yeah, designed it so should be trivial to add as needed. Will add.

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

More generally, I've been thinking about adding a preprocess step that would crawl through the plot schema and output this list of array container (as determined by _isLinkedToArray) to a json file in build/. That build/ file would then be required in the relevant plotly.js src file(s).

But, that will be for a different PR ...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sounds good. 👍


// TODO: This test is unimplemented since it's a currently-unused corner case.
// Getting the test to pass requires some extension (pun?) to extendDeepNoArrays
// that's intelligent enough to only selectively merge *some* arrays, in particular

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

those arrays are declared as info_array e.g. pie domain.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does

varinput={'marker[1].range': [4,5]};Lib.expandObjectPaths(input);// => {marker: [undefined, {range: [4, 5]}]}

??

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes, that one works. It's fairly robust when there's just one property. It's the merging of arrays that doesn't currently work.

On that note, found a simpler case that might not be okay:

Lib.expandObjectPaths({'marker.range[0]': 5,'marker.range[1]': 2})// => {marker: {range: [null, 2]}}

This happens because there's not a way for it to tell how deeply it should merge, i.e. whether range is an data_array or not.

Note that this case does work because the array merge is not deep:

Lib.expandObjectPaths({'range[0]': 5,'range[1]': 2}// => {range: [5, 2]}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

My best guess at a workaround was to flag arrays that have been expanded by this routine with {_extendDeepArrays: true}, and then modify the extendDeepNoArrays to optionally extend deep if that override is set.

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@etpinard I added these examples to test comments so that when we regroup and come up with a more complete solution, the cases that work vs. do not work should be readily apparent. There's no regression in functionality here (the opposite, in fact), so it doesn't bother me to consider this mergable even though it's not as complete a solution as I'd like.

Side note: I've still debated just making this a deep merge with arrays since the cost of iterating through ~500 array contents is still probably an order of magnitude or two less than the cost of SVG rendering ~500 elements, which kinda gets up to the limit of what you can animate nicely with SVG anyway.

Comment threadsrc/plots/plots.js
*
* The result is the original object reference with the new contents merged in.
*/
plots.extendTrace = function(destTrace, srcTrace) {

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For completeness, transforms is currently the only array containers found in data traces until perhaps #1031

👍

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rreusser looking good

After review:

@etpinardetpinard removed this from the v1.19.0 milestone Oct 17, 2016

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great work 💃

Comment threadsrc/plots/plots.js
'shapes',
'images',
'sliders',
'updatemenus'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

// Lib.expandObjectPaths({'marker.range[1]': 2})
//
// // => {marker: {range: [null, 2]}}
//

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rreusser@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improved animation merging for layout and traces by rreusser · Pull Request #1041 · plotly/plotly.js · GitHub
Skip to content

Improved animation merging for layout and traces - #1041

Merged
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2
Oct 17, 2016
Merged

Improved animation merging for layout and traces#1041
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2

Conversation

@rreusser

@rreusserrreusser commented Oct 14, 2016

Copy link
Copy Markdown
Contributor

This PR adds some nuance to extendDeepNoArrays with Lib.extendTrace and Lib.extendLayout. It manually dives into container arrays to allow more animation compatibility. Specifically, it removes the blocker for transform animations:

Plotly.animate(gd,{'transforms[0].value': 7})

To do:

  • Make expandObjectPaths handle a couple more array corner cases. This functionality is unused at the moment, but it should be correct.
  • Test that it also works in Plotly.animate (arises in both Plots.transition and Plotly.animate)
  • Confirm existing tests pass

@rreusserrreusser added bug something broken feature something new status: in progress labels Oct 14, 2016
@rreusser

rreusser commented Oct 14, 2016

Copy link
Copy Markdown
ContributorAuthor

@etpinard A brief explanation of how merging frames works and why this exists.

  1. It copies the input frame with extendDeepNoArrays so that the original frame definitions don't get mangled.
  2. It expands paths in the copied input. That is, a frame with {'line.color': 'red'} gets expanded into {line: {color: 'red'}}
  3. It merges those changes into the destination trace using extendDeepNoArrays.

The reason for this PR: To get this process working with container arrays, it was not enough to simply recurse into container objects. expandObjectPaths did not previously know about array notation so that it was unable to expand things like {transforms[0].operation: '='}. Step 2 now expands arrays.

In case you're wondering, yes, it uses objectFromPath so it's not entirely duplicating functionality. I could have used objectFromPath to recurse slightly differently, but I think the result would be the same.

@etpinardetpinard added this to the v1.19.0 milestone Oct 17, 2016
Comment threadsrc/lib/index.js
var dottedPropertyRegex = /^([^\[\.]+)\.(.+)?/;
var indexedPropertyRegex = /^([^\.]+)\[([0-9]+)\](\.)?(.+)?/;

lib.expandObjectPaths = function(data) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks for reusing this method 🎉

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you're missing a few items here:

  • images
  • updatemenus
  • sliders

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, thanks! I didn't have a full list on hand, but yeah, designed it so should be trivial to add as needed. Will add.

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

More generally, I've been thinking about adding a preprocess step that would crawl through the plot schema and output this list of array container (as determined by _isLinkedToArray) to a json file in build/. That build/ file would then be required in the relevant plotly.js src file(s).

But, that will be for a different PR ...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sounds good. 👍


// TODO: This test is unimplemented since it's a currently-unused corner case.
// Getting the test to pass requires some extension (pun?) to extendDeepNoArrays
// that's intelligent enough to only selectively merge *some* arrays, in particular

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

those arrays are declared as info_array e.g. pie domain.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does

varinput={'marker[1].range': [4,5]};Lib.expandObjectPaths(input);// => {marker: [undefined, {range: [4, 5]}]}

??

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes, that one works. It's fairly robust when there's just one property. It's the merging of arrays that doesn't currently work.

On that note, found a simpler case that might not be okay:

Lib.expandObjectPaths({'marker.range[0]': 5,'marker.range[1]': 2})// => {marker: {range: [null, 2]}}

This happens because there's not a way for it to tell how deeply it should merge, i.e. whether range is an data_array or not.

Note that this case does work because the array merge is not deep:

Lib.expandObjectPaths({'range[0]': 5,'range[1]': 2}// => {range: [5, 2]}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

My best guess at a workaround was to flag arrays that have been expanded by this routine with {_extendDeepArrays: true}, and then modify the extendDeepNoArrays to optionally extend deep if that override is set.

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@etpinard I added these examples to test comments so that when we regroup and come up with a more complete solution, the cases that work vs. do not work should be readily apparent. There's no regression in functionality here (the opposite, in fact), so it doesn't bother me to consider this mergable even though it's not as complete a solution as I'd like.

Side note: I've still debated just making this a deep merge with arrays since the cost of iterating through ~500 array contents is still probably an order of magnitude or two less than the cost of SVG rendering ~500 elements, which kinda gets up to the limit of what you can animate nicely with SVG anyway.

Comment threadsrc/plots/plots.js
*
* The result is the original object reference with the new contents merged in.
*/
plots.extendTrace = function(destTrace, srcTrace) {

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For completeness, transforms is currently the only array containers found in data traces until perhaps #1031

👍

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rreusser looking good

After review:

@etpinardetpinard removed this from the v1.19.0 milestone Oct 17, 2016

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great work 💃

Comment threadsrc/plots/plots.js
'shapes',
'images',
'sliders',
'updatemenus'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

// Lib.expandObjectPaths({'marker.range[1]': 2})
//
// // => {marker: {range: [null, 2]}}
//

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rreusser@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improved animation merging for layout and traces by rreusser · Pull Request #1041 · plotly/plotly.js · GitHub
Skip to content

Improved animation merging for layout and traces - #1041

Merged
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2
Oct 17, 2016
Merged

Improved animation merging for layout and traces#1041
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2

Conversation

@rreusser

@rreusserrreusser commented Oct 14, 2016

Copy link
Copy Markdown
Contributor

This PR adds some nuance to extendDeepNoArrays with Lib.extendTrace and Lib.extendLayout. It manually dives into container arrays to allow more animation compatibility. Specifically, it removes the blocker for transform animations:

Plotly.animate(gd,{'transforms[0].value': 7})

To do:

  • Make expandObjectPaths handle a couple more array corner cases. This functionality is unused at the moment, but it should be correct.
  • Test that it also works in Plotly.animate (arises in both Plots.transition and Plotly.animate)
  • Confirm existing tests pass

@rreusserrreusser added bug something broken feature something new status: in progress labels Oct 14, 2016
@rreusser

rreusser commented Oct 14, 2016

Copy link
Copy Markdown
ContributorAuthor

@etpinard A brief explanation of how merging frames works and why this exists.

  1. It copies the input frame with extendDeepNoArrays so that the original frame definitions don't get mangled.
  2. It expands paths in the copied input. That is, a frame with {'line.color': 'red'} gets expanded into {line: {color: 'red'}}
  3. It merges those changes into the destination trace using extendDeepNoArrays.

The reason for this PR: To get this process working with container arrays, it was not enough to simply recurse into container objects. expandObjectPaths did not previously know about array notation so that it was unable to expand things like {transforms[0].operation: '='}. Step 2 now expands arrays.

In case you're wondering, yes, it uses objectFromPath so it's not entirely duplicating functionality. I could have used objectFromPath to recurse slightly differently, but I think the result would be the same.

@etpinardetpinard added this to the v1.19.0 milestone Oct 17, 2016
Comment threadsrc/lib/index.js
var dottedPropertyRegex = /^([^\[\.]+)\.(.+)?/;
var indexedPropertyRegex = /^([^\.]+)\[([0-9]+)\](\.)?(.+)?/;

lib.expandObjectPaths = function(data) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks for reusing this method 🎉

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you're missing a few items here:

  • images
  • updatemenus
  • sliders

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, thanks! I didn't have a full list on hand, but yeah, designed it so should be trivial to add as needed. Will add.

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

More generally, I've been thinking about adding a preprocess step that would crawl through the plot schema and output this list of array container (as determined by _isLinkedToArray) to a json file in build/. That build/ file would then be required in the relevant plotly.js src file(s).

But, that will be for a different PR ...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sounds good. 👍


// TODO: This test is unimplemented since it's a currently-unused corner case.
// Getting the test to pass requires some extension (pun?) to extendDeepNoArrays
// that's intelligent enough to only selectively merge *some* arrays, in particular

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

those arrays are declared as info_array e.g. pie domain.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does

varinput={'marker[1].range': [4,5]};Lib.expandObjectPaths(input);// => {marker: [undefined, {range: [4, 5]}]}

??

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes, that one works. It's fairly robust when there's just one property. It's the merging of arrays that doesn't currently work.

On that note, found a simpler case that might not be okay:

Lib.expandObjectPaths({'marker.range[0]': 5,'marker.range[1]': 2})// => {marker: {range: [null, 2]}}

This happens because there's not a way for it to tell how deeply it should merge, i.e. whether range is an data_array or not.

Note that this case does work because the array merge is not deep:

Lib.expandObjectPaths({'range[0]': 5,'range[1]': 2}// => {range: [5, 2]}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

My best guess at a workaround was to flag arrays that have been expanded by this routine with {_extendDeepArrays: true}, and then modify the extendDeepNoArrays to optionally extend deep if that override is set.

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@etpinard I added these examples to test comments so that when we regroup and come up with a more complete solution, the cases that work vs. do not work should be readily apparent. There's no regression in functionality here (the opposite, in fact), so it doesn't bother me to consider this mergable even though it's not as complete a solution as I'd like.

Side note: I've still debated just making this a deep merge with arrays since the cost of iterating through ~500 array contents is still probably an order of magnitude or two less than the cost of SVG rendering ~500 elements, which kinda gets up to the limit of what you can animate nicely with SVG anyway.

Comment threadsrc/plots/plots.js
*
* The result is the original object reference with the new contents merged in.
*/
plots.extendTrace = function(destTrace, srcTrace) {

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For completeness, transforms is currently the only array containers found in data traces until perhaps #1031

👍

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rreusser looking good

After review:

@etpinardetpinard removed this from the v1.19.0 milestone Oct 17, 2016

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great work 💃

Comment threadsrc/plots/plots.js
'shapes',
'images',
'sliders',
'updatemenus'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

// Lib.expandObjectPaths({'marker.range[1]': 2})
//
// // => {marker: {range: [null, 2]}}
//

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rreusser@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Improved animation merging for layout and traces by rreusser · Pull Request #1041 · plotly/plotly.js · GitHub
Skip to content

Improved animation merging for layout and traces - #1041

Merged
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2
Oct 17, 2016
Merged

Improved animation merging for layout and traces#1041
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2

Conversation

@rreusser

@rreusserrreusser commented Oct 14, 2016

Copy link
Copy Markdown
Contributor

This PR adds some nuance to extendDeepNoArrays with Lib.extendTrace and Lib.extendLayout. It manually dives into container arrays to allow more animation compatibility. Specifically, it removes the blocker for transform animations:

Plotly.animate(gd,{'transforms[0].value': 7})

To do:

  • Make expandObjectPaths handle a couple more array corner cases. This functionality is unused at the moment, but it should be correct.
  • Test that it also works in Plotly.animate (arises in both Plots.transition and Plotly.animate)
  • Confirm existing tests pass

@rreusserrreusser added bug something broken feature something new status: in progress labels Oct 14, 2016
@rreusser

rreusser commented Oct 14, 2016

Copy link
Copy Markdown
ContributorAuthor

@etpinard A brief explanation of how merging frames works and why this exists.

  1. It copies the input frame with extendDeepNoArrays so that the original frame definitions don't get mangled.
  2. It expands paths in the copied input. That is, a frame with {'line.color': 'red'} gets expanded into {line: {color: 'red'}}
  3. It merges those changes into the destination trace using extendDeepNoArrays.

The reason for this PR: To get this process working with container arrays, it was not enough to simply recurse into container objects. expandObjectPaths did not previously know about array notation so that it was unable to expand things like {transforms[0].operation: '='}. Step 2 now expands arrays.

In case you're wondering, yes, it uses objectFromPath so it's not entirely duplicating functionality. I could have used objectFromPath to recurse slightly differently, but I think the result would be the same.

@etpinardetpinard added this to the v1.19.0 milestone Oct 17, 2016
Comment threadsrc/lib/index.js
var dottedPropertyRegex = /^([^\[\.]+)\.(.+)?/;
var indexedPropertyRegex = /^([^\.]+)\[([0-9]+)\](\.)?(.+)?/;

lib.expandObjectPaths = function(data) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks for reusing this method 🎉

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you're missing a few items here:

  • images
  • updatemenus
  • sliders

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, thanks! I didn't have a full list on hand, but yeah, designed it so should be trivial to add as needed. Will add.

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

More generally, I've been thinking about adding a preprocess step that would crawl through the plot schema and output this list of array container (as determined by _isLinkedToArray) to a json file in build/. That build/ file would then be required in the relevant plotly.js src file(s).

But, that will be for a different PR ...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sounds good. 👍


// TODO: This test is unimplemented since it's a currently-unused corner case.
// Getting the test to pass requires some extension (pun?) to extendDeepNoArrays
// that's intelligent enough to only selectively merge *some* arrays, in particular

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

those arrays are declared as info_array e.g. pie domain.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does

varinput={'marker[1].range': [4,5]};Lib.expandObjectPaths(input);// => {marker: [undefined, {range: [4, 5]}]}

??

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes, that one works. It's fairly robust when there's just one property. It's the merging of arrays that doesn't currently work.

On that note, found a simpler case that might not be okay:

Lib.expandObjectPaths({'marker.range[0]': 5,'marker.range[1]': 2})// => {marker: {range: [null, 2]}}

This happens because there's not a way for it to tell how deeply it should merge, i.e. whether range is an data_array or not.

Note that this case does work because the array merge is not deep:

Lib.expandObjectPaths({'range[0]': 5,'range[1]': 2}// => {range: [5, 2]}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

My best guess at a workaround was to flag arrays that have been expanded by this routine with {_extendDeepArrays: true}, and then modify the extendDeepNoArrays to optionally extend deep if that override is set.

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@etpinard I added these examples to test comments so that when we regroup and come up with a more complete solution, the cases that work vs. do not work should be readily apparent. There's no regression in functionality here (the opposite, in fact), so it doesn't bother me to consider this mergable even though it's not as complete a solution as I'd like.

Side note: I've still debated just making this a deep merge with arrays since the cost of iterating through ~500 array contents is still probably an order of magnitude or two less than the cost of SVG rendering ~500 elements, which kinda gets up to the limit of what you can animate nicely with SVG anyway.

Comment threadsrc/plots/plots.js
*
* The result is the original object reference with the new contents merged in.
*/
plots.extendTrace = function(destTrace, srcTrace) {

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For completeness, transforms is currently the only array containers found in data traces until perhaps #1031

👍

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rreusser looking good

After review:

@etpinardetpinard removed this from the v1.19.0 milestone Oct 17, 2016

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great work 💃

Comment threadsrc/plots/plots.js
'shapes',
'images',
'sliders',
'updatemenus'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

// Lib.expandObjectPaths({'marker.range[1]': 2})
//
// // => {marker: {range: [null, 2]}}
//

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rreusser@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improved animation merging for layout and traces by rreusser · Pull Request #1041 · plotly/plotly.js · GitHub
Skip to content

Improved animation merging for layout and traces - #1041

Merged
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2
Oct 17, 2016
Merged

Improved animation merging for layout and traces#1041
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2

Conversation

@rreusser

@rreusserrreusser commented Oct 14, 2016

Copy link
Copy Markdown
Contributor

This PR adds some nuance to extendDeepNoArrays with Lib.extendTrace and Lib.extendLayout. It manually dives into container arrays to allow more animation compatibility. Specifically, it removes the blocker for transform animations:

Plotly.animate(gd,{'transforms[0].value': 7})

To do:

  • Make expandObjectPaths handle a couple more array corner cases. This functionality is unused at the moment, but it should be correct.
  • Test that it also works in Plotly.animate (arises in both Plots.transition and Plotly.animate)
  • Confirm existing tests pass

@rreusserrreusser added bug something broken feature something new status: in progress labels Oct 14, 2016
@rreusser

rreusser commented Oct 14, 2016

Copy link
Copy Markdown
ContributorAuthor

@etpinard A brief explanation of how merging frames works and why this exists.

  1. It copies the input frame with extendDeepNoArrays so that the original frame definitions don't get mangled.
  2. It expands paths in the copied input. That is, a frame with {'line.color': 'red'} gets expanded into {line: {color: 'red'}}
  3. It merges those changes into the destination trace using extendDeepNoArrays.

The reason for this PR: To get this process working with container arrays, it was not enough to simply recurse into container objects. expandObjectPaths did not previously know about array notation so that it was unable to expand things like {transforms[0].operation: '='}. Step 2 now expands arrays.

In case you're wondering, yes, it uses objectFromPath so it's not entirely duplicating functionality. I could have used objectFromPath to recurse slightly differently, but I think the result would be the same.

@etpinardetpinard added this to the v1.19.0 milestone Oct 17, 2016
Comment threadsrc/lib/index.js
var dottedPropertyRegex = /^([^\[\.]+)\.(.+)?/;
var indexedPropertyRegex = /^([^\.]+)\[([0-9]+)\](\.)?(.+)?/;

lib.expandObjectPaths = function(data) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks for reusing this method 🎉

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you're missing a few items here:

  • images
  • updatemenus
  • sliders

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, thanks! I didn't have a full list on hand, but yeah, designed it so should be trivial to add as needed. Will add.

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

More generally, I've been thinking about adding a preprocess step that would crawl through the plot schema and output this list of array container (as determined by _isLinkedToArray) to a json file in build/. That build/ file would then be required in the relevant plotly.js src file(s).

But, that will be for a different PR ...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sounds good. 👍


// TODO: This test is unimplemented since it's a currently-unused corner case.
// Getting the test to pass requires some extension (pun?) to extendDeepNoArrays
// that's intelligent enough to only selectively merge *some* arrays, in particular

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

those arrays are declared as info_array e.g. pie domain.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does

varinput={'marker[1].range': [4,5]};Lib.expandObjectPaths(input);// => {marker: [undefined, {range: [4, 5]}]}

??

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes, that one works. It's fairly robust when there's just one property. It's the merging of arrays that doesn't currently work.

On that note, found a simpler case that might not be okay:

Lib.expandObjectPaths({'marker.range[0]': 5,'marker.range[1]': 2})// => {marker: {range: [null, 2]}}

This happens because there's not a way for it to tell how deeply it should merge, i.e. whether range is an data_array or not.

Note that this case does work because the array merge is not deep:

Lib.expandObjectPaths({'range[0]': 5,'range[1]': 2}// => {range: [5, 2]}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

My best guess at a workaround was to flag arrays that have been expanded by this routine with {_extendDeepArrays: true}, and then modify the extendDeepNoArrays to optionally extend deep if that override is set.

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@etpinard I added these examples to test comments so that when we regroup and come up with a more complete solution, the cases that work vs. do not work should be readily apparent. There's no regression in functionality here (the opposite, in fact), so it doesn't bother me to consider this mergable even though it's not as complete a solution as I'd like.

Side note: I've still debated just making this a deep merge with arrays since the cost of iterating through ~500 array contents is still probably an order of magnitude or two less than the cost of SVG rendering ~500 elements, which kinda gets up to the limit of what you can animate nicely with SVG anyway.

Comment threadsrc/plots/plots.js
*
* The result is the original object reference with the new contents merged in.
*/
plots.extendTrace = function(destTrace, srcTrace) {

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For completeness, transforms is currently the only array containers found in data traces until perhaps #1031

👍

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rreusser looking good

After review:

@etpinardetpinard removed this from the v1.19.0 milestone Oct 17, 2016

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great work 💃

Comment threadsrc/plots/plots.js
'shapes',
'images',
'sliders',
'updatemenus'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

// Lib.expandObjectPaths({'marker.range[1]': 2})
//
// // => {marker: {range: [null, 2]}}
//

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rreusser@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Improved animation merging for layout and traces by rreusser · Pull Request #1041 · plotly/plotly.js · GitHub
Skip to content

Improved animation merging for layout and traces - #1041

Merged
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2
Oct 17, 2016
Merged

Improved animation merging for layout and traces#1041
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2

Conversation

@rreusser

@rreusserrreusser commented Oct 14, 2016

Copy link
Copy Markdown
Contributor

This PR adds some nuance to extendDeepNoArrays with Lib.extendTrace and Lib.extendLayout. It manually dives into container arrays to allow more animation compatibility. Specifically, it removes the blocker for transform animations:

Plotly.animate(gd,{'transforms[0].value': 7})

To do:

  • Make expandObjectPaths handle a couple more array corner cases. This functionality is unused at the moment, but it should be correct.
  • Test that it also works in Plotly.animate (arises in both Plots.transition and Plotly.animate)
  • Confirm existing tests pass

@rreusserrreusser added bug something broken feature something new status: in progress labels Oct 14, 2016
@rreusser

rreusser commented Oct 14, 2016

Copy link
Copy Markdown
ContributorAuthor

@etpinard A brief explanation of how merging frames works and why this exists.

  1. It copies the input frame with extendDeepNoArrays so that the original frame definitions don't get mangled.
  2. It expands paths in the copied input. That is, a frame with {'line.color': 'red'} gets expanded into {line: {color: 'red'}}
  3. It merges those changes into the destination trace using extendDeepNoArrays.

The reason for this PR: To get this process working with container arrays, it was not enough to simply recurse into container objects. expandObjectPaths did not previously know about array notation so that it was unable to expand things like {transforms[0].operation: '='}. Step 2 now expands arrays.

In case you're wondering, yes, it uses objectFromPath so it's not entirely duplicating functionality. I could have used objectFromPath to recurse slightly differently, but I think the result would be the same.

@etpinardetpinard added this to the v1.19.0 milestone Oct 17, 2016
Comment threadsrc/lib/index.js
var dottedPropertyRegex = /^([^\[\.]+)\.(.+)?/;
var indexedPropertyRegex = /^([^\.]+)\[([0-9]+)\](\.)?(.+)?/;

lib.expandObjectPaths = function(data) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks for reusing this method 🎉

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you're missing a few items here:

  • images
  • updatemenus
  • sliders

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, thanks! I didn't have a full list on hand, but yeah, designed it so should be trivial to add as needed. Will add.

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

More generally, I've been thinking about adding a preprocess step that would crawl through the plot schema and output this list of array container (as determined by _isLinkedToArray) to a json file in build/. That build/ file would then be required in the relevant plotly.js src file(s).

But, that will be for a different PR ...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sounds good. 👍


// TODO: This test is unimplemented since it's a currently-unused corner case.
// Getting the test to pass requires some extension (pun?) to extendDeepNoArrays
// that's intelligent enough to only selectively merge *some* arrays, in particular

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

those arrays are declared as info_array e.g. pie domain.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does

varinput={'marker[1].range': [4,5]};Lib.expandObjectPaths(input);// => {marker: [undefined, {range: [4, 5]}]}

??

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes, that one works. It's fairly robust when there's just one property. It's the merging of arrays that doesn't currently work.

On that note, found a simpler case that might not be okay:

Lib.expandObjectPaths({'marker.range[0]': 5,'marker.range[1]': 2})// => {marker: {range: [null, 2]}}

This happens because there's not a way for it to tell how deeply it should merge, i.e. whether range is an data_array or not.

Note that this case does work because the array merge is not deep:

Lib.expandObjectPaths({'range[0]': 5,'range[1]': 2}// => {range: [5, 2]}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

My best guess at a workaround was to flag arrays that have been expanded by this routine with {_extendDeepArrays: true}, and then modify the extendDeepNoArrays to optionally extend deep if that override is set.

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@etpinard I added these examples to test comments so that when we regroup and come up with a more complete solution, the cases that work vs. do not work should be readily apparent. There's no regression in functionality here (the opposite, in fact), so it doesn't bother me to consider this mergable even though it's not as complete a solution as I'd like.

Side note: I've still debated just making this a deep merge with arrays since the cost of iterating through ~500 array contents is still probably an order of magnitude or two less than the cost of SVG rendering ~500 elements, which kinda gets up to the limit of what you can animate nicely with SVG anyway.

Comment threadsrc/plots/plots.js
*
* The result is the original object reference with the new contents merged in.
*/
plots.extendTrace = function(destTrace, srcTrace) {

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For completeness, transforms is currently the only array containers found in data traces until perhaps #1031

👍

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rreusser looking good

After review:

@etpinardetpinard removed this from the v1.19.0 milestone Oct 17, 2016

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great work 💃

Comment threadsrc/plots/plots.js
'shapes',
'images',
'sliders',
'updatemenus'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

// Lib.expandObjectPaths({'marker.range[1]': 2})
//
// // => {marker: {range: [null, 2]}}
//

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rreusser@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Improved animation merging for layout and traces by rreusser · Pull Request #1041 · plotly/plotly.js · GitHub
Skip to content

Improved animation merging for layout and traces - #1041

Merged
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2
Oct 17, 2016
Merged

Improved animation merging for layout and traces#1041
rreusser merged 9 commits into
masterfrom
merge-container-arrays-2

Conversation

@rreusser

@rreusserrreusser commented Oct 14, 2016

Copy link
Copy Markdown
Contributor

This PR adds some nuance to extendDeepNoArrays with Lib.extendTrace and Lib.extendLayout. It manually dives into container arrays to allow more animation compatibility. Specifically, it removes the blocker for transform animations:

Plotly.animate(gd,{'transforms[0].value': 7})

To do:

  • Make expandObjectPaths handle a couple more array corner cases. This functionality is unused at the moment, but it should be correct.
  • Test that it also works in Plotly.animate (arises in both Plots.transition and Plotly.animate)
  • Confirm existing tests pass

@rreusserrreusser added bug something broken feature something new status: in progress labels Oct 14, 2016
@rreusser

rreusser commented Oct 14, 2016

Copy link
Copy Markdown
ContributorAuthor

@etpinard A brief explanation of how merging frames works and why this exists.

  1. It copies the input frame with extendDeepNoArrays so that the original frame definitions don't get mangled.
  2. It expands paths in the copied input. That is, a frame with {'line.color': 'red'} gets expanded into {line: {color: 'red'}}
  3. It merges those changes into the destination trace using extendDeepNoArrays.

The reason for this PR: To get this process working with container arrays, it was not enough to simply recurse into container objects. expandObjectPaths did not previously know about array notation so that it was unable to expand things like {transforms[0].operation: '='}. Step 2 now expands arrays.

In case you're wondering, yes, it uses objectFromPath so it's not entirely duplicating functionality. I could have used objectFromPath to recurse slightly differently, but I think the result would be the same.

@etpinardetpinard added this to the v1.19.0 milestone Oct 17, 2016
Comment threadsrc/lib/index.js
var dottedPropertyRegex = /^([^\[\.]+)\.(.+)?/;
var indexedPropertyRegex = /^([^\.]+)\[([0-9]+)\](\.)?(.+)?/;

lib.expandObjectPaths = function(data) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

thanks for reusing this method 🎉

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you're missing a few items here:

  • images
  • updatemenus
  • sliders

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ah, thanks! I didn't have a full list on hand, but yeah, designed it so should be trivial to add as needed. Will add.

Comment threadsrc/plots/plots.js
*/
plots.extendLayout = function(destLayout, srcLayout) {
return plots.extendObjectWithContainers(destLayout, srcLayout, [
'annotations',

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

More generally, I've been thinking about adding a preprocess step that would crawl through the plot schema and output this list of array container (as determined by _isLinkedToArray) to a json file in build/. That build/ file would then be required in the relevant plotly.js src file(s).

But, that will be for a different PR ...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Sounds good. 👍


// TODO: This test is unimplemented since it's a currently-unused corner case.
// Getting the test to pass requires some extension (pun?) to extendDeepNoArrays
// that's intelligent enough to only selectively merge *some* arrays, in particular

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

those arrays are declared as info_array e.g. pie domain.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does

varinput={'marker[1].range': [4,5]};Lib.expandObjectPaths(input);// => {marker: [undefined, {range: [4, 5]}]}

??

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yes, that one works. It's fairly robust when there's just one property. It's the merging of arrays that doesn't currently work.

On that note, found a simpler case that might not be okay:

Lib.expandObjectPaths({'marker.range[0]': 5,'marker.range[1]': 2})// => {marker: {range: [null, 2]}}

This happens because there's not a way for it to tell how deeply it should merge, i.e. whether range is an data_array or not.

Note that this case does work because the array merge is not deep:

Lib.expandObjectPaths({'range[0]': 5,'range[1]': 2}// => {range: [5, 2]}

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

My best guess at a workaround was to flag arrays that have been expanded by this routine with {_extendDeepArrays: true}, and then modify the extendDeepNoArrays to optionally extend deep if that override is set.

@rreusserrreusserOct 17, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@etpinard I added these examples to test comments so that when we regroup and come up with a more complete solution, the cases that work vs. do not work should be readily apparent. There's no regression in functionality here (the opposite, in fact), so it doesn't bother me to consider this mergable even though it's not as complete a solution as I'd like.

Side note: I've still debated just making this a deep merge with arrays since the cost of iterating through ~500 array contents is still probably an order of magnitude or two less than the cost of SVG rendering ~500 elements, which kinda gets up to the limit of what you can animate nicely with SVG anyway.

Comment threadsrc/plots/plots.js
*
* The result is the original object reference with the new contents merged in.
*/
plots.extendTrace = function(destTrace, srcTrace) {

@etpinardetpinardOct 17, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For completeness, transforms is currently the only array containers found in data traces until perhaps #1031

👍

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rreusser looking good

After review:

@etpinardetpinard removed this from the v1.19.0 milestone Oct 17, 2016

@etpinardetpinard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Great work 💃

Comment threadsrc/plots/plots.js
'shapes',
'images',
'sliders',
'updatemenus'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

// Lib.expandObjectPaths({'marker.range[1]': 2})
//
// // => {marker: {range: [null, 2]}}
//

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very nice 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugsomething brokenfeaturesomething new

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@rreusser@etpinard