From a45e89c30058f2bd00a7cf0254f6e4f6dedf4603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 31 Jul 2025 18:47:22 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E9=81=A9=E7=94=A8=E4=B8=AD?=
 =?UTF-8?q?=E3=81=AE=E3=83=86=E3=83=BC=E3=83=9E=E3=82=92=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E9=9A=9B=E3=81=AB=E3=83=AA=E3=82=A2=E3=82=AF?=
 =?UTF-8?q?=E3=83=86=E3=82=A3=E3=83=93=E3=83=86=E3=82=A3=E3=82=82=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#16304)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): 現在のテーマを保持する際にリアクティビティが保持される問題を修正

* Update Changelog

* Update theme.ts
---
 CHANGELOG.md                   | 1 +
 packages/frontend/src/theme.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af5c0da4a3..e0f9d775e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Client
 - Fix: 一部の設定検索結果が存在しないパスになる問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1171)
+- Fix: テーマエディタが動作しない問題を修正
 
 ### Server
 - Enhance: ノートの削除処理の効率化
diff --git a/packages/frontend/src/theme.ts b/packages/frontend/src/theme.ts
index e48eb04103..a2658df374 100644
--- a/packages/frontend/src/theme.ts
+++ b/packages/frontend/src/theme.ts
@@ -137,7 +137,8 @@ export function applyTheme(theme: Theme, persist = true) {
 	}
 
 	if (deepEqual(currentTheme, theme)) return;
-	currentTheme = theme;
+	// リアクティビティ解除
+	currentTheme = deepClone(theme);
 
 	if (window.document.startViewTransition != null && prefer.s.animation) {
 		window.document.documentElement.classList.add('_themeChanging_');