From c5afc6a9f9c9f172ec007ad816e65233a2c5a950 Mon Sep 17 00:00:00 2001
From: Tachibana Shin <shin@shin.is-a.dev>
Date: Mon, 18 May 2026 14:55:48 +0700
Subject: [PATCH] fix(lang): emit selected locale on close (#1234)

---
 src/shared/components/HeaderMenu.js       | 5 ++++-
 src/shared/components/LanguageSwitcher.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/shared/components/HeaderMenu.js b/src/shared/components/HeaderMenu.js
index bb44d8e6..1f36be12 100644
--- a/src/shared/components/HeaderMenu.js
+++ b/src/shared/components/HeaderMenu.js
@@ -153,7 +153,10 @@ export default function HeaderMenu({ onLogout }) {
 
       <ChangelogModal isOpen={changelogOpen} onClose={() => setChangelogOpen(false)} />
       <NineRemotePromoModal isOpen={remoteOpen} onClose={() => setRemoteOpen(false)} />
-      <LanguageSwitcher hideTrigger isOpen={langOpen} onClose={() => setLangOpen(false)} />
+      <LanguageSwitcher hideTrigger isOpen={langOpen} onClose={((locale) => {
+        setLangOpen(false)
+        setLocale(locale)
+      })} />
     </>
   );
 }
diff --git a/src/shared/components/LanguageSwitcher.js b/src/shared/components/LanguageSwitcher.js
index 5e2f9019..b14a8179 100644
--- a/src/shared/components/LanguageSwitcher.js
+++ b/src/shared/components/LanguageSwitcher.js
@@ -64,7 +64,7 @@ export default function LanguageSwitcher({ className = "", isOpen: controlledOpe
   const isOpen = isControlled ? controlledOpen : internalOpen;
   const setIsOpen = (value) => {
     if (isControlled) {
-      if (!value && onClose) onClose();
+      if (!value && onClose) onClose(locale);
     } else {
       setInternalOpen(value);
     }