Adding sheet content in createSheet() instead of update (UIKit, AppKit)

Author: MiaKoring

Sources/AppKitBackend/AppKitBackend.swift

@@ -1687,32 +1687,28 @@ public final class AppKitBackend: AppBackend {
         webView.load(request)
     }
 
-    public func createSheet() -> NSCustomSheet {
+    public func createSheet(content: NSView) -> NSCustomSheet {
         // Initialize with a default contentRect, similar to window creation (lines 58-68)
         let sheet = NSCustomSheet(
             contentRect: NSRect(
                 x: 0,
                 y: 0,
                 width: 400,  // Default width
-                height: 300  // Default height
+                height: 400  // Default height
             ),
             styleMask: [.titled, .closable],
             backing: .buffered,
             defer: true
         )
+        sheet.contentView = content
+
         return sheet
     }
 
     public func updateSheet(
-        _ sheet: NSCustomSheet, content: NSView, onDismiss: @escaping () -> Void
+        _ sheet: NSCustomSheet,
+        onDismiss: @escaping () -> Void
     ) {
-        let contentSize = naturalSize(of: content)
-
-        let width = max(contentSize.x, 10)
-        let height = max(contentSize.y, 10)
-        sheet.setContentSize(NSSize(width: width, height: height))
-
-        sheet.contentView = content
         sheet.onDismiss = onDismiss
     }
 

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -607,12 +607,11 @@ public protocol AppBackend: Sendable {
     /// Creates a sheet object (without showing it yet). Sheets contain view content.
     /// They optionally execute provided code on dismiss and
     /// prevent users from interacting with the parent window until dimissed.
-    func createSheet() -> Sheet
+    func createSheet(content: Widget) -> Sheet
 
     /// Updates the content and appearance of a sheet.
     func updateSheet(
         _ sheet: Sheet,
-        content: Widget,
         onDismiss: @escaping () -> Void
     )
 
@@ -1260,13 +1259,12 @@ extension AppBackend {
         todo()
     }
 
-    public func createSheet() -> Sheet {
+    public func createSheet(content: Widget) -> Sheet {
         todo()
     }
 
     public func updateSheet(
         _ sheet: Sheet,
-        content: Widget,
         onDismiss: @escaping () -> Void
     ) {
         todo()

Sources/SwiftCrossUI/Views/Modifiers/SheetModifier.swift

@@ -71,7 +71,9 @@ struct SheetModifier<Content: View, SheetContent: View>: TypeSafeView {
         )
 
         if isPresented.wrappedValue && children.sheet == nil {
-            let sheet = backend.createSheet()
+            let sheet = backend.createSheet(
+                content: children.sheetContentNode.widget.into()
+            )
 
             let dismissAction = DismissAction(action: { [isPresented] in
                 isPresented.wrappedValue = false
@@ -96,7 +98,6 @@ struct SheetModifier<Content: View, SheetContent: View>: TypeSafeView {
 
             backend.updateSheet(
                 sheet,
-                content: children.sheetContentNode.widget.into(),
                 onDismiss: handleDismiss
             )
 

Sources/UIKitBackend/UIKitBackend+Sheet.swift

@@ -4,16 +4,14 @@ import UIKit
 extension UIKitBackend {
     public typealias Sheet = CustomSheet
 
-    public func createSheet() -> CustomSheet {
+    public func createSheet(content: Widget) -> CustomSheet {
         let sheet = CustomSheet()
         sheet.modalPresentationStyle = .formSheet
-
+        sheet.view = content.view
         return sheet
     }
 
-    public func updateSheet(_ sheet: CustomSheet, content: Widget, onDismiss: @escaping () -> Void)
-    {
-        sheet.view = content.view
+    public func updateSheet(_ sheet: CustomSheet, onDismiss: @escaping () -> Void) {
         sheet.onDismiss = onDismiss
     }
 

Sources/WinUIBackend/WinUIBackend.swift

@@ -34,7 +34,7 @@ public final class WinUIBackend: AppBackend {
     public typealias Menu = Void
     public typealias Alert = WinUI.ContentDialog
     public typealias Path = GeometryGroupHolder
-    public typealias Sheet = CustomWindow  //only for be protocol conform. doesn't currently support it
+    public typealias Sheet = CustomWindow  // Only for protocol conformance. WinUI doesn't currently support it.
 
     public let defaultTableRowContentHeight = 20
     public let defaultTableCellVerticalPadding = 4