removed SheetImplementation Protocol, replaced with backend.sizeOf(_:)

changed comment in appbackend

Author: MiaKoring

Sources/AppKitBackend/AppKitBackend.swift

@@ -1716,6 +1716,13 @@ public final class AppKitBackend: AppBackend {
         sheet.onDismiss = onDismiss
     }
 
+    public func sizeOf(_ sheet: NSCustomSheet) -> SIMD2<Int> {
+        guard let size = sheet.contentView?.frame.size else {
+            return SIMD2(x: 0, y: 0)
+        }
+        return SIMD2(x: Int(size.width), y: Int(size.height))
+    }
+
     public func showSheet(_ sheet: NSCustomSheet, window: NSCustomWindow?) {
         guard let window else {
             print("warning: Cannot show sheet without a parent window")
@@ -1772,13 +1779,7 @@ public final class AppKitBackend: AppBackend {
     }
 }
 
-public final class NSCustomSheet: NSCustomWindow, NSWindowDelegate, SheetImplementation {
-    public var sheetSize: SIMD2<Int> {
-        guard let size = self.contentView?.frame.size else {
-            return SIMD2(x: 0, y: 0)
-        }
-        return SIMD2(x: Int(size.width), y: Int(size.height))
-    }
+public final class NSCustomSheet: NSCustomWindow, NSWindowDelegate {
     public var onDismiss: (() -> Void)?
 
     public var interactiveDismissDisabled: Bool = false

Sources/GtkBackend/GtkBackend.swift

@@ -1694,6 +1694,10 @@ public final class GtkBackend: AppBackend {
         connectedCloseHandlers.remove(key)
     }
 
+    public func sizeOf(_ sheet: Gtk.Window) -> SIMD2<Int> {
+        return SIMD2(x: sheet.size.width, y: sheet.size.height)
+    }
+
     public func setPresentationBackground(of sheet: Gtk.Window, to color: SwiftCrossUI.Color) {
         sheet.css.set(properties: [.backgroundColor(color.gtkColor)])
     }
@@ -1732,12 +1736,6 @@ class CustomListBox: ListBox {
     var cachedSelection: Int? = nil
 }
 
-extension Gtk.Window: SheetImplementation {
-    public var sheetSize: SIMD2<Int> {
-        return SIMD2(x: self.size.width, y: self.size.height)
-    }
-}
-
 final class ValueBox<T> {
     let value: T
     init(value: T) {

Sources/SwiftCrossUI/Backend/AppBackend.swift

@@ -47,7 +47,7 @@ public protocol AppBackend: Sendable {
     associatedtype Menu
     associatedtype Alert
     associatedtype Path
-    associatedtype Sheet: SheetImplementation
+    associatedtype Sheet
 
     /// Creates an instance of the backend.
     init()
@@ -604,12 +604,12 @@ public protocol AppBackend: Sendable {
     /// ``showAlert(_:window:responseHandler:)``.
     func dismissAlert(_ alert: Alert, window: Window?)
 
-    /// Creates a sheet object (without showing it yet). Sheets contain View Content.
-    /// They optionally execute provied code on dismiss and
+    /// 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
 
-    /// Updates the content and appearance of a sheet
+    /// Updates the content and appearance of a sheet.
     func updateSheet(
         _ sheet: Sheet,
         content: Widget,
@@ -633,6 +633,9 @@ public protocol AppBackend: Sendable {
     /// Gets used by the SCUI sheet implementation to close a sheet.
     func dismissSheet(_ sheet: Sheet, window: Window?)
 
+    /// Get the dimensions of a sheet
+    func sizeOf(_ sheet: Sheet) -> SIMD2<Int>
+
     /// Sets the corner radius for a sheet presentation.
     ///
     /// This method is called when the sheet content has a `presentationCornerRadius` modifier
@@ -806,10 +809,6 @@ extension AppBackend {
     }
 }
 
-public protocol SheetImplementation {
-    var sheetSize: SIMD2<Int> { get }
-}
-
 extension AppBackend {
     /// Used by placeholder implementations of backend methods.
     private func todo(_ function: String = #function) -> Never {
@@ -1273,6 +1272,12 @@ extension AppBackend {
         todo()
     }
 
+    public func sizeOf(
+        sheet: Sheet
+    ) -> SIMD2<Int> {
+        todo()
+    }
+
     public func showSheet(
         _ sheet: Sheet,
         window: Window?

Sources/SwiftCrossUI/Views/Modifiers/SheetModifier.swift

@@ -80,7 +80,7 @@ struct SheetModifier<Content: View, SheetContent: View>: TypeSafeView {
 
             let dryRunResult = children.sheetContentNode.update(
                 with: sheetContent(),
-                proposedSize: sheet.sheetSize,
+                proposedSize: backend.sizeOf(sheet),
                 environment: sheetEnvironment,
                 dryRun: true
             )
@@ -89,7 +89,7 @@ struct SheetModifier<Content: View, SheetContent: View>: TypeSafeView {
 
             let _ = children.sheetContentNode.update(
                 with: sheetContent(),
-                proposedSize: sheet.sheetSize,
+                proposedSize: backend.sizeOf(sheet),
                 environment: sheetEnvironment,
                 dryRun: false
             )

Sources/UIKitBackend/UIKitBackend+Sheet.swift

@@ -37,6 +37,11 @@ extension UIKitBackend {
         }
     }
 
+    public func sizeOf(_ sheet: CustomSheet) -> SIMD2<Int> {
+        let size = sheet.view.frame.size
+        return SIMD2(x: Int(size.width), y: Int(size.height))
+    }
+
     public func setPresentationDetents(of sheet: CustomSheet, to detents: [PresentationDetent]) {
         if #available(iOS 15.0, *) {
             #if !os(visionOS)
@@ -121,12 +126,7 @@ extension UIKitBackend {
     }
 }
 
-public final class CustomSheet: UIViewController, SheetImplementation {
-    public var sheetSize: SIMD2<Int> {
-        let size = view.frame.size
-        return SIMD2(x: Int(size.width), y: Int(size.height))
-    }
-
+public final class CustomSheet: UIViewController {
     var onDismiss: (() -> Void)?
     private var isDismissedProgrammatically = false
 

Sources/WinUIBackend/WinUIBackend.swift

@@ -1870,7 +1870,7 @@ class SwiftIInitializeWithWindow: WindowsFoundation.IUnknown {
     }
 }
 
-public class CustomWindow: WinUI.Window, SheetImplementation {
+public class CustomWindow: WinUI.Window {
     /// Hardcoded menu bar height from MenuBar_themeresources.xaml in the
     /// microsoft-ui-xaml repository.
     static let menuBarHeight = 0
@@ -1880,12 +1880,6 @@ public class CustomWindow: WinUI.Window, SheetImplementation {
     var grid: WinUI.Grid
     var cachedAppWindow: WinAppSDK.AppWindow!
 
-    //only for AppBackend conformance, no support yet
-    public var sheetSize: SIMD2<Int> {
-        let size = self.cachedAppWindow.size
-        return SIMD2<Int>(x: Int(size.width), y: Int(size.height))
-    }
-
     var scaleFactor: Double {
         // I'm leaving this code here for future travellers. Be warned that this always
         // seems to return 100% even if the scale factor is set to 125% in settings.