Support activating selecting chat tab in various situations

Author: intitni

Core/Sources/ChatGPTChatTab/Chat.swift

@@ -32,6 +32,11 @@ struct Chat: ReducerProtocol {
         var history: [ChatMessage] = []
         @BindingState var isReceivingMessage = false
         var chatMenu = ChatMenu.State()
+        @BindingState var focusedField: Field? = .textField
+
+        enum Field: String, Hashable {
+            case textField
+        }
     }
 
     enum Action: Equatable, BindableAction {
@@ -45,6 +50,7 @@ struct Chat: ReducerProtocol {
         case deleteMessageButtonTapped(MessageID)
         case resendMessageButtonTapped(MessageID)
         case setAsExtraPromptButtonTapped(MessageID)
+        case focusOnTextField
 
         case observeChatService
         case observeHistoryChange
@@ -127,6 +133,10 @@ struct Chat: ReducerProtocol {
                 return .run { _ in
                     await service.setMessageAsExtraPrompt(id: id)
                 }
+                
+            case .focusOnTextField:
+                state.focusedField = .textField
+                return .none
 
             case .observeChatService:
                 return .run { send in

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -116,6 +116,12 @@ public class ChatGPTChatTab: ChatTab {
     public func start() {
         chatTabViewStore.send(.updateTitle("Chat"))
 
+        chatTabViewStore.publisher.focusTrigger.removeDuplicates().sink { [weak self] _ in
+            Task { @MainActor [weak self] in
+                self?.viewStore.send(.focusOnTextField)
+            }
+        }.store(in: &cancellable)
+
         service.$systemPrompt.removeDuplicates().sink { _ in
             Task { @MainActor [weak self] in
                 self?.chatTabViewStore.send(.tabContentUpdated)

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -498,16 +498,13 @@ struct FunctionMessage: View {
 
 struct ChatPanelInputArea: View {
     let chat: StoreOf<Chat>
-    @FocusState var isInputAreaFocused: Bool
+    @FocusState var focusedField: Chat.State.Field?
 
     var body: some View {
         HStack {
             clearButton
             textEditor
         }
-        .onAppear {
-            isInputAreaFocused = true
-        }
         .padding(8)
         .background(.ultraThickMaterial)
     }
@@ -538,8 +535,11 @@ struct ChatPanelInputArea: View {
     @MainActor
     var textEditor: some View {
         HStack(spacing: 0) {
-            WithViewStore(chat, removeDuplicates: { $0.typedMessage == $1.typedMessage }) {
-                viewStore in
+            WithViewStore(
+                chat,
+                removeDuplicates: {
+                    $0.typedMessage == $1.typedMessage && $0.focusedField == $1.focusedField
+            }) { viewStore in
                 ZStack(alignment: .center) {
                     // a hack to support dynamic height of TextEditor
                     Text(
@@ -560,7 +560,8 @@ struct ChatPanelInputArea: View {
                     .padding(.top, 1)
                     .padding(.bottom, -1)
                 }
-                .focused($isInputAreaFocused)
+                .focused($focusedField, equals: .textField)
+                .bind(viewStore.$focusedField, to: $focusedField)
                 .padding(8)
                 .fixedSize(horizontal: false, vertical: true)
             }
@@ -595,7 +596,7 @@ struct ChatPanelInputArea: View {
             .keyboardShortcut(KeyEquivalent.return, modifiers: [.shift])
 
             Button(action: {
-                isInputAreaFocused = true
+                focusedField = .textField
             }) {
                 EmptyView()
             }

Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift

@@ -70,6 +70,7 @@ public struct ChatPanelFeature: ReducerProtocol {
         case switchToNextTab
         case switchToPreviousTab
         case moveChatTab(from: Int, to: Int)
+        case focusActiveChatTab
 
         case chatTab(id: String, action: ChatTabItem.Action)
     }
@@ -117,8 +118,9 @@ public struct ChatPanelFeature: ReducerProtocol {
                     state.chatPanelInASeparateWindow = true
                 }
                 state.isPanelDisplayed = true
-                return .run { _ in
+                return .run { send in
                     await activateExtensionService()
+                    await send(.focusActiveChatTab)
                 }
 
             case let .updateChatTabInfo(chatTabInfo):
@@ -172,14 +174,18 @@ public struct ChatPanelFeature: ReducerProtocol {
                     return .none
                 }
                 state.chatTabGroup.selectedTabId = id
-                return .none
+                return .run { send in
+                    await send(.focusActiveChatTab)
+                }
 
             case let .appendAndSelectTab(tab):
                 guard !state.chatTabGroup.tabInfo.contains(where: { $0.id == tab.id })
                 else { return .none }
                 state.chatTabGroup.tabInfo.append(tab)
                 state.chatTabGroup.selectedTabId = tab.id
-                return .none
+                return .run { send in
+                    await send(.focusActiveChatTab)
+                }
 
             case .switchToNextTab:
                 let selectedId = state.chatTabGroup.selectedTabId
@@ -192,7 +198,9 @@ public struct ChatPanelFeature: ReducerProtocol {
                 }
                 let targetId = state.chatTabGroup.tabInfo[nextIndex].id
                 state.chatTabGroup.selectedTabId = targetId
-                return .none
+                return .run { send in
+                    await send(.focusActiveChatTab)
+                }
 
             case .switchToPreviousTab:
                 let selectedId = state.chatTabGroup.selectedTabId
@@ -205,7 +213,9 @@ public struct ChatPanelFeature: ReducerProtocol {
                 }
                 let targetId = state.chatTabGroup.tabInfo[previousIndex].id
                 state.chatTabGroup.selectedTabId = targetId
-                return .none
+                return .run { send in
+                    await send(.focusActiveChatTab)
+                }
 
             case let .moveChatTab(from, to):
                 guard from >= 0, from < state.chatTabGroup.tabInfo.endIndex, to >= 0,
@@ -217,6 +227,13 @@ public struct ChatPanelFeature: ReducerProtocol {
                 state.chatTabGroup.tabInfo.remove(at: from)
                 state.chatTabGroup.tabInfo.insert(tab, at: to)
                 return .none
+                
+            case .focusActiveChatTab:
+                let id = state.chatTabGroup.selectedTabInfo?.id
+                guard let id else { return .none }
+                return .run { send in
+                    await send(.chatTab(id: id, action: .focus))
+                }
 
             case let .chatTab(id, .close):
                 return .run { send in

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -164,7 +164,11 @@ public struct WidgetFeature: ReducerProtocol {
                     state.chatPanelState.isPanelDisplayed = true
                 }
                 let isDisplayingContent = state._circularWidgetState.isDisplayingContent
-                return .run { _ in
+                return .run { send in
+                    if isDisplayingContent {
+                        await send(.chatPanel(.focusActiveChatTab))
+                    }
+                    
                     if isDisplayingContent, !(await NSApplication.shared.isActive) {
                         try await Task.sleep(nanoseconds: 50_000_000)
                         await NSApplication.shared.activate(ignoringOtherApps: true)

Tool/Sources/ChatTab/ChatTab.swift

@@ -6,6 +6,7 @@ import SwiftUI
 public struct ChatTabInfo: Identifiable, Equatable {
     public var id: String
     public var title: String
+    public var focusTrigger: Int = 0
 
     public init(id: String, title: String) {
         self.id = id

Tool/Sources/ChatTab/ChatTabItem.swift

@@ -21,6 +21,7 @@ public struct ChatTabItem: ReducerProtocol {
         case openNewTab(AnyChatTabBuilder)
         case tabContentUpdated
         case close
+        case focus
     }
 
     public init() {}
@@ -37,6 +38,9 @@ public struct ChatTabItem: ReducerProtocol {
                 return .none
             case .close:
                 return .none
+            case .focus:
+                state.focusTrigger += 1
+                return .none
             }
         }
     }