fix(trigger): fixed output function performance (#106)

close #104
webscopeio · Nov 25, 2018 · c209192 · c209192
1 parent 7aed1ec
commit c209192
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Textarea.jsx b/src/Textarea.jsx
@@ -71,6 +71,7 @@ class ReactTextareaAutocomplete extends React.Component<
     selectionEnd: 0,
     selectionStart: 0,
     component: null,
+    textToReplace: null,
   };
 
   componentDidMount() {
@@ -217,9 +218,14 @@ class ReactTextareaAutocomplete extends React.Component<
     );
   };
 
-  _getTextToReplace = (): ?outputType => {
-    const { currentTrigger, actualToken } = this.state;
-    const triggerSettings = this._getCurrentTriggerSettings();
+  _getTextToReplace = ({
+    actualToken,
+    currentTrigger,
+  }: {|
+    actualToken: string,
+    currentTrigger: string,
+  |}): ?outputType => {
+    const triggerSettings = this.props.trigger[currentTrigger];
 
     if (!currentTrigger || !triggerSettings) return null;
 
@@ -543,6 +549,10 @@ class ReactTextareaAutocomplete extends React.Component<
         selectionEnd,
         selectionStart,
         currentTrigger,
+        textToReplace: this._getTextToReplace({
+          actualToken,
+          currentTrigger,
+        }),
         actualToken,
       },
       () => {
@@ -648,10 +658,10 @@ class ReactTextareaAutocomplete extends React.Component<
       currentTrigger,
       component,
       value,
+      textToReplace,
     } = this.state;
 
     const suggestionData = this._getSuggestions();
-    const textToReplace = this._getTextToReplace();
 
     return (
       <div

diff --git a/src/types.js b/src/types.js
@@ -102,4 +102,5 @@ export type TextareaState = {
   selectionEnd: number,
   selectionStart: number,
   component: ?React$StatelessFunctionalComponent<*>,
+  textToReplace: ?outputType,
 };