Skip to content

Improve intrinsic height sheet #456

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
MarcHidalgo5 merged 8 commits into from
Feb 23, 2026
Merged

Improve intrinsic height sheet #456

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
afcdb1d
refactor: consolidate sheet detent logic
MarcHidalgo5 Feb 23, 2026
f5a27f3
fix: conditionally compile presentationDetents on non-Darwin platforms
MarcHidalgo5 Feb 23, 2026
3bc7387
Merge branch 'develop' into improve-intrinsicHeightSheet
MarcHidalgo5 Feb 23, 2026
c0da530
fix: reset sheet size on presentation and improve size handling
MarcHidalgo5 Feb 23, 2026
413a6af
refactor: remove platform-specific code for uniform behavior
MarcHidalgo5 Feb 23, 2026
9d9e9ee
refactor: remove redundant checks and refactor sheet presentation
MarcHidalgo5 Feb 23, 2026
02386f3
refactor: simplify intrinsicSheetDetents logic and adjust compensation
MarcHidalgo5 Feb 23, 2026
6249d69
refactor: remove unnecessary code for non-Darwin platforms
MarcHidalgo5 Feb 23, 2026
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
31 changes: 18 additions & 13 deletions Sources/BSWInterfaceKit/SwiftUI/ViewModifiers/IntrinsicHeightSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,16 @@ struct IntrinsicHeightDetentView_ForBool<Host: View, Content: View>: View {
@Binding var isPresented: Bool
let onDismiss: (() -> Void)?

#if canImport(Darwin)
@State var sheetSize: CGSize = .zero
#endif

var body: some View {
hostView
.sheet(isPresented: $isPresented, onDismiss: onDismiss) {
contentView()
#if canImport(Darwin)
.getCGSize($sheetSize)
.presentationDetents([.height(sheetSize.height)])
#if canImport(Darwin)
.fixedSize(horizontal: false, vertical: true)
#else
.presentationDetents([.medium])
#endif
}
}
Expand All @@ -94,20 +90,15 @@ struct IntrinsicHeightDetentView_ForItems<Host: View, Content: View, Item: Ident
hostView
.sheet(item: $isPresented, onDismiss: onDismiss) { item in
contentView(item)
#if canImport(Darwin)
.getCGSize($sheetSize)
.presentationDetents([.height(sheetSize.height)])
#if canImport(Darwin)
.fixedSize(horizontal: false, vertical: true)
#else
.presentationDetents([.medium])
#endif
}
}
}

#if canImport(Darwin)
import SwiftUI

private struct CGSizeKey: PreferenceKey {
nonisolated(unsafe) static var defaultValue = CGSize.zero
static func reduce (value: inout CGSize, nextValue: () -> CGSize) {
Expand All @@ -125,9 +116,23 @@ private extension View {
Color.clear
.preference(key: CGSizeKey.self, value: proxy.size)
}.onPreferenceChange(CGSizeKey.self) { value in
viewSize.wrappedValue = value
updateSheetSize(viewSize, newSize: value)
}
)
}

func updateSheetSize(_ viewSize: Binding<CGSize>, newSize: CGSize) {
guard newSize.height > 0 else {
return
}

#if canImport(Darwin)
viewSize.wrappedValue = newSize
#else
guard viewSize.wrappedValue.height <= 0 else {
return
}
viewSize.wrappedValue = newSize
#endif
}
}
#endif