fix(connectInfiniteHits): always provide an array for hits

algolia · Mar 9, 2018 · 5774ad5 · 5774ad5
1 parent 57be1b5
commit 5774ad5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/packages/react-instantsearch/src/connectors/connectInfiniteHits.js b/packages/react-instantsearch/src/connectors/connectInfiniteHits.js
@@ -43,17 +43,17 @@ export default createConnector({
   getProvidedProps(props, searchState, searchResults) {
     const results = getResults(searchResults, this.context);
 
+    this._allResults = this._allResults || [];
+
     if (!results) {
-      this._allResults = [];
       return {
-        hits: this._allResults,
+        hits: [],
         hasMore: false,
       };
     }
 
     const { hits, page, nbPages } = results;
 
-    // If it is the same page we do not touch the page result list
     if (page === 0) {
       this._allResults = hits;
     } else if (page > this.previousPage) {
@@ -64,7 +64,9 @@ export default createConnector({
 
     const lastPageIndex = nbPages - 1;
     const hasMore = page < lastPageIndex;
+
     this.previousPage = page;
+
     return {
       hits: this._allResults,
       hasMore,

diff --git a/packages/react-instantsearch/src/connectors/connectInfiniteHits.test.js b/packages/react-instantsearch/src/connectors/connectInfiniteHits.test.js
@@ -202,6 +202,33 @@ describe('connectInfiniteHits', () => {
       const state1 = refine(props, state0);
       expect(state1).toEqual({ page: 1 });
     });
+
+    it('expect to always return an array of hits', () => {
+      const context = createSingleIndexContext();
+      const getProvidedProps = connect.getProvidedProps.bind(context);
+
+      const props = {};
+      const searchState = {};
+
+      // Retrieve the results from the cache that's why
+      // the page it's not zero on the first render
+      const searchResults = {
+        results: {
+          hits: [{}, {}, {}],
+          page: 1,
+          nbPages: 3,
+        },
+      };
+
+      const expectation = {
+        hits: [],
+        hasMore: true,
+      };
+
+      const actual = getProvidedProps(props, searchState, searchResults);
+
+      expect(actual).toEqual(expectation);
+    });
   });
 
   describe('multi index', () => {