Fix sidebar update pill cached popover flow (#2142)

* test: cover cached update pill first-click flow

* fix: use cached sidebar update popover

Author: austinywang

Sources/Update/UpdatePill.swift

@@ -1,5 +1,4 @@
 import AppKit
-import Bonsplit
 import Foundation
 import SwiftUI
 
@@ -13,36 +12,19 @@ struct UpdatePill: View {
     var body: some View {
         if model.showsPill {
             pillButton
-                .popover(
-                    isPresented: $showPopover,
-                    attachmentAnchor: .rect(.bounds),
-                    arrowEdge: .top
-                ) {
-                    UpdatePopoverView(model: model)
+                .background(UpdatePillPopoverAnchor(isPresented: $showPopover, model: model))
+                .onChange(of: model.showsPill) { _, showsPill in
+                    if !showsPill {
+                        showPopover = false
+                    }
                 }
                 .transition(.opacity.combined(with: .scale(scale: 0.95)))
         }
     }
 
     @ViewBuilder
     private var pillButton: some View {
-        Button(action: {
-            if model.showsDetectedBackgroundUpdate {
-                if showPopover {
-                    showPopover = false
-                } else {
-                    showPopover = true
-                    AppDelegate.shared?.checkForUpdatesInCustomUI()
-                }
-                return
-            }
-            if case .notFound(let notFound) = model.state {
-                model.state = .idle
-                notFound.acknowledgement()
-            } else {
-                showPopover.toggle()
-            }
-        }) {
+        Button(action: handleTap) {
             HStack(spacing: 6) {
                 UpdateBadge(model: model)
                     .frame(width: 14, height: 14)
@@ -68,13 +50,141 @@ struct UpdatePill: View {
         .accessibilityIdentifier("UpdatePill")
     }
 
+    private func handleTap() {
+        if model.showsDetectedBackgroundUpdate {
+            if model.hasCachedDetectedUpdateDetails {
+                showPopover.toggle()
+            } else if showPopover {
+                showPopover = false
+            } else {
+                showPopover = true
+                AppDelegate.shared?.checkForUpdatesInCustomUI()
+            }
+            return
+        }
+
+        if case .notFound(let notFound) = model.state {
+            model.state = .idle
+            notFound.acknowledgement()
+        } else {
+            showPopover.toggle()
+        }
+    }
+
     private var textWidth: CGFloat? {
         let attributes: [NSAttributedString.Key: Any] = [.font: textFont]
         let size = (model.maxWidthText as NSString).size(withAttributes: attributes)
         return size.width
     }
 }
 
+private struct UpdatePillPopoverAnchor: NSViewRepresentable {
+    @Binding var isPresented: Bool
+    @ObservedObject var model: UpdateViewModel
+
+    func makeNSView(context: Context) -> NSView {
+        let view = NSView()
+        context.coordinator.anchorView = view
+        return view
+    }
+
+    func updateNSView(_ nsView: NSView, context: Context) {
+        let coordinator = context.coordinator
+        context.coordinator.anchorView = nsView
+        context.coordinator.updateRootView(
+            AnyView(
+                UpdatePopoverView(model: model) {
+                    [weak coordinator] in
+                    coordinator?.closeFromContent()
+                }
+            )
+        )
+
+        if isPresented {
+            context.coordinator.present()
+        } else {
+            context.coordinator.dismiss()
+        }
+    }
+
+    func makeCoordinator() -> Coordinator {
+        Coordinator(isPresented: $isPresented)
+    }
+
+    static func dismantleNSView(_ nsView: NSView, coordinator: Coordinator) {
+        coordinator.dismiss()
+    }
+
+    final class Coordinator: NSObject, NSPopoverDelegate {
+        @Binding var isPresented: Bool
+
+        weak var anchorView: NSView?
+        private let hostingController = NSHostingController(rootView: AnyView(EmptyView()))
+        private var popover: NSPopover?
+
+        init(isPresented: Binding<Bool>) {
+            _isPresented = isPresented
+        }
+
+        func updateRootView(_ rootView: AnyView) {
+            hostingController.rootView = rootView
+            hostingController.view.invalidateIntrinsicContentSize()
+            hostingController.view.layoutSubtreeIfNeeded()
+            updateContentSize()
+        }
+
+        func present() {
+            guard let anchorView, anchorView.window != nil else {
+                isPresented = false
+                dismiss()
+                return
+            }
+
+            anchorView.superview?.layoutSubtreeIfNeeded()
+            let popover = popover ?? makePopover()
+            updateContentSize()
+            guard !popover.isShown else { return }
+
+            popover.show(relativeTo: anchorView.bounds, of: anchorView, preferredEdge: .maxY)
+        }
+
+        func dismiss() {
+            popover?.performClose(nil)
+        }
+
+        func closeFromContent() {
+            isPresented = false
+            dismiss()
+        }
+
+        func popoverDidClose(_ notification: Notification) {
+            popover = nil
+            if isPresented {
+                isPresented = false
+            }
+        }
+
+        private func makePopover() -> NSPopover {
+            let popover = NSPopover()
+            popover.behavior = .semitransient
+            popover.animates = true
+            popover.contentViewController = hostingController
+            popover.delegate = self
+            self.popover = popover
+            return popover
+        }
+
+        private func updateContentSize() {
+            let fittingSize = hostingController.view.fittingSize
+            guard fittingSize.width > 0, fittingSize.height > 0 else { return }
+            popover?.contentSize = NSSize(
+                width: ceil(fittingSize.width),
+                height: ceil(fittingSize.height)
+            )
+        }
+    }
+}
+
 /// Menu item that shows "Install Update and Relaunch" when an update is ready.
 struct InstallUpdateMenuItem: View {
     @ObservedObject var model: UpdateViewModel