react-instantsearch 7.16.0 → 7.16.2

package/dist/umd/ReactInstantSearch.js

@@ -7,7 +7,7 @@
 
   var React__default = 'default' in React ? React['default'] : React;
 
-  var version = '7.16.0';
+  var version = '7.16.2';
 
   // Copyright Joyent, Inc. and other Node contributors.
   //
@@ -9575,19 +9575,29 @@
    */
   var useIsomorphicLayoutEffect = typeof window !== 'undefined' ? React.useLayoutEffect : React.useEffect;
 
-  var InstantSearchRSCContext = /*#__PURE__*/React.createContext(null);
+  var InstantSearchRSCContext = /*#__PURE__*/React.createContext({
+    countRef: {
+      current: 0
+    },
+    waitForResultsRef: null,
+    ignoreMultipleHooksWarning: false
+  });
 
   function useRSCContext() {
     return React.useContext(InstantSearchRSCContext);
   }
 
   function useWidget(_ref) {
-    var _waitingForResultsRef;
+    var _waitForResultsRef$cu, _waitForResultsRef$cu2;
     var widget = _ref.widget,
       parentIndex = _ref.parentIndex,
       props = _ref.props,
-      shouldSsr = _ref.shouldSsr;
-    var waitingForResultsRef = useRSCContext();
+      shouldSsr = _ref.shouldSsr,
+      skipSuspense = _ref.skipSuspense;
+    var _useRSCContext = useRSCContext(),
+      waitForResultsRef = _useRSCContext.waitForResultsRef,
+      countRef = _useRSCContext.countRef,
+      ignoreMultipleHooksWarning = _useRSCContext.ignoreMultipleHooksWarning;
     var prevPropsRef = React.useRef(props);
     React.useEffect(function () {
       prevPropsRef.current = props;
@@ -9647,20 +9657,21 @@
         });
       };
     }, [parentIndex, widget, shouldSsr, search, props]);
-    if (shouldAddWidgetEarly || (waitingForResultsRef === null || waitingForResultsRef === void 0 ? void 0 : (_waitingForResultsRef = waitingForResultsRef.current) === null || _waitingForResultsRef === void 0 ? void 0 : _waitingForResultsRef.status) === 'pending') {
+    if (shouldAddWidgetEarly || (waitForResultsRef === null || waitForResultsRef === void 0 ? void 0 : (_waitForResultsRef$cu = waitForResultsRef.current) === null || _waitForResultsRef$cu === void 0 ? void 0 : _waitForResultsRef$cu.status) === 'pending') {
       parentIndex.addWidgets([widget]);
     }
-    if (typeof window === 'undefined' && waitingForResultsRef !== null && waitingForResultsRef !== void 0 && waitingForResultsRef.current &&
-    // We need the widgets contained in the index to be added before we trigger the search request.
-    widget.$$type !== 'ais.index') {
+    if (waitForResultsRef !== null && waitForResultsRef !== void 0 && waitForResultsRef.current && !skipSuspense) {
       var _search$helper;
-      use(waitingForResultsRef.current);
+      use(waitForResultsRef.current);
       // If we made a second request because of DynamicWidgets, we need to wait for the second result,
       // except for DynamicWidgets itself which needs to render its children after the first result.
       if (widget.$$type !== 'ais.dynamicWidgets' && (_search$helper = search.helper) !== null && _search$helper !== void 0 && _search$helper.lastResults) {
-        use(waitingForResultsRef.current);
+        use(waitForResultsRef.current);
       }
     }
+    if ((waitForResultsRef === null || waitForResultsRef === void 0 ? void 0 : (_waitForResultsRef$cu2 = waitForResultsRef.current) === null || _waitForResultsRef$cu2 === void 0 ? void 0 : _waitForResultsRef$cu2.status) === 'fulfilled') {
+      countRef.current += 1;
+    }
   }
 
   function _typeof$d(o) {
@@ -9672,8 +9683,9 @@
       return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
     }, _typeof$d(o);
   }
-  var _excluded$1 = ["instantSearchInstance", "widgetParams"],
-    _excluded2 = ["widgetParams"];
+  var _excluded$1 = ["skipSuspense"],
+    _excluded2 = ["instantSearchInstance", "widgetParams"],
+    _excluded3 = ["widgetParams"];
   function _slicedToArray$5(arr, i) {
     return _arrayWithHoles$5(arr) || _iterableToArrayLimit$5(arr, i) || _unsupportedIterableToArray$6(arr, i) || _nonIterableRest$5();
   }
@@ -9801,7 +9813,10 @@
   }
   function useConnector(connector) {
     var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var additionalWidgetProperties = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      _ref$skipSuspense = _ref.skipSuspense,
+      skipSuspense = _ref$skipSuspense === void 0 ? false : _ref$skipSuspense,
+      additionalWidgetProperties = _objectWithoutProperties$1(_ref, _excluded$1);
     var serverContext = useInstantSearchServerContext();
     var ssrContext = useInstantSearchSSRContext();
     var search = useInstantSearchContext();
@@ -9835,7 +9850,7 @@
         if (shouldSetStateRef.current) {
           var instantSearchInstance = connectorState.instantSearchInstance,
             widgetParams = connectorState.widgetParams,
-            renderState = _objectWithoutProperties$1(connectorState, _excluded$1);
+            renderState = _objectWithoutProperties$1(connectorState, _excluded2);
 
           // We only update the state when a widget render state param changes,
           // except for functions. We ignore function reference changes to avoid
@@ -9891,7 +9906,7 @@
               error: search.error
             }),
             widgetParams = _widget$getWidgetRend.widgetParams,
-            renderState = _objectWithoutProperties$1(_widget$getWidgetRend, _excluded2);
+            renderState = _objectWithoutProperties$1(_widget$getWidgetRend, _excluded3);
           return renderState;
         }
         return {};
@@ -9903,7 +9918,8 @@
       widget: widget,
       parentIndex: parentIndex,
       props: stableProps,
-      shouldSsr: Boolean(serverContext)
+      shouldSsr: Boolean(serverContext),
+      skipSuspense: skipSuspense
     });
     return state;
   }
@@ -11118,7 +11134,8 @@
       widget: indexWidget,
       parentIndex: parentIndex,
       props: stableProps,
-      shouldSsr: Boolean(serverContext || initialResults)
+      shouldSsr: Boolean(serverContext || initialResults),
+      skipSuspense: true
     });
     return indexWidget;
   }
@@ -13451,7 +13468,7 @@
     };
   }
 
-  var version$3 = '4.79.0';
+  var version$3 = '4.79.2';
 
   function _typeof$q(o) {
     "@babel/helpers - typeof";
@@ -14307,15 +14324,16 @@
     var forceUpdate = useForceUpdate();
     var serverContext = useInstantSearchServerContext();
     var serverState = useInstantSearchSSRContext();
-    var waitingForResultsRef = useRSCContext();
+    var _useRSCContext = useRSCContext(),
+      waitForResultsRef = _useRSCContext.waitForResultsRef;
     var initialResults = serverState === null || serverState === void 0 ? void 0 : serverState.initialResults;
     var prevPropsRef = React.useRef(props);
-    var shouldRenderAtOnce = serverContext || initialResults || waitingForResultsRef;
+    var shouldRenderAtOnce = serverContext || initialResults || waitForResultsRef;
     var searchRef = React.useRef(null);
     // As we need to render on mount with SSR, using the local ref above in `StrictMode` will
     // create and start two instances of InstantSearch. To avoid this, we instead discard it and use
     // an upward ref from `InstantSearchSSRContext` as it has already been mounted a second time at this point.
-    if (serverState) {
+    if (serverState !== null && serverState !== void 0 && serverState.ssrSearchRef) {
       searchRef = serverState.ssrSearchRef;
     }
     if (searchRef.current === null) {
@@ -14428,6 +14446,9 @@
         search._preventWidgetCleanup = false;
       }
       return function () {
+        if (serverState !== null && serverState !== void 0 && serverState.ssrSearchRef) {
+          return;
+        }
         function cleanup() {
           search.dispose();
         }
@@ -14439,13 +14460,12 @@
         // in the next effect.
         // (There might be better ways to do this.)
         cleanupTimerRef.current = setTimeout(cleanup);
-
         // We need to prevent the `useWidget` cleanup function so that widgets
         // are not removed before the instance is disposed, triggering
         // an unwanted search request.
         search._preventWidgetCleanup = true;
       };
-    }, [forceUpdate]), function () {
+    }, [forceUpdate, serverState]), function () {
       return searchRef.current;
     }, function () {
       return searchRef.current;
@@ -16776,22 +16796,20 @@
           return Math.max.apply(Math, [page].concat(_toConsumableArray$6(pages)));
         }
       };
-      var getShowPrevious = function getShowPrevious(helper) {
+      var getShowPrevious = function getShowPrevious(helper, getCachedHits) {
         return function () {
+          var cachedHits = getCachedHits();
           // Using the helper's `overrideStateWithoutTriggeringChangeEvent` method
           // avoid updating the browser URL when the user displays the previous page.
           helper.overrideStateWithoutTriggeringChangeEvent(_objectSpread$v(_objectSpread$v({}, helper.state), {}, {
-            page: getFirstReceivedPage(helper.state, cache.read({
-              state: normalizeState(helper.state)
-            }) || {}) - 1
+            page: getFirstReceivedPage(helper.state, cachedHits) - 1
           })).searchWithoutTriggeringOnStateChange();
         };
       };
-      var getShowMore = function getShowMore(helper) {
+      var getShowMore = function getShowMore(helper, getCachedHits) {
         return function () {
-          helper.setPage(getLastReceivedPage(helper.state, cache.read({
-            state: normalizeState(helper.state)
-          }) || {}) + 1).search();
+          var cachedHits = getCachedHits();
+          helper.setPage(getLastReceivedPage(helper.state, cachedHits) + 1).search();
         };
       };
       return {
@@ -16823,6 +16841,12 @@
             parent = _ref6.parent,
             existingState = _ref6.state,
             instantSearchInstance = _ref6.instantSearchInstance;
+          var getCacheHits = function getCacheHits() {
+            var state = parent.getPreviousState() || existingState;
+            return cache.read({
+              state: normalizeState(state)
+            }) || {};
+          };
           var isFirstPage;
           var currentPageHits = [];
           /**
@@ -16831,13 +16855,15 @@
            * is loading.
            */
           var state = parent.getPreviousState() || existingState;
-          var cachedHits = cache.read({
-            state: normalizeState(state)
-          }) || {};
+          var cachedHits = getCacheHits();
           var banner = results === null || results === void 0 ? void 0 : (_results$renderingCon = results.renderingContent) === null || _results$renderingCon === void 0 ? void 0 : (_results$renderingCon2 = _results$renderingCon.widgets) === null || _results$renderingCon2 === void 0 ? void 0 : (_results$renderingCon3 = _results$renderingCon2.banners) === null || _results$renderingCon3 === void 0 ? void 0 : _results$renderingCon3[0];
           if (!showPrevious) {
-            showPrevious = getShowPrevious(helper);
-            showMore = getShowMore(helper);
+            showPrevious = function showPrevious() {
+              return getShowPrevious(helper, getCacheHits)();
+            };
+            showMore = function showMore() {
+              return getShowMore(helper, getCacheHits)();
+            };
           }
           if (!sendEvent) {
             sendEvent = createSendEventForHits({
@@ -21011,18 +21037,13 @@
 
   var _extends_1 = createCommonjsModule(function (module) {
   function _extends() {
-    module.exports = _extends = Object.assign ? Object.assign.bind() : function (target) {
-      for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i];
-        for (var key in source) {
-          if (Object.prototype.hasOwnProperty.call(source, key)) {
-            target[key] = source[key];
-          }
-        }
+    return module.exports = _extends = Object.assign ? Object.assign.bind() : function (n) {
+      for (var e = 1; e < arguments.length; e++) {
+        var t = arguments[e];
+        for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
       }
-      return target;
-    }, module.exports.__esModule = true, module.exports["default"] = module.exports;
-    return _extends.apply(this, arguments);
+      return n;
+    }, module.exports.__esModule = true, module.exports["default"] = module.exports, _extends.apply(null, arguments);
   }
   module.exports = _extends, module.exports.__esModule = true, module.exports["default"] = module.exports;
   });
@@ -21030,63 +21051,57 @@
   var _extends$2 = unwrapExports(_extends_1);
 
   var _typeof_1 = createCommonjsModule(function (module) {
-  function _typeof(obj) {
+  function _typeof(o) {
     "@babel/helpers - typeof";
 
-    return (module.exports = _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
-      return typeof obj;
-    } : function (obj) {
-      return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    }, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(obj);
+    return module.exports = _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+      return typeof o;
+    } : function (o) {
+      return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+    }, module.exports.__esModule = true, module.exports["default"] = module.exports, _typeof(o);
   }
   module.exports = _typeof, module.exports.__esModule = true, module.exports["default"] = module.exports;
   });
 
   unwrapExports(_typeof_1);
 
-  var toPrimitive = createCommonjsModule(function (module) {
+  var toPrimitive_1 = createCommonjsModule(function (module) {
   var _typeof = _typeof_1["default"];
-  function _toPrimitive(input, hint) {
-    if (_typeof(input) !== "object" || input === null) return input;
-    var prim = input[Symbol.toPrimitive];
-    if (prim !== undefined) {
-      var res = prim.call(input, hint || "default");
-      if (_typeof(res) !== "object") return res;
+  function toPrimitive(t, r) {
+    if ("object" != _typeof(t) || !t) return t;
+    var e = t[Symbol.toPrimitive];
+    if (void 0 !== e) {
+      var i = e.call(t, r || "default");
+      if ("object" != _typeof(i)) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return (hint === "string" ? String : Number)(input);
+    return ("string" === r ? String : Number)(t);
   }
-  module.exports = _toPrimitive, module.exports.__esModule = true, module.exports["default"] = module.exports;
+  module.exports = toPrimitive, module.exports.__esModule = true, module.exports["default"] = module.exports;
   });
 
-  unwrapExports(toPrimitive);
+  unwrapExports(toPrimitive_1);
 
-  var toPropertyKey = createCommonjsModule(function (module) {
+  var toPropertyKey_1 = createCommonjsModule(function (module) {
   var _typeof = _typeof_1["default"];
 
-  function _toPropertyKey(arg) {
-    var key = toPrimitive(arg, "string");
-    return _typeof(key) === "symbol" ? key : String(key);
+  function toPropertyKey(t) {
+    var i = toPrimitive_1(t, "string");
+    return "symbol" == _typeof(i) ? i : i + "";
   }
-  module.exports = _toPropertyKey, module.exports.__esModule = true, module.exports["default"] = module.exports;
+  module.exports = toPropertyKey, module.exports.__esModule = true, module.exports["default"] = module.exports;
   });
 
-  unwrapExports(toPropertyKey);
+  unwrapExports(toPropertyKey_1);
 
   var defineProperty = createCommonjsModule(function (module) {
-  function _defineProperty(obj, key, value) {
-    key = toPropertyKey(key);
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-    return obj;
+  function _defineProperty(e, r, t) {
+    return (r = toPropertyKey_1(r)) in e ? Object.defineProperty(e, r, {
+      value: t,
+      enumerable: !0,
+      configurable: !0,
+      writable: !0
+    }) : e[r] = t, e;
   }
   module.exports = _defineProperty, module.exports.__esModule = true, module.exports["default"] = module.exports;
   });
@@ -21094,17 +21109,14 @@
   var _defineProperty$N = unwrapExports(defineProperty);
 
   var objectWithoutPropertiesLoose = createCommonjsModule(function (module) {
-  function _objectWithoutPropertiesLoose(source, excluded) {
-    if (source == null) return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
-    for (i = 0; i < sourceKeys.length; i++) {
-      key = sourceKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      target[key] = source[key];
+  function _objectWithoutPropertiesLoose(r, e) {
+    if (null == r) return {};
+    var t = {};
+    for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+      if (-1 !== e.indexOf(n)) continue;
+      t[n] = r[n];
     }
-    return target;
+    return t;
   }
   module.exports = _objectWithoutPropertiesLoose, module.exports.__esModule = true, module.exports["default"] = module.exports;
   });
@@ -21112,20 +21124,16 @@
   unwrapExports(objectWithoutPropertiesLoose);
 
   var objectWithoutProperties = createCommonjsModule(function (module) {
-  function _objectWithoutProperties(source, excluded) {
-    if (source == null) return {};
-    var target = objectWithoutPropertiesLoose(source, excluded);
-    var key, i;
+  function _objectWithoutProperties(e, t) {
+    if (null == e) return {};
+    var o,
+      r,
+      i = objectWithoutPropertiesLoose(e, t);
     if (Object.getOwnPropertySymbols) {
-      var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-      for (i = 0; i < sourceSymbolKeys.length; i++) {
-        key = sourceSymbolKeys[i];
-        if (excluded.indexOf(key) >= 0) continue;
-        if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-        target[key] = source[key];
-      }
+      var n = Object.getOwnPropertySymbols(e);
+      for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
     }
-    return target;
+    return i;
   }
   module.exports = _objectWithoutProperties, module.exports.__esModule = true, module.exports["default"] = module.exports;
   });
@@ -23758,6 +23766,7 @@
   exports.InfiniteHits = InfiniteHits$1;
   exports.InstantSearch = InstantSearch$1;
   exports.InstantSearchRSCContext = InstantSearchRSCContext;
+  exports.InstantSearchSSRContext = InstantSearchSSRContext;
   exports.InstantSearchSSRProvider = InstantSearchSSRProvider;
   exports.InstantSearchServerContext = InstantSearchServerContext;
   exports.LookingSimilar = LookingSimilar;