From 66dac7069cf5a5a88451cb8f92acd63bf42994a0 Mon Sep 17 00:00:00 2001
From: Kihron <starlicblackhole@gmail.com>
Date: Sat, 3 May 2025 16:26:07 -0400
Subject: [PATCH] - This fixes various navigation bugs across settings,
 including getting locked into a sub navigation section.

---
 CodeEdit/Features/Settings/SettingsView.swift |  2 +-
 .../Settings/Views/SettingsForm.swift         | 58 ++++++++++---------
 .../Views/View+HideSidebarToggle.swift        | 12 ++--
 .../View+NavigationBarBackButtonVisible.swift |  6 +-
 4 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/CodeEdit/Features/Settings/SettingsView.swift b/CodeEdit/Features/Settings/SettingsView.swift
index d7e7ef766..a9e501d20 100644
--- a/CodeEdit/Features/Settings/SettingsView.swift
+++ b/CodeEdit/Features/Settings/SettingsView.swift
@@ -184,11 +184,11 @@ struct SettingsView: View {
                 }
             }
             .navigationSplitViewColumnWidth(500)
-            .hideSidebarToggle()
             .onAppear {
                 model.backButtonVisible = false
             }
         }
+        .hideSidebarToggle()
         .navigationTitle(selectedPage.name.rawValue)
         .toolbar {
             ToolbarItem(placement: .navigation) {
diff --git a/CodeEdit/Features/Settings/Views/SettingsForm.swift b/CodeEdit/Features/Settings/Views/SettingsForm.swift
index 14faaaa61..ee093864a 100644
--- a/CodeEdit/Features/Settings/Views/SettingsForm.swift
+++ b/CodeEdit/Features/Settings/Views/SettingsForm.swift
@@ -17,39 +17,41 @@ struct SettingsForm<Content: View>: View {
     @ViewBuilder var content: Content
 
     var body: some View {
-        Form {
-            Section {
-                EmptyView()
-            } footer: {
-                Rectangle()
-                    .frame(height: 0)
-                    .background(
-                        GeometryReader {
-                            Color.clear.preference(
-                                key: ViewOffsetKey.self,
-                                value: -$0.frame(in: .named("scroll")).origin.y
-                            )
-                        }
-                    )
-                    .onPreferenceChange(ViewOffsetKey.self) {
-                        if $0 <= -20.0 && !model.scrolledToTop {
-                            withAnimation {
-                                model.scrolledToTop = true
+        NavigationStack {
+            Form {
+                Section {
+                    EmptyView()
+                } footer: {
+                    Rectangle()
+                        .frame(height: 0)
+                        .background(
+                            GeometryReader {
+                                Color.clear.preference(
+                                    key: ViewOffsetKey.self,
+                                    value: -$0.frame(in: .named("scroll")).origin.y
+                                )
                             }
-                        } else if $0 > -20.0 && model.scrolledToTop {
-                            withAnimation {
-                                model.scrolledToTop = false
+                        )
+                        .onPreferenceChange(ViewOffsetKey.self) {
+                            if $0 <= -20.0 && !model.scrolledToTop {
+                                withAnimation {
+                                    model.scrolledToTop = true
+                                }
+                            } else if $0 > -20.0 && model.scrolledToTop {
+                                withAnimation {
+                                    model.scrolledToTop = false
+                                }
                             }
                         }
-                    }
+                }
+                content
             }
-            content
-        }
-        .introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15)) {
-            $0.scrollerInsets.top = 50
+            .introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15)) {
+                $0.scrollerInsets.top = 50
+            }
+            .formStyle(.grouped)
+            .coordinateSpace(name: "scroll")
         }
-        .formStyle(.grouped)
-        .coordinateSpace(name: "scroll")
         .safeAreaInset(edge: .top, spacing: -50) {
             EffectView(.menu)
                 .opacity(!model.scrolledToTop ? 1 : 0)
diff --git a/CodeEdit/Features/Settings/Views/View+HideSidebarToggle.swift b/CodeEdit/Features/Settings/Views/View+HideSidebarToggle.swift
index 09b65c858..b48c81d30 100644
--- a/CodeEdit/Features/Settings/Views/View+HideSidebarToggle.swift
+++ b/CodeEdit/Features/Settings/Views/View+HideSidebarToggle.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import SwiftUIIntrospect
 
 extension View {
     func hideSidebarToggle() -> some View {
@@ -16,12 +17,11 @@ extension View {
 struct HideSidebarToggleViewModifier: ViewModifier {
     func body(content: Content) -> some View {
         content
-            .task {
-                let window = NSApp.windows.first { $0.identifier?.rawValue == SceneID.settings.rawValue }!
-                let sidebaritem = "com.apple.SwiftUI.navigationSplitView.toggleSidebar"
-                let index = window.toolbar?.items.firstIndex { $0.itemIdentifier.rawValue == sidebaritem }
-                if let index {
-                    window.toolbar?.removeItem(at: index)
+            .introspect(.window, on: .macOS(.v13, .v14, .v15)) { window in
+                if let toolbar = window.toolbar {
+                    let sidebarItem = "com.apple.SwiftUI.navigationSplitView.toggleSidebar"
+                    let sidebarToggle = toolbar.items.first(where: { $0.itemIdentifier.rawValue == sidebarItem })
+                    sidebarToggle?.view?.isHidden = true
                 }
             }
     }
diff --git a/CodeEdit/Features/Settings/Views/View+NavigationBarBackButtonVisible.swift b/CodeEdit/Features/Settings/Views/View+NavigationBarBackButtonVisible.swift
index 325a0b123..a9ab0ea9f 100644
--- a/CodeEdit/Features/Settings/Views/View+NavigationBarBackButtonVisible.swift
+++ b/CodeEdit/Features/Settings/Views/View+NavigationBarBackButtonVisible.swift
@@ -17,7 +17,6 @@ struct NavigationBarBackButtonVisible: ViewModifier {
         .toolbar {
             ToolbarItem(placement: .navigation) {
                 Button {
-                    print(self.presentationMode.wrappedValue)
                     self.presentationMode.wrappedValue.dismiss()
                 } label: {
                     Image(systemName: "chevron.left")
@@ -25,10 +24,13 @@ struct NavigationBarBackButtonVisible: ViewModifier {
                 }
             }
         }
-        .hideSidebarToggle()
+        .navigationBarBackButtonHidden()
         .onAppear {
             model.backButtonVisible = true
         }
+        .onDisappear {
+            model.backButtonVisible = false
+        }
     }
 }