Skip to content

Improve padding logic for updatemenus#989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rreusser merged 2 commits into from
Sep 29, 2016
Merged

Improve padding logic for updatemenus #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05ac586
Improve padding logic for updatemenus
rreusser Sep 28, 2016
4604341
Add jasmine tests for updatemenus padding
rreusser Sep 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/updatemenus/attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
var fontAttrs = require('../../plots/font_attributes');
var colorAttrs = require('../color/attributes');
var extendFlat = require('../../lib/extend').extendFlat;
var padAttrs = require('../../plots/pad_attributes');

@etpinardetpinardSep 28, 2016•
edited
Loading

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.

That's where pad_attributes.js belongs at the moment, but I hate to see so many files pile up in the src/plots/ root.

Maybe we could add a src/plots/common/folder? or src/components/common/? or even a src/common/ for similar shared modules.

@rreusserrreusserSep 28, 2016•
edited
Loading

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.

Agreed. Font attributes would probably go with it? At least internal reorg is easy refactoring (especially since static requires so that errors fail bundling), so can try to cut down on plots/ bit by bit (pun?)

@etpinardetpinardSep 29, 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.

Font attributes would probably go with it?

yep, exactly.

so can try to cut down on plots/ bit by bit (pun?)

No action required in this PR. I just wanted to mention something I've been thinking about for a while now.


var buttonsAttrs = {
_isLinkedToArray: true,
Expand DownExpand Up@@ -140,6 +141,10 @@ module.exports = {
].join(' ')
},

pad: extendFlat({}, padAttrs, {
description: 'Sets the padding around the buttons or dropdown menu.'
}),

font: extendFlat({}, fontAttrs, {
description: 'Sets the font of the update menu button text.'
}),
Expand Down
5 changes: 5 additions & 0 deletions src/components/updatemenus/defaults.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
coerce('xanchor');
coerce('yanchor');

coerce('pad.t');
coerce('pad.r');
coerce('pad.b');
coerce('pad.l');

Lib.coerceFont(coerce, 'font', layoutOut.font);

coerce('bgcolor', layoutOut.paper_bgcolor);
Expand Down
29 changes: 16 additions & 13 deletions src/components/updatemenus/draw.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {

var active = menuOpts.active,
headerOpts = menuOpts.buttons[active] || constants.blankHeaderOpts,
posOpts = { y: 0, yPad: 0, x: 0, xPad: 0, index: 0 },
posOpts = { y: menuOpts.pad.t, yPad: 0, x: menuOpts.pad.l, xPad: 0, index: 0 },
positionOverrides = {
width: menuOpts.headerWidth,
height: menuOpts.headerHeight
Expand All@@ -191,8 +191,8 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
.text('▼');

arrow.attr({
x: menuOpts.headerWidth - constants.arrowOffsetX,
y: menuOpts.headerHeight / 2 + constants.textOffsetY
x: menuOpts.headerWidth - constants.arrowOffsetX + menuOpts.pad.l,
y: menuOpts.headerHeight / 2 + constants.textOffsetY + menuOpts.pad.t
});

header.on('click', function() {
Expand DownExpand Up@@ -275,8 +275,8 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
}

var posOpts = {
x: x0,
y: y0,
x: x0 + menuOpts.pad.l,
y: y0 + menuOpts.pad.t,
yPad: constants.gapButton,
xPad: constants.gapButton,
index: 0,
Expand DownExpand Up@@ -468,27 +468,30 @@ function findDimenstions(gd, menuOpts) {

fakeButtons.remove();

var paddedWidth = menuOpts.totalWidth + menuOpts.pad.l + menuOpts.pad.r;
var paddedHeight = menuOpts.totalHeight + menuOpts.pad.t + menuOpts.pad.b;

var graphSize = gd._fullLayout._size;
menuOpts.lx = graphSize.l + graphSize.w * menuOpts.x;
menuOpts.ly = graphSize.t + graphSize.h * (1 - menuOpts.y);

var xanchor = 'left';
if(anchorUtils.isRightAnchor(menuOpts)) {
menuOpts.lx -= menuOpts.totalWidth;
menuOpts.lx -= paddedWidth;
xanchor = 'right';
}
if(anchorUtils.isCenterAnchor(menuOpts)) {
menuOpts.lx -= menuOpts.totalWidth / 2;
menuOpts.lx -= paddedWidth / 2;
xanchor = 'center';
}

var yanchor = 'top';
if(anchorUtils.isBottomAnchor(menuOpts)) {
menuOpts.ly -= menuOpts.totalHeight;
menuOpts.ly -= paddedHeight;
yanchor = 'bottom';
}
if(anchorUtils.isMiddleAnchor(menuOpts)) {
menuOpts.ly -= menuOpts.totalHeight / 2;
menuOpts.ly -= paddedHeight / 2;
yanchor = 'middle';
}

Expand All@@ -500,10 +503,10 @@ function findDimenstions(gd, menuOpts) {
Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index, {
x: menuOpts.x,
y: menuOpts.y,
l: menuOpts.totalWidth * ({right: 1, center: 0.5}[xanchor] || 0),
r: menuOpts.totalWidth * ({left: 1, center: 0.5}[xanchor] || 0),
b: menuOpts.totalHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
t: menuOpts.totalHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
l: paddedWidth * ({right: 1, center: 0.5}[xanchor] || 0),
r: paddedWidth * ({left: 1, center: 0.5}[xanchor] || 0),
b: paddedHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
t: paddedHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)

@etpinardetpinardSep 28, 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.

Wow. That was easy. I love it!

});
}

Expand Down
36 changes: 36 additions & 0 deletions src/plots/pad_attributes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
t: {
valType: 'number',
dflt: 0,
role: 'style',
description: 'The amount of padding (in px) along the top of the component.'
},
r: {
valType: 'number',
dflt: 0,
role: 'style',
description: 'The amount of padding (in px) on the right side of the component.'
},
b: {
valType: 'number',
dflt: 0,
role: 'style',
description: 'The amount of padding (in px) along the bottom of the component.'
},
l: {
valType: 'number',
dflt: 0,
role: 'style',
description: 'The amount of padding (in px) on the left side of the component.'
}
};
Binary file modifiedtest/image/baselines/updatemenus_positioning.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
, '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" + '
Improve padding logic for updatemenus by rreusser · Pull Request #989 · plotly/plotly.js · GitHub
Skip to content
Improve padding logic for updatemenus#989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rreusser
merged 2 commits into

from

Sep 29, 2016
 Merged


Improve padding logic for updatemenus
#989
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05ac586

Improve padding logic for updatemenus


rreusser Sep 28, 2016
4604341

Add jasmine tests for updatemenus padding


rreusser Sep 29, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
src/components/updatemenus/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
var fontAttrs = require('../../plots/font_attributes');
var colorAttrs = require('../color/attributes');
var extendFlat = require('../../lib/extend').extendFlat;
var padAttrs = require('../../plots/pad_attributes');
@etpinardetpinardSep 28, 2016•

edited

Loading

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.

That's where pad_attributes.js belongs at the moment, but I hate to see so many files pile up in the src/plots/ root.
Maybe we could add a src/plots/common/folder? or src/components/common/? or even a src/common/ for similar shared modules.
@rreusserrreusserSep 28, 2016•

edited

Loading

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.

Agreed. Font attributes would probably go with it? At least internal reorg is easy refactoring (especially since static requires so that errors fail bundling), so can try to cut down on plots/ bit by bit (pun?)
@etpinardetpinardSep 29, 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.

Font attributes would probably go with it?
yep, exactly.
so can try to cut down on plots/ bit by bit (pun?)
No action required in this PR. I just wanted to mention something I've been thinking about for a while now.

var buttonsAttrs = {
 _isLinkedToArray: true,
Expand DownExpand Up@@ -140,6 +141,10 @@ module.exports = {
 ].join(' ')
 },

 pad: extendFlat({}, padAttrs, {
 description: 'Sets the padding around the buttons or dropdown menu.'
 }),

 font: extendFlat({}, fontAttrs, {
 description: 'Sets the font of the update menu button text.'
 }),
Expand Down

5 changes: 5 additions & 0 deletions
src/components/updatemenus/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
 coerce('xanchor');
 coerce('yanchor');

 coerce('pad.t');
 coerce('pad.r');
 coerce('pad.b');
 coerce('pad.l');

 Lib.coerceFont(coerce, 'font', layoutOut.font);

 coerce('bgcolor', layoutOut.paper_bgcolor);
Expand Down

29 changes: 16 additions & 13 deletions
src/components/updatemenus/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {

 var active = menuOpts.active,
 headerOpts = menuOpts.buttons[active] || constants.blankHeaderOpts,
 posOpts = { y: 0, yPad: 0, x: 0, xPad: 0, index: 0 },
 posOpts = { y: menuOpts.pad.t, yPad: 0, x: menuOpts.pad.l, xPad: 0, index: 0 },
 positionOverrides = {
 width: menuOpts.headerWidth,
 height: menuOpts.headerHeight
Expand All@@ -191,8 +191,8 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
 .text('▼');

 arrow.attr({
 x: menuOpts.headerWidth - constants.arrowOffsetX,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY
 x: menuOpts.headerWidth - constants.arrowOffsetX + menuOpts.pad.l,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY + menuOpts.pad.t
 });

 header.on('click', function() {
Expand DownExpand Up@@ -275,8 +275,8 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
 }

 var posOpts = {
 x: x0,
 y: y0,
 x: x0 + menuOpts.pad.l,
 y: y0 + menuOpts.pad.t,
 yPad: constants.gapButton,
 xPad: constants.gapButton,
 index: 0,
Expand DownExpand Up@@ -468,27 +468,30 @@ function findDimenstions(gd, menuOpts) {

 fakeButtons.remove();

 var paddedWidth = menuOpts.totalWidth + menuOpts.pad.l + menuOpts.pad.r;
 var paddedHeight = menuOpts.totalHeight + menuOpts.pad.t + menuOpts.pad.b;

 var graphSize = gd._fullLayout._size;
 menuOpts.lx = graphSize.l + graphSize.w * menuOpts.x;
 menuOpts.ly = graphSize.t + graphSize.h * (1 - menuOpts.y);

 var xanchor = 'left';
 if(anchorUtils.isRightAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth;
 menuOpts.lx -= paddedWidth;
 xanchor = 'right';
 }
 if(anchorUtils.isCenterAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth / 2;
 menuOpts.lx -= paddedWidth / 2;
 xanchor = 'center';
 }

 var yanchor = 'top';
 if(anchorUtils.isBottomAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight;
 menuOpts.ly -= paddedHeight;
 yanchor = 'bottom';
 }
 if(anchorUtils.isMiddleAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight / 2;
 menuOpts.ly -= paddedHeight / 2;
 yanchor = 'middle';
 }

Expand All@@ -500,10 +503,10 @@ function findDimenstions(gd, menuOpts) {
 Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index, {
 x: menuOpts.x,
 y: menuOpts.y,
 l: menuOpts.totalWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: menuOpts.totalWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: menuOpts.totalHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: menuOpts.totalHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
 l: paddedWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: paddedWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: paddedHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: paddedHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
@etpinardetpinardSep 28, 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.

Wow. That was easy. I love it!
 });
}

Expand Down

36 changes: 36 additions & 0 deletions
src/plots/pad_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
 t: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the top of the component.'
 },
 r: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the right side of the component.'
 },
 b: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the bottom of the component.'
 },
 l: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the left side of the component.'
 }
};
Binary file modifiedtest/image/baselines/updatemenus_positioning.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, '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('^' + ".*" + '
Improve padding logic for updatemenus by rreusser · Pull Request #989 · plotly/plotly.js · GitHub
Skip to content
Improve padding logic for updatemenus#989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rreusser
merged 2 commits into

from

Sep 29, 2016
 Merged


Improve padding logic for updatemenus
#989
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05ac586

Improve padding logic for updatemenus


rreusser Sep 28, 2016
4604341

Add jasmine tests for updatemenus padding


rreusser Sep 29, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
src/components/updatemenus/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
var fontAttrs = require('../../plots/font_attributes');
var colorAttrs = require('../color/attributes');
var extendFlat = require('../../lib/extend').extendFlat;
var padAttrs = require('../../plots/pad_attributes');
@etpinardetpinardSep 28, 2016•

edited

Loading

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.

That's where pad_attributes.js belongs at the moment, but I hate to see so many files pile up in the src/plots/ root.
Maybe we could add a src/plots/common/folder? or src/components/common/? or even a src/common/ for similar shared modules.
@rreusserrreusserSep 28, 2016•

edited

Loading

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.

Agreed. Font attributes would probably go with it? At least internal reorg is easy refactoring (especially since static requires so that errors fail bundling), so can try to cut down on plots/ bit by bit (pun?)
@etpinardetpinardSep 29, 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.

Font attributes would probably go with it?
yep, exactly.
so can try to cut down on plots/ bit by bit (pun?)
No action required in this PR. I just wanted to mention something I've been thinking about for a while now.

var buttonsAttrs = {
 _isLinkedToArray: true,
Expand DownExpand Up@@ -140,6 +141,10 @@ module.exports = {
 ].join(' ')
 },

 pad: extendFlat({}, padAttrs, {
 description: 'Sets the padding around the buttons or dropdown menu.'
 }),

 font: extendFlat({}, fontAttrs, {
 description: 'Sets the font of the update menu button text.'
 }),
Expand Down

5 changes: 5 additions & 0 deletions
src/components/updatemenus/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
 coerce('xanchor');
 coerce('yanchor');

 coerce('pad.t');
 coerce('pad.r');
 coerce('pad.b');
 coerce('pad.l');

 Lib.coerceFont(coerce, 'font', layoutOut.font);

 coerce('bgcolor', layoutOut.paper_bgcolor);
Expand Down

29 changes: 16 additions & 13 deletions
src/components/updatemenus/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {

 var active = menuOpts.active,
 headerOpts = menuOpts.buttons[active] || constants.blankHeaderOpts,
 posOpts = { y: 0, yPad: 0, x: 0, xPad: 0, index: 0 },
 posOpts = { y: menuOpts.pad.t, yPad: 0, x: menuOpts.pad.l, xPad: 0, index: 0 },
 positionOverrides = {
 width: menuOpts.headerWidth,
 height: menuOpts.headerHeight
Expand All@@ -191,8 +191,8 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
 .text('▼');

 arrow.attr({
 x: menuOpts.headerWidth - constants.arrowOffsetX,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY
 x: menuOpts.headerWidth - constants.arrowOffsetX + menuOpts.pad.l,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY + menuOpts.pad.t
 });

 header.on('click', function() {
Expand DownExpand Up@@ -275,8 +275,8 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
 }

 var posOpts = {
 x: x0,
 y: y0,
 x: x0 + menuOpts.pad.l,
 y: y0 + menuOpts.pad.t,
 yPad: constants.gapButton,
 xPad: constants.gapButton,
 index: 0,
Expand DownExpand Up@@ -468,27 +468,30 @@ function findDimenstions(gd, menuOpts) {

 fakeButtons.remove();

 var paddedWidth = menuOpts.totalWidth + menuOpts.pad.l + menuOpts.pad.r;
 var paddedHeight = menuOpts.totalHeight + menuOpts.pad.t + menuOpts.pad.b;

 var graphSize = gd._fullLayout._size;
 menuOpts.lx = graphSize.l + graphSize.w * menuOpts.x;
 menuOpts.ly = graphSize.t + graphSize.h * (1 - menuOpts.y);

 var xanchor = 'left';
 if(anchorUtils.isRightAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth;
 menuOpts.lx -= paddedWidth;
 xanchor = 'right';
 }
 if(anchorUtils.isCenterAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth / 2;
 menuOpts.lx -= paddedWidth / 2;
 xanchor = 'center';
 }

 var yanchor = 'top';
 if(anchorUtils.isBottomAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight;
 menuOpts.ly -= paddedHeight;
 yanchor = 'bottom';
 }
 if(anchorUtils.isMiddleAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight / 2;
 menuOpts.ly -= paddedHeight / 2;
 yanchor = 'middle';
 }

Expand All@@ -500,10 +503,10 @@ function findDimenstions(gd, menuOpts) {
 Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index, {
 x: menuOpts.x,
 y: menuOpts.y,
 l: menuOpts.totalWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: menuOpts.totalWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: menuOpts.totalHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: menuOpts.totalHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
 l: paddedWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: paddedWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: paddedHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: paddedHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
@etpinardetpinardSep 28, 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.

Wow. That was easy. I love it!
 });
}

Expand Down

36 changes: 36 additions & 0 deletions
src/plots/pad_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
 t: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the top of the component.'
 },
 r: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the right side of the component.'
 },
 b: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the bottom of the component.'
 },
 l: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the left side of the component.'
 }
};
Binary file modifiedtest/image/baselines/updatemenus_positioning.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, '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('^' + ".*" + '
Improve padding logic for updatemenus by rreusser · Pull Request #989 · plotly/plotly.js · GitHub
Skip to content
Improve padding logic for updatemenus#989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rreusser
merged 2 commits into

from

Sep 29, 2016
 Merged


Improve padding logic for updatemenus
#989
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05ac586

Improve padding logic for updatemenus


rreusser Sep 28, 2016
4604341

Add jasmine tests for updatemenus padding


rreusser Sep 29, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
src/components/updatemenus/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
var fontAttrs = require('../../plots/font_attributes');
var colorAttrs = require('../color/attributes');
var extendFlat = require('../../lib/extend').extendFlat;
var padAttrs = require('../../plots/pad_attributes');
@etpinardetpinardSep 28, 2016•

edited

Loading

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.

That's where pad_attributes.js belongs at the moment, but I hate to see so many files pile up in the src/plots/ root.
Maybe we could add a src/plots/common/folder? or src/components/common/? or even a src/common/ for similar shared modules.
@rreusserrreusserSep 28, 2016•

edited

Loading

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.

Agreed. Font attributes would probably go with it? At least internal reorg is easy refactoring (especially since static requires so that errors fail bundling), so can try to cut down on plots/ bit by bit (pun?)
@etpinardetpinardSep 29, 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.

Font attributes would probably go with it?
yep, exactly.
so can try to cut down on plots/ bit by bit (pun?)
No action required in this PR. I just wanted to mention something I've been thinking about for a while now.

var buttonsAttrs = {
 _isLinkedToArray: true,
Expand DownExpand Up@@ -140,6 +141,10 @@ module.exports = {
 ].join(' ')
 },

 pad: extendFlat({}, padAttrs, {
 description: 'Sets the padding around the buttons or dropdown menu.'
 }),

 font: extendFlat({}, fontAttrs, {
 description: 'Sets the font of the update menu button text.'
 }),
Expand Down

5 changes: 5 additions & 0 deletions
src/components/updatemenus/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
 coerce('xanchor');
 coerce('yanchor');

 coerce('pad.t');
 coerce('pad.r');
 coerce('pad.b');
 coerce('pad.l');

 Lib.coerceFont(coerce, 'font', layoutOut.font);

 coerce('bgcolor', layoutOut.paper_bgcolor);
Expand Down

29 changes: 16 additions & 13 deletions
src/components/updatemenus/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {

 var active = menuOpts.active,
 headerOpts = menuOpts.buttons[active] || constants.blankHeaderOpts,
 posOpts = { y: 0, yPad: 0, x: 0, xPad: 0, index: 0 },
 posOpts = { y: menuOpts.pad.t, yPad: 0, x: menuOpts.pad.l, xPad: 0, index: 0 },
 positionOverrides = {
 width: menuOpts.headerWidth,
 height: menuOpts.headerHeight
Expand All@@ -191,8 +191,8 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
 .text('▼');

 arrow.attr({
 x: menuOpts.headerWidth - constants.arrowOffsetX,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY
 x: menuOpts.headerWidth - constants.arrowOffsetX + menuOpts.pad.l,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY + menuOpts.pad.t
 });

 header.on('click', function() {
Expand DownExpand Up@@ -275,8 +275,8 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
 }

 var posOpts = {
 x: x0,
 y: y0,
 x: x0 + menuOpts.pad.l,
 y: y0 + menuOpts.pad.t,
 yPad: constants.gapButton,
 xPad: constants.gapButton,
 index: 0,
Expand DownExpand Up@@ -468,27 +468,30 @@ function findDimenstions(gd, menuOpts) {

 fakeButtons.remove();

 var paddedWidth = menuOpts.totalWidth + menuOpts.pad.l + menuOpts.pad.r;
 var paddedHeight = menuOpts.totalHeight + menuOpts.pad.t + menuOpts.pad.b;

 var graphSize = gd._fullLayout._size;
 menuOpts.lx = graphSize.l + graphSize.w * menuOpts.x;
 menuOpts.ly = graphSize.t + graphSize.h * (1 - menuOpts.y);

 var xanchor = 'left';
 if(anchorUtils.isRightAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth;
 menuOpts.lx -= paddedWidth;
 xanchor = 'right';
 }
 if(anchorUtils.isCenterAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth / 2;
 menuOpts.lx -= paddedWidth / 2;
 xanchor = 'center';
 }

 var yanchor = 'top';
 if(anchorUtils.isBottomAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight;
 menuOpts.ly -= paddedHeight;
 yanchor = 'bottom';
 }
 if(anchorUtils.isMiddleAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight / 2;
 menuOpts.ly -= paddedHeight / 2;
 yanchor = 'middle';
 }

Expand All@@ -500,10 +503,10 @@ function findDimenstions(gd, menuOpts) {
 Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index, {
 x: menuOpts.x,
 y: menuOpts.y,
 l: menuOpts.totalWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: menuOpts.totalWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: menuOpts.totalHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: menuOpts.totalHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
 l: paddedWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: paddedWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: paddedHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: paddedHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
@etpinardetpinardSep 28, 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.

Wow. That was easy. I love it!
 });
}

Expand Down

36 changes: 36 additions & 0 deletions
src/plots/pad_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
 t: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the top of the component.'
 },
 r: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the right side of the component.'
 },
 b: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the bottom of the component.'
 },
 l: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the left side of the component.'
 }
};
Binary file modifiedtest/image/baselines/updatemenus_positioning.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, '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" + '
Improve padding logic for updatemenus by rreusser · Pull Request #989 · plotly/plotly.js · GitHub
Skip to content
Improve padding logic for updatemenus#989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rreusser
merged 2 commits into

from

Sep 29, 2016
 Merged


Improve padding logic for updatemenus
#989
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05ac586

Improve padding logic for updatemenus


rreusser Sep 28, 2016
4604341

Add jasmine tests for updatemenus padding


rreusser Sep 29, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
src/components/updatemenus/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
var fontAttrs = require('../../plots/font_attributes');
var colorAttrs = require('../color/attributes');
var extendFlat = require('../../lib/extend').extendFlat;
var padAttrs = require('../../plots/pad_attributes');
@etpinardetpinardSep 28, 2016•

edited

Loading

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.

That's where pad_attributes.js belongs at the moment, but I hate to see so many files pile up in the src/plots/ root.
Maybe we could add a src/plots/common/folder? or src/components/common/? or even a src/common/ for similar shared modules.
@rreusserrreusserSep 28, 2016•

edited

Loading

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.

Agreed. Font attributes would probably go with it? At least internal reorg is easy refactoring (especially since static requires so that errors fail bundling), so can try to cut down on plots/ bit by bit (pun?)
@etpinardetpinardSep 29, 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.

Font attributes would probably go with it?
yep, exactly.
so can try to cut down on plots/ bit by bit (pun?)
No action required in this PR. I just wanted to mention something I've been thinking about for a while now.

var buttonsAttrs = {
 _isLinkedToArray: true,
Expand DownExpand Up@@ -140,6 +141,10 @@ module.exports = {
 ].join(' ')
 },

 pad: extendFlat({}, padAttrs, {
 description: 'Sets the padding around the buttons or dropdown menu.'
 }),

 font: extendFlat({}, fontAttrs, {
 description: 'Sets the font of the update menu button text.'
 }),
Expand Down

5 changes: 5 additions & 0 deletions
src/components/updatemenus/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
 coerce('xanchor');
 coerce('yanchor');

 coerce('pad.t');
 coerce('pad.r');
 coerce('pad.b');
 coerce('pad.l');

 Lib.coerceFont(coerce, 'font', layoutOut.font);

 coerce('bgcolor', layoutOut.paper_bgcolor);
Expand Down

29 changes: 16 additions & 13 deletions
src/components/updatemenus/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {

 var active = menuOpts.active,
 headerOpts = menuOpts.buttons[active] || constants.blankHeaderOpts,
 posOpts = { y: 0, yPad: 0, x: 0, xPad: 0, index: 0 },
 posOpts = { y: menuOpts.pad.t, yPad: 0, x: menuOpts.pad.l, xPad: 0, index: 0 },
 positionOverrides = {
 width: menuOpts.headerWidth,
 height: menuOpts.headerHeight
Expand All@@ -191,8 +191,8 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
 .text('▼');

 arrow.attr({
 x: menuOpts.headerWidth - constants.arrowOffsetX,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY
 x: menuOpts.headerWidth - constants.arrowOffsetX + menuOpts.pad.l,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY + menuOpts.pad.t
 });

 header.on('click', function() {
Expand DownExpand Up@@ -275,8 +275,8 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
 }

 var posOpts = {
 x: x0,
 y: y0,
 x: x0 + menuOpts.pad.l,
 y: y0 + menuOpts.pad.t,
 yPad: constants.gapButton,
 xPad: constants.gapButton,
 index: 0,
Expand DownExpand Up@@ -468,27 +468,30 @@ function findDimenstions(gd, menuOpts) {

 fakeButtons.remove();

 var paddedWidth = menuOpts.totalWidth + menuOpts.pad.l + menuOpts.pad.r;
 var paddedHeight = menuOpts.totalHeight + menuOpts.pad.t + menuOpts.pad.b;

 var graphSize = gd._fullLayout._size;
 menuOpts.lx = graphSize.l + graphSize.w * menuOpts.x;
 menuOpts.ly = graphSize.t + graphSize.h * (1 - menuOpts.y);

 var xanchor = 'left';
 if(anchorUtils.isRightAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth;
 menuOpts.lx -= paddedWidth;
 xanchor = 'right';
 }
 if(anchorUtils.isCenterAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth / 2;
 menuOpts.lx -= paddedWidth / 2;
 xanchor = 'center';
 }

 var yanchor = 'top';
 if(anchorUtils.isBottomAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight;
 menuOpts.ly -= paddedHeight;
 yanchor = 'bottom';
 }
 if(anchorUtils.isMiddleAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight / 2;
 menuOpts.ly -= paddedHeight / 2;
 yanchor = 'middle';
 }

Expand All@@ -500,10 +503,10 @@ function findDimenstions(gd, menuOpts) {
 Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index, {
 x: menuOpts.x,
 y: menuOpts.y,
 l: menuOpts.totalWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: menuOpts.totalWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: menuOpts.totalHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: menuOpts.totalHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
 l: paddedWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: paddedWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: paddedHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: paddedHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
@etpinardetpinardSep 28, 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.

Wow. That was easy. I love it!
 });
}

Expand Down

36 changes: 36 additions & 0 deletions
src/plots/pad_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
 t: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the top of the component.'
 },
 r: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the right side of the component.'
 },
 b: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the bottom of the component.'
 },
 l: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the left side of the component.'
 }
};
Binary file modifiedtest/image/baselines/updatemenus_positioning.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, '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('^' + ".*" + '
Improve padding logic for updatemenus by rreusser · Pull Request #989 · plotly/plotly.js · GitHub
Skip to content
Improve padding logic for updatemenus#989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rreusser
merged 2 commits into

from

Sep 29, 2016
 Merged


Improve padding logic for updatemenus
#989
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05ac586

Improve padding logic for updatemenus


rreusser Sep 28, 2016
4604341

Add jasmine tests for updatemenus padding


rreusser Sep 29, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
src/components/updatemenus/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
var fontAttrs = require('../../plots/font_attributes');
var colorAttrs = require('../color/attributes');
var extendFlat = require('../../lib/extend').extendFlat;
var padAttrs = require('../../plots/pad_attributes');
@etpinardetpinardSep 28, 2016•

edited

Loading

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.

That's where pad_attributes.js belongs at the moment, but I hate to see so many files pile up in the src/plots/ root.
Maybe we could add a src/plots/common/folder? or src/components/common/? or even a src/common/ for similar shared modules.
@rreusserrreusserSep 28, 2016•

edited

Loading

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.

Agreed. Font attributes would probably go with it? At least internal reorg is easy refactoring (especially since static requires so that errors fail bundling), so can try to cut down on plots/ bit by bit (pun?)
@etpinardetpinardSep 29, 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.

Font attributes would probably go with it?
yep, exactly.
so can try to cut down on plots/ bit by bit (pun?)
No action required in this PR. I just wanted to mention something I've been thinking about for a while now.

var buttonsAttrs = {
 _isLinkedToArray: true,
Expand DownExpand Up@@ -140,6 +141,10 @@ module.exports = {
 ].join(' ')
 },

 pad: extendFlat({}, padAttrs, {
 description: 'Sets the padding around the buttons or dropdown menu.'
 }),

 font: extendFlat({}, fontAttrs, {
 description: 'Sets the font of the update menu button text.'
 }),
Expand Down

5 changes: 5 additions & 0 deletions
src/components/updatemenus/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
 coerce('xanchor');
 coerce('yanchor');

 coerce('pad.t');
 coerce('pad.r');
 coerce('pad.b');
 coerce('pad.l');

 Lib.coerceFont(coerce, 'font', layoutOut.font);

 coerce('bgcolor', layoutOut.paper_bgcolor);
Expand Down

29 changes: 16 additions & 13 deletions
src/components/updatemenus/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {

 var active = menuOpts.active,
 headerOpts = menuOpts.buttons[active] || constants.blankHeaderOpts,
 posOpts = { y: 0, yPad: 0, x: 0, xPad: 0, index: 0 },
 posOpts = { y: menuOpts.pad.t, yPad: 0, x: menuOpts.pad.l, xPad: 0, index: 0 },
 positionOverrides = {
 width: menuOpts.headerWidth,
 height: menuOpts.headerHeight
Expand All@@ -191,8 +191,8 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
 .text('▼');

 arrow.attr({
 x: menuOpts.headerWidth - constants.arrowOffsetX,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY
 x: menuOpts.headerWidth - constants.arrowOffsetX + menuOpts.pad.l,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY + menuOpts.pad.t
 });

 header.on('click', function() {
Expand DownExpand Up@@ -275,8 +275,8 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
 }

 var posOpts = {
 x: x0,
 y: y0,
 x: x0 + menuOpts.pad.l,
 y: y0 + menuOpts.pad.t,
 yPad: constants.gapButton,
 xPad: constants.gapButton,
 index: 0,
Expand DownExpand Up@@ -468,27 +468,30 @@ function findDimenstions(gd, menuOpts) {

 fakeButtons.remove();

 var paddedWidth = menuOpts.totalWidth + menuOpts.pad.l + menuOpts.pad.r;
 var paddedHeight = menuOpts.totalHeight + menuOpts.pad.t + menuOpts.pad.b;

 var graphSize = gd._fullLayout._size;
 menuOpts.lx = graphSize.l + graphSize.w * menuOpts.x;
 menuOpts.ly = graphSize.t + graphSize.h * (1 - menuOpts.y);

 var xanchor = 'left';
 if(anchorUtils.isRightAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth;
 menuOpts.lx -= paddedWidth;
 xanchor = 'right';
 }
 if(anchorUtils.isCenterAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth / 2;
 menuOpts.lx -= paddedWidth / 2;
 xanchor = 'center';
 }

 var yanchor = 'top';
 if(anchorUtils.isBottomAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight;
 menuOpts.ly -= paddedHeight;
 yanchor = 'bottom';
 }
 if(anchorUtils.isMiddleAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight / 2;
 menuOpts.ly -= paddedHeight / 2;
 yanchor = 'middle';
 }

Expand All@@ -500,10 +503,10 @@ function findDimenstions(gd, menuOpts) {
 Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index, {
 x: menuOpts.x,
 y: menuOpts.y,
 l: menuOpts.totalWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: menuOpts.totalWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: menuOpts.totalHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: menuOpts.totalHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
 l: paddedWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: paddedWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: paddedHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: paddedHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
@etpinardetpinardSep 28, 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.

Wow. That was easy. I love it!
 });
}

Expand Down

36 changes: 36 additions & 0 deletions
src/plots/pad_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
 t: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the top of the component.'
 },
 r: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the right side of the component.'
 },
 b: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the bottom of the component.'
 },
 l: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the left side of the component.'
 }
};
Binary file modifiedtest/image/baselines/updatemenus_positioning.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, '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('^' + ".*" + '
Improve padding logic for updatemenus by rreusser · Pull Request #989 · plotly/plotly.js · GitHub
Skip to content
Improve padding logic for updatemenus#989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rreusser
merged 2 commits into

from

Sep 29, 2016
 Merged


Improve padding logic for updatemenus
#989
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05ac586

Improve padding logic for updatemenus


rreusser Sep 28, 2016
4604341

Add jasmine tests for updatemenus padding


rreusser Sep 29, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
src/components/updatemenus/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
var fontAttrs = require('../../plots/font_attributes');
var colorAttrs = require('../color/attributes');
var extendFlat = require('../../lib/extend').extendFlat;
var padAttrs = require('../../plots/pad_attributes');
@etpinardetpinardSep 28, 2016•

edited

Loading

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.

That's where pad_attributes.js belongs at the moment, but I hate to see so many files pile up in the src/plots/ root.
Maybe we could add a src/plots/common/folder? or src/components/common/? or even a src/common/ for similar shared modules.
@rreusserrreusserSep 28, 2016•

edited

Loading

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.

Agreed. Font attributes would probably go with it? At least internal reorg is easy refactoring (especially since static requires so that errors fail bundling), so can try to cut down on plots/ bit by bit (pun?)
@etpinardetpinardSep 29, 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.

Font attributes would probably go with it?
yep, exactly.
so can try to cut down on plots/ bit by bit (pun?)
No action required in this PR. I just wanted to mention something I've been thinking about for a while now.

var buttonsAttrs = {
 _isLinkedToArray: true,
Expand DownExpand Up@@ -140,6 +141,10 @@ module.exports = {
 ].join(' ')
 },

 pad: extendFlat({}, padAttrs, {
 description: 'Sets the padding around the buttons or dropdown menu.'
 }),

 font: extendFlat({}, fontAttrs, {
 description: 'Sets the font of the update menu button text.'
 }),
Expand Down

5 changes: 5 additions & 0 deletions
src/components/updatemenus/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
 coerce('xanchor');
 coerce('yanchor');

 coerce('pad.t');
 coerce('pad.r');
 coerce('pad.b');
 coerce('pad.l');

 Lib.coerceFont(coerce, 'font', layoutOut.font);

 coerce('bgcolor', layoutOut.paper_bgcolor);
Expand Down

29 changes: 16 additions & 13 deletions
src/components/updatemenus/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {

 var active = menuOpts.active,
 headerOpts = menuOpts.buttons[active] || constants.blankHeaderOpts,
 posOpts = { y: 0, yPad: 0, x: 0, xPad: 0, index: 0 },
 posOpts = { y: menuOpts.pad.t, yPad: 0, x: menuOpts.pad.l, xPad: 0, index: 0 },
 positionOverrides = {
 width: menuOpts.headerWidth,
 height: menuOpts.headerHeight
Expand All@@ -191,8 +191,8 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
 .text('▼');

 arrow.attr({
 x: menuOpts.headerWidth - constants.arrowOffsetX,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY
 x: menuOpts.headerWidth - constants.arrowOffsetX + menuOpts.pad.l,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY + menuOpts.pad.t
 });

 header.on('click', function() {
Expand DownExpand Up@@ -275,8 +275,8 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
 }

 var posOpts = {
 x: x0,
 y: y0,
 x: x0 + menuOpts.pad.l,
 y: y0 + menuOpts.pad.t,
 yPad: constants.gapButton,
 xPad: constants.gapButton,
 index: 0,
Expand DownExpand Up@@ -468,27 +468,30 @@ function findDimenstions(gd, menuOpts) {

 fakeButtons.remove();

 var paddedWidth = menuOpts.totalWidth + menuOpts.pad.l + menuOpts.pad.r;
 var paddedHeight = menuOpts.totalHeight + menuOpts.pad.t + menuOpts.pad.b;

 var graphSize = gd._fullLayout._size;
 menuOpts.lx = graphSize.l + graphSize.w * menuOpts.x;
 menuOpts.ly = graphSize.t + graphSize.h * (1 - menuOpts.y);

 var xanchor = 'left';
 if(anchorUtils.isRightAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth;
 menuOpts.lx -= paddedWidth;
 xanchor = 'right';
 }
 if(anchorUtils.isCenterAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth / 2;
 menuOpts.lx -= paddedWidth / 2;
 xanchor = 'center';
 }

 var yanchor = 'top';
 if(anchorUtils.isBottomAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight;
 menuOpts.ly -= paddedHeight;
 yanchor = 'bottom';
 }
 if(anchorUtils.isMiddleAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight / 2;
 menuOpts.ly -= paddedHeight / 2;
 yanchor = 'middle';
 }

Expand All@@ -500,10 +503,10 @@ function findDimenstions(gd, menuOpts) {
 Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index, {
 x: menuOpts.x,
 y: menuOpts.y,
 l: menuOpts.totalWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: menuOpts.totalWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: menuOpts.totalHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: menuOpts.totalHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
 l: paddedWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: paddedWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: paddedHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: paddedHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
@etpinardetpinardSep 28, 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.

Wow. That was easy. I love it!
 });
}

Expand Down

36 changes: 36 additions & 0 deletions
src/plots/pad_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
 t: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the top of the component.'
 },
 r: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the right side of the component.'
 },
 b: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the bottom of the component.'
 },
 l: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the left side of the component.'
 }
};
Binary file modifiedtest/image/baselines/updatemenus_positioning.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

, '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); }
})();
})();
Improve padding logic for updatemenus by rreusser · Pull Request #989 · plotly/plotly.js · GitHub
Skip to content
Improve padding logic for updatemenus#989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

rreusser
merged 2 commits into

from

Sep 29, 2016
 Merged


Improve padding logic for updatemenus
#989
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05ac586

Improve padding logic for updatemenus


rreusser Sep 28, 2016
4604341

Add jasmine tests for updatemenus padding


rreusser Sep 29, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
src/components/updatemenus/attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
var fontAttrs = require('../../plots/font_attributes');
var colorAttrs = require('../color/attributes');
var extendFlat = require('../../lib/extend').extendFlat;
var padAttrs = require('../../plots/pad_attributes');
@etpinardetpinardSep 28, 2016•

edited

Loading

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.

That's where pad_attributes.js belongs at the moment, but I hate to see so many files pile up in the src/plots/ root.
Maybe we could add a src/plots/common/folder? or src/components/common/? or even a src/common/ for similar shared modules.
@rreusserrreusserSep 28, 2016•

edited

Loading

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.

Agreed. Font attributes would probably go with it? At least internal reorg is easy refactoring (especially since static requires so that errors fail bundling), so can try to cut down on plots/ bit by bit (pun?)
@etpinardetpinardSep 29, 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.

Font attributes would probably go with it?
yep, exactly.
so can try to cut down on plots/ bit by bit (pun?)
No action required in this PR. I just wanted to mention something I've been thinking about for a while now.

var buttonsAttrs = {
 _isLinkedToArray: true,
Expand DownExpand Up@@ -140,6 +141,10 @@ module.exports = {
 ].join(' ')
 },

 pad: extendFlat({}, padAttrs, {
 description: 'Sets the padding around the buttons or dropdown menu.'
 }),

 font: extendFlat({}, fontAttrs, {
 description: 'Sets the font of the update menu button text.'
 }),
Expand Down

5 changes: 5 additions & 0 deletions
src/components/updatemenus/defaults.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,11 @@ function menuDefaults(menuIn, menuOut, layoutOut) {
 coerce('xanchor');
 coerce('yanchor');

 coerce('pad.t');
 coerce('pad.r');
 coerce('pad.b');
 coerce('pad.l');

 Lib.coerceFont(coerce, 'font', layoutOut.font);

 coerce('bgcolor', layoutOut.paper_bgcolor);
Expand Down

29 changes: 16 additions & 13 deletions
src/components/updatemenus/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -169,7 +169,7 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {

 var active = menuOpts.active,
 headerOpts = menuOpts.buttons[active] || constants.blankHeaderOpts,
 posOpts = { y: 0, yPad: 0, x: 0, xPad: 0, index: 0 },
 posOpts = { y: menuOpts.pad.t, yPad: 0, x: menuOpts.pad.l, xPad: 0, index: 0 },
 positionOverrides = {
 width: menuOpts.headerWidth,
 height: menuOpts.headerHeight
Expand All@@ -191,8 +191,8 @@ function drawHeader(gd, gHeader, gButton, menuOpts) {
 .text('▼');

 arrow.attr({
 x: menuOpts.headerWidth - constants.arrowOffsetX,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY
 x: menuOpts.headerWidth - constants.arrowOffsetX + menuOpts.pad.l,
 y: menuOpts.headerHeight / 2 + constants.textOffsetY + menuOpts.pad.t
 });

 header.on('click', function() {
Expand DownExpand Up@@ -275,8 +275,8 @@ function drawButtons(gd, gHeader, gButton, menuOpts) {
 }

 var posOpts = {
 x: x0,
 y: y0,
 x: x0 + menuOpts.pad.l,
 y: y0 + menuOpts.pad.t,
 yPad: constants.gapButton,
 xPad: constants.gapButton,
 index: 0,
Expand DownExpand Up@@ -468,27 +468,30 @@ function findDimenstions(gd, menuOpts) {

 fakeButtons.remove();

 var paddedWidth = menuOpts.totalWidth + menuOpts.pad.l + menuOpts.pad.r;
 var paddedHeight = menuOpts.totalHeight + menuOpts.pad.t + menuOpts.pad.b;

 var graphSize = gd._fullLayout._size;
 menuOpts.lx = graphSize.l + graphSize.w * menuOpts.x;
 menuOpts.ly = graphSize.t + graphSize.h * (1 - menuOpts.y);

 var xanchor = 'left';
 if(anchorUtils.isRightAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth;
 menuOpts.lx -= paddedWidth;
 xanchor = 'right';
 }
 if(anchorUtils.isCenterAnchor(menuOpts)) {
 menuOpts.lx -= menuOpts.totalWidth / 2;
 menuOpts.lx -= paddedWidth / 2;
 xanchor = 'center';
 }

 var yanchor = 'top';
 if(anchorUtils.isBottomAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight;
 menuOpts.ly -= paddedHeight;
 yanchor = 'bottom';
 }
 if(anchorUtils.isMiddleAnchor(menuOpts)) {
 menuOpts.ly -= menuOpts.totalHeight / 2;
 menuOpts.ly -= paddedHeight / 2;
 yanchor = 'middle';
 }

Expand All@@ -500,10 +503,10 @@ function findDimenstions(gd, menuOpts) {
 Plots.autoMargin(gd, constants.autoMarginIdRoot + menuOpts._index, {
 x: menuOpts.x,
 y: menuOpts.y,
 l: menuOpts.totalWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: menuOpts.totalWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: menuOpts.totalHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: menuOpts.totalHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
 l: paddedWidth * ({right: 1, center: 0.5}[xanchor] || 0),
 r: paddedWidth * ({left: 1, center: 0.5}[xanchor] || 0),
 b: paddedHeight * ({top: 1, middle: 0.5}[yanchor] || 0),
 t: paddedHeight * ({bottom: 1, middle: 0.5}[yanchor] || 0)
@etpinardetpinardSep 28, 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.

Wow. That was easy. I love it!
 });
}

Expand Down

36 changes: 36 additions & 0 deletions
src/plots/pad_attributes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
/**
* Copyright 2012-2016, Plotly, Inc.
* All rights reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

'use strict';

module.exports = {
 t: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the top of the component.'
 },
 r: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the right side of the component.'
 },
 b: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) along the bottom of the component.'
 },
 l: {
 valType: 'number',
 dflt: 0,
 role: 'style',
 description: 'The amount of padding (in px) on the left side of the component.'
 }
};
Binary file modifiedtest/image/baselines/updatemenus_positioning.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading