Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions build/plotcss.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ var rules = {
"X .ease-bg": "-webkit-transition:background-color .3s ease 0s;-moz-transition:background-color .3s ease 0s;-ms-transition:background-color .3s ease 0s;-o-transition:background-color .3s ease 0s;transition:background-color .3s ease 0s;",
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity .3s ease 0s;-moz-transition:opacity .3s ease 0s;-ms-transition:opacity .3s ease 0s;-o-transition:opacity .3s ease 0s;transition:opacity .3s ease 0s;",
"X:hover .modebar--hover .modebar-group": "opacity:1;",
"X:focus-within .modebar--hover .modebar-group": "opacity:1;",
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
"X .modebar-btn svg": "position:relative;top:2px;",
"X .modebar-group a": "display:grid;place-content:center;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;border:none;background:rgba(0,0,0,0);",
"X .modebar-btn svg": "position:relative;",
"X .modebar-btn:focus-visible": "outline:1px solid #000;outline-offset:1px;border-radius:3px;",
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
"X .modebar.vertical svg": "top:-1px;",
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7492_add.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
- Make modebar keyboard-accessible via tabbing [[#7492](https://github.com/plotly/plotly.js/pull/7492)], with thanks to @davidangarita1 for the contribution!
13 changes: 9 additions & 4 deletions src/components/modebar/modebar.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,10 @@ proto.update = function(graphInfo, buttons) {
var modeBarId = 'modebar-' + fullLayout._uid;

this.element.setAttribute('id', modeBarId);
this._uid = modeBarId;
this.element.setAttribute('role', 'toolbar');

this.element.className = 'modebar';
this._uid = modeBarId;
this.element.className = 'modebar modebar--custom';
if(context.displayModeBar === 'hover') this.element.className += ' modebar--hover ease-bg';

if(fullLayout.modebar.orientation === 'v') {
Expand DownExpand Up@@ -145,8 +146,9 @@ proto.createGroup = function() {
*/
proto.createButton = function(config) {
var _this = this;
var button = document.createElement('a');
var button = document.createElement('button');

button.setAttribute('type', 'button');
button.setAttribute('rel', 'tooltip');
button.className = 'modebar-btn';

Expand All@@ -155,7 +157,10 @@ proto.createButton = function(config) {
// for localization: allow title to be a callable that takes gd as arg
else if(typeof title === 'function') title = title(this.graphInfo);

if(title || title === 0) button.setAttribute('data-title', title);
if(title || title === 0) {
button.setAttribute('data-title', title)
button.setAttribute("aria-label", title)
};

if(config.attr !== undefined) button.setAttribute('data-attr', config.attr);

Expand Down
28 changes: 22 additions & 6 deletions src/css/_modebar.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
@include vendor('transition', background-color 0.3s ease 0s);
}

.modebar--hover> :not(.watermark) {
.modebar--hover> :not(.watermark) {
opacity: 0;
@include vendor('transition', opacity 0.3s ease 0s);
}
Expand All@@ -17,6 +17,10 @@
opacity: 1;
}

&:focus-within .modebar--hover .modebar-group {
opacity: 1;
}

.modebar-group {
float: left;
display: inline-block;
Expand All@@ -25,6 +29,11 @@
position: relative;
vertical-align: middle;
white-space: nowrap;

a {
display: grid;
place-content: center;
}
}

.modebar-btn {
Expand All@@ -36,15 +45,20 @@
cursor: pointer;
line-height: normal;
box-sizing: border-box;
border: none;
background: transparent;

svg {
position: relative;
top: 2px;
}

&.modebar-btn--logo {

&:focus-visible {
outline: 1px solid black;
outline-offset: 1px;
border-radius: 3px;
}

&.modebar-btn--logo {}
}

.modebar.vertical {
Expand All@@ -53,9 +67,11 @@
flex-wrap: wrap;
align-content: flex-end;
max-height: 100%;

svg {
top: -1px;
top: -1px;
}

.modebar-group {
display: block;
float: none;
Expand All@@ -67,4 +83,4 @@
text-align: center;
}
}
}
}
14 changes: 7 additions & 7 deletions test/jasmine/tests/modebar_test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,15 +69,15 @@ describe('ModeBar', function() {
}

function countButtons(modeBar) {
return d3Select(modeBar.element).selectAll('a.modebar-btn').size();
return d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn').size();
}

function countLogo(modeBar) {
return d3Select(modeBar.element).selectAll('a.plotlyjsicon').size();
}

function checkBtnAttr(modeBar, index, attr) {
var buttons = d3Select(modeBar.element).selectAll('a.modebar-btn');
var buttons = d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn');
return d3Select(buttons[0][index]).attr(attr);
}

Expand DownExpand Up@@ -1676,7 +1676,7 @@ describe('ModeBar', function() {
it('add predefined shape drawing and hover buttons via layout.modebar.add', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1761,7 +1761,7 @@ describe('ModeBar', function() {
it('remove buttons using exact (camel case) and short (lower case) names via layout.modebar.remove and template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1842,7 +1842,7 @@ describe('ModeBar', function() {
it('add buttons using template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1865,7 +1865,7 @@ describe('ModeBar', function() {
it('add ' + t + ' button if removed by layout and added by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1886,7 +1886,7 @@ describe('ModeBar', function() {
it('remove button if added by layout and removed by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand Down
, '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" + '
feat: Improve keyboard navigation of modebar (by @davidangarita1) by emilykl · Pull Request #7492 · plotly/plotly.js · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions build/plotcss.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ var rules = {
"X .ease-bg": "-webkit-transition:background-color .3s ease 0s;-moz-transition:background-color .3s ease 0s;-ms-transition:background-color .3s ease 0s;-o-transition:background-color .3s ease 0s;transition:background-color .3s ease 0s;",
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity .3s ease 0s;-moz-transition:opacity .3s ease 0s;-ms-transition:opacity .3s ease 0s;-o-transition:opacity .3s ease 0s;transition:opacity .3s ease 0s;",
"X:hover .modebar--hover .modebar-group": "opacity:1;",
"X:focus-within .modebar--hover .modebar-group": "opacity:1;",
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
"X .modebar-btn svg": "position:relative;top:2px;",
"X .modebar-group a": "display:grid;place-content:center;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;border:none;background:rgba(0,0,0,0);",
"X .modebar-btn svg": "position:relative;",
"X .modebar-btn:focus-visible": "outline:1px solid #000;outline-offset:1px;border-radius:3px;",
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
"X .modebar.vertical svg": "top:-1px;",
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7492_add.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
- Make modebar keyboard-accessible via tabbing [[#7492](https://github.com/plotly/plotly.js/pull/7492)], with thanks to @davidangarita1 for the contribution!
13 changes: 9 additions & 4 deletions src/components/modebar/modebar.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,10 @@ proto.update = function(graphInfo, buttons) {
var modeBarId = 'modebar-' + fullLayout._uid;

this.element.setAttribute('id', modeBarId);
this._uid = modeBarId;
this.element.setAttribute('role', 'toolbar');

this.element.className = 'modebar';
this._uid = modeBarId;
this.element.className = 'modebar modebar--custom';
if(context.displayModeBar === 'hover') this.element.className += ' modebar--hover ease-bg';

if(fullLayout.modebar.orientation === 'v') {
Expand DownExpand Up@@ -145,8 +146,9 @@ proto.createGroup = function() {
*/
proto.createButton = function(config) {
var _this = this;
var button = document.createElement('a');
var button = document.createElement('button');

button.setAttribute('type', 'button');
button.setAttribute('rel', 'tooltip');
button.className = 'modebar-btn';

Expand All@@ -155,7 +157,10 @@ proto.createButton = function(config) {
// for localization: allow title to be a callable that takes gd as arg
else if(typeof title === 'function') title = title(this.graphInfo);

if(title || title === 0) button.setAttribute('data-title', title);
if(title || title === 0) {
button.setAttribute('data-title', title)
button.setAttribute("aria-label", title)
};

if(config.attr !== undefined) button.setAttribute('data-attr', config.attr);

Expand Down
28 changes: 22 additions & 6 deletions src/css/_modebar.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
@include vendor('transition', background-color 0.3s ease 0s);
}

.modebar--hover> :not(.watermark) {
.modebar--hover> :not(.watermark) {
opacity: 0;
@include vendor('transition', opacity 0.3s ease 0s);
}
Expand All@@ -17,6 +17,10 @@
opacity: 1;
}

&:focus-within .modebar--hover .modebar-group {
opacity: 1;
}

.modebar-group {
float: left;
display: inline-block;
Expand All@@ -25,6 +29,11 @@
position: relative;
vertical-align: middle;
white-space: nowrap;

a {
display: grid;
place-content: center;
}
}

.modebar-btn {
Expand All@@ -36,15 +45,20 @@
cursor: pointer;
line-height: normal;
box-sizing: border-box;
border: none;
background: transparent;

svg {
position: relative;
top: 2px;
}

&.modebar-btn--logo {

&:focus-visible {
outline: 1px solid black;
outline-offset: 1px;
border-radius: 3px;
}

&.modebar-btn--logo {}
}

.modebar.vertical {
Expand All@@ -53,9 +67,11 @@
flex-wrap: wrap;
align-content: flex-end;
max-height: 100%;

svg {
top: -1px;
top: -1px;
}

.modebar-group {
display: block;
float: none;
Expand All@@ -67,4 +83,4 @@
text-align: center;
}
}
}
}
14 changes: 7 additions & 7 deletions test/jasmine/tests/modebar_test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,15 +69,15 @@ describe('ModeBar', function() {
}

function countButtons(modeBar) {
return d3Select(modeBar.element).selectAll('a.modebar-btn').size();
return d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn').size();
}

function countLogo(modeBar) {
return d3Select(modeBar.element).selectAll('a.plotlyjsicon').size();
}

function checkBtnAttr(modeBar, index, attr) {
var buttons = d3Select(modeBar.element).selectAll('a.modebar-btn');
var buttons = d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn');
return d3Select(buttons[0][index]).attr(attr);
}

Expand DownExpand Up@@ -1676,7 +1676,7 @@ describe('ModeBar', function() {
it('add predefined shape drawing and hover buttons via layout.modebar.add', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1761,7 +1761,7 @@ describe('ModeBar', function() {
it('remove buttons using exact (camel case) and short (lower case) names via layout.modebar.remove and template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1842,7 +1842,7 @@ describe('ModeBar', function() {
it('add buttons using template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1865,7 +1865,7 @@ describe('ModeBar', function() {
it('add ' + t + ' button if removed by layout and added by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1886,7 +1886,7 @@ describe('ModeBar', function() {
it('remove button if added by layout and removed by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand Down
, '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('^' + ".*" + ' feat: Improve keyboard navigation of modebar (by @davidangarita1) by emilykl · Pull Request #7492 · plotly/plotly.js · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions build/plotcss.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ var rules = {
"X .ease-bg": "-webkit-transition:background-color .3s ease 0s;-moz-transition:background-color .3s ease 0s;-ms-transition:background-color .3s ease 0s;-o-transition:background-color .3s ease 0s;transition:background-color .3s ease 0s;",
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity .3s ease 0s;-moz-transition:opacity .3s ease 0s;-ms-transition:opacity .3s ease 0s;-o-transition:opacity .3s ease 0s;transition:opacity .3s ease 0s;",
"X:hover .modebar--hover .modebar-group": "opacity:1;",
"X:focus-within .modebar--hover .modebar-group": "opacity:1;",
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
"X .modebar-btn svg": "position:relative;top:2px;",
"X .modebar-group a": "display:grid;place-content:center;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;border:none;background:rgba(0,0,0,0);",
"X .modebar-btn svg": "position:relative;",
"X .modebar-btn:focus-visible": "outline:1px solid #000;outline-offset:1px;border-radius:3px;",
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
"X .modebar.vertical svg": "top:-1px;",
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7492_add.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
- Make modebar keyboard-accessible via tabbing [[#7492](https://github.com/plotly/plotly.js/pull/7492)], with thanks to @davidangarita1 for the contribution!
13 changes: 9 additions & 4 deletions src/components/modebar/modebar.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,10 @@ proto.update = function(graphInfo, buttons) {
var modeBarId = 'modebar-' + fullLayout._uid;

this.element.setAttribute('id', modeBarId);
this._uid = modeBarId;
this.element.setAttribute('role', 'toolbar');

this.element.className = 'modebar';
this._uid = modeBarId;
this.element.className = 'modebar modebar--custom';
if(context.displayModeBar === 'hover') this.element.className += ' modebar--hover ease-bg';

if(fullLayout.modebar.orientation === 'v') {
Expand DownExpand Up@@ -145,8 +146,9 @@ proto.createGroup = function() {
*/
proto.createButton = function(config) {
var _this = this;
var button = document.createElement('a');
var button = document.createElement('button');

button.setAttribute('type', 'button');
button.setAttribute('rel', 'tooltip');
button.className = 'modebar-btn';

Expand All@@ -155,7 +157,10 @@ proto.createButton = function(config) {
// for localization: allow title to be a callable that takes gd as arg
else if(typeof title === 'function') title = title(this.graphInfo);

if(title || title === 0) button.setAttribute('data-title', title);
if(title || title === 0) {
button.setAttribute('data-title', title)
button.setAttribute("aria-label", title)
};

if(config.attr !== undefined) button.setAttribute('data-attr', config.attr);

Expand Down
28 changes: 22 additions & 6 deletions src/css/_modebar.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
@include vendor('transition', background-color 0.3s ease 0s);
}

.modebar--hover> :not(.watermark) {
.modebar--hover> :not(.watermark) {
opacity: 0;
@include vendor('transition', opacity 0.3s ease 0s);
}
Expand All@@ -17,6 +17,10 @@
opacity: 1;
}

&:focus-within .modebar--hover .modebar-group {
opacity: 1;
}

.modebar-group {
float: left;
display: inline-block;
Expand All@@ -25,6 +29,11 @@
position: relative;
vertical-align: middle;
white-space: nowrap;

a {
display: grid;
place-content: center;
}
}

.modebar-btn {
Expand All@@ -36,15 +45,20 @@
cursor: pointer;
line-height: normal;
box-sizing: border-box;
border: none;
background: transparent;

svg {
position: relative;
top: 2px;
}

&.modebar-btn--logo {

&:focus-visible {
outline: 1px solid black;
outline-offset: 1px;
border-radius: 3px;
}

&.modebar-btn--logo {}
}

.modebar.vertical {
Expand All@@ -53,9 +67,11 @@
flex-wrap: wrap;
align-content: flex-end;
max-height: 100%;

svg {
top: -1px;
top: -1px;
}

.modebar-group {
display: block;
float: none;
Expand All@@ -67,4 +83,4 @@
text-align: center;
}
}
}
}
14 changes: 7 additions & 7 deletions test/jasmine/tests/modebar_test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,15 +69,15 @@ describe('ModeBar', function() {
}

function countButtons(modeBar) {
return d3Select(modeBar.element).selectAll('a.modebar-btn').size();
return d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn').size();
}

function countLogo(modeBar) {
return d3Select(modeBar.element).selectAll('a.plotlyjsicon').size();
}

function checkBtnAttr(modeBar, index, attr) {
var buttons = d3Select(modeBar.element).selectAll('a.modebar-btn');
var buttons = d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn');
return d3Select(buttons[0][index]).attr(attr);
}

Expand DownExpand Up@@ -1676,7 +1676,7 @@ describe('ModeBar', function() {
it('add predefined shape drawing and hover buttons via layout.modebar.add', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1761,7 +1761,7 @@ describe('ModeBar', function() {
it('remove buttons using exact (camel case) and short (lower case) names via layout.modebar.remove and template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1842,7 +1842,7 @@ describe('ModeBar', function() {
it('add buttons using template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1865,7 +1865,7 @@ describe('ModeBar', function() {
it('add ' + t + ' button if removed by layout and added by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1886,7 +1886,7 @@ describe('ModeBar', function() {
it('remove button if added by layout and removed by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand Down
, '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('^' + ".*" + ' feat: Improve keyboard navigation of modebar (by @davidangarita1) by emilykl · Pull Request #7492 · plotly/plotly.js · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions build/plotcss.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ var rules = {
"X .ease-bg": "-webkit-transition:background-color .3s ease 0s;-moz-transition:background-color .3s ease 0s;-ms-transition:background-color .3s ease 0s;-o-transition:background-color .3s ease 0s;transition:background-color .3s ease 0s;",
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity .3s ease 0s;-moz-transition:opacity .3s ease 0s;-ms-transition:opacity .3s ease 0s;-o-transition:opacity .3s ease 0s;transition:opacity .3s ease 0s;",
"X:hover .modebar--hover .modebar-group": "opacity:1;",
"X:focus-within .modebar--hover .modebar-group": "opacity:1;",
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
"X .modebar-btn svg": "position:relative;top:2px;",
"X .modebar-group a": "display:grid;place-content:center;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;border:none;background:rgba(0,0,0,0);",
"X .modebar-btn svg": "position:relative;",
"X .modebar-btn:focus-visible": "outline:1px solid #000;outline-offset:1px;border-radius:3px;",
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
"X .modebar.vertical svg": "top:-1px;",
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7492_add.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
- Make modebar keyboard-accessible via tabbing [[#7492](https://github.com/plotly/plotly.js/pull/7492)], with thanks to @davidangarita1 for the contribution!
13 changes: 9 additions & 4 deletions src/components/modebar/modebar.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,10 @@ proto.update = function(graphInfo, buttons) {
var modeBarId = 'modebar-' + fullLayout._uid;

this.element.setAttribute('id', modeBarId);
this._uid = modeBarId;
this.element.setAttribute('role', 'toolbar');

this.element.className = 'modebar';
this._uid = modeBarId;
this.element.className = 'modebar modebar--custom';
if(context.displayModeBar === 'hover') this.element.className += ' modebar--hover ease-bg';

if(fullLayout.modebar.orientation === 'v') {
Expand DownExpand Up@@ -145,8 +146,9 @@ proto.createGroup = function() {
*/
proto.createButton = function(config) {
var _this = this;
var button = document.createElement('a');
var button = document.createElement('button');

button.setAttribute('type', 'button');
button.setAttribute('rel', 'tooltip');
button.className = 'modebar-btn';

Expand All@@ -155,7 +157,10 @@ proto.createButton = function(config) {
// for localization: allow title to be a callable that takes gd as arg
else if(typeof title === 'function') title = title(this.graphInfo);

if(title || title === 0) button.setAttribute('data-title', title);
if(title || title === 0) {
button.setAttribute('data-title', title)
button.setAttribute("aria-label", title)
};

if(config.attr !== undefined) button.setAttribute('data-attr', config.attr);

Expand Down
28 changes: 22 additions & 6 deletions src/css/_modebar.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
@include vendor('transition', background-color 0.3s ease 0s);
}

.modebar--hover> :not(.watermark) {
.modebar--hover> :not(.watermark) {
opacity: 0;
@include vendor('transition', opacity 0.3s ease 0s);
}
Expand All@@ -17,6 +17,10 @@
opacity: 1;
}

&:focus-within .modebar--hover .modebar-group {
opacity: 1;
}

.modebar-group {
float: left;
display: inline-block;
Expand All@@ -25,6 +29,11 @@
position: relative;
vertical-align: middle;
white-space: nowrap;

a {
display: grid;
place-content: center;
}
}

.modebar-btn {
Expand All@@ -36,15 +45,20 @@
cursor: pointer;
line-height: normal;
box-sizing: border-box;
border: none;
background: transparent;

svg {
position: relative;
top: 2px;
}

&.modebar-btn--logo {

&:focus-visible {
outline: 1px solid black;
outline-offset: 1px;
border-radius: 3px;
}

&.modebar-btn--logo {}
}

.modebar.vertical {
Expand All@@ -53,9 +67,11 @@
flex-wrap: wrap;
align-content: flex-end;
max-height: 100%;

svg {
top: -1px;
top: -1px;
}

.modebar-group {
display: block;
float: none;
Expand All@@ -67,4 +83,4 @@
text-align: center;
}
}
}
}
14 changes: 7 additions & 7 deletions test/jasmine/tests/modebar_test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,15 +69,15 @@ describe('ModeBar', function() {
}

function countButtons(modeBar) {
return d3Select(modeBar.element).selectAll('a.modebar-btn').size();
return d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn').size();
}

function countLogo(modeBar) {
return d3Select(modeBar.element).selectAll('a.plotlyjsicon').size();
}

function checkBtnAttr(modeBar, index, attr) {
var buttons = d3Select(modeBar.element).selectAll('a.modebar-btn');
var buttons = d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn');
return d3Select(buttons[0][index]).attr(attr);
}

Expand DownExpand Up@@ -1676,7 +1676,7 @@ describe('ModeBar', function() {
it('add predefined shape drawing and hover buttons via layout.modebar.add', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1761,7 +1761,7 @@ describe('ModeBar', function() {
it('remove buttons using exact (camel case) and short (lower case) names via layout.modebar.remove and template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1842,7 +1842,7 @@ describe('ModeBar', function() {
it('add buttons using template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1865,7 +1865,7 @@ describe('ModeBar', function() {
it('add ' + t + ' button if removed by layout and added by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1886,7 +1886,7 @@ describe('ModeBar', function() {
it('remove button if added by layout and removed by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand Down
, '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" + ' feat: Improve keyboard navigation of modebar (by @davidangarita1) by emilykl · Pull Request #7492 · plotly/plotly.js · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions build/plotcss.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ var rules = {
"X .ease-bg": "-webkit-transition:background-color .3s ease 0s;-moz-transition:background-color .3s ease 0s;-ms-transition:background-color .3s ease 0s;-o-transition:background-color .3s ease 0s;transition:background-color .3s ease 0s;",
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity .3s ease 0s;-moz-transition:opacity .3s ease 0s;-ms-transition:opacity .3s ease 0s;-o-transition:opacity .3s ease 0s;transition:opacity .3s ease 0s;",
"X:hover .modebar--hover .modebar-group": "opacity:1;",
"X:focus-within .modebar--hover .modebar-group": "opacity:1;",
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
"X .modebar-btn svg": "position:relative;top:2px;",
"X .modebar-group a": "display:grid;place-content:center;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;border:none;background:rgba(0,0,0,0);",
"X .modebar-btn svg": "position:relative;",
"X .modebar-btn:focus-visible": "outline:1px solid #000;outline-offset:1px;border-radius:3px;",
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
"X .modebar.vertical svg": "top:-1px;",
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7492_add.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
- Make modebar keyboard-accessible via tabbing [[#7492](https://github.com/plotly/plotly.js/pull/7492)], with thanks to @davidangarita1 for the contribution!
13 changes: 9 additions & 4 deletions src/components/modebar/modebar.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,10 @@ proto.update = function(graphInfo, buttons) {
var modeBarId = 'modebar-' + fullLayout._uid;

this.element.setAttribute('id', modeBarId);
this._uid = modeBarId;
this.element.setAttribute('role', 'toolbar');

this.element.className = 'modebar';
this._uid = modeBarId;
this.element.className = 'modebar modebar--custom';
if(context.displayModeBar === 'hover') this.element.className += ' modebar--hover ease-bg';

if(fullLayout.modebar.orientation === 'v') {
Expand DownExpand Up@@ -145,8 +146,9 @@ proto.createGroup = function() {
*/
proto.createButton = function(config) {
var _this = this;
var button = document.createElement('a');
var button = document.createElement('button');

button.setAttribute('type', 'button');
button.setAttribute('rel', 'tooltip');
button.className = 'modebar-btn';

Expand All@@ -155,7 +157,10 @@ proto.createButton = function(config) {
// for localization: allow title to be a callable that takes gd as arg
else if(typeof title === 'function') title = title(this.graphInfo);

if(title || title === 0) button.setAttribute('data-title', title);
if(title || title === 0) {
button.setAttribute('data-title', title)
button.setAttribute("aria-label", title)
};

if(config.attr !== undefined) button.setAttribute('data-attr', config.attr);

Expand Down
28 changes: 22 additions & 6 deletions src/css/_modebar.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
@include vendor('transition', background-color 0.3s ease 0s);
}

.modebar--hover> :not(.watermark) {
.modebar--hover> :not(.watermark) {
opacity: 0;
@include vendor('transition', opacity 0.3s ease 0s);
}
Expand All@@ -17,6 +17,10 @@
opacity: 1;
}

&:focus-within .modebar--hover .modebar-group {
opacity: 1;
}

.modebar-group {
float: left;
display: inline-block;
Expand All@@ -25,6 +29,11 @@
position: relative;
vertical-align: middle;
white-space: nowrap;

a {
display: grid;
place-content: center;
}
}

.modebar-btn {
Expand All@@ -36,15 +45,20 @@
cursor: pointer;
line-height: normal;
box-sizing: border-box;
border: none;
background: transparent;

svg {
position: relative;
top: 2px;
}

&.modebar-btn--logo {

&:focus-visible {
outline: 1px solid black;
outline-offset: 1px;
border-radius: 3px;
}

&.modebar-btn--logo {}
}

.modebar.vertical {
Expand All@@ -53,9 +67,11 @@
flex-wrap: wrap;
align-content: flex-end;
max-height: 100%;

svg {
top: -1px;
top: -1px;
}

.modebar-group {
display: block;
float: none;
Expand All@@ -67,4 +83,4 @@
text-align: center;
}
}
}
}
14 changes: 7 additions & 7 deletions test/jasmine/tests/modebar_test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,15 +69,15 @@ describe('ModeBar', function() {
}

function countButtons(modeBar) {
return d3Select(modeBar.element).selectAll('a.modebar-btn').size();
return d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn').size();
}

function countLogo(modeBar) {
return d3Select(modeBar.element).selectAll('a.plotlyjsicon').size();
}

function checkBtnAttr(modeBar, index, attr) {
var buttons = d3Select(modeBar.element).selectAll('a.modebar-btn');
var buttons = d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn');
return d3Select(buttons[0][index]).attr(attr);
}

Expand DownExpand Up@@ -1676,7 +1676,7 @@ describe('ModeBar', function() {
it('add predefined shape drawing and hover buttons via layout.modebar.add', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1761,7 +1761,7 @@ describe('ModeBar', function() {
it('remove buttons using exact (camel case) and short (lower case) names via layout.modebar.remove and template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1842,7 +1842,7 @@ describe('ModeBar', function() {
it('add buttons using template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1865,7 +1865,7 @@ describe('ModeBar', function() {
it('add ' + t + ' button if removed by layout and added by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1886,7 +1886,7 @@ describe('ModeBar', function() {
it('remove button if added by layout and removed by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand Down
, '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('^' + ".*" + ' feat: Improve keyboard navigation of modebar (by @davidangarita1) by emilykl · Pull Request #7492 · plotly/plotly.js · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions build/plotcss.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ var rules = {
"X .ease-bg": "-webkit-transition:background-color .3s ease 0s;-moz-transition:background-color .3s ease 0s;-ms-transition:background-color .3s ease 0s;-o-transition:background-color .3s ease 0s;transition:background-color .3s ease 0s;",
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity .3s ease 0s;-moz-transition:opacity .3s ease 0s;-ms-transition:opacity .3s ease 0s;-o-transition:opacity .3s ease 0s;transition:opacity .3s ease 0s;",
"X:hover .modebar--hover .modebar-group": "opacity:1;",
"X:focus-within .modebar--hover .modebar-group": "opacity:1;",
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
"X .modebar-btn svg": "position:relative;top:2px;",
"X .modebar-group a": "display:grid;place-content:center;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;border:none;background:rgba(0,0,0,0);",
"X .modebar-btn svg": "position:relative;",
"X .modebar-btn:focus-visible": "outline:1px solid #000;outline-offset:1px;border-radius:3px;",
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
"X .modebar.vertical svg": "top:-1px;",
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7492_add.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
- Make modebar keyboard-accessible via tabbing [[#7492](https://github.com/plotly/plotly.js/pull/7492)], with thanks to @davidangarita1 for the contribution!
13 changes: 9 additions & 4 deletions src/components/modebar/modebar.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,10 @@ proto.update = function(graphInfo, buttons) {
var modeBarId = 'modebar-' + fullLayout._uid;

this.element.setAttribute('id', modeBarId);
this._uid = modeBarId;
this.element.setAttribute('role', 'toolbar');

this.element.className = 'modebar';
this._uid = modeBarId;
this.element.className = 'modebar modebar--custom';
if(context.displayModeBar === 'hover') this.element.className += ' modebar--hover ease-bg';

if(fullLayout.modebar.orientation === 'v') {
Expand DownExpand Up@@ -145,8 +146,9 @@ proto.createGroup = function() {
*/
proto.createButton = function(config) {
var _this = this;
var button = document.createElement('a');
var button = document.createElement('button');

button.setAttribute('type', 'button');
button.setAttribute('rel', 'tooltip');
button.className = 'modebar-btn';

Expand All@@ -155,7 +157,10 @@ proto.createButton = function(config) {
// for localization: allow title to be a callable that takes gd as arg
else if(typeof title === 'function') title = title(this.graphInfo);

if(title || title === 0) button.setAttribute('data-title', title);
if(title || title === 0) {
button.setAttribute('data-title', title)
button.setAttribute("aria-label", title)
};

if(config.attr !== undefined) button.setAttribute('data-attr', config.attr);

Expand Down
28 changes: 22 additions & 6 deletions src/css/_modebar.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
@include vendor('transition', background-color 0.3s ease 0s);
}

.modebar--hover> :not(.watermark) {
.modebar--hover> :not(.watermark) {
opacity: 0;
@include vendor('transition', opacity 0.3s ease 0s);
}
Expand All@@ -17,6 +17,10 @@
opacity: 1;
}

&:focus-within .modebar--hover .modebar-group {
opacity: 1;
}

.modebar-group {
float: left;
display: inline-block;
Expand All@@ -25,6 +29,11 @@
position: relative;
vertical-align: middle;
white-space: nowrap;

a {
display: grid;
place-content: center;
}
}

.modebar-btn {
Expand All@@ -36,15 +45,20 @@
cursor: pointer;
line-height: normal;
box-sizing: border-box;
border: none;
background: transparent;

svg {
position: relative;
top: 2px;
}

&.modebar-btn--logo {

&:focus-visible {
outline: 1px solid black;
outline-offset: 1px;
border-radius: 3px;
}

&.modebar-btn--logo {}
}

.modebar.vertical {
Expand All@@ -53,9 +67,11 @@
flex-wrap: wrap;
align-content: flex-end;
max-height: 100%;

svg {
top: -1px;
top: -1px;
}

.modebar-group {
display: block;
float: none;
Expand All@@ -67,4 +83,4 @@
text-align: center;
}
}
}
}
14 changes: 7 additions & 7 deletions test/jasmine/tests/modebar_test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,15 +69,15 @@ describe('ModeBar', function() {
}

function countButtons(modeBar) {
return d3Select(modeBar.element).selectAll('a.modebar-btn').size();
return d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn').size();
}

function countLogo(modeBar) {
return d3Select(modeBar.element).selectAll('a.plotlyjsicon').size();
}

function checkBtnAttr(modeBar, index, attr) {
var buttons = d3Select(modeBar.element).selectAll('a.modebar-btn');
var buttons = d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn');
return d3Select(buttons[0][index]).attr(attr);
}

Expand DownExpand Up@@ -1676,7 +1676,7 @@ describe('ModeBar', function() {
it('add predefined shape drawing and hover buttons via layout.modebar.add', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1761,7 +1761,7 @@ describe('ModeBar', function() {
it('remove buttons using exact (camel case) and short (lower case) names via layout.modebar.remove and template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1842,7 +1842,7 @@ describe('ModeBar', function() {
it('add buttons using template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1865,7 +1865,7 @@ describe('ModeBar', function() {
it('add ' + t + ' button if removed by layout and added by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1886,7 +1886,7 @@ describe('ModeBar', function() {
it('remove button if added by layout and removed by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand Down
, '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('^' + ".*" + ' feat: Improve keyboard navigation of modebar (by @davidangarita1) by emilykl · Pull Request #7492 · plotly/plotly.js · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions build/plotcss.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ var rules = {
"X .ease-bg": "-webkit-transition:background-color .3s ease 0s;-moz-transition:background-color .3s ease 0s;-ms-transition:background-color .3s ease 0s;-o-transition:background-color .3s ease 0s;transition:background-color .3s ease 0s;",
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity .3s ease 0s;-moz-transition:opacity .3s ease 0s;-ms-transition:opacity .3s ease 0s;-o-transition:opacity .3s ease 0s;transition:opacity .3s ease 0s;",
"X:hover .modebar--hover .modebar-group": "opacity:1;",
"X:focus-within .modebar--hover .modebar-group": "opacity:1;",
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
"X .modebar-btn svg": "position:relative;top:2px;",
"X .modebar-group a": "display:grid;place-content:center;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;border:none;background:rgba(0,0,0,0);",
"X .modebar-btn svg": "position:relative;",
"X .modebar-btn:focus-visible": "outline:1px solid #000;outline-offset:1px;border-radius:3px;",
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
"X .modebar.vertical svg": "top:-1px;",
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7492_add.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
- Make modebar keyboard-accessible via tabbing [[#7492](https://github.com/plotly/plotly.js/pull/7492)], with thanks to @davidangarita1 for the contribution!
13 changes: 9 additions & 4 deletions src/components/modebar/modebar.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,10 @@ proto.update = function(graphInfo, buttons) {
var modeBarId = 'modebar-' + fullLayout._uid;

this.element.setAttribute('id', modeBarId);
this._uid = modeBarId;
this.element.setAttribute('role', 'toolbar');

this.element.className = 'modebar';
this._uid = modeBarId;
this.element.className = 'modebar modebar--custom';
if(context.displayModeBar === 'hover') this.element.className += ' modebar--hover ease-bg';

if(fullLayout.modebar.orientation === 'v') {
Expand DownExpand Up@@ -145,8 +146,9 @@ proto.createGroup = function() {
*/
proto.createButton = function(config) {
var _this = this;
var button = document.createElement('a');
var button = document.createElement('button');

button.setAttribute('type', 'button');
button.setAttribute('rel', 'tooltip');
button.className = 'modebar-btn';

Expand All@@ -155,7 +157,10 @@ proto.createButton = function(config) {
// for localization: allow title to be a callable that takes gd as arg
else if(typeof title === 'function') title = title(this.graphInfo);

if(title || title === 0) button.setAttribute('data-title', title);
if(title || title === 0) {
button.setAttribute('data-title', title)
button.setAttribute("aria-label", title)
};

if(config.attr !== undefined) button.setAttribute('data-attr', config.attr);

Expand Down
28 changes: 22 additions & 6 deletions src/css/_modebar.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
@include vendor('transition', background-color 0.3s ease 0s);
}

.modebar--hover> :not(.watermark) {
.modebar--hover> :not(.watermark) {
opacity: 0;
@include vendor('transition', opacity 0.3s ease 0s);
}
Expand All@@ -17,6 +17,10 @@
opacity: 1;
}

&:focus-within .modebar--hover .modebar-group {
opacity: 1;
}

.modebar-group {
float: left;
display: inline-block;
Expand All@@ -25,6 +29,11 @@
position: relative;
vertical-align: middle;
white-space: nowrap;

a {
display: grid;
place-content: center;
}
}

.modebar-btn {
Expand All@@ -36,15 +45,20 @@
cursor: pointer;
line-height: normal;
box-sizing: border-box;
border: none;
background: transparent;

svg {
position: relative;
top: 2px;
}

&.modebar-btn--logo {

&:focus-visible {
outline: 1px solid black;
outline-offset: 1px;
border-radius: 3px;
}

&.modebar-btn--logo {}
}

.modebar.vertical {
Expand All@@ -53,9 +67,11 @@
flex-wrap: wrap;
align-content: flex-end;
max-height: 100%;

svg {
top: -1px;
top: -1px;
}

.modebar-group {
display: block;
float: none;
Expand All@@ -67,4 +83,4 @@
text-align: center;
}
}
}
}
14 changes: 7 additions & 7 deletions test/jasmine/tests/modebar_test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,15 +69,15 @@ describe('ModeBar', function() {
}

function countButtons(modeBar) {
return d3Select(modeBar.element).selectAll('a.modebar-btn').size();
return d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn').size();
}

function countLogo(modeBar) {
return d3Select(modeBar.element).selectAll('a.plotlyjsicon').size();
}

function checkBtnAttr(modeBar, index, attr) {
var buttons = d3Select(modeBar.element).selectAll('a.modebar-btn');
var buttons = d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn');
return d3Select(buttons[0][index]).attr(attr);
}

Expand DownExpand Up@@ -1676,7 +1676,7 @@ describe('ModeBar', function() {
it('add predefined shape drawing and hover buttons via layout.modebar.add', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1761,7 +1761,7 @@ describe('ModeBar', function() {
it('remove buttons using exact (camel case) and short (lower case) names via layout.modebar.remove and template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1842,7 +1842,7 @@ describe('ModeBar', function() {
it('add buttons using template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1865,7 +1865,7 @@ describe('ModeBar', function() {
it('add ' + t + ' button if removed by layout and added by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1886,7 +1886,7 @@ describe('ModeBar', function() {
it('remove button if added by layout and removed by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand Down
, '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); } })(); })(); feat: Improve keyboard navigation of modebar (by @davidangarita1) by emilykl · Pull Request #7492 · plotly/plotly.js · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 5 additions & 2 deletions build/plotcss.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,9 +34,12 @@ var rules = {
"X .ease-bg": "-webkit-transition:background-color .3s ease 0s;-moz-transition:background-color .3s ease 0s;-ms-transition:background-color .3s ease 0s;-o-transition:background-color .3s ease 0s;transition:background-color .3s ease 0s;",
"X .modebar--hover>:not(.watermark)": "opacity:0;-webkit-transition:opacity .3s ease 0s;-moz-transition:opacity .3s ease 0s;-ms-transition:opacity .3s ease 0s;-o-transition:opacity .3s ease 0s;transition:opacity .3s ease 0s;",
"X:hover .modebar--hover .modebar-group": "opacity:1;",
"X:focus-within .modebar--hover .modebar-group": "opacity:1;",
"X .modebar-group": "float:left;display:inline-block;box-sizing:border-box;padding-left:8px;position:relative;vertical-align:middle;white-space:nowrap;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;",
"X .modebar-btn svg": "position:relative;top:2px;",
"X .modebar-group a": "display:grid;place-content:center;",
"X .modebar-btn": "position:relative;font-size:16px;padding:3px 4px;height:22px;cursor:pointer;line-height:normal;box-sizing:border-box;border:none;background:rgba(0,0,0,0);",
"X .modebar-btn svg": "position:relative;",
"X .modebar-btn:focus-visible": "outline:1px solid #000;outline-offset:1px;border-radius:3px;",
"X .modebar.vertical": "display:flex;flex-direction:column;flex-wrap:wrap;align-content:flex-end;max-height:100%;",
"X .modebar.vertical svg": "top:-1px;",
"X .modebar.vertical .modebar-group": "display:block;float:none;padding-left:0px;padding-bottom:8px;",
Expand Down
1 change: 1 addition & 0 deletions draftlogs/7492_add.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
- Make modebar keyboard-accessible via tabbing [[#7492](https://github.com/plotly/plotly.js/pull/7492)], with thanks to @davidangarita1 for the contribution!
13 changes: 9 additions & 4 deletions src/components/modebar/modebar.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,10 @@ proto.update = function(graphInfo, buttons) {
var modeBarId = 'modebar-' + fullLayout._uid;

this.element.setAttribute('id', modeBarId);
this._uid = modeBarId;
this.element.setAttribute('role', 'toolbar');

this.element.className = 'modebar';
this._uid = modeBarId;
this.element.className = 'modebar modebar--custom';
if(context.displayModeBar === 'hover') this.element.className += ' modebar--hover ease-bg';

if(fullLayout.modebar.orientation === 'v') {
Expand DownExpand Up@@ -145,8 +146,9 @@ proto.createGroup = function() {
*/
proto.createButton = function(config) {
var _this = this;
var button = document.createElement('a');
var button = document.createElement('button');

button.setAttribute('type', 'button');
button.setAttribute('rel', 'tooltip');
button.className = 'modebar-btn';

Expand All@@ -155,7 +157,10 @@ proto.createButton = function(config) {
// for localization: allow title to be a callable that takes gd as arg
else if(typeof title === 'function') title = title(this.graphInfo);

if(title || title === 0) button.setAttribute('data-title', title);
if(title || title === 0) {
button.setAttribute('data-title', title)
button.setAttribute("aria-label", title)
};

if(config.attr !== undefined) button.setAttribute('data-attr', config.attr);

Expand Down
28 changes: 22 additions & 6 deletions src/css/_modebar.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
@include vendor('transition', background-color 0.3s ease 0s);
}

.modebar--hover> :not(.watermark) {
.modebar--hover> :not(.watermark) {
opacity: 0;
@include vendor('transition', opacity 0.3s ease 0s);
}
Expand All@@ -17,6 +17,10 @@
opacity: 1;
}

&:focus-within .modebar--hover .modebar-group {
opacity: 1;
}

.modebar-group {
float: left;
display: inline-block;
Expand All@@ -25,6 +29,11 @@
position: relative;
vertical-align: middle;
white-space: nowrap;

a {
display: grid;
place-content: center;
}
}

.modebar-btn {
Expand All@@ -36,15 +45,20 @@
cursor: pointer;
line-height: normal;
box-sizing: border-box;
border: none;
background: transparent;

svg {
position: relative;
top: 2px;
}

&.modebar-btn--logo {

&:focus-visible {
outline: 1px solid black;
outline-offset: 1px;
border-radius: 3px;
}

&.modebar-btn--logo {}
}

.modebar.vertical {
Expand All@@ -53,9 +67,11 @@
flex-wrap: wrap;
align-content: flex-end;
max-height: 100%;

svg {
top: -1px;
top: -1px;
}

.modebar-group {
display: block;
float: none;
Expand All@@ -67,4 +83,4 @@
text-align: center;
}
}
}
}
14 changes: 7 additions & 7 deletions test/jasmine/tests/modebar_test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,15 +69,15 @@ describe('ModeBar', function() {
}

function countButtons(modeBar) {
return d3Select(modeBar.element).selectAll('a.modebar-btn').size();
return d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn').size();
}

function countLogo(modeBar) {
return d3Select(modeBar.element).selectAll('a.plotlyjsicon').size();
}

function checkBtnAttr(modeBar, index, attr) {
var buttons = d3Select(modeBar.element).selectAll('a.modebar-btn');
var buttons = d3Select(modeBar.element).selectAll('button.modebar-btn, a.modebar-btn');
return d3Select(buttons[0][index]).attr(attr);
}

Expand DownExpand Up@@ -1676,7 +1676,7 @@ describe('ModeBar', function() {
it('add predefined shape drawing and hover buttons via layout.modebar.add', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1761,7 +1761,7 @@ describe('ModeBar', function() {
it('remove buttons using exact (camel case) and short (lower case) names via layout.modebar.remove and template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand DownExpand Up@@ -1842,7 +1842,7 @@ describe('ModeBar', function() {
it('add buttons using template', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1865,7 +1865,7 @@ describe('ModeBar', function() {
it('add ' + t + ' button if removed by layout and added by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand All@@ -1886,7 +1886,7 @@ describe('ModeBar', function() {
it('remove button if added by layout and removed by config', function(done) {
function countButtons() {
var modeBarEl = gd._fullLayout._modeBar.element;
return d3Select(modeBarEl).selectAll('a.modebar-btn').size();
return d3Select(modeBarEl).selectAll('button.modebar-btn, a.modebar-btn').size();
}

var initial = 10;
Expand Down