Remove BaseWidget for AppKit backend.

Signed-off-by: furby™ <[email protected]>

Author: furby-tm

Examples/Package.resolved

@@ -61,7 +61,7 @@ switch ProcessInfo.processInfo.environment["SCUI_LIBRARY_TYPE"] {
 
 let package = Package(
     name: "swift-cross-ui",
-    platforms: [.macOS(.v11), .iOS(.v13), .tvOS(.v13), .macCatalyst(.v13)],
+    platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .macCatalyst(.v13)],
     products: [
         .library(name: "SwiftCrossUI", type: libraryType, targets: ["SwiftCrossUI"]),
         .library(name: "AppKitBackend", type: libraryType, targets: ["AppKitBackend"]),

Package.swift

@@ -6,8 +6,7 @@ public struct NSViewRepresentableContext<Coordinator> {
     public internal(set) var environment: EnvironmentValues
 }
 
-public protocol NSViewRepresentable: View
-where Content == Never {
+public protocol NSViewRepresentable: View where Content == Never {
     associatedtype NSViewType: NSView
     associatedtype Coordinator = Void
 
@@ -46,6 +45,7 @@ where Content == Never {
     ///
     /// The default implementation uses `nsView.intrinsicContentSize` and `nsView.sizeThatFits(_:)`
     /// to determine the return value.
+    @MainActor
     func determineViewSize(
         for proposal: SIMD2<Int>, nsView: NSViewType,
         context: NSViewRepresentableContext<Coordinator>
@@ -101,8 +101,7 @@ extension NSViewRepresentable {
     }
 }
 
-extension View
-where Self: NSViewRepresentable {
+extension View where Self: NSViewRepresentable {
     public var body: Never {
         preconditionFailure("This should never be called")
     }
@@ -121,89 +120,10 @@ where Self: NSViewRepresentable {
     ) -> [LayoutSystem.LayoutableChild] {
         []
     }
-
-    public func asWidget<Backend: AppBackend>(
-        _: any ViewGraphNodeChildren,
-        backend _: Backend
-    ) -> Backend.Widget {
-        if let widget = RepresentingWidget(representable: self) as? Backend.Widget {
-            return widget
-        } else {
-            fatalError("NSViewRepresentable requested by \(Backend.self)")
-        }
-    }
-
-    public func update<Backend: AppBackend>(
-        _ widget: Backend.Widget,
-        children _: any ViewGraphNodeChildren,
-        proposedSize: SIMD2<Int>,
-        environment: EnvironmentValues,
-        backend _: Backend,
-        dryRun: Bool
-    ) -> ViewUpdateResult {
-        let representingWidget = widget as! RepresentingWidget<Self>
-        representingWidget.update(with: environment)
-
-        let size =
-            representingWidget.representable.determineViewSize(
-                for: proposedSize,
-                nsView: representingWidget.subview,
-                context: representingWidget.context!
-            )
-
-        if !dryRun {
-            representingWidget.width = size.size.x
-            representingWidget.height = size.size.y
-        }
-
-        return ViewUpdateResult.leafView(size: size)
-    }
 }
 
-extension NSViewRepresentable
-where Coordinator == Void {
+extension NSViewRepresentable where Coordinator == Void {
     public func makeCoordinator() {
         return ()
     }
 }
-
-final class RepresentingWidget<Representable: NSViewRepresentable>: BaseWidget {
-    var representable: Representable
-    var context: NSViewRepresentableContext<Representable.Coordinator>?
-
-    lazy var subview: Representable.NSViewType = {
-        let view = representable.makeNSView(context: context!)
-
-        self.addSubview(view)
-
-        view.translatesAutoresizingMaskIntoConstraints = false
-        NSLayoutConstraint.activate([
-            view.topAnchor.constraint(equalTo: self.topAnchor),
-            view.leadingAnchor.constraint(equalTo: self.leadingAnchor),
-            view.trailingAnchor.constraint(equalTo: self.trailingAnchor),
-            view.bottomAnchor.constraint(equalTo: self.bottomAnchor),
-        ])
-
-        return view
-    }()
-
-    func update(with environment: EnvironmentValues) {
-        if context == nil {
-            context = .init(coordinator: representable.makeCoordinator(), environment: environment)
-        } else {
-            context!.environment = environment
-            representable.updateNSView(subview, context: context!)
-        }
-    }
-
-    init(representable: Representable) {
-        self.representable = representable
-        super.init()
-    }
-
-    deinit {
-        if let context {
-            Representable.dismantleNSView(subview, coordinator: context.coordinator)
-        }
-    }
-}