From 1f9dc06a104281b30c9bdab7571ff660b902067c Mon Sep 17 00:00:00 2001 From: coolone Date: Tue, 20 Sep 2022 02:40:03 +0200 Subject: [PATCH] Fix dynamic content --- .../NativePartialSheet.swift | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/Sources/NativePartialSheet/NativePartialSheet.swift b/Sources/NativePartialSheet/NativePartialSheet.swift index 93345a7..565ef29 100644 --- a/Sources/NativePartialSheet/NativePartialSheet.swift +++ b/Sources/NativePartialSheet/NativePartialSheet.swift @@ -78,20 +78,8 @@ public class NativePartialSheetController: UIHostingController } } -extension UISheetPresentationController.Detent { - var myIdentifier: Identifier { - if #available(iOS 16.0, *) { - return self.identifier - } else { - let test = value(forKey: "identifier") - debugPrint("ffdf") - return test as! Identifier - } - } -} - public struct NativePartialSheet: Preferences, UIViewControllerRepresentable where Content : View { - private let content: Content + private let content: () -> Content let detents: [Detent] let preferredCornerRadius: CGFloat? let prefersGrabberVisible: Bool @@ -110,9 +98,9 @@ public struct NativePartialSheet: Preferences, UIViewControllerRepresen widthFollowsPreferredContentSizeWhenEdgeAttached: Bool = false, largestUndimmedDetent: Detent? = nil, selectedDetent: Binding = .init(get: { nil }, set: { _ in }), - @ViewBuilder content: () -> Content + @ViewBuilder content: @escaping () -> Content ) { - self.content = content() + self.content = content self.detents = detents self.preferredCornerRadius = preferredCornerRadius self.prefersGrabberVisible = prefersGrabberVisible @@ -124,7 +112,7 @@ public struct NativePartialSheet: Preferences, UIViewControllerRepresen } public func makeUIViewController(context: Context) -> NativePartialSheetController { - let viewController = NativePartialSheetController(rootView: content) + let viewController = NativePartialSheetController(rootView: content()) viewController.prefs = self return viewController } @@ -136,6 +124,6 @@ public struct NativePartialSheet: Preferences, UIViewControllerRepresen presentation.selectedDetentIdentifier = selectedDetent.wrappedValue?.id } } - + viewController.rootView = content() } }