Skip to content

Fix Getting Stuck in Sub-View within Settings #2038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2025
+41 −37
Merged

Fix Getting Stuck in Sub-View within Settings #2038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CodeEdit/Features/Settings/SettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ struct SettingsView: View {
}
}
.navigationSplitViewColumnWidth(500)
.hideSidebarToggle()
.onAppear {
model.backButtonVisible = false
}
}
.hideSidebarToggle()
.navigationTitle(selectedPage.name.rawValue)
.toolbar {
ToolbarItem(placement: .navigation) {
Expand Down
58 changes: 30 additions & 28 deletions CodeEdit/Features/Settings/Views/SettingsForm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions CodeEdit/Features/Settings/Views/View+HideSidebarToggle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import SwiftUI
import SwiftUIIntrospect

extension View {
func hideSidebarToggle() -> some View {
Expand All @@ -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
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions CodeEdit/Features/Settings/Views/View+NavigationBarBackButtonVisible.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@ struct NavigationBarBackButtonVisible: ViewModifier {
.toolbar {
ToolbarItem(placement: .navigation) {
Button {
print(self.presentationMode.wrappedValue)
self.presentationMode.wrappedValue.dismiss()
} label: {
Image(systemName: "chevron.left")
.frame(width: 23)
}
}
}
.hideSidebarToggle()
.navigationBarBackButtonHidden()
.onAppear {
model.backButtonVisible = true
}
.onDisappear {
model.backButtonVisible = false
}
}
}

Expand Down