aboutsummaryrefslogtreecommitdiff
path: root/site
diff options
context:
space:
mode:
authorPatrick H. Lauke <[email protected]>2023-01-02 05:54:46 +0000
committerGitHub <[email protected]>2023-01-01 21:54:46 -0800
commit212c0dfd076e4e504de135b2b41647199feb3696 (patch)
tree857059426a06653a8ab57950da4f4016b71e1e0b /site
parent2cc580e2d1e70d942965d54365db24fe6728ad00 (diff)
downloadbootstrap-212c0dfd076e4e504de135b2b41647199feb3696.tar.xz
bootstrap-212c0dfd076e4e504de135b2b41647199feb3696.zip
Docs: Make theme switcher accessible (#37780)
* Make theme switcher accessible * set an explicit `aria-label` to the switcher (as the `<span>` is not sufficient, as it can be display:none'd and then the button has no accName) * make the theme buttons actual `aria-pressed` toggles * Dynamically update aria-label for theme switcher * Explicitly reset focus after activating theme * Use innerText for the constructed dynamic aria-label this way, if the text ever gets changed in the html, this will adapt appropriately * Tweak accessible name for the dropdown * Fixup * Use `textContent` instead of `innerText`
Diffstat (limited to 'site')
-rw-r--r--site/layouts/partials/docs-navbar.html13
-rw-r--r--site/static/docs/5.3/assets/js/color-modes.js7
2 files changed, 14 insertions, 6 deletions
diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html
index 4b942a65e..2795ec85b 100644
--- a/site/layouts/partials/docs-navbar.html
+++ b/site/layouts/partials/docs-navbar.html
@@ -90,27 +90,28 @@
type="button"
aria-expanded="false"
data-bs-toggle="dropdown"
- data-bs-display="static">
+ data-bs-display="static"
+ aria-label="Toggle theme (auto)">
<svg class="bi my-1 theme-icon-active"><use href="#circle-half"></use></svg>
- <span class="d-lg-none ms-2">Toggle theme</span>
+ <span class="d-lg-none ms-2" id="bd-theme-text">Toggle theme</span>
</button>
- <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme" style="--bs-dropdown-min-width: 8rem;">
+ <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme-text" style="--bs-dropdown-min-width: 8rem;">
<li>
- <button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light">
+ <button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light" aria-pressed="false">
<svg class="bi me-2 opacity-50 theme-icon"><use href="#sun-fill"></use></svg>
Light
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
</button>
</li>
<li>
- <button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark">
+ <button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="dark" aria-pressed="false">
<svg class="bi me-2 opacity-50 theme-icon"><use href="#moon-stars-fill"></use></svg>
Dark
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
</button>
</li>
<li>
- <button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto">
+ <button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="auto" aria-pressed="true">
<svg class="bi me-2 opacity-50 theme-icon"><use href="#circle-half"></use></svg>
Auto
<svg class="bi ms-auto d-none"><use href="#check2"></use></svg>
diff --git a/site/static/docs/5.3/assets/js/color-modes.js b/site/static/docs/5.3/assets/js/color-modes.js
index 50a798649..fdd3303dc 100644
--- a/site/static/docs/5.3/assets/js/color-modes.js
+++ b/site/static/docs/5.3/assets/js/color-modes.js
@@ -28,16 +28,23 @@
setTheme(getPreferredTheme())
const showActiveTheme = theme => {
+ const themeSwitcher = document.querySelector('#bd-theme')
+ const themeSwitcherText = document.querySelector('#bd-theme-text')
const activeThemeIcon = document.querySelector('.theme-icon-active use')
const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
const svgOfActiveBtn = btnToActive.querySelector('svg use').getAttribute('href')
document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
element.classList.remove('active')
+ element.setAttribute('aria-pressed', 'false')
})
btnToActive.classList.add('active')
+ btnToActive.setAttribute('aria-pressed', 'true')
activeThemeIcon.setAttribute('href', svgOfActiveBtn)
+ const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})`
+ themeSwitcher.setAttribute('aria-label', themeSwitcherLabel)
+ themeSwitcher.focus()
}
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {