Fix Default Selection in Settings (#1547)

* fix(#1540): fix default selection in settings * fix(#1546): cancel capitalized for settings search results
CodeEditApp · Jan 9, 2024 · 683942e · 683942e
1 parent 9db0309
commit 683942e
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/CodeEdit/Features/Settings/SettingsView.swift b/CodeEdit/Features/Settings/SettingsView.swift
@@ -15,7 +15,7 @@ struct SettingsView: View {
     private var colorScheme
 
     /// Variables for the selected Page, the current search text and software updater
-    @State private var selectedPage: SettingsPage = SettingsPage(.general)
+    @State private var selectedPage: SettingsPage = Self.pages[0].page
     @State private var searchText: String = ""
 
     @Environment(\.presentationMode)
@@ -112,7 +112,7 @@ struct SettingsView: View {
 
                 ForEach(results.pages, id: \.settingName) { setting in
                     NavigationLink(value: setting) {
-                        setting.settingName.capitalized.highlightOccurrences(searchText)
+                        setting.settingName.highlightOccurrences(searchText)
                             .padding(.leading, 22)
                     }
                 }
@@ -136,13 +136,8 @@ struct SettingsView: View {
                     }
                 }
             }
+            .searchable(text: $searchText, placement: .sidebar, prompt: "Search")
             .navigationSplitViewColumnWidth(215)
-            .safeAreaInset(edge: .top, spacing: 0) {
-                List {}
-                    .frame(height: 35)
-                    .searchable(text: $searchText, placement: .sidebar, prompt: "Search")
-                    .scrollDisabled(true)
-            }
         } detail: {
             Group {
                 switch selectedPage.name {