From cda772f8350d5dbf46f89905780c86c4ff4834db Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Thu, 2 Jul 2026 22:20:41 +0800
Subject: [PATCH] fix(rules): reset edit sheets between additions

---
 .../ui/highlightTagRule/HighlightTagRuleEditSheet.kt   | 10 +++++-----
 .../app/ui/tagGroupRule/TagGroupRuleEditSheet.kt       |  8 ++++----
 .../app/ui/widget/components/rules/RuleEditSheet.kt    | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/highlightTagRule/HighlightTagRuleEditSheet.kt b/app/src/main/java/io/legado/app/ui/highlightTagRule/HighlightTagRuleEditSheet.kt
index 0f3250430..4a9c2bd31 100644
--- a/app/src/main/java/io/legado/app/ui/highlightTagRule/HighlightTagRuleEditSheet.kt
+++ b/app/src/main/java/io/legado/app/ui/highlightTagRule/HighlightTagRuleEditSheet.kt
@@ -54,15 +54,15 @@ fun HighlightTagRuleEditSheet(
     val scope = rememberCoroutineScope()
 
     val isNew = rule == null || rule.id == 0L
-    val initial = remember(rule) {
+    val initial = remember(show, rule) {
         rule ?: HighlightTagRule()
     }
 
-    var title by remember(initial) { mutableStateOf(initial.title) }
-    var pattern by remember(initial) { mutableStateOf(initial.pattern) }
-    var enabled by remember(initial) { mutableStateOf(initial.enabled) }
+    var title by remember(show, rule) { mutableStateOf(initial.title) }
+    var pattern by remember(show, rule) { mutableStateOf(initial.pattern) }
+    var enabled by remember(show, rule) { mutableStateOf(initial.enabled) }
 
-    var showMenu by remember { mutableStateOf(false) }
+    var showMenu by remember(show, rule) { mutableStateOf(false) }
 
     fun getCurrentRule(): HighlightTagRule {
         return initial.copy(
diff --git a/app/src/main/java/io/legado/app/ui/tagGroupRule/TagGroupRuleEditSheet.kt b/app/src/main/java/io/legado/app/ui/tagGroupRule/TagGroupRuleEditSheet.kt
index ae959f5be..a15381460 100644
--- a/app/src/main/java/io/legado/app/ui/tagGroupRule/TagGroupRuleEditSheet.kt
+++ b/app/src/main/java/io/legado/app/ui/tagGroupRule/TagGroupRuleEditSheet.kt
@@ -49,13 +49,13 @@ fun TagGroupRuleEditSheet(
     val scope = rememberCoroutineScope()
 
     val isNew = rule == null || rule.id == 0L
-    val initial = remember(rule) {
+    val initial = remember(show, rule) {
         rule ?: TagGroupRule()
     }
 
-    var pattern by remember(initial) { mutableStateOf(initial.pattern) }
-    var groupName by remember(initial) { mutableStateOf(initial.groupName) }
-    var showMenu by remember { mutableStateOf(false) }
+    var pattern by remember(show, rule) { mutableStateOf(initial.pattern) }
+    var groupName by remember(show, rule) { mutableStateOf(initial.groupName) }
+    var showMenu by remember(show, rule) { mutableStateOf(false) }
 
     fun getCurrentRule(): TagGroupRule {
         return initial.copy(
diff --git a/app/src/main/java/io/legado/app/ui/widget/components/rules/RuleEditSheet.kt b/app/src/main/java/io/legado/app/ui/widget/components/rules/RuleEditSheet.kt
index 7ac8dd570..0337ef1da 100644
--- a/app/src/main/java/io/legado/app/ui/widget/components/rules/RuleEditSheet.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/components/rules/RuleEditSheet.kt
@@ -62,12 +62,12 @@ fun <T> RuleEditSheet(
 ) {
     val scope = rememberCoroutineScope()
 
-    val initialFields = remember(rule) { toFields(rule) }
-    var name by remember(initialFields) { mutableStateOf(initialFields.name) }
-    var rule1 by remember(initialFields) { mutableStateOf(initialFields.rule1) }
-    var rule2 by remember(initialFields) { mutableStateOf(initialFields.rule2) }
+    val initialFields = remember(show, rule) { toFields(rule) }
+    var name by remember(show, rule) { mutableStateOf(initialFields.name) }
+    var rule1 by remember(show, rule) { mutableStateOf(initialFields.rule1) }
+    var rule2 by remember(show, rule) { mutableStateOf(initialFields.rule2) }
 
-    var showMenu by remember { mutableStateOf(false) }
+    var showMenu by remember(show, rule) { mutableStateOf(false) }
 
     fun getCurrentEntity() = fromFields(RuleEditFields(name, rule1, rule2), rule)