fix(nav): control order is language -> mode -> theme in bar and sheet (supersedes Q12/Q15)

This commit is contained in:
dong.nguyen committed 2026-10-17 14:51:02 +07:00
1 parent d7ef4a28e4
commit 6cd665960a
7 files changed
+56 -51

No files matched your search

+22 -22
View File
@@ -68,28 +68,6 @@ export function MobileMenu({ open, onClose }: MobileMenuProps) {
<div className="mobile-menu-group">
<span className="mobile-menu-heading">{strings.nav.groupAppearance[lang]}</span>
<div className="mobile-menu-segment">
<span className="mobile-menu-segment-label">{strings.nav.themeGroup[lang]}</span>
<div className="mobile-menu-segment-options" role="group" aria-label={strings.nav.themeGroup[lang]}>
<button
type="button"
className={resolvedTheme === 'dark' ? 'mobile-menu-segment-option active' : 'mobile-menu-segment-option'}
aria-pressed={resolvedTheme === 'dark'}
onClick={() => setTheme('dark')}
>
{strings.nav.themeDark[lang]}
</button>
<button
type="button"
className={resolvedTheme === 'light' ? 'mobile-menu-segment-option active' : 'mobile-menu-segment-option'}
aria-pressed={resolvedTheme === 'light'}
onClick={() => setTheme('light')}
>
{strings.nav.themeLight[lang]}
</button>
</div>
</div>
<div className="mobile-menu-segment">
<span className="mobile-menu-segment-label">{strings.nav.langGroup[lang]}</span>
<div className="mobile-menu-segment-options" role="group" aria-label={strings.nav.langGroup[lang]}>
@@ -112,6 +90,28 @@ export function MobileMenu({ open, onClose }: MobileMenuProps) {
</div>
</div>
<div className="mobile-menu-segment">
<span className="mobile-menu-segment-label">{strings.nav.themeGroup[lang]}</span>
<div className="mobile-menu-segment-options" role="group" aria-label={strings.nav.themeGroup[lang]}>
<button
type="button"
className={resolvedTheme === 'dark' ? 'mobile-menu-segment-option active' : 'mobile-menu-segment-option'}
aria-pressed={resolvedTheme === 'dark'}
onClick={() => setTheme('dark')}
>
{strings.nav.themeDark[lang]}
</button>
<button
type="button"
className={resolvedTheme === 'light' ? 'mobile-menu-segment-option active' : 'mobile-menu-segment-option'}
aria-pressed={resolvedTheme === 'light'}
onClick={() => setTheme('light')}
>
{strings.nav.themeLight[lang]}
</button>
</div>
</div>
<div className="mobile-menu-segment">
<span className="mobile-menu-segment-label">{strings.nav.palette[lang]}</span>
<div className="mobile-menu-segment-options" role="group" aria-label={strings.nav.palette[lang]}>
+9 -9
View File
@@ -81,6 +81,15 @@ export function Navigation() {
</ul>
<div className="nav-actions">
<button
className="nav-control lang-toggle"
onClick={toggleLang}
aria-label="Switch language"
title={`Switch to ${lang === 'en' ? 'Tiếng Việt' : 'English'}`}
>
{lang === 'en' ? 'VI' : 'EN'}
</button>
<button
className="nav-control theme-toggle"
onClick={cycleTheme}
@@ -99,15 +108,6 @@ export function Navigation() {
)}
</button>
<button
className="nav-control lang-toggle"
onClick={toggleLang}
aria-label="Switch language"
title={`Switch to ${lang === 'en' ? 'Tiếng Việt' : 'English'}`}
>
{lang === 'en' ? 'VI' : 'EN'}
</button>
<ThemePaletteMenu />
<button