Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1286283 - support ARIA for devtools inspector tabs. r=bgrinstead

Browse Source 
MozReview-Commit-ID: BOOWwPqmTbT

--HG--
extra : transplant_source : %86%B1%AC%8Eh%16%60%C7i%97%FF%83%0A%5Ec%0E%AE%84%0A%5B
This commit is contained in:
Ricky Chien 2016-07-20 14:06:44 +08:00
parent 53a89f1b4a
commit 3595510cde
3 changed files with 91 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
devtools/client/shared/components/tabs/tabs.js
View File

@ -26,7 +26,7 @@ define(function (require, exports, module) {
* <li class='tabs-menu-item'>Tab #2</li>
* </ul>
* </nav>
* <div class='tab-panel'>
* <div class='panels'>
* The content of active panel here
* </div>
* <div>
@ -184,11 +184,12 @@ define(function (require, exports, module) {
let ref = ("tab-menu-" + index);
let title = tab.props.title;
let tabClassName = tab.props.className;
let isTabSelected = this.state.tabActive === index;
let classes = [
"tabs-menu-item",
tabClassName,
this.state.tabActive === index ? "is-active" : ""
isTabSelected ? "is-active" : ""
].join(" ");
// Set tabindex to -1 (except the selected tab) so, it's focusable,
@ -200,11 +201,18 @@ define(function (require, exports, module) {
DOM.li({
ref: ref,
key: index,
className: classes},
id: "tab-" + index,
className: classes,
role: "presentation",
},
DOM.a({
href: "#",
tabIndex: this.state.tabActive === index ? 0 : -1,
onClick: this.onClickTab.bind(this, index)},
"aria-controls": "panel-" + index,
"aria-selected": isTabSelected,
role: "tab",
onClick: this.onClickTab.bind(this, index),
},
title
)
)
@ -213,7 +221,7 @@ define(function (require, exports, module) {
return (
DOM.nav({className: "tabs-navigation"},
DOM.ul({className: "tabs-menu"},
DOM.ul({className: "tabs-menu", role: "tablist"},
tabs
)
)
@ -251,8 +259,12 @@ define(function (require, exports, module) {
return (
DOM.div({
key: index,
id: "panel-" + index,
style: style,
className: "tab-panel-box"},
className: "tab-panel-box",
role: "tabpanel",
"aria-labelledby": "tab-" + index,
},
(selected || this.state.created[index]) ? tab : null
)
);

1
devtools/client/shared/components/test/mochitest/chrome.ini
View File

@ -27,6 +27,7 @@ support-files =
[test_reps_undefined.html]
[test_reps_window.html]
[test_sidebar_toggle.html]
[test_tabs_accessibility.html]
[test_tree_01.html]
[test_tree_02.html]
[test_tree_03.html]

72
devtools/client/shared/components/test/mochitest/test_tabs_accessibility.html Normal file
View File

@ -0,0 +1,72 @@
<!DOCTYPE HTML>
<html>
<!--
Test tabs accessibility.
-->
<head>
<meta charset="utf-8">
<title>Tabs component accessibility test</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
</head>
<body>
<pre id="test">
<script src="head.js" type="application/javascript;version=1.8"></script>
<script type="application/javascript;version=1.8">
window.onload = Task.async(function* () {
try {
const ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
const React = browserRequire("devtools/client/shared/vendor/react");
const { Simulate } = React.addons.TestUtils;
const InspectorTabPanel = React.createFactory(browserRequire("devtools/client/inspector/components/inspector-tab-panel"));
const Tabbar = React.createFactory(browserRequire("devtools/client/shared/components/tabs/tabbar"));
const tabbar = Tabbar();
const tabbarReact = ReactDOM.render(tabbar, window.document.body);
const tabbarEl = ReactDOM.findDOMNode(tabbarReact);
// Setup for InspectorTabPanel
const tabpanels = document.createElement("div");
tabpanels.id = "tabpanels";
document.body.appendChild(tabpanels);
yield addTabWithPanel(0);
yield addTabWithPanel(1);
const tabAnchors = tabbarEl.querySelectorAll("li.tabs-menu-item a");
is(tabAnchors[0].parentElement.getAttribute("role"), "presentation", "li role is set correctly");
is(tabAnchors[0].getAttribute("role"), "tab", "Anchor role is set correctly");
is(tabAnchors[0].getAttribute("aria-selected"), "true", "Anchor aria-selected is set correctly by default");
is(tabAnchors[0].getAttribute("aria-controls"), "panel-0", "Anchor aria-controls is set correctly");
is(tabAnchors[1].parentElement.getAttribute("role"), "presentation", "li role is set correctly");
is(tabAnchors[1].getAttribute("role"), "tab", "Anchor role is set correctly");
is(tabAnchors[1].getAttribute("aria-selected"), "false", "Anchor aria-selected is set correctly by default");
is(tabAnchors[1].getAttribute("aria-controls"), "panel-1", "Anchor aria-controls is set correctly");
yield setState(tabbarReact, Object.assign({}, tabbarReact.state, {
activeTab: 1
}));
is(tabAnchors[0].getAttribute("aria-selected"), "false", "Anchor aria-selected is reset correctly");
is(tabAnchors[1].getAttribute("aria-selected"), "true", "Anchor aria-selected is reset correctly");
function addTabWithPanel(tabId) {
// Setup for InspectorTabPanel
let panel = document.createElement("div");
panel.id = `sidebar-panel-${tabId}`;
document.body.appendChild(panel);
return setState(tabbarReact, Object.assign({}, tabbarReact.state, {
tabs: tabbarReact.state.tabs.concat({id: `${tabId}`, title: `tab-${tabId}`, panel: InspectorTabPanel}),
}));
}
} catch(e) {
ok(false, "Got an error: " + DevToolsUtils.safeErrorString(e));
} finally {
SimpleTest.finish();
}
});
</script>
</pre>
</body>
</html>