fix(macOS): address PR review regressions

Author: JerrySmith

Sources/Lithe/LitheApp.swift

@@ -438,19 +438,26 @@ private struct SettingsWindow: View {
     @ObservedObject var model: AppModel
     @ObservedObject var settings: AppSettings
     @StateObject private var windowReference = SettingsWindowReference()
+    @StateObject private var viewState: SettingsViewState
+
+    init(model: AppModel, settings: AppSettings) {
+        self.model = model
+        self.settings = settings
+        _viewState = StateObject(wrappedValue: SettingsViewState(
+            initialCategory: model.requestedSettingsCategory
+        ))
+    }
 
     var body: some View {
-        SettingsView(
-            settings: settings,
-            initialCategory: model.requestedSettingsCategory,
-            onDismiss: close
-        )
-        .environmentObject(model)
-        // Rebuild the SwiftUI theme environment when the preference changes.
-        // Without a new identity, a Window scene can retain the previous
-        // Light/Dark color scheme even after the AppKit window has switched.
-        .id(settings.themePreference.rawValue)
-        .preferredColorScheme(settings.themePreference.preferredColorScheme)
+        SettingsAppearanceContainer(themePreference: settings.themePreference) {
+            SettingsView(
+                settings: settings,
+                viewState: viewState,
+                initialCategory: model.requestedSettingsCategory,
+                onDismiss: close
+            )
+            .environmentObject(model)
+        }
         .background(
             SettingsWindowAccessor(
                 reference: windowReference,
@@ -469,6 +476,23 @@ private struct SettingsWindow: View {
     }
 }
 
+struct SettingsAppearanceContainer<Content: View>: View {
+    let themePreference: AppThemePreference
+    let content: Content
+
+    init(
+        themePreference: AppThemePreference,
+        @ViewBuilder content: () -> Content
+    ) {
+        self.themePreference = themePreference
+        self.content = content()
+    }
+
+    var body: some View {
+        content.preferredColorScheme(themePreference.preferredColorScheme)
+    }
+}
+
 @MainActor
 private final class SettingsWindowReference: ObservableObject {
     weak var window: NSWindow?

Sources/Lithe/Views/App/SettingsView.swift

@@ -3,31 +3,41 @@ import LitheCoreContracts
 import LitheGitModule
 import LitheModuleAPI
 
+@MainActor
+final class SettingsViewState: ObservableObject {
+    @Published var selection: SettingsCategory
+    @Published var searchQuery = ""
+    @Published var hiddenDirectoriesDraft = ""
+    @Published var hiddenFilePatternsDraft = ""
+    @Published var aiAPIKeyDraft = ""
+    @Published var isFormatPickerPresented = false
+
+    init(initialCategory: SettingsCategory) {
+        selection = initialCategory
+    }
+}
+
 struct SettingsView: View {
     @Environment(\.dismiss) private var dismiss
     @Environment(\.accessibilityReduceMotion) private var accessibilityReduceMotion
     @EnvironmentObject private var model: AppModel
     @EnvironmentObject private var updateChecker: UpdateChecker
     @ObservedObject var settings: AppSettings
-    @State private var selection: SettingsCategory
-    @State private var searchQuery = ""
-    @State private var hiddenDirectoriesDraft = ""
-    @State private var hiddenFilePatternsDraft = ""
-    @State private var aiAPIKeyDraft = ""
-    @State private var isFormatPickerPresented = false
+    @ObservedObject var viewState: SettingsViewState
     let initialCategory: SettingsCategory
     private let onDismiss: (() -> Void)?
     private static let footerActionLabelWidth: CGFloat = 52
 
     init(
         settings: AppSettings,
+        viewState: SettingsViewState,
         initialCategory: SettingsCategory = .general,
         onDismiss: (() -> Void)? = nil
     ) {
         self.settings = settings
+        self.viewState = viewState
         self.initialCategory = initialCategory
         self.onDismiss = onDismiss
-        _selection = State(initialValue: initialCategory)
     }
 
     var body: some View {
@@ -54,13 +64,13 @@ struct SettingsView: View {
         .onChange(of: settings.hiddenFilePatterns) { _ in syncVisibilityDrafts() }
         .onChange(of: settings.commitMessageAI.activeProviderID) { _ in syncAIProviderDraft() }
         .onChange(of: initialCategory) { category in
-            searchQuery = ""
-            selection = category
+            viewState.searchQuery = ""
+            viewState.selection = category
         }
-        .onChange(of: searchQuery) { _ in
-            guard !filteredCategories.contains(selection),
+        .onChange(of: viewState.searchQuery) { _ in
+            guard !filteredCategories.contains(viewState.selection),
                   let firstMatch = filteredCategories.first else { return }
-            selection = firstMatch
+            viewState.selection = firstMatch
         }
         .environment(\.locale, settings.language.locale)
     }
@@ -100,13 +110,13 @@ struct SettingsView: View {
     }
 
     private var settingsSearchField: some View {
-        LitheSettingsSearchField("Search settings", text: $searchQuery)
+        LitheSettingsSearchField("Search settings", text: $viewState.searchQuery)
     }
 
     private func categoryButton(_ category: SettingsCategory) -> some View {
-        let isSelected = selection == category
+        let isSelected = viewState.selection == category
         return Button {
-            selection = category
+            viewState.selection = category
         } label: {
             HStack(spacing: 10) {
                 Image(systemName: category.icon)
@@ -128,7 +138,7 @@ struct SettingsView: View {
     }
 
     private var filteredCategories: [SettingsCategory] {
-        let query = searchQuery.trimmingCharacters(in: .whitespacesAndNewlines)
+        let query = viewState.searchQuery.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !query.isEmpty else { return SettingsCategory.allCases }
 
         return SettingsCategory.allCases.filter { category in
@@ -179,10 +189,10 @@ struct SettingsView: View {
             }
             .foregroundStyle(LitheTheme.secondaryText)
             .frame(maxWidth: .infinity, maxHeight: .infinity)
-        } else if selection == .lsp {
+        } else if viewState.selection == .lsp {
             LSPControlCenterView()
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
-        } else if selection == .keymap {
+        } else if viewState.selection == .keymap {
             KeyboardShortcutSettingsView(
                 feature: model.keyboardShortcutFeature,
                 language: settings.language
@@ -191,12 +201,12 @@ struct SettingsView: View {
         } else {
             ScrollView {
                 VStack(alignment: .leading, spacing: 8) {
-                    Text(LocalizedStringKey(selection.rawValue))
+                    Text(LocalizedStringKey(viewState.selection.rawValue))
                         .font(.system(size: 22, weight: .semibold))
                         .foregroundStyle(LitheTheme.primaryText)
                         .padding(.bottom, 8)
 
-                    switch selection {
+                    switch viewState.selection {
                     case .general: generalSettings
                     case .editor: editorSettings
                     case .keymap: EmptyView()
@@ -315,7 +325,7 @@ struct SettingsView: View {
 
                 Text("Directories")
                     .font(.system(size: 11.5, weight: .medium))
-                TextEditor(text: $hiddenDirectoriesDraft)
+                TextEditor(text: $viewState.hiddenDirectoriesDraft)
                     .font(.system(size: 12, design: .monospaced))
                     .frame(height: 66)
                     .padding(5)
@@ -327,7 +337,7 @@ struct SettingsView: View {
 
                 Text("File patterns")
                     .font(.system(size: 11.5, weight: .medium))
-                TextEditor(text: $hiddenFilePatternsDraft)
+                TextEditor(text: $viewState.hiddenFilePatternsDraft)
                     .font(.system(size: 12, design: .monospaced))
                     .frame(height: 52)
                     .padding(5)
@@ -570,11 +580,11 @@ struct SettingsView: View {
                         .disabled(model.activeCommitMessageCredentialIsConfigurationManaged)
 
                     HStack(spacing: 8) {
-                        SecureField("API key or token", text: $aiAPIKeyDraft)
+                        SecureField("API key or token", text: $viewState.aiAPIKeyDraft)
                             .litheSettingsTextField()
                             .disabled(model.activeCommitMessageCredentialIsConfigurationManaged)
                         Button("Save Key") {
-                            model.saveActiveCommitMessageAPIKey(aiAPIKeyDraft)
+                            model.saveActiveCommitMessageAPIKey(viewState.aiAPIKeyDraft)
                         }
                         .buttonStyle(LitheSecondaryButtonStyle())
                         .disabled(model.activeCommitMessageCredentialIsConfigurationManaged)
@@ -815,24 +825,24 @@ struct SettingsView: View {
                         Image(systemName: "chevron.down")
                             .font(.system(size: 10, weight: .semibold))
                             .foregroundStyle(LitheTheme.secondaryText)
-                            .rotationEffect(.degrees(isFormatPickerPresented ? 180 : 0))
-                            .animation(formatPickerAnimation, value: isFormatPickerPresented)
+                            .rotationEffect(.degrees(viewState.isFormatPickerPresented ? 180 : 0))
+                            .animation(formatPickerAnimation, value: viewState.isFormatPickerPresented)
                     }
                     .padding(.horizontal, 10)
                     .frame(maxWidth: .infinity, minHeight: 48, alignment: .leading)
-                    .background(isFormatPickerPresented ? LitheTheme.inputBackground.opacity(0.9) : LitheTheme.inputBackground)
+                    .background(viewState.isFormatPickerPresented ? LitheTheme.inputBackground.opacity(0.9) : LitheTheme.inputBackground)
                     .overlay {
                         RoundedRectangle(cornerRadius: LitheTheme.Metrics.controlCornerRadius)
                             .stroke(
-                                isFormatPickerPresented ? LitheTheme.inputFocusBorder : LitheTheme.inputBorder,
+                                viewState.isFormatPickerPresented ? LitheTheme.inputFocusBorder : LitheTheme.inputBorder,
                                 lineWidth: 1
                             )
                     }
                     .clipShape(RoundedRectangle(cornerRadius: LitheTheme.Metrics.controlCornerRadius))
                 }
                 .buttonStyle(.plain)
                 .lithePointer()
-                .popover(isPresented: $isFormatPickerPresented, arrowEdge: .bottom) {
+                .popover(isPresented: $viewState.isFormatPickerPresented, arrowEdge: .bottom) {
                     formatPickerPopover
                 }
 
@@ -857,7 +867,7 @@ struct SettingsView: View {
                 Spacer(minLength: 8)
 
                 Button {
-                    isFormatPickerPresented = false
+                    viewState.isFormatPickerPresented = false
                 } label: {
                     Image(systemName: "xmark")
                         .font(.system(size: 10, weight: .semibold))
@@ -984,14 +994,14 @@ struct SettingsView: View {
 
     private func toggleFormatPicker() {
         withAnimation(formatPickerAnimation) {
-            isFormatPickerPresented.toggle()
+            viewState.isFormatPickerPresented.toggle()
         }
     }
 
     private func selectFormat(_ format: CommitMessageFormat) {
         withAnimation(formatPickerAnimation) {
             settings.commitMessageAI.format = format
-            isFormatPickerPresented = false
+            viewState.isFormatPickerPresented = false
         }
     }
 
@@ -1124,7 +1134,7 @@ struct SettingsView: View {
     }
 
     private func syncAIProviderDraft() {
-        aiAPIKeyDraft = model.activeCommitMessageAPIKey
+        viewState.aiAPIKeyDraft = model.activeCommitMessageAPIKey
     }
 
     private func providerTitle(_ id: UUID) -> String {
@@ -1206,13 +1216,13 @@ struct SettingsView: View {
     }
 
     private func syncVisibilityDrafts() {
-        hiddenDirectoriesDraft = settings.hiddenDirectoryNames.joined(separator: "\n")
-        hiddenFilePatternsDraft = settings.hiddenFilePatterns.joined(separator: "\n")
+        viewState.hiddenDirectoriesDraft = settings.hiddenDirectoryNames.joined(separator: "\n")
+        viewState.hiddenFilePatternsDraft = settings.hiddenFilePatterns.joined(separator: "\n")
     }
 
     private func applyVisibilityDrafts() {
-        settings.hiddenDirectoryNames = entries(from: hiddenDirectoriesDraft)
-        settings.hiddenFilePatterns = entries(from: hiddenFilePatternsDraft)
+        settings.hiddenDirectoryNames = entries(from: viewState.hiddenDirectoriesDraft)
+        settings.hiddenFilePatterns = entries(from: viewState.hiddenFilePatternsDraft)
     }
 
     private func entries(from text: String) -> [String] {