fix(connectQueryRules): fix crash when using connectQueryRules with m…

…ultiple indexes (#2903)
algolia · Mar 27, 2020 · c66d612 · c66d612
1 parent b7e104d
commit c66d612
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/packages/react-instantsearch-core/src/connectors/__tests__/connectQueryRules.ts b/packages/react-instantsearch-core/src/connectors/__tests__/connectQueryRules.ts
@@ -622,6 +622,24 @@ Consider using \`transformRuleContexts\` to minimize the number of rules sent to
           'ais-price-3000',
         ]);
       });
+
+      it('sets empty ruleContexts without search state', () => {
+        const props: ConnectedProps<QueryRulesProps> = {
+          ...defaultPropsMultiIndex,
+          trackedFilters: {
+            price: values => values,
+          },
+        };
+        const searchState = {};
+
+        const searchParameters = connect.getSearchParameters(
+          new SearchParameters(),
+          props,
+          searchState
+        );
+
+        expect(searchParameters.ruleContexts).toEqual([]);
+      });
     });
 
     describe('transformRuleContexts', () => {

diff --git a/packages/react-instantsearch-core/src/connectors/connectQueryRules.ts b/packages/react-instantsearch-core/src/connectors/connectQueryRules.ts
@@ -157,17 +157,18 @@ export default createConnector({
       return searchParameters;
     }
 
-    const indexSearchState = hasMultipleIndices({
-      ais: props.contextValue,
-      multiIndexContext: props.indexContextValue,
-    })
-      ? searchState.indices[
-          getIndexId({
-            ais: props.contextValue,
-            multiIndexContext: props.indexContextValue,
-          })
-        ]
-      : searchState;
+    const indexSearchState =
+      hasMultipleIndices({
+        ais: props.contextValue,
+        multiIndexContext: props.indexContextValue,
+      }) && searchState.indices
+        ? searchState.indices[
+            getIndexId({
+              ais: props.contextValue,
+              multiIndexContext: props.indexContextValue,
+            })
+          ]
+        : searchState;
 
     const newRuleContexts = getRuleContextsFromTrackedFilters({
       searchState: indexSearchState,