Fix chat panel jumping to top, again

Author: intitni

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -45,9 +45,12 @@ struct ChatPanelMessages: View {
     @State var isScrollToBottomButtonDisplayed = true
     @State var isPinnedToBottom = true
     @Namespace var bottomID
+    @Namespace var topID
     @Namespace var scrollSpace
     @State var scrollOffset: Double = 0
     @State var listHeight: Double = 0
+    @State var didAppearOnce = false
+    @State var isBottomHidden = true
     @Environment(\.isEnabled) var isEnabled
 
     var body: some View {
@@ -56,6 +59,7 @@ struct ChatPanelMessages: View {
                 List {
                     Group {
                         Spacer(minLength: 12)
+                            .id(topID)
 
                         Instruction(chat: chat)
 
@@ -71,10 +75,19 @@ struct ChatPanelMessages: View {
                         Spacer(minLength: 12)
                             .id(bottomID)
                             .onAppear {
-                                proxy.scrollTo(bottomID, anchor: .bottom)
+                                isBottomHidden = false
+                                if !didAppearOnce {
+                                    proxy.scrollTo(bottomID, anchor: .bottom)
+                                }
+                            }
+                            .onDisappear {
+                                isBottomHidden = true
                             }
                             .task {
-                                proxy.scrollTo(bottomID, anchor: .bottom)
+                                if !didAppearOnce {
+                                    proxy.scrollTo(bottomID, anchor: .bottom)
+                                    didAppearOnce = true
+                                }
                             }
                             .background(GeometryReader { geo in
                                 let offset = geo.frame(in: .named(scrollSpace)).minY
@@ -129,7 +142,11 @@ struct ChatPanelMessages: View {
                     scrollToBottomButton(proxy: proxy)
                 }
                 .background {
-                    PinToBottomHandler(chat: chat, pinnedToBottom: $isPinnedToBottom) {
+                    PinToBottomHandler(
+                        chat: chat,
+                        isBottomHidden: isBottomHidden,
+                        pinnedToBottom: $isPinnedToBottom
+                    ) {
                         proxy.scrollTo(bottomID, anchor: .bottom)
                     }
                 }
@@ -199,6 +216,7 @@ struct ChatPanelMessages: View {
 
     struct PinToBottomHandler: View {
         let chat: StoreOf<Chat>
+        let isBottomHidden: Bool
         @Binding var pinnedToBottom: Bool
         let scrollToBottom: () -> Void
 
@@ -222,7 +240,9 @@ struct ChatPanelMessages: View {
                             Task {
                                 pinnedToBottom = true
                                 await Task.yield()
-                                scrollToBottom()
+                                withAnimation(.easeInOut(duration: 0.1)) {
+                                    scrollToBottom()
+                                }
                             }
                         }
                     }
@@ -233,10 +253,18 @@ struct ChatPanelMessages: View {
                             }
                             Task {
                                 await Task.yield()
-                                scrollToBottom()
+                                withAnimation(.easeInOut(duration: 0.1)) {
+                                    scrollToBottom()
+                                }
                             }
                         }
                     }
+                    .onChange(of: isBottomHidden) { value in
+                        // This is important to prevent it from jumping to the top!
+                        if value, pinnedToBottom {
+                            scrollToBottom()
+                        }
+                    }
             }
         }
     }

Tool/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift

@@ -55,8 +55,7 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
 
             var functionPrompt = """
             ONLY call it when one of the following conditions are satisfied:
-            - the user explicitly ask you about specific line of code, \
-            but the line was NOT in the focused range \(contextLineRange).
+            - the user explicitly ask you about specific line of code, that is NOT in the focused range \(contextLineRange).
             """
 
             if let annotations = context.focusedContext?.otherLineAnnotations,