Merge branch 'autocomplete' into beta

FreeFeed · Jun 27, 2024 · 43bce9e · 43bce9e
2 parents 657784d + 29bd8bc
commit 43bce9e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/components/autocomplete/autocomplete.jsx b/src/components/autocomplete/autocomplete.jsx
@@ -131,4 +131,5 @@ function replaceQuery(input, replacement) {
   input.setSelectionRange(newCaretPos, newCaretPos);
 
   input.dispatchEvent(new Event('input', { bubbles: true }));
+  input.updateStates?.();
 }
diff --git a/src/components/smart-textarea.jsx b/src/components/smart-textarea.jsx
@@ -63,7 +63,13 @@ export const SmartTextarea = forwardRef(function SmartTextarea(
     };
   }, [cancelEmptyDraftOnBlur, draftKey, ref]);
 
-  ref.current.insertText = useDebouncedInsert(100, ref, onText, draftKey);
+  // Public component methods
+  ref.current.insertText = useDebouncedInsert(100, ref);
+  ref.current.updateStates = useCallback(() => {
+    const text = ref.current.value;
+    onText?.(text);
+    draftKey && setDraftField(draftKey, 'text', text);
+  }, [draftKey, onText, ref]);
 
   useEffect(() => {
     if (!draftKey && !onText) {
@@ -242,7 +248,7 @@ function containsFiles(dndEvent) {
   return false;
 }
 
-function useDebouncedInsert(interval, inputRef, onText, draftKey) {
+function useDebouncedInsert(interval, inputRef) {
   const queue = useRef([]);
   const timer = useRef(0);
 
@@ -267,11 +273,8 @@ function useDebouncedInsert(interval, inputRef, onText, draftKey) {
     input.value = text;
     input.setSelectionRange(selStart, selEnd);
     input.focus();
-    onText?.(input.value);
-    if (draftKey) {
-      setDraftField(draftKey, 'text', input.value);
-    }
-  }, [draftKey, inputRef, onText]);
+    input.updateStates();
+  }, [inputRef]);
 
   return useCallback(
     (insertion) => {