Commit 7c99fed9 authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

PDF Viewer update: Add aria-expanded attribute to the menu button.

Fixed: 1132421
Change-Id: I7d3e3261fcd35a27bc0da0338a5c1182adca7378
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431574
Commit-Queue: John Lee <johntlee@chromium.org>
Reviewed-by: default avatarJohn Lee <johntlee@chromium.org>
Auto-Submit: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811274}
parent 773b24b9
...@@ -173,6 +173,7 @@ ...@@ -173,6 +173,7 @@
<div id="start"> <div id="start">
<cr-icon-button id="sidenavToggle" iron-icon="cr20:menu" <cr-icon-button id="sidenavToggle" iron-icon="cr20:menu"
title="$i18n{menu}" aria-label="$i18n{menu}" title="$i18n{menu}" aria-label="$i18n{menu}"
aria-expanded$="[[getAriaExpanded_(sidenavCollapsed)]]"
<if expr="chromeos"> <if expr="chromeos">
disabled="[[annotationMode]]" disabled="[[annotationMode]]"
</if> </if>
......
...@@ -76,6 +76,7 @@ export class ViewerPdfToolbarNewElement extends PolymerElement { ...@@ -76,6 +76,7 @@ export class ViewerPdfToolbarNewElement extends PolymerElement {
observer: 'viewportZoomChanged_', observer: 'viewportZoomChanged_',
}, },
sidenavCollapsed: Boolean,
twoUpViewEnabled: Boolean, twoUpViewEnabled: Boolean,
moreMenuOpen_: { moreMenuOpen_: {
...@@ -111,6 +112,9 @@ export class ViewerPdfToolbarNewElement extends PolymerElement { ...@@ -111,6 +112,9 @@ export class ViewerPdfToolbarNewElement extends PolymerElement {
constructor() { constructor() {
super(); super();
/** @type {boolean} */
this.sidenavCollapsed = false;
/** @private {!FittingType} */ /** @private {!FittingType} */
this.fittingType_ = FittingType.FIT_TO_PAGE; this.fittingType_ = FittingType.FIT_TO_PAGE;
...@@ -230,6 +234,11 @@ export class ViewerPdfToolbarNewElement extends PolymerElement { ...@@ -230,6 +234,11 @@ export class ViewerPdfToolbarNewElement extends PolymerElement {
return checked ? 'true' : 'false'; return checked ? 'true' : 'false';
} }
/** @return {string} */
getAriaExpanded_() {
return this.sidenavCollapsed ? 'false' : 'true';
}
/** @private */ /** @private */
toggleTwoPageViewClick_() { toggleTwoPageViewClick_() {
const newTwoUpViewEnabled = !this.twoUpViewEnabled; const newTwoUpViewEnabled = !this.twoUpViewEnabled;
......
...@@ -158,6 +158,7 @@ ...@@ -158,6 +158,7 @@
pdf-form-save-enabled="[[pdfFormSaveEnabled_]]" pdf-form-save-enabled="[[pdfFormSaveEnabled_]]"
printing-enabled="[[printingEnabled_]]" rotated="[[rotated_]]" printing-enabled="[[printingEnabled_]]" rotated="[[rotated_]]"
is-form-field-focused="[[isFormFieldFocused_]]" is-form-field-focused="[[isFormFieldFocused_]]"
sidenav-collapsed="[[sidenavCollapsed_]]"
two-up-view-enabled="[[twoUpViewEnabled_]]" two-up-view-enabled="[[twoUpViewEnabled_]]"
viewport-zoom="[[viewportZoom_]]" viewport-zoom="[[viewportZoom_]]"
<if expr="chromeos"> <if expr="chromeos">
......
...@@ -141,6 +141,7 @@ export class PDFViewerElement extends PDFViewerBaseElement { ...@@ -141,6 +141,7 @@ export class PDFViewerElement extends PDFViewerBaseElement {
title_: String, title_: String,
sidenavCollapsed_: Boolean,
twoUpViewEnabled_: Boolean, twoUpViewEnabled_: Boolean,
isFormFieldFocused_: Boolean, isFormFieldFocused_: Boolean,
......
...@@ -232,9 +232,18 @@ const tests = [ ...@@ -232,9 +232,18 @@ const tests = [
function testSidenavToggleButton() { function testSidenavToggleButton() {
const toolbar = createToolbar(); const toolbar = createToolbar();
chrome.test.assertFalse(toolbar.sidenavCollapsed);
const toggleButton = toolbar.shadowRoot.querySelector('#sidenavToggle');
chrome.test.assertTrue(toggleButton.hasAttribute('aria-label'));
chrome.test.assertTrue(toggleButton.hasAttribute('title'));
chrome.test.assertEq('true', toggleButton.getAttribute('aria-expanded'));
toolbar.sidenavCollapsed = true;
chrome.test.assertEq('false', toggleButton.getAttribute('aria-expanded'));
toolbar.addEventListener( toolbar.addEventListener(
'sidenav-toggle-click', () => chrome.test.succeed()); 'sidenav-toggle-click', () => chrome.test.succeed());
const toggleButton = toolbar.shadowRoot.querySelector('#sidenavToggle');
toggleButton.click(); toggleButton.click();
}, },
]; ];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment