Update to control prompt to code focus state in reducer

Author: intitni

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCode.swift

@@ -43,6 +43,10 @@ public struct PromptToCode: ReducerProtocol {
                 }
             }
         }
+        
+        public enum FocusField: Equatable {
+            case textField
+        }
 
         public var id: URL { documentURL }
         public var history: HistoryNode
@@ -63,6 +67,7 @@ public struct PromptToCode: ReducerProtocol {
         @BindingState public var prompt: String
         @BindingState public var isContinuous: Bool
         @BindingState public var isAttachedToSelectionRange: Bool
+        @BindingState public var focusedField: FocusField? = .textField
 
         public var filename: String { documentURL.lastPathComponent }
         public var canRevert: Bool { history != .empty }
@@ -114,6 +119,7 @@ public struct PromptToCode: ReducerProtocol {
 
     public enum Action: Equatable, BindableAction {
         case binding(BindingAction<State>)
+        case focusOnTextField
         case selectionRangeToggleTapped
         case modifyCodeButtonTapped
         case revertButtonTapped
@@ -142,6 +148,10 @@ public struct PromptToCode: ReducerProtocol {
             switch action {
             case .binding:
                 return .none
+                
+            case .focusOnTextField:
+                state.focusedField = .textField
+                return .none
 
             case .selectionRangeToggleTapped:
                 state.isAttachedToSelectionRange.toggle()

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodeGroup.swift

@@ -86,8 +86,10 @@ public struct PromptToCodeGroup: ReducerProtocol {
         Reduce { state, action in
             switch action {
             case let .activateOrCreatePromptToCode(s):
-                guard state.activePromptToCode == nil else {
-                    return .none
+                if let promptToCode = state.activePromptToCode {
+                    return .run { send in
+                        await send(.promptToCode(promptToCode.id, .focusOnTextField))
+                    }
                 }
                 return .run { send in
                     await send(.createPromptToCode(s))

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

@@ -290,7 +290,7 @@ extension PromptToCodePanel {
 
     struct Toolbar: View {
         let store: StoreOf<PromptToCode>
-        @FocusState var isInputAreaFocused: Bool
+        @FocusState var focusField: PromptToCode.State.FocusField?
 
         struct RevertButtonState: Equatable {
             var isResponding: Bool
@@ -299,6 +299,7 @@ extension PromptToCodePanel {
 
         struct InputFieldState: Equatable {
             @BindingViewState var prompt: String
+            @BindingViewState var focusField: PromptToCode.State.FocusField?
             var isResponding: Bool
         }
 
@@ -326,15 +327,12 @@ extension PromptToCodePanel {
                     .keyboardShortcut(KeyEquivalent.return, modifiers: [.shift])
                 }
                 .background {
-                    Button(action: { isInputAreaFocused = true }) {
+                    Button(action: { focusField = .textField }) {
                         EmptyView()
                     }
                     .keyboardShortcut("l", modifiers: [.command])
                 }
             }
-            .onAppear {
-                isInputAreaFocused = true
-            }
             .padding(8)
             .background(.ultraThickMaterial)
         }
@@ -366,7 +364,13 @@ extension PromptToCodePanel {
         var inputField: some View {
             WithViewStore(
                 store,
-                observe: { InputFieldState(prompt: $0.$prompt, isResponding: $0.isResponding) }
+                observe: {
+                    InputFieldState(
+                        prompt: $0.$prompt,
+                        focusField: $0.$focusedField,
+                        isResponding: $0.isResponding
+                    )
+                }
             ) { viewStore in
                 ZStack(alignment: .center) {
                     // a hack to support dynamic height of TextEditor
@@ -389,8 +393,9 @@ extension PromptToCodePanel {
                     .opacity(viewStore.state.isResponding ? 0.5 : 1)
                     .disabled(viewStore.state.isResponding)
                 }
+                .focused($focusField, equals: .textField)
+                .bind(viewStore.$focusField, to: $focusField)
             }
-            .focused($isInputAreaFocused)
             .padding(8)
             .fixedSize(horizontal: false, vertical: true)
         }