Display widget animation when it's hidden

Author: intitni

Core/Sources/SuggestionWidget/WidgetPositionStrategy.swift

@@ -102,24 +102,24 @@ enum UpdateLocationStrategy {
                 mainScreen.frame.height - editorFrame.minY - Style.widgetHeight - Style
                     .widgetPadding
             )
-
-            let proposedAnchorFrameOnTheRightSide = {
-                if hideCircularWidget {
-                    return CGRect(
-                        x: editorFrame.maxX,
-                        y: y,
-                        width: 0,
-                        height: 0
-                    )
-                } else {
-                    return CGRect(
-                        x: editorFrame.maxX - Style.widgetPadding - Style.widgetWidth,
-                        y: y,
-                        width: Style.widgetWidth,
-                        height: Style.widgetHeight
-                    )
-                }
-            }()
+            
+            var proposedAnchorFrameOnTheRightSide = CGRect(
+                x: editorFrame.maxX,
+                y: y,
+                width: 0,
+                height: 0
+            )
+            
+            let widgetFrameOnTheRightSide = CGRect(
+                x: editorFrame.maxX - Style.widgetPadding - Style.widgetWidth,
+                y: y,
+                width: Style.widgetWidth,
+                height: Style.widgetHeight
+            )
+            
+            if !hideCircularWidget {
+                proposedAnchorFrameOnTheRightSide = widgetFrameOnTheRightSide
+            }
 
             let proposedPanelX = proposedAnchorFrameOnTheRightSide.maxX + Style
                 .widgetPadding * 2
@@ -148,7 +148,7 @@ enum UpdateLocationStrategy {
                 )
 
                 return .init(
-                    widgetFrame: anchorFrame,
+                    widgetFrame: widgetFrameOnTheRightSide,
                     tabFrame: tabFrame,
                     defaultPanelLocation: .init(
                         frame: panelFrame,
@@ -157,23 +157,24 @@ enum UpdateLocationStrategy {
                     suggestionPanelLocation: nil
                 )
             } else {
-                let proposedAnchorFrameOnTheLeftSide = {
-                    if hideCircularWidget {
-                        return CGRect(
-                            x: editorFrame.minX,
-                            y: proposedAnchorFrameOnTheRightSide.origin.y,
-                            width: 0,
-                            height: 0
-                        )
-                    } else {
-                        return CGRect(
-                            x: editorFrame.minX + Style.widgetPadding,
-                            y: proposedAnchorFrameOnTheRightSide.origin.y,
-                            width: Style.widgetWidth,
-                            height: Style.widgetHeight
-                        )
-                    }
-                }()
+                var proposedAnchorFrameOnTheLeftSide = CGRect(
+                    x: editorFrame.minX,
+                    y: proposedAnchorFrameOnTheRightSide.origin.y,
+                    width: 0,
+                    height: 0
+                )
+                
+                let widgetFrameOnTheLeftSide = CGRect(
+                    x: editorFrame.minX + Style.widgetPadding,
+                    y: proposedAnchorFrameOnTheRightSide.origin.y,
+                    width: Style.widgetWidth,
+                    height: Style.widgetHeight
+                )
+            
+                if !hideCircularWidget {
+                    proposedAnchorFrameOnTheLeftSide = widgetFrameOnTheLeftSide
+                }
+                
                 let proposedPanelX = proposedAnchorFrameOnTheLeftSide.minX - Style
                     .widgetPadding * 2 - Style.panelWidth
                 let putAnchorToTheLeft = {
@@ -204,7 +205,7 @@ enum UpdateLocationStrategy {
                         height: Style.widgetHeight
                     )
                     return .init(
-                        widgetFrame: anchorFrame,
+                        widgetFrame: widgetFrameOnTheLeftSide,
                         tabFrame: tabFrame,
                         defaultPanelLocation: .init(
                             frame: panelFrame,
@@ -229,7 +230,7 @@ enum UpdateLocationStrategy {
                         height: Style.widgetHeight
                     )
                     return .init(
-                        widgetFrame: anchorFrame,
+                        widgetFrame: widgetFrameOnTheRightSide,
                         tabFrame: tabFrame,
                         defaultPanelLocation: .init(
                             frame: panelFrame,

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -10,23 +10,31 @@ struct WidgetView: View {
     @State var isHovering: Bool = false
     var onOpenChatClicked: () -> Void = {}
     var onCustomCommandClicked: (CustomCommand) -> Void = { _ in }
+    
+    @AppStorage(\.hideCircularWidget) var hideCircularWidget
 
     var body: some View {
-        Circle()
-            .fill(isHovering ? .white.opacity(0.8) : .white.opacity(0.3))
-            .onTapGesture {
-                withAnimation(.easeInOut(duration: 0.2)) {
-                    store.send(.widgetClicked)
+        WithViewStore(store, observe: { $0.isProcessing }) { viewStore in
+            Circle()
+                .fill(isHovering ? .white.opacity(0.8) : .white.opacity(0.3))
+                .onTapGesture {
+                    withAnimation(.easeInOut(duration: 0.2)) {
+                        store.send(.widgetClicked)
+                    }
                 }
-            }
-            .overlay { overlayCircle }
-            .onHover { yes in
-                withAnimation(.easeInOut(duration: 0.2)) {
-                    isHovering = yes
+                .overlay { overlayCircle }
+                .onHover { yes in
+                    withAnimation(.easeInOut(duration: 0.2)) {
+                        isHovering = yes
+                    }
+                }.contextMenu {
+                    WidgetContextMenu(store: store)
                 }
-            }.contextMenu {
-                WidgetContextMenu(store: store)
-            }
+                .opacity({
+                    if !hideCircularWidget { return 1 }
+                    return viewStore.state ? 1 : 0
+                }())
+        }
     }
 
     struct OverlayCircleState: Equatable {