Update floating widget to the bottom, move to left or right according to the window position

Author: intitni

Core/Sources/SuggestionWidget/Styles.swift

@@ -3,5 +3,6 @@ enum Style {
     static let panelWidth: Double = 450
     static let widgetHeight: Double = 30
     static var widgetWidth: Double { widgetHeight }
+    static let widgetPadding: Double = 4
 }
 

Core/Sources/SuggestionWidget/SuggestionPanelView.swift

@@ -44,6 +44,10 @@ struct SuggestionPanelView: View {
 
     var body: some View {
         VStack {
+            Spacer()
+                .frame(minHeight: 0, maxHeight: .infinity)
+                .allowsHitTesting(false)
+            
             ZStack(alignment: .topLeading) {
                 VStack(spacing: 0) {
                     ScrollView {
@@ -74,10 +78,6 @@ struct SuggestionPanelView: View {
             }
             .allowsHitTesting(viewModel.isPanelDisplayed && !viewModel.suggestion.isEmpty)
             .preferredColorScheme(.dark)
-
-            Spacer()
-                .frame(minHeight: 0, maxHeight: .infinity)
-                .allowsHitTesting(false)
         }
         .opacity({
             guard viewModel.isPanelDisplayed else { return 0 }

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -186,7 +186,7 @@ public final class SuggestionWidgetController {
             for await notification in notifications {
                 guard let self else { return }
                 try Task.checkCancellation()
-                self.updateWindowLocation()
+                self.updateWindowLocation(animated: false)
 
                 if notification.name == kAXFocusedUIElementChangedNotification {
                     guard let fileURL = try? await Environment.fetchCurrentFileURL(),
@@ -211,7 +211,7 @@ public final class SuggestionWidgetController {
     ///
     /// - note: It's possible to get the scroll view's postion by getting position on the focus
     /// element.
-    private func updateWindowLocation() {
+    private func updateWindowLocation(animated: Bool = false) {
         func hide() {
             panelWindow.alphaValue = 0
             widgetWindow.alphaValue = 0
@@ -246,26 +246,60 @@ public final class SuggestionWidgetController {
                 let screen = NSScreen.screens.first
                 let frame = CGRect(origin: position, size: size)
                 if foundSize, foundPosition, let screen {
-                    let anchorFrame = CGRect(
-                        x: frame.maxX - 4 - Style.widgetWidth,
-                        y: screen.frame.height - frame.minY - Style.widgetHeight - 4,
+                    let proposedAnchorFrameOnTheRightSide = CGRect(
+                        x: frame.maxX - Style.widgetPadding - Style.widgetWidth,
+                        y: max(screen.frame.height - frame.maxY + Style.widgetPadding, 4),
                         width: Style.widgetWidth,
                         height: Style.widgetHeight
                     )
-                    widgetWindow.setFrame(anchorFrame, display: false)
 
-                    let proposedPanelX = anchorFrame.maxX + 8
+                    let proposedPanelX = proposedAnchorFrameOnTheRightSide.maxX + Style
+                        .widgetPadding * 2
                     let putPanelToTheRight = screen.frame.maxX > proposedPanelX + Style.panelWidth
 
-                    let panelFrame = CGRect(
-                        x: putPanelToTheRight ? proposedPanelX : anchorFrame.maxX - Style
-                            .panelWidth,
-                        y: putPanelToTheRight ? anchorFrame.minY - Style.panelHeight + Style
-                            .widgetHeight : anchorFrame.minY - Style.panelHeight - 4,
-                        width: Style.panelWidth,
-                        height: Style.panelHeight
-                    )
-                    panelWindow.setFrame(panelFrame, display: false)
+                    if putPanelToTheRight {
+                        let anchorFrame = proposedAnchorFrameOnTheRightSide
+                        let panelFrame = CGRect(
+                            x: proposedPanelX,
+                            y: anchorFrame.minY,
+                            width: Style.panelWidth,
+                            height: Style.panelHeight
+                        )
+                        widgetWindow.setFrame(anchorFrame, display: false, animate: animated)
+                        panelWindow.setFrame(panelFrame, display: false, animate: animated)
+                    } else {
+                        let proposedAnchorFrameOnTheLeftSide = CGRect(
+                            x: frame.minX + Style.widgetPadding + Style.widgetWidth,
+                            y: proposedAnchorFrameOnTheRightSide.origin.y,
+                            width: Style.widgetWidth,
+                            height: Style.widgetHeight
+                        )
+                        let proposedPanelX = proposedAnchorFrameOnTheLeftSide.minX - Style
+                            .widgetPadding * 2 - Style.panelWidth
+                        let putAnchorToTheLeft = proposedPanelX > screen.frame.minX
+
+                        if putAnchorToTheLeft {
+                            let anchorFrame = proposedAnchorFrameOnTheLeftSide
+                            let panelFrame = CGRect(
+                                x: proposedPanelX,
+                                y: anchorFrame.minY,
+                                width: Style.panelWidth,
+                                height: Style.panelHeight
+                            )
+                            widgetWindow.setFrame(anchorFrame, display: false, animate: animated)
+                            panelWindow.setFrame(panelFrame, display: false, animate: animated)
+                        } else {
+                            let anchorFrame = proposedAnchorFrameOnTheRightSide
+                            let panelFrame = CGRect(
+                                x: anchorFrame.maxX - Style.panelWidth,
+                                y: anchorFrame.maxY + Style.widgetPadding,
+                                width: Style.panelWidth,
+                                height: Style.panelHeight
+                            )
+                            widgetWindow.setFrame(anchorFrame, display: false, animate: animated)
+                            panelWindow.setFrame(panelFrame, display: false, animate: animated)
+                        }
+                    }
 
                     panelWindow.alphaValue = 1
                     widgetWindow.alphaValue = 1

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -2,18 +2,9 @@ import SwiftUI
 
 @MainActor
 final class WidgetViewModel: ObservableObject {
-    enum Position {
-        case topLeft
-        case topRight
-        case bottomLeft
-        case bottomRight
-    }
-
-    var position: Position
     @Published var isProcessing: Bool
 
-    init(position: Position = .topRight, isProcessing: Bool = false) {
-        self.position = position
+    init(isProcessing: Bool = false) {
         self.isProcessing = isProcessing
     }
 }
@@ -99,25 +90,25 @@ struct WidgetView_Preview: PreviewProvider {
     static var previews: some View {
         VStack {
             WidgetView(
-                viewModel: .init(position: .topRight, isProcessing: false),
+                viewModel: .init(isProcessing: false),
                 panelViewModel: .init(),
                 isHovering: false
             )
 
             WidgetView(
-                viewModel: .init(position: .topRight, isProcessing: false),
+                viewModel: .init(isProcessing: false),
                 panelViewModel: .init(),
                 isHovering: true
             )
 
             WidgetView(
-                viewModel: .init(position: .topRight, isProcessing: true),
+                viewModel: .init(isProcessing: true),
                 panelViewModel: .init(),
                 isHovering: false
             )
 
             WidgetView(
-                viewModel: .init(position: .topRight, isProcessing: false),
+                viewModel: .init(isProcessing: false),
                 panelViewModel: .init(suggestion: ["Hello"]),
                 isHovering: false
             )