Fix edit button showing Add sheet on first click

sheet(isPresented:) captures closure values at build time, not
at presentation time. The first click sets editingSnippetID but
the sheet evaluates the old nil value, showing "Add" instead of
"Edit". Switch to sheet(item:) with an Identifiable wrapper that
carries the snippet and isEditing flag, guaranteeing the sheet
is created fresh with the correct data each time.

Made-with: Cursor

Author: seyeong-han

voxtral_realtime/macos/VoxtralRealtime/Views/ReplacementManagementView.swift

@@ -8,22 +8,24 @@
 
 import SwiftUI
 
+private struct ReplacementEditorItem: Identifiable {
+    let id = UUID()
+    let entry: ReplacementEntry
+    let isEditing: Bool
+}
+
 struct ReplacementManagementView: View {
     @Environment(ReplacementStore.self) private var replacementStore
     @State private var searchText = ""
-    @State private var editingEntry = ReplacementEntry()
-    @State private var editingEntryID: UUID?
-    @State private var isPresentingEditor = false
+    @State private var editorItem: ReplacementEditorItem?
 
     var body: some View {
         VStack(alignment: .leading, spacing: 12) {
             HStack {
                 TextField("Search terms", text: $searchText)
                     .textFieldStyle(.roundedBorder)
                 Button("Add") {
-                    editingEntry = ReplacementEntry()
-                    editingEntryID = nil
-                    isPresentingEditor = true
+                    editorItem = ReplacementEditorItem(entry: ReplacementEntry(), isEditing: false)
                 }
                 .buttonStyle(.borderedProminent)
             }
@@ -54,17 +56,13 @@ struct ReplacementManagementView: View {
                             }
                             Spacer()
                             Button("Edit") {
-                                editingEntry = entry
-                                editingEntryID = entry.id
-                                isPresentingEditor = true
+                                editorItem = ReplacementEditorItem(entry: entry, isEditing: true)
                             }
                             .buttonStyle(.borderless)
                         }
                         .contextMenu {
                             Button("Edit") {
-                                editingEntry = entry
-                                editingEntryID = entry.id
-                                isPresentingEditor = true
+                                editorItem = ReplacementEditorItem(entry: entry, isEditing: true)
                             }
                             Button(entry.isEnabled ? "Disable" : "Enable") {
                                 replacementStore.toggleEnabled(for: entry.id)
@@ -79,16 +77,16 @@ struct ReplacementManagementView: View {
                 .listStyle(.inset)
             }
         }
-        .sheet(isPresented: $isPresentingEditor) {
-            ReplacementEntryEditor(entry: editingEntry, isEditing: editingEntryID != nil) { entry in
-                if editingEntryID == nil {
-                    replacementStore.add(entry)
-                } else {
+        .sheet(item: $editorItem) { item in
+            ReplacementEntryEditor(entry: item.entry, isEditing: item.isEditing) { entry in
+                if item.isEditing {
                     replacementStore.update(entry)
+                } else {
+                    replacementStore.add(entry)
                 }
-                isPresentingEditor = false
+                editorItem = nil
             } onCancel: {
-                isPresentingEditor = false
+                editorItem = nil
             }
             .frame(width: 420)
         }

voxtral_realtime/macos/VoxtralRealtime/Views/SnippetManagementView.swift

@@ -8,22 +8,24 @@
 
 import SwiftUI
 
+private struct SnippetEditorItem: Identifiable {
+    let id = UUID()
+    let snippet: Snippet
+    let isEditing: Bool
+}
+
 struct SnippetManagementView: View {
     @Environment(SnippetStore.self) private var snippetStore
     @State private var searchText = ""
-    @State private var editingSnippet = Snippet()
-    @State private var editingSnippetID: UUID?
-    @State private var isPresentingEditor = false
+    @State private var editorItem: SnippetEditorItem?
 
     var body: some View {
         VStack(alignment: .leading, spacing: 12) {
             HStack {
                 TextField("Search snippets", text: $searchText)
                     .textFieldStyle(.roundedBorder)
                 Button("Add") {
-                    editingSnippet = Snippet()
-                    editingSnippetID = nil
-                    isPresentingEditor = true
+                    editorItem = SnippetEditorItem(snippet: Snippet(), isEditing: false)
                 }
                 .buttonStyle(.borderedProminent)
             }
@@ -65,17 +67,13 @@ struct SnippetManagementView: View {
                             }
                             Spacer()
                             Button("Edit") {
-                                editingSnippet = snippet
-                                editingSnippetID = snippet.id
-                                isPresentingEditor = true
+                                editorItem = SnippetEditorItem(snippet: snippet, isEditing: true)
                             }
                             .buttonStyle(.borderless)
                         }
                         .contextMenu {
                             Button("Edit") {
-                                editingSnippet = snippet
-                                editingSnippetID = snippet.id
-                                isPresentingEditor = true
+                                editorItem = SnippetEditorItem(snippet: snippet, isEditing: true)
                             }
                             Button(snippet.isEnabled ? "Disable" : "Enable") {
                                 snippetStore.toggleEnabled(for: snippet.id)
@@ -90,16 +88,16 @@ struct SnippetManagementView: View {
                 .listStyle(.inset)
             }
         }
-        .sheet(isPresented: $isPresentingEditor) {
-            SnippetEditor(snippet: editingSnippet, isEditing: editingSnippetID != nil) { snippet in
-                if editingSnippetID == nil {
-                    snippetStore.add(snippet)
-                } else {
+        .sheet(item: $editorItem) { item in
+            SnippetEditor(snippet: item.snippet, isEditing: item.isEditing) { snippet in
+                if item.isEditing {
                     snippetStore.update(snippet)
+                } else {
+                    snippetStore.add(snippet)
                 }
-                isPresentingEditor = false
+                editorItem = nil
             } onCancel: {
-                isPresentingEditor = false
+                editorItem = nil
             }
             .frame(width: 480, height: 460)
         }