Filling out more of NSUIViewRepresentable

mattmassicotte · Mar 30, 2024 · 16d736b · 16d736b
1 parent 1390ba9
commit 16d736b
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 5 deletions.
diff --git a/Sources/NSUI/ViewControllerRepresentable.swift b/Sources/NSUI/ViewControllerRepresentable.swift
@@ -15,7 +15,7 @@ public protocol NSUIViewControllerRepresentable: NSViewControllerRepresentable w
 
 	@available(macOS 13.0, *)
 	@MainActor
-	func sizeThatFits(_ proposal: ProposedViewSize, nsUIViewController: Self.NSUIViewControllerType, context: Self.Context) -> CGSize?
+	func sizeThatFits(_ proposal: ProposedViewSize, nsuiViewController: Self.NSUIViewControllerType, context: Self.Context) -> CGSize?
 }
 
 public extension NSUIViewControllerRepresentable {
@@ -37,7 +37,7 @@ public extension NSUIViewControllerRepresentable {
 	@available(macOS 13.0, *)
 	@MainActor
 	func sizeThatFits(_ proposal: ProposedViewSize, nsViewController: Self.NSUIViewControllerType, context: Self.Context) -> CGSize? {
-		sizeThatFits(proposal, nsUIViewController: nsViewController, context: context)
+		sizeThatFits(proposal, nsuiViewController: nsViewController, context: context)
 	}
 }
 
@@ -56,7 +56,7 @@ public protocol NSUIViewControllerRepresentable: UIViewControllerRepresentable w
 
 	@available(iOS 16.0, tvOS 16.0, *)
 	@MainActor
-	func sizeThatFits(_ proposal: ProposedViewSize, nsUIViewController: Self.NSUIViewControllerType, context: Self.Context) -> CGSize?
+	func sizeThatFits(_ proposal: ProposedViewSize, nsuiViewController: Self.NSUIViewControllerType, context: Self.Context) -> CGSize?
 }
 
 public extension NSUIViewControllerRepresentable {
@@ -82,7 +82,7 @@ public extension NSUIViewControllerRepresentable {
 		uiViewController: Self.NSUIViewControllerType,
 		context: Self.Context
 	) -> CGSize? {
-		sizeThatFits(proposal, nsUIViewController: uiViewController, context: context)
+		sizeThatFits(proposal, nsuiViewController: uiViewController, context: context)
 	}
 }
 #endif
@@ -94,7 +94,7 @@ extension NSUIViewControllerRepresentable {
 
 	@available(iOS 16.0, tvOS 16.0, macOS 13.0, *)
 	@MainActor
-	public func sizeThatFits(_ proposal: ProposedViewSize, nsUIViewController: Self.NSUIViewControllerType, context: Self.Context) -> CGSize? {
+	public func sizeThatFits(_ proposal: ProposedViewSize, nsuiViewController: Self.NSUIViewControllerType, context: Self.Context) -> CGSize? {
 		nil
 	}
 }
diff --git a/Sources/NSUI/ViewRepresentable.swift b/Sources/NSUI/ViewRepresentable.swift
@@ -10,6 +10,10 @@ public protocol NSUIViewRepresentable: NSViewRepresentable {
 	func makeNSUIView(context: Context) -> NSUIViewType
 	@MainActor
 	func updateNSUIView(_ view: NSUIViewType, context: Context)
+	@MainActor
+	static func dismantleNSUIView(_ view: Self.NSUIViewType, coordinator: Self.Coordinator)
+	@available(macOS 13.0, *)
+	@MainActor func sizeThatFits(_ proposal: ProposedViewSize, nsuiView: Self.NSUIViewType, context: Self.Context) -> CGSize?
 }
 
 public extension NSUIViewRepresentable {
@@ -22,6 +26,16 @@ public extension NSUIViewRepresentable {
 	func updateNSView(_ view: NSUIViewType, context: Context) {
 		updateNSUIView(view, context: context)
 	}
+
+	@MainActor
+	static func dismantleNSView(_ nsView: Self.NSUIViewType, coordinator: Self.Coordinator) {
+		Self.dismantleNSUIView(nsView, coordinator: coordinator)
+	}
+
+	@available(macOS 13.0, *)
+	@MainActor func sizeThatFits(_ proposal: ProposedViewSize, nsView: Self.NSUIViewType, context: Self.Context) -> CGSize? {
+		sizeThatFits(proposal, nsuiView: nsView, context: context)
+	}
 }
 
 #elseif canImport(UIKit)
@@ -34,6 +48,10 @@ public protocol NSUIViewRepresentable: UIViewRepresentable {
 	func makeNSUIView(context: Context) -> NSUIViewType
 	@MainActor
 	func updateNSUIView(_ view: NSUIViewType, context: Context)
+	@MainActor
+	static func dismantleNSUIView(_ view: Self.NSUIViewType, coordinator: Self.Coordinator)
+	@available(iOS 16.0, tvOS 16.0, *)
+	@MainActor func sizeThatFits(_ proposal: ProposedViewSize, nsuiView: Self.NSUIViewType, context: Self.Context) -> CGSize?
 }
 
 public extension NSUIViewRepresentable {
@@ -46,6 +64,28 @@ public extension NSUIViewRepresentable {
 	func updateUIView(_ view: NSUIViewType, context: Context) {
 		updateNSUIView(view, context: context)
 	}
+
+	@MainActor
+	static func dismantleUIView(_ uiView: Self.NSUIViewType, coordinator: Self.Coordinator) {
+		Self.dismantleNSUIView(uiView, coordinator: coordinator)
+	}
+
+	@available(iOS 16.0, tvOS 16.0, *)
+	@MainActor func sizeThatFits(_ proposal: ProposedViewSize, uiView: Self.NSUIViewType, context: Self.Context) -> CGSize? {
+		sizeThatFits(proposal, nsuiView: uiView, context: context)
+	}
 }
 
 #endif
+
+extension NSUIViewRepresentable {
+	@MainActor
+	public static func dismantleNSUIView(_ view: Self.NSUIViewType, coordinator: Self.Coordinator) {
+	}
+
+	@available(macOS 13.0, iOS 16.0, tvOS 16.0, *)
+	@MainActor
+	public func sizeThatFits(_ proposal: ProposedViewSize, nsuiView: Self.NSUIViewType, context: Self.Context) -> CGSize? {
+		nil
+	}
+}
diff --git a/Tests/NSUITests/ViewRepresentableTests.swift b/Tests/NSUITests/ViewRepresentableTests.swift
@@ -9,6 +9,12 @@ struct RepresentedView: NSUIViewRepresentable {
 
 	func updateNSUIView(_ uiView: NSUIView, context: Context) {
 	}
+
+	final class Coordinator {}
+
+	func makeCoordinator() -> Coordinator {
+		Coordinator()
+	}
 }
 
 final class ViewRepresentableTests: XCTestCase {