Просмотр исходного кода

Disable UnifiedMergeView when a Form is submitted with UnifiedMergeView enabled

Shun Miyazawa 10 месяцев назад
Родитель
Сommit
61e2b5581d
1 измененных файлов с 4 добавлено и 13 удалено
  1. 4 13
      apps/app/src/features/openai/client/services/editor-assistant.tsx

+ 4 - 13
apps/app/src/features/openai/client/services/editor-assistant.tsx

@@ -188,6 +188,9 @@ export const useEditorAssistant: UseEditorAssistant = () => {
       }
     };
 
+    // Disable UnifiedMergeView when a Form is submitted with UnifiedMergeView enabled
+    mutateIsEnableUnifiedMergeView(false);
+
     const response = await fetch('/_api/v3/openai/edit', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -199,7 +202,7 @@ export const useEditorAssistant: UseEditorAssistant = () => {
     });
 
     return response;
-  }, [codeMirrorEditor, selectedText]);
+  }, [codeMirrorEditor, mutateIsEnableUnifiedMergeView, selectedText]);
 
   const processMessage: ProcessMessage = useCallback((data, handler) => {
     handleIfSuccessfullyParsed(data, SseMessageSchema, (data: SseMessage) => {
@@ -276,18 +279,6 @@ export const useEditorAssistant: UseEditorAssistant = () => {
     }
   }, [detectedDiff]);
 
-  // Disable UnifiedMergeView when starting to write text in Form while UnifiedMergeView is enabled
-  useEffect(() => {
-    const subscription = form.watch(
-      (formData) => {
-        if (formData.input != null && formData.input.length > 0 && isEnableUnifiedMergeView) {
-          mutateIsEnableUnifiedMergeView(false);
-        }
-      },
-    );
-    return () => subscription.unsubscribe();
-  }, [form, form.watch, isEnableUnifiedMergeView, mutateIsEnableUnifiedMergeView]);
-
   // Views
   const headerIcon = useMemo(() => {
     return <span className="material-symbols-outlined growi-ai-chat-icon me-3 fs-4">support_agent</span>;