Improve NSHostingPopover

Author: vmanot

Sources/Intermodular/Helpers/AppKit or UIKit/AppKitOrUIKit.swift

@@ -93,7 +93,7 @@ public typealias AppKitOrUIKitWindow = NSWindow
 
 extension NSView {
     public static var layoutFittingCompressedSize: CGSize {
-        .init(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude)
+        .init(width: 0, height: 0)
     }
 
     public static var layoutFittingExpandedSize: CGSize {

Sources/Intermodular/Helpers/AppKit/NSHostingPopover.swift

@@ -9,29 +9,33 @@ import Swift
 import SwiftUI
 
 open class NSHostingPopover<Content: View>: NSPopover {
-    var presentationManager: PresentationManager!
+    private var presentationManager: PresentationManager!
 
-    var _contentViewController: NSHostingController<ContentWrapper> {
-        contentViewController as! NSHostingController<ContentWrapper>
+    private var _contentViewController: CocoaHostingController<ContentWrapper> {
+        contentViewController as! CocoaHostingController<ContentWrapper>
     }
 
     public var rootView: Content {
         get {
-            _contentViewController.rootView.content
+            _contentViewController.mainView.content
         } set {
-            _contentViewController.rootView = .init(content: newValue, owner: self)
+            _contentViewController.mainView.content = newValue
 
-            contentSize = _contentViewController.sizeThatFits(in: Screen.main.bounds.size)
+            _contentViewController.view.layout()
         }
     }
 
     public init(rootView: Content) {
         super.init()
 
         presentationManager = .init(self)
-
-        contentViewController = NSHostingController(rootView: ContentWrapper(content: rootView, owner: self))
-        contentSize = _contentViewController.sizeThatFits(in: Screen.main.bounds.size)
+        
+        let contentViewController = CocoaHostingController(mainView: ContentWrapper(content: rootView, owner: self))
+        
+        contentViewController.parentPopover = self
+        
+        self.animates = true
+        self.contentViewController = contentViewController
     }
 
     public required init?(coder: NSCoder) {
@@ -42,20 +46,23 @@ open class NSHostingPopover<Content: View>: NSPopover {
 // MARK: - Auxiliary Implementation -
 
 extension NSHostingPopover {
-    struct ContentWrapper: View {
-        let content: Content
+    private struct ContentWrapper: View {
+        var content: Content
 
         weak var owner: NSHostingPopover?
 
         var body: some View {
-            owner.ifSome { owner in
+            if let owner = owner {
                 content
                     .environment(\.presentationManager, owner.presentationManager)
+                    .onChangeOfFrame { _ in
+                        owner._contentViewController.view.layout()
+                    }
             }
         }
     }
 
-    class PresentationManager: SwiftUIX.PresentationManager {
+    private class PresentationManager: SwiftUIX.PresentationManager {
         private unowned let popover: NSHostingPopover
 
         public var isPresented: Bool {

Sources/Intramodular/Bridging/CocoaHostingController.swift

@@ -20,6 +20,10 @@ open class CocoaHostingController<Content: View>: AppKitOrUIKitHostingController
     #endif
     var _isResizingParentWindow: Bool = false
     var _didResizeParentWindowOnce: Bool = false
+
+    #if os(macOS)
+    weak var parentPopover: NSPopover?
+    #endif
 
     public var mainView: Content {
         get {
@@ -125,7 +129,15 @@ open class CocoaHostingController<Content: View>: AppKitOrUIKitHostingController
     override open func viewDidLayout() {
         super.viewDidLayout()
 
-        preferredContentSize = sizeThatFits(in: Screen.main.bounds.size)
+        let size = sizeThatFits(in: NSView.layoutFittingCompressedSize)
+        
+        DispatchQueue.main.async {
+            if let popover = self.parentPopover {
+                popover.contentSize = size
+            } else {
+                self.preferredContentSize = size
+            }
+        }
     }
     #endif