Fix sheet presentation in < iOS 14.5

Sources/FlowStacks/Backport.swift

@@ -0,0 +1,10 @@
+import Foundation
+import SwiftUI
+
+struct Backport<Content> {
+	let content: Content
+}
+
+extension View {
+	var backport: Backport<Self> { Backport(content: self) }
+}

Sources/FlowStacks/Node.swift

@@ -105,21 +105,19 @@ indirect enum Node<Screen, V: View>: View {
           onDismiss: onDismiss,
           content: { next }
         )
-        .cover(
+		.backport.cover(
           isPresented: coverBinding,
           onDismiss: onDismiss,
           content: { next }
         )
     } else {
-      let asSheet = next?.route?.style.isSheet ?? false
       screenView
         .background(
           NavigationLink(destination: next, isActive: pushBinding, label: EmptyView.init)
             .hidden()
         )
-        .present(
-          asSheet: asSheet,
-          isPresented: asSheet ? sheetBinding : coverBinding,
+		.backport.present(
+          isPresented: sheetBinding,
           onDismiss: onDismiss,
           content: { next }
         )

Sources/FlowStacks/View+cover.swift

@@ -1,54 +1,57 @@
 import Foundation
 import SwiftUI
 
-extension View {
-  /// A shim for presenting a full-screen cover that falls back on a sheet presentation on platforms
-  /// where fullScreenCover is unavailable.
-  @ViewBuilder
-  func cover<Content: View>(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, @ViewBuilder content: @escaping () -> Content) -> some View {
-    #if os(macOS)
-      self
-        .sheet(
-          isPresented: isPresented,
-          onDismiss: onDismiss,
-          content: content
-        )
-    #else
-      if #available(iOS 14.0, tvOS 14.0, macOS 99.9, *) {
-        self
-          .fullScreenCover(
-            isPresented: isPresented,
-            onDismiss: onDismiss,
-            content: content
-          )
-      } else {
-        self
-          .sheet(
-            isPresented: isPresented,
-            onDismiss: onDismiss,
-            content: content
-          )
-      }
-    #endif
-  }
+extension Backport where Content: View {
 
-  /// NOTE: On iOS 14.4 and below, a bug prevented multiple sheet/fullScreenCover modifiers being chained
-  /// on the same view, so we conditionally add the sheet/cover modifiers as a workaround. See
-  /// https://developer.apple.com/documentation/ios-ipados-release-notes/ios-ipados-14_5-release-notes
-  @ViewBuilder
-  func present<Content: View>(asSheet: Bool, isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, @ViewBuilder content: @escaping () -> Content) -> some View {
-    if asSheet {
-      self.sheet(
-        isPresented: isPresented,
-        onDismiss: nil,
-        content: content
-      )
-    } else {
-      self.cover(
-        isPresented: isPresented,
-        onDismiss: nil,
-        content: content
-      )
-    }
-  }
+	/// A shim for presenting a full-screen cover that falls back on a sheet presentation on platforms
+	/// where fullScreenCover is unavailable.
+	@ViewBuilder
+	func cover<Content: View>(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, @ViewBuilder content contentBuilder: @escaping () -> Content) -> some View {
+	  #if os(macOS)
+		self
+		  content.sheet(
+			isPresented: isPresented,
+			onDismiss: onDismiss,
+			content: content
+		  )
+	  #else
+		if #available(iOS 14.0, tvOS 14.0, macOS 99.9, *) {
+			content.fullScreenCover(
+			  isPresented: isPresented,
+			  onDismiss: onDismiss,
+			  content: contentBuilder
+			)
+		} else {
+			content.sheet(
+			  isPresented: isPresented,
+			  onDismiss: onDismiss,
+			  content: contentBuilder
+			)
+		}
+	  #endif
+	}
+
+	  /// NOTE: On iOS 14.4 and below, a bug prevented multiple sheet/fullScreenCover modifiers being chained
+	  /// on the same view, so we conditionally add the sheet/cover modifiers as a workaround. See
+	  /// https://developer.apple.com/documentation/ios-ipados-release-notes/ios-ipados-14_5-release-notes
+	  @ViewBuilder
+	  func present<Content: View>(isPresented: Binding<Bool>, onDismiss: (() -> Void)? = nil, @ViewBuilder content contentBuilder: @escaping () -> Content) -> some View {
+			if #available(iOS 14.5, *) {
+				content.sheet(
+					isPresented: isPresented,
+					onDismiss: onDismiss,
+					content: contentBuilder
+				)
+			} else {
+				content.background(
+					EmptyView()
+						.sheet(
+							isPresented: isPresented,
+							onDismiss: onDismiss,
+							content: contentBuilder
+						)
+				)
+			}
+	  }
 }
+