Fix caret position restoration logic and remove redundant prompt field focus calls

Author: robertpiosik

packages/ui/src/components/editor/panel/PromptField/PromptField.tsx

@@ -170,22 +170,23 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
 
   useEffect(() => {
     if (input_ref.current && input_ref.current.innerHTML !== highlighted_html) {
-      let selection_start = 0
-
-      if (is_focused) {
-        selection_start = get_caret_position_from_div(input_ref.current)
-      } else {
-        selection_start = map_raw_pos_to_display_pos(
-          props.value.length,
-          props.value,
-          props.context_file_paths ?? []
-        )
-      }
-
+      const selection = window.getSelection()
+      const should_restore_caret =
+        document.activeElement === input_ref.current &&
+        selection &&
+        selection.rangeCount > 0 &&
+        selection.anchorNode &&
+        input_ref.current.contains(selection.anchorNode)
+
+      const selection_start = should_restore_caret
+        ? get_caret_position_from_div(input_ref.current)
+        : 0
       input_ref.current.innerHTML = highlighted_html
-      set_caret_position_for_div(input_ref.current, selection_start)
+      if (should_restore_caret) {
+        set_caret_position_for_div(input_ref.current, selection_start)
+      }
     }
-  }, [highlighted_html, is_focused, props.value, props.context_file_paths])
+  }, [highlighted_html])
 
   useEffect(() => {
     if (input_ref.current) {
@@ -228,14 +229,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
     }
   }, [props.focus_and_select_key])
 
-  useEffect(() => {
-    const input_element = input_ref.current
-    if (input_element) {
-      const is_focused = document.activeElement === input_element
-      if (!is_focused) input_element.focus()
-    }
-  }, [props.value])
-
   useEffect(() => {
     const on_selection_change = () => {
       if (document.activeElement === input_ref.current && input_ref.current) {

packages/vscode/src/views/panel/backend/message-handlers/handle-show-prompt-template-quick-pick.ts

@@ -352,9 +352,6 @@ export const handle_show_prompt_template_quick_pick = async (
         }
 
         await set_instructions(prompt_text)
-        panel_provider.send_message({
-          command: 'FOCUS_PROMPT_FIELD'
-        })
       }
     }),
     templates_quick_pick.onDidChangeValue((value) => {