Call onSuggestionsFetchRequested onFocus only if shouldRenderSuggesti…

…ons returns true
moroshko · Aug 28, 2016 · 8cee3a1 · 8cee3a1
1 parent 7608db8
commit 8cee3a1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/src/Autosuggest.js b/src/Autosuggest.js
@@ -56,6 +56,7 @@ class Autosuggest extends Component {
   componentWillReceiveProps(nextProps) {
     if (shallowEqualArrays(nextProps.suggestions, this.props.suggestions)) {
       if (nextProps.focusFirstSuggestion &&
+          nextProps.suggestions.length > 0 &&
           nextProps.focusedSuggestionIndex === null &&
           nextProps.inputProps.value !== this.props.inputProps.value &&
           nextProps.valueBeforeUpDown === this.props.valueBeforeUpDown) {
@@ -286,7 +287,10 @@ class Autosuggest extends Component {
         if (!this.justSelectedSuggestion && !this.justClickedOnSuggestionsContainer) {
           inputFocused(shouldRenderSuggestions(value));
           onFocus && onFocus(event);
-          onSuggestionsFetchRequested({ value });
+
+          if (shouldRenderSuggestions(value)) {
+            onSuggestionsFetchRequested({ value });
+          }
         }
       },
       onBlur: event => {
@@ -304,7 +308,6 @@ class Autosuggest extends Component {
       },
       onChange: event => {
         const { value } = event.target;
-        const { shouldRenderSuggestions } = this.props;
         const shouldRender = shouldRenderSuggestions(value);
 
         this.maybeCallOnChange(event, value, 'type');

diff --git a/test/multi-section/AutosuggestApp.test.js b/test/multi-section/AutosuggestApp.test.js
@@ -67,6 +67,13 @@ describe('Autosuggest with multiSection={true}', () => {
   });
 
   describe('onSuggestionsFetchRequested', () => {
+    it('should be called once with the right parameters when input gets focus and shouldRenderSuggestions returns true', () => {
+      onSuggestionsFetchRequested.reset();
+      focusInput();
+      expect(onSuggestionsFetchRequested).to.have.been.calledOnce;
+      expect(onSuggestionsFetchRequested).to.have.been.calledWithExactly({ value: '' });
+    });
+
     it('should be called once with the right parameters when Escape is pressed and suggestions are hidden and shouldRenderSuggestions returns true for empty value', () => {
       focusAndSetInputValue('jr');
       onSuggestionsFetchRequested.reset();

diff --git a/test/plain-list/AutosuggestApp.test.js b/test/plain-list/AutosuggestApp.test.js
@@ -579,13 +579,6 @@ describe('Default Autosuggest', () => {
   });
 
   describe('onSuggestionsFetchRequested', () => {
-    it('should be called once with the right parameters when input gets focus', () => {
-      onSuggestionsFetchRequested.reset();
-      focusInput();
-      expect(onSuggestionsFetchRequested).to.have.been.calledOnce;
-      expect(onSuggestionsFetchRequested).to.have.been.calledWithExactly({ value: '' });
-    });
-
     it('should be called once with the right parameters when user types', () => {
       focusInput();
       onSuggestionsFetchRequested.reset();
@@ -603,6 +596,19 @@ describe('Default Autosuggest', () => {
       expect(onSuggestionsFetchRequested).to.have.been.calledWithExactly({ value: 'Javascript' });
     });
 
+    it('should not be called when input gets focus and shouldRenderSuggestions returns false', () => {
+      onSuggestionsFetchRequested.reset();
+      focusInput();
+      expect(onSuggestionsFetchRequested).not.to.have.been.called;
+    });
+
+    it('should not be called when user types and shouldRenderSuggestions returns false', () => {
+      focusInput();
+      onSuggestionsFetchRequested.reset();
+      setInputValue(' ');
+      expect(onSuggestionsFetchRequested).not.to.have.been.called;
+    });
+
     it('should not be called when Down is pressed to highlight the next suggestion', () => {
       focusAndSetInputValue('j');
       onSuggestionsFetchRequested.reset();
@@ -670,13 +676,6 @@ describe('Default Autosuggest', () => {
       clickEscape();
       expect(onSuggestionsFetchRequested).not.to.have.been.called;
     });
-
-    it('should not be called when shouldRenderSuggestions returns false', () => {
-      focusInput();
-      onSuggestionsFetchRequested.reset();
-      setInputValue(' ');
-      expect(onSuggestionsFetchRequested).not.to.have.been.called;
-    });
   });
 
   describe('onSuggestionsClearRequested', () => {