Skip to content

FlowStack Parent Toolbar Bug When Using Sheet #41

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
brody2002 merged 1 commit into from
Jul 15, 2025
Merged

FlowStack Parent Toolbar Bug When Using Sheet #41

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
12 changes: 8 additions & 4 deletions Sources/FlowStack/View+InteractiveDismiss.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct InteractiveDismissContainer<T: View>: UIViewControllerRepresentable {

class InteractiveDismissViewController<Content: View>: UIHostingController<Content> {

var coordinator: InteractiveDismissCoordinator
private var coordinator: InteractiveDismissCoordinator
private var frameObservation: NSKeyValueObservation?

init(rootView: Content, coordinator: InteractiveDismissCoordinator) {
Expand All @@ -83,7 +83,7 @@ class InteractiveDismissViewController<Content: View>: UIHostingController<Conte
frameObservation = view.observe(\.frame) { [weak self] theView, _ in
guard let self = self else { return }
self.additionalSafeAreaInsets = UIEdgeInsets(
top: theView.overlappingTopInset,
top: coordinator.isUpdating ? theView.overlappingTopInset : 0,
left: 0,
bottom: 0,
right: 0
Expand Down Expand Up @@ -144,6 +144,9 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
private var panGestureRecognizer: UIPanGestureRecognizer!
private var edgeGestureRecognizer: UIScreenEdgePanGestureRecognizer!

/// Bool that tracks active dragging to be used to track tool bar position for overlappingTopInset
@Published var isUpdating: Bool = false
Copy link
Member

@zac zac Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔍 Maybe private here?

Copy link
Collaborator Author

@brody2002 brody2002 Jul 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zac Has to be public so that the InteractiveDismissViewController has access to it.


private var isPastThreshold: Bool = false
private var impactGenerator: UIImpactFeedbackGenerator

Expand Down Expand Up @@ -197,7 +200,6 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
private func edgeGestureUpdated(recognizer: UIScreenEdgePanGestureRecognizer) {
guard let view = recognizer.view else { return }
let offset = recognizer.translation(in: view)

update(offset: offset, isEdge: true, hasEnded: recognizer.state == .ended)
}

Expand All @@ -210,6 +212,7 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
}

private func update(offset: CGPoint, isEdge: Bool, hasEnded: Bool) {
isUpdating = true
onPan(offset)

let shouldDismiss = offset.y > threshold || (offset.x > threshold && isEdge)
Expand All @@ -224,8 +227,9 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
isEnabled = false
onDismiss()
isPastThreshold = false
} else {
isUpdating = false
}

onEnded(shouldDismiss)
}
}
Expand Down
Loading