Fix #1913 by pushing overflowed legend items to a new line - #3628

Merged
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line#3628
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups

Conversation

@nathanjenx

@nathanjenxnathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

Fixes the handling of horizontal grouped legend items see #1913. Maintains the vertical grouping and includes gaps between traces (see below screenshot)
image
@antoinerg@etpinard

(edit: updated to show current behaviour, original available here)

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for submitting this PR 🎉

It seems like two mocks are not matching the baselines. Could you update the baselines by running:

$ npm run baseline legend_horizontal_groups
$ npm run baseline legendgroup_horizontal_wrapping

I will review the rest of your PR shortly 😸

@antoinerg

Copy link
Copy Markdown
Contributor

About tracegroupgap, its description says that it

Sets the amount of vertical space (in px) between legend groups.

As of right now, it also affects the horizontal spacing. Could you get rid of this behaviour by not adding traceGroupGap to the widths that are computed?

cc @nathanjenx

@nathanjenx

nathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

Removed traceGroupGap from all the width's & fixed up where the newline resets to (incase it's not 0) from:
groupXOffsets[groupXOffsets.length - 1] = 0;
to:
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
@antoinerg

Comment threadsrc/components/legend/draw.js Outdated
@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

Is commit 51178ec what you had in mind?

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
@archmoj

Copy link
Copy Markdown
Contributor

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

@antoinerg

Copy link
Copy Markdown
Contributor

@nathanjenx The horizontal spacing issue is still present.

If I remove all legendgroup from your mock, I get the following:
newplot (11)

Now if I add a legendgroup to the first trace, I get:
newplot (12)

I expected the horizontal spacing to remain the same 🤔

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

Indeed, it would be better if this baseline didn't change at all. @nathanjenx let me know if this is easy/possible!

Thank you again!

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@antoinerg the horizontal spacing was off because I was updating the width then checking it then adding it again, rather than checking if we would be too long + then adding the width if we aren't.

@antoinerg, @archmoj the axis line was off as I originally added traceGroupGap to EVERY row, not just new ones. The changes to the horizontal spacing of the legend items you see now are due to the traceGap being set to 5 (not the 10 it was inheriting from opts.traceGroupGap).

Should be all sorted now! 🎉

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for the thorough revision! It looks good to me 💃

@@ -0,0 +1,57 @@
{

@etpinardetpinardMar 18, 2019

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 comparison, this mock looks like:

image

on master.

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
var textWidths = groupData[i].map(function(legendItemArray) {
var maxItems = 0;

groupData.forEach(function(group) {

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.

NON-BLOCKING

We could probably clean up these few lines a little:

  • use for-loop here instead of forEach
  • ⚡ that double empty new line
  • use Lib.aggNums instead of Math.max.apply and group.reduce
  • make the for(var i = 0, n = groupData.length; i < n; i++) loops for(var i = 0; i < groupData.length; i++), i.e. no need to define n (I think).

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.

Done in a5fa247 except for group.reduce.

Can I really replace group.reduce with Lib.aggNums?

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.

Can I really replace group.reduce with Lib.aggNums?

Maybe with something like:

Lib.aggNums(function(a,b){returna+b[0].height;},0,groups)

similar to Lib.mean, but you're right, that's probably an overkill here as all the b[0].height should be defined. 💃

@etpinard

Copy link
Copy Markdown
Contributor

@antoinerg Thanks for adding that test! I made one very non-blocking comment. Feel free to ignore it.

I'll let you the honours of merging this thing 💃 💃

Thank again @nathanjenx 🥇

@antoinerg
antoinerg merged commit a24fea7 into plotly:masterMar 20, 2019
@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@etpinard@antoinerg sorry for going dark at the end there! Cheers for pushing it over the line! 💃💃

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

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanjenx@antoinerg@archmoj@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Fix #1913 by pushing overflowed legend items to a new line - #3628

Merged
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line#3628
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups

Conversation

@nathanjenx

@nathanjenxnathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

Fixes the handling of horizontal grouped legend items see #1913. Maintains the vertical grouping and includes gaps between traces (see below screenshot)
image
@antoinerg@etpinard

(edit: updated to show current behaviour, original available here)

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for submitting this PR 🎉

It seems like two mocks are not matching the baselines. Could you update the baselines by running:

$ npm run baseline legend_horizontal_groups
$ npm run baseline legendgroup_horizontal_wrapping

I will review the rest of your PR shortly 😸

@antoinerg

Copy link
Copy Markdown
Contributor

About tracegroupgap, its description says that it

Sets the amount of vertical space (in px) between legend groups.

As of right now, it also affects the horizontal spacing. Could you get rid of this behaviour by not adding traceGroupGap to the widths that are computed?

cc @nathanjenx

@nathanjenx

nathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

Removed traceGroupGap from all the width's & fixed up where the newline resets to (incase it's not 0) from:
groupXOffsets[groupXOffsets.length - 1] = 0;
to:
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
@antoinerg

Comment threadsrc/components/legend/draw.js Outdated
@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

Is commit 51178ec what you had in mind?

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
@archmoj

Copy link
Copy Markdown
Contributor

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

@antoinerg

Copy link
Copy Markdown
Contributor

@nathanjenx The horizontal spacing issue is still present.

If I remove all legendgroup from your mock, I get the following:
newplot (11)

Now if I add a legendgroup to the first trace, I get:
newplot (12)

I expected the horizontal spacing to remain the same 🤔

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

Indeed, it would be better if this baseline didn't change at all. @nathanjenx let me know if this is easy/possible!

Thank you again!

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@antoinerg the horizontal spacing was off because I was updating the width then checking it then adding it again, rather than checking if we would be too long + then adding the width if we aren't.

@antoinerg, @archmoj the axis line was off as I originally added traceGroupGap to EVERY row, not just new ones. The changes to the horizontal spacing of the legend items you see now are due to the traceGap being set to 5 (not the 10 it was inheriting from opts.traceGroupGap).

Should be all sorted now! 🎉

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for the thorough revision! It looks good to me 💃

@@ -0,0 +1,57 @@
{

@etpinardetpinardMar 18, 2019

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 comparison, this mock looks like:

image

on master.

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
var textWidths = groupData[i].map(function(legendItemArray) {
var maxItems = 0;

groupData.forEach(function(group) {

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.

NON-BLOCKING

We could probably clean up these few lines a little:

  • use for-loop here instead of forEach
  • ⚡ that double empty new line
  • use Lib.aggNums instead of Math.max.apply and group.reduce
  • make the for(var i = 0, n = groupData.length; i < n; i++) loops for(var i = 0; i < groupData.length; i++), i.e. no need to define n (I think).

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.

Done in a5fa247 except for group.reduce.

Can I really replace group.reduce with Lib.aggNums?

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.

Can I really replace group.reduce with Lib.aggNums?

Maybe with something like:

Lib.aggNums(function(a,b){returna+b[0].height;},0,groups)

similar to Lib.mean, but you're right, that's probably an overkill here as all the b[0].height should be defined. 💃

@etpinard

Copy link
Copy Markdown
Contributor

@antoinerg Thanks for adding that test! I made one very non-blocking comment. Feel free to ignore it.

I'll let you the honours of merging this thing 💃 💃

Thank again @nathanjenx 🥇

@antoinerg
antoinerg merged commit a24fea7 into plotly:masterMar 20, 2019
@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@etpinard@antoinerg sorry for going dark at the end there! Cheers for pushing it over the line! 💃💃

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

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix #1913 by pushing overflowed legend items to a new line - #3628

Merged
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line#3628
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups

Conversation

@nathanjenx

@nathanjenxnathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

Fixes the handling of horizontal grouped legend items see #1913. Maintains the vertical grouping and includes gaps between traces (see below screenshot)
image
@antoinerg@etpinard

(edit: updated to show current behaviour, original available here)

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for submitting this PR 🎉

It seems like two mocks are not matching the baselines. Could you update the baselines by running:

$ npm run baseline legend_horizontal_groups
$ npm run baseline legendgroup_horizontal_wrapping

I will review the rest of your PR shortly 😸

@antoinerg

Copy link
Copy Markdown
Contributor

About tracegroupgap, its description says that it

Sets the amount of vertical space (in px) between legend groups.

As of right now, it also affects the horizontal spacing. Could you get rid of this behaviour by not adding traceGroupGap to the widths that are computed?

cc @nathanjenx

@nathanjenx

nathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

Removed traceGroupGap from all the width's & fixed up where the newline resets to (incase it's not 0) from:
groupXOffsets[groupXOffsets.length - 1] = 0;
to:
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
@antoinerg

Comment threadsrc/components/legend/draw.js Outdated
@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

Is commit 51178ec what you had in mind?

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
@archmoj

Copy link
Copy Markdown
Contributor

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

@antoinerg

Copy link
Copy Markdown
Contributor

@nathanjenx The horizontal spacing issue is still present.

If I remove all legendgroup from your mock, I get the following:
newplot (11)

Now if I add a legendgroup to the first trace, I get:
newplot (12)

I expected the horizontal spacing to remain the same 🤔

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

Indeed, it would be better if this baseline didn't change at all. @nathanjenx let me know if this is easy/possible!

Thank you again!

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@antoinerg the horizontal spacing was off because I was updating the width then checking it then adding it again, rather than checking if we would be too long + then adding the width if we aren't.

@antoinerg, @archmoj the axis line was off as I originally added traceGroupGap to EVERY row, not just new ones. The changes to the horizontal spacing of the legend items you see now are due to the traceGap being set to 5 (not the 10 it was inheriting from opts.traceGroupGap).

Should be all sorted now! 🎉

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for the thorough revision! It looks good to me 💃

@@ -0,0 +1,57 @@
{

@etpinardetpinardMar 18, 2019

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 comparison, this mock looks like:

image

on master.

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
var textWidths = groupData[i].map(function(legendItemArray) {
var maxItems = 0;

groupData.forEach(function(group) {

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.

NON-BLOCKING

We could probably clean up these few lines a little:

  • use for-loop here instead of forEach
  • ⚡ that double empty new line
  • use Lib.aggNums instead of Math.max.apply and group.reduce
  • make the for(var i = 0, n = groupData.length; i < n; i++) loops for(var i = 0; i < groupData.length; i++), i.e. no need to define n (I think).

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.

Done in a5fa247 except for group.reduce.

Can I really replace group.reduce with Lib.aggNums?

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.

Can I really replace group.reduce with Lib.aggNums?

Maybe with something like:

Lib.aggNums(function(a,b){returna+b[0].height;},0,groups)

similar to Lib.mean, but you're right, that's probably an overkill here as all the b[0].height should be defined. 💃

@etpinard

Copy link
Copy Markdown
Contributor

@antoinerg Thanks for adding that test! I made one very non-blocking comment. Feel free to ignore it.

I'll let you the honours of merging this thing 💃 💃

Thank again @nathanjenx 🥇

@antoinerg
antoinerg merged commit a24fea7 into plotly:masterMar 20, 2019
@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@etpinard@antoinerg sorry for going dark at the end there! Cheers for pushing it over the line! 💃💃

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

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix #1913 by pushing overflowed legend items to a new line - #3628

Merged
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line#3628
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups

Conversation

@nathanjenx

@nathanjenxnathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

Fixes the handling of horizontal grouped legend items see #1913. Maintains the vertical grouping and includes gaps between traces (see below screenshot)
image
@antoinerg@etpinard

(edit: updated to show current behaviour, original available here)

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for submitting this PR 🎉

It seems like two mocks are not matching the baselines. Could you update the baselines by running:

$ npm run baseline legend_horizontal_groups
$ npm run baseline legendgroup_horizontal_wrapping

I will review the rest of your PR shortly 😸

@antoinerg

Copy link
Copy Markdown
Contributor

About tracegroupgap, its description says that it

Sets the amount of vertical space (in px) between legend groups.

As of right now, it also affects the horizontal spacing. Could you get rid of this behaviour by not adding traceGroupGap to the widths that are computed?

cc @nathanjenx

@nathanjenx

nathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

Removed traceGroupGap from all the width's & fixed up where the newline resets to (incase it's not 0) from:
groupXOffsets[groupXOffsets.length - 1] = 0;
to:
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
@antoinerg

Comment threadsrc/components/legend/draw.js Outdated
@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

Is commit 51178ec what you had in mind?

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
@archmoj

Copy link
Copy Markdown
Contributor

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

@antoinerg

Copy link
Copy Markdown
Contributor

@nathanjenx The horizontal spacing issue is still present.

If I remove all legendgroup from your mock, I get the following:
newplot (11)

Now if I add a legendgroup to the first trace, I get:
newplot (12)

I expected the horizontal spacing to remain the same 🤔

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

Indeed, it would be better if this baseline didn't change at all. @nathanjenx let me know if this is easy/possible!

Thank you again!

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@antoinerg the horizontal spacing was off because I was updating the width then checking it then adding it again, rather than checking if we would be too long + then adding the width if we aren't.

@antoinerg, @archmoj the axis line was off as I originally added traceGroupGap to EVERY row, not just new ones. The changes to the horizontal spacing of the legend items you see now are due to the traceGap being set to 5 (not the 10 it was inheriting from opts.traceGroupGap).

Should be all sorted now! 🎉

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for the thorough revision! It looks good to me 💃

@@ -0,0 +1,57 @@
{

@etpinardetpinardMar 18, 2019

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 comparison, this mock looks like:

image

on master.

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
var textWidths = groupData[i].map(function(legendItemArray) {
var maxItems = 0;

groupData.forEach(function(group) {

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.

NON-BLOCKING

We could probably clean up these few lines a little:

  • use for-loop here instead of forEach
  • ⚡ that double empty new line
  • use Lib.aggNums instead of Math.max.apply and group.reduce
  • make the for(var i = 0, n = groupData.length; i < n; i++) loops for(var i = 0; i < groupData.length; i++), i.e. no need to define n (I think).

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.

Done in a5fa247 except for group.reduce.

Can I really replace group.reduce with Lib.aggNums?

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.

Can I really replace group.reduce with Lib.aggNums?

Maybe with something like:

Lib.aggNums(function(a,b){returna+b[0].height;},0,groups)

similar to Lib.mean, but you're right, that's probably an overkill here as all the b[0].height should be defined. 💃

@etpinard

Copy link
Copy Markdown
Contributor

@antoinerg Thanks for adding that test! I made one very non-blocking comment. Feel free to ignore it.

I'll let you the honours of merging this thing 💃 💃

Thank again @nathanjenx 🥇

@antoinerg
antoinerg merged commit a24fea7 into plotly:masterMar 20, 2019
@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@etpinard@antoinerg sorry for going dark at the end there! Cheers for pushing it over the line! 💃💃

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

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix #1913 by pushing overflowed legend items to a new line - #3628

Merged
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line#3628
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups

Conversation

@nathanjenx

@nathanjenxnathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

Fixes the handling of horizontal grouped legend items see #1913. Maintains the vertical grouping and includes gaps between traces (see below screenshot)
image
@antoinerg@etpinard

(edit: updated to show current behaviour, original available here)

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for submitting this PR 🎉

It seems like two mocks are not matching the baselines. Could you update the baselines by running:

$ npm run baseline legend_horizontal_groups
$ npm run baseline legendgroup_horizontal_wrapping

I will review the rest of your PR shortly 😸

@antoinerg

Copy link
Copy Markdown
Contributor

About tracegroupgap, its description says that it

Sets the amount of vertical space (in px) between legend groups.

As of right now, it also affects the horizontal spacing. Could you get rid of this behaviour by not adding traceGroupGap to the widths that are computed?

cc @nathanjenx

@nathanjenx

nathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

Removed traceGroupGap from all the width's & fixed up where the newline resets to (incase it's not 0) from:
groupXOffsets[groupXOffsets.length - 1] = 0;
to:
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
@antoinerg

Comment threadsrc/components/legend/draw.js Outdated
@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

Is commit 51178ec what you had in mind?

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
@archmoj

Copy link
Copy Markdown
Contributor

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

@antoinerg

Copy link
Copy Markdown
Contributor

@nathanjenx The horizontal spacing issue is still present.

If I remove all legendgroup from your mock, I get the following:
newplot (11)

Now if I add a legendgroup to the first trace, I get:
newplot (12)

I expected the horizontal spacing to remain the same 🤔

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

Indeed, it would be better if this baseline didn't change at all. @nathanjenx let me know if this is easy/possible!

Thank you again!

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@antoinerg the horizontal spacing was off because I was updating the width then checking it then adding it again, rather than checking if we would be too long + then adding the width if we aren't.

@antoinerg, @archmoj the axis line was off as I originally added traceGroupGap to EVERY row, not just new ones. The changes to the horizontal spacing of the legend items you see now are due to the traceGap being set to 5 (not the 10 it was inheriting from opts.traceGroupGap).

Should be all sorted now! 🎉

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for the thorough revision! It looks good to me 💃

@@ -0,0 +1,57 @@
{

@etpinardetpinardMar 18, 2019

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 comparison, this mock looks like:

image

on master.

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
var textWidths = groupData[i].map(function(legendItemArray) {
var maxItems = 0;

groupData.forEach(function(group) {

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.

NON-BLOCKING

We could probably clean up these few lines a little:

  • use for-loop here instead of forEach
  • ⚡ that double empty new line
  • use Lib.aggNums instead of Math.max.apply and group.reduce
  • make the for(var i = 0, n = groupData.length; i < n; i++) loops for(var i = 0; i < groupData.length; i++), i.e. no need to define n (I think).

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.

Done in a5fa247 except for group.reduce.

Can I really replace group.reduce with Lib.aggNums?

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.

Can I really replace group.reduce with Lib.aggNums?

Maybe with something like:

Lib.aggNums(function(a,b){returna+b[0].height;},0,groups)

similar to Lib.mean, but you're right, that's probably an overkill here as all the b[0].height should be defined. 💃

@etpinard

Copy link
Copy Markdown
Contributor

@antoinerg Thanks for adding that test! I made one very non-blocking comment. Feel free to ignore it.

I'll let you the honours of merging this thing 💃 💃

Thank again @nathanjenx 🥇

@antoinerg
antoinerg merged commit a24fea7 into plotly:masterMar 20, 2019
@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@etpinard@antoinerg sorry for going dark at the end there! Cheers for pushing it over the line! 💃💃

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

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanjenx@antoinerg@archmoj@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix #1913 by pushing overflowed legend items to a new line - #3628

Merged
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line#3628
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups

Conversation

@nathanjenx

@nathanjenxnathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

Fixes the handling of horizontal grouped legend items see #1913. Maintains the vertical grouping and includes gaps between traces (see below screenshot)
image
@antoinerg@etpinard

(edit: updated to show current behaviour, original available here)

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for submitting this PR 🎉

It seems like two mocks are not matching the baselines. Could you update the baselines by running:

$ npm run baseline legend_horizontal_groups
$ npm run baseline legendgroup_horizontal_wrapping

I will review the rest of your PR shortly 😸

@antoinerg

Copy link
Copy Markdown
Contributor

About tracegroupgap, its description says that it

Sets the amount of vertical space (in px) between legend groups.

As of right now, it also affects the horizontal spacing. Could you get rid of this behaviour by not adding traceGroupGap to the widths that are computed?

cc @nathanjenx

@nathanjenx

nathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

Removed traceGroupGap from all the width's & fixed up where the newline resets to (incase it's not 0) from:
groupXOffsets[groupXOffsets.length - 1] = 0;
to:
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
@antoinerg

Comment threadsrc/components/legend/draw.js Outdated
@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

Is commit 51178ec what you had in mind?

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
@archmoj

Copy link
Copy Markdown
Contributor

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

@antoinerg

Copy link
Copy Markdown
Contributor

@nathanjenx The horizontal spacing issue is still present.

If I remove all legendgroup from your mock, I get the following:
newplot (11)

Now if I add a legendgroup to the first trace, I get:
newplot (12)

I expected the horizontal spacing to remain the same 🤔

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

Indeed, it would be better if this baseline didn't change at all. @nathanjenx let me know if this is easy/possible!

Thank you again!

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@antoinerg the horizontal spacing was off because I was updating the width then checking it then adding it again, rather than checking if we would be too long + then adding the width if we aren't.

@antoinerg, @archmoj the axis line was off as I originally added traceGroupGap to EVERY row, not just new ones. The changes to the horizontal spacing of the legend items you see now are due to the traceGap being set to 5 (not the 10 it was inheriting from opts.traceGroupGap).

Should be all sorted now! 🎉

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for the thorough revision! It looks good to me 💃

@@ -0,0 +1,57 @@
{

@etpinardetpinardMar 18, 2019

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 comparison, this mock looks like:

image

on master.

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
var textWidths = groupData[i].map(function(legendItemArray) {
var maxItems = 0;

groupData.forEach(function(group) {

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.

NON-BLOCKING

We could probably clean up these few lines a little:

  • use for-loop here instead of forEach
  • ⚡ that double empty new line
  • use Lib.aggNums instead of Math.max.apply and group.reduce
  • make the for(var i = 0, n = groupData.length; i < n; i++) loops for(var i = 0; i < groupData.length; i++), i.e. no need to define n (I think).

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.

Done in a5fa247 except for group.reduce.

Can I really replace group.reduce with Lib.aggNums?

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.

Can I really replace group.reduce with Lib.aggNums?

Maybe with something like:

Lib.aggNums(function(a,b){returna+b[0].height;},0,groups)

similar to Lib.mean, but you're right, that's probably an overkill here as all the b[0].height should be defined. 💃

@etpinard

Copy link
Copy Markdown
Contributor

@antoinerg Thanks for adding that test! I made one very non-blocking comment. Feel free to ignore it.

I'll let you the honours of merging this thing 💃 💃

Thank again @nathanjenx 🥇

@antoinerg
antoinerg merged commit a24fea7 into plotly:masterMar 20, 2019
@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@etpinard@antoinerg sorry for going dark at the end there! Cheers for pushing it over the line! 💃💃

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

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanjenx@antoinerg@archmoj@etpinard
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix #1913 by pushing overflowed legend items to a new line - #3628

Merged
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line#3628
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups

Conversation

@nathanjenx

@nathanjenxnathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

Fixes the handling of horizontal grouped legend items see #1913. Maintains the vertical grouping and includes gaps between traces (see below screenshot)
image
@antoinerg@etpinard

(edit: updated to show current behaviour, original available here)

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for submitting this PR 🎉

It seems like two mocks are not matching the baselines. Could you update the baselines by running:

$ npm run baseline legend_horizontal_groups
$ npm run baseline legendgroup_horizontal_wrapping

I will review the rest of your PR shortly 😸

@antoinerg

Copy link
Copy Markdown
Contributor

About tracegroupgap, its description says that it

Sets the amount of vertical space (in px) between legend groups.

As of right now, it also affects the horizontal spacing. Could you get rid of this behaviour by not adding traceGroupGap to the widths that are computed?

cc @nathanjenx

@nathanjenx

nathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

Removed traceGroupGap from all the width's & fixed up where the newline resets to (incase it's not 0) from:
groupXOffsets[groupXOffsets.length - 1] = 0;
to:
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
@antoinerg

Comment threadsrc/components/legend/draw.js Outdated
@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

Is commit 51178ec what you had in mind?

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
@archmoj

Copy link
Copy Markdown
Contributor

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

@antoinerg

Copy link
Copy Markdown
Contributor

@nathanjenx The horizontal spacing issue is still present.

If I remove all legendgroup from your mock, I get the following:
newplot (11)

Now if I add a legendgroup to the first trace, I get:
newplot (12)

I expected the horizontal spacing to remain the same 🤔

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

Indeed, it would be better if this baseline didn't change at all. @nathanjenx let me know if this is easy/possible!

Thank you again!

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@antoinerg the horizontal spacing was off because I was updating the width then checking it then adding it again, rather than checking if we would be too long + then adding the width if we aren't.

@antoinerg, @archmoj the axis line was off as I originally added traceGroupGap to EVERY row, not just new ones. The changes to the horizontal spacing of the legend items you see now are due to the traceGap being set to 5 (not the 10 it was inheriting from opts.traceGroupGap).

Should be all sorted now! 🎉

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for the thorough revision! It looks good to me 💃

@@ -0,0 +1,57 @@
{

@etpinardetpinardMar 18, 2019

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 comparison, this mock looks like:

image

on master.

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
var textWidths = groupData[i].map(function(legendItemArray) {
var maxItems = 0;

groupData.forEach(function(group) {

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.

NON-BLOCKING

We could probably clean up these few lines a little:

  • use for-loop here instead of forEach
  • ⚡ that double empty new line
  • use Lib.aggNums instead of Math.max.apply and group.reduce
  • make the for(var i = 0, n = groupData.length; i < n; i++) loops for(var i = 0; i < groupData.length; i++), i.e. no need to define n (I think).

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.

Done in a5fa247 except for group.reduce.

Can I really replace group.reduce with Lib.aggNums?

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.

Can I really replace group.reduce with Lib.aggNums?

Maybe with something like:

Lib.aggNums(function(a,b){returna+b[0].height;},0,groups)

similar to Lib.mean, but you're right, that's probably an overkill here as all the b[0].height should be defined. 💃

@etpinard

Copy link
Copy Markdown
Contributor

@antoinerg Thanks for adding that test! I made one very non-blocking comment. Feel free to ignore it.

I'll let you the honours of merging this thing 💃 💃

Thank again @nathanjenx 🥇

@antoinerg
antoinerg merged commit a24fea7 into plotly:masterMar 20, 2019
@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@etpinard@antoinerg sorry for going dark at the end there! Cheers for pushing it over the line! 💃💃

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

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix #1913 by pushing overflowed legend items to a new line - #3628

Merged
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups
Mar 20, 2019
Merged

Fix #1913 by pushing overflowed legend items to a new line#3628
antoinerg merged 14 commits into
plotly:masterfrom
nathanjenx:fix1913-horizontal-legened-groups

Conversation

@nathanjenx

@nathanjenxnathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

Fixes the handling of horizontal grouped legend items see #1913. Maintains the vertical grouping and includes gaps between traces (see below screenshot)
image
@antoinerg@etpinard

(edit: updated to show current behaviour, original available here)

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for submitting this PR 🎉

It seems like two mocks are not matching the baselines. Could you update the baselines by running:

$ npm run baseline legend_horizontal_groups
$ npm run baseline legendgroup_horizontal_wrapping

I will review the rest of your PR shortly 😸

@antoinerg

Copy link
Copy Markdown
Contributor

About tracegroupgap, its description says that it

Sets the amount of vertical space (in px) between legend groups.

As of right now, it also affects the horizontal spacing. Could you get rid of this behaviour by not adding traceGroupGap to the widths that are computed?

cc @nathanjenx

@nathanjenx

nathanjenx commented Mar 12, 2019

Copy link
Copy Markdown
ContributorAuthor

Removed traceGroupGap from all the width's & fixed up where the newline resets to (incase it's not 0) from:
groupXOffsets[groupXOffsets.length - 1] = 0;
to:
groupXOffsets[groupXOffsets.length - 1] = groupXOffsets[0];
@antoinerg

Comment threadsrc/components/legend/draw.js Outdated
@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

Thank you @nathanjenx for commit b9542c4 which removes tracegroupgap from horizontal margin.

I now realize however that we should still have some horizontal spacing between items to be in line with what we have when there are no grouped items. To do so, we should add a traceGap of 5 px to be equivalent to L672 of draw.js.

While you're at it, I think we should replace L672 from:
var traceGap = opts.tracegroupgap || 5; to var traceGap = 5;
Otherwise, tracegroupgap has an effect on legends without grouped items which shouldn't be the case.

Is commit 51178ec what you had in mind?

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
@archmoj

Copy link
Copy Markdown
Contributor

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

@antoinerg

Copy link
Copy Markdown
Contributor

@nathanjenx The horizontal spacing issue is still present.

If I remove all legendgroup from your mock, I get the following:
newplot (11)

Now if I add a legendgroup to the first trace, I get:
newplot (12)

I expected the horizontal spacing to remain the same 🤔

Concerning the changes in this baseline, I am wondering one should find a way to keep the axis line where it was before?

Indeed, it would be better if this baseline didn't change at all. @nathanjenx let me know if this is easy/possible!

Thank you again!

@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@antoinerg the horizontal spacing was off because I was updating the width then checking it then adding it again, rather than checking if we would be too long + then adding the width if we aren't.

@antoinerg, @archmoj the axis line was off as I originally added traceGroupGap to EVERY row, not just new ones. The changes to the horizontal spacing of the legend items you see now are due to the traceGap being set to 5 (not the 10 it was inheriting from opts.traceGroupGap).

Should be all sorted now! 🎉

@antoinerg

Copy link
Copy Markdown
Contributor

Thank you @nathanjenx for the thorough revision! It looks good to me 💃

@@ -0,0 +1,57 @@
{

@etpinardetpinardMar 18, 2019

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 comparison, this mock looks like:

image

on master.

Comment threadsrc/components/legend/draw.js Outdated
Comment threadsrc/components/legend/draw.js Outdated
var textWidths = groupData[i].map(function(legendItemArray) {
var maxItems = 0;

groupData.forEach(function(group) {

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.

NON-BLOCKING

We could probably clean up these few lines a little:

  • use for-loop here instead of forEach
  • ⚡ that double empty new line
  • use Lib.aggNums instead of Math.max.apply and group.reduce
  • make the for(var i = 0, n = groupData.length; i < n; i++) loops for(var i = 0; i < groupData.length; i++), i.e. no need to define n (I think).

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.

Done in a5fa247 except for group.reduce.

Can I really replace group.reduce with Lib.aggNums?

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.

Can I really replace group.reduce with Lib.aggNums?

Maybe with something like:

Lib.aggNums(function(a,b){returna+b[0].height;},0,groups)

similar to Lib.mean, but you're right, that's probably an overkill here as all the b[0].height should be defined. 💃

@etpinard

Copy link
Copy Markdown
Contributor

@antoinerg Thanks for adding that test! I made one very non-blocking comment. Feel free to ignore it.

I'll let you the honours of merging this thing 💃 💃

Thank again @nathanjenx 🥇

@antoinerg
antoinerg merged commit a24fea7 into plotly:masterMar 20, 2019
@nathanjenx

Copy link
Copy Markdown
ContributorAuthor

@etpinard@antoinerg sorry for going dark at the end there! Cheers for pushing it over the line! 💃💃

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

Labels

bugsomething broken

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nathanjenx@antoinerg@archmoj@etpinard