Skip to content

Commit 6a6156a

Browse files
committed
Improve theme switcher a11y
1 parent 0ce0b1b commit 6a6156a

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

resources/presets/theme_toggle/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
],
2121
[
2222
'type' => 'notify',
23-
'content' => "Add this to your `lang/locale/strings.php` file:\n\n// Theme toggle\n'theme_toggle_dark' => 'Use dark theme.',\n'theme_toggle_light' => 'Use light theme.',\n'theme_toggle_system' => 'Use system preference.',\n'theme_toggle_dark_short' => 'Dark',\n'theme_toggle_light_short' => 'Light',\n'theme_toggle_system_short' => 'System',\n'theme_toggle_toggle_open' => 'Open dark mode picker.',\n'theme_toggle_toggle_close' => 'Close dark mode picker.',"
23+
'content' => "Add this to your `lang/locale/strings.php` file:\n'theme_toggle_dark' => 'Use dark theme.',\n'theme_toggle_light' => 'Use light theme.',\n'theme_toggle_system' => 'Use system preference.',\n'theme_toggle_dark_short' => 'Dark',\n'theme_toggle_light_short' => 'Light',\n'theme_toggle_system_short' => 'System',\n'theme_toggle_dark_toggle_open' => 'Dark theme: open site theme picker.',\n'theme_toggle_dark_toggle_close' => 'Dark theme: close site theme picker.',\n'theme_toggle_light_toggle_open' => 'Light theme: open site theme picker.',\n'theme_toggle_light_toggle_close' => 'Light theme: close site theme picker.',\n'theme_toggle_system_toggle_open' => 'System (Default): open site theme picker.',\n'theme_toggle_system_toggle_close' => 'System (Default): close site theme picker.'",
2424
],
2525
[
2626
'type' => 'notify',

resources/presets/theme_toggle/resources/views/components/_theme_toggle.antlers.html

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,20 @@
129129
this.themeToggleOpen = !this.themeToggleOpen
130130
},
131131
[':aria-label']() {
132-
return this.themeToggleOpen
133-
? '{{ trans:strings.theme_toggle_toggle_close }}'
134-
: '{{ trans:strings.theme_toggle_toggle_open }}'
132+
switch (this.$store.theme.get()) {
133+
case 'dark':
134+
return this.themeToggleOpen
135+
? '{{ trans:strings.theme_toggle_dark_toggle_close }}'
136+
: '{{ trans:strings.theme_toggle_dark_toggle_open }}'
137+
case 'light':
138+
return this.themeToggleOpen
139+
? '{{ trans:strings.theme_toggle_light_toggle_close }}'
140+
: '{{ trans:strings.theme_toggle_light_toggle_open }}'
141+
case 'system':
142+
return this.themeToggleOpen
143+
? '{{ trans:strings.theme_toggle_system_toggle_close }}'
144+
: '{{ trans:strings.theme_toggle_system_toggle_open }}'
145+
}
135146
},
136147
[':aria-expanded']() {
137148
return this.themeToggleOpen

0 commit comments

Comments
 (0)