changes

dismissSheet now expects non optional Window
rolled back proposed size try

Author: MiaKoring

Sources/AppKitBackend/AppKitBackend.swift

@@ -1724,18 +1724,13 @@ public final class AppKitBackend: AppBackend {
             print("warning: Cannot show sheet without a parent window")
             return
         }
-        // critical sheets stack
-        // beginSheet only shows a nested
-        // sheet after its parent gets dismissed
+        // Critical sheets stack. beginSheet only shows a nested sheet
+        // after its parent gets dismissed.
         window.beginCriticalSheet(sheet)
     }
 
-    public func dismissSheet(_ sheet: NSCustomSheet, window: NSCustomWindow?) {
-        if let window {
-            window.endSheet(sheet)
-        } else {
-            NSApplication.shared.stopModal()
-        }
+    public func dismissSheet(_ sheet: NSCustomSheet, window: NSCustomWindow) {
+        window.endSheet(sheet)
     }
 
     public func setPresentationBackground(of sheet: NSCustomSheet, to color: Color) {

Sources/GtkBackend/GtkBackend.swift

@@ -1685,7 +1685,7 @@ public final class GtkBackend: AppBackend {
         sheet.present()
     }
 
-    public func dismissSheet(_ sheet: Gtk.Window, window: ApplicationWindow?) {
+    public func dismissSheet(_ sheet: Gtk.Window, window: ApplicationWindow) {
         let key: OpaquePointer = OpaquePointer(sheet.widgetPointer)
         if let ctx = sheetContexts[key] {
             ctx.isProgrammaticDismiss = true

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -612,7 +612,6 @@ public protocol AppBackend: Sendable {
     /// Updates the content and appearance of a sheet.
     func updateSheet(
         _ sheet: Sheet,
-        proposedSize: SIMD2<Int>,
         onDismiss: @escaping () -> Void
     )
 
@@ -632,7 +631,7 @@ public protocol AppBackend: Sendable {
 
     /// Dismisses a sheet programmatically.
     /// Gets used by the ``View/sheet`` modifier to close a sheet.
-    func dismissSheet(_ sheet: Sheet, window: Window?)
+    func dismissSheet(_ sheet: Sheet, window: Window)
 
     /// Get the dimensions of a sheet
     func sizeOf(_ sheet: Sheet) -> SIMD2<Int>
@@ -1267,7 +1266,6 @@ extension AppBackend {
 
     public func updateSheet(
         _ sheet: Sheet,
-        proposedSize: SIMD2<Int>,
         onDismiss: @escaping () -> Void
     ) {
         todo()
@@ -1286,7 +1284,7 @@ extension AppBackend {
         todo()
     }
 
-    public func dismissSheet(_ sheet: Sheet, window: Window?) {
+    public func dismissSheet(_ sheet: Sheet, window: Window) {
         todo()
     }
 

Sources/SwiftCrossUI/Views/Modifiers/SheetModifier.swift

@@ -91,14 +91,13 @@ struct SheetModifier<Content: View, SheetContent: View>: TypeSafeView {
 
             let _ = children.sheetContentNode.update(
                 with: sheetContent(),
-                proposedSize: dryRunResult.size.idealSize,
+                proposedSize: backend.sizeOf(sheet),
                 environment: sheetEnvironment,
                 dryRun: false
             )
 
             backend.updateSheet(
                 sheet,
-                proposedSize: dryRunResult.size.idealSize,
                 onDismiss: handleDismiss
             )
 
@@ -134,7 +133,7 @@ struct SheetModifier<Content: View, SheetContent: View>: TypeSafeView {
         } else if !isPresented.wrappedValue && children.sheet != nil {
             backend.dismissSheet(
                 children.sheet as! Backend.Sheet,
-                window: .some(environment.window! as! Backend.Window)
+                window: environment.window! as! Backend.Window
             )
             children.sheet = nil
         }

Sources/UIKitBackend/UIKitBackend+Sheet.swift

@@ -23,7 +23,7 @@ extension UIKitBackend {
         topController?.present(sheet, animated: true)
     }
 
-    public func dismissSheet(_ sheet: CustomSheet, window: UIWindow?) {
+    public func dismissSheet(_ sheet: CustomSheet, window: UIWindow) {
         // If this sheet has a presented view controller (nested sheet), dismiss it first
         if let presentedVC = sheet.presentedViewController {
             presentedVC.dismiss(animated: false) { [weak sheet] in