react-instantsearch-core 7.15.8 → 7.16.1

package/dist/cjs/components/InstantSearch.js

@@ -1,15 +1,17 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _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; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InstantSearch = InstantSearch;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _IndexContext = require("../lib/IndexContext");
 var _InstantSearchContext = require("../lib/InstantSearchContext");
 var _useInstantSearchApi = require("../lib/useInstantSearchApi");
 var _excluded = ["children"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; 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]; } } return target; }
 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]; } return target; }
 function InstantSearch(_ref) {
@@ -23,5 +25,16 @@ function InstantSearch(_ref) {
     value: search
   }, /*#__PURE__*/_react.default.createElement(_IndexContext.IndexContext.Provider, {
     value: search.mainIndex
-  }, children));
+  }, children, /*#__PURE__*/_react.default.createElement(ResetScheduleSearch, {
+    search: search
+  })));
+}
+function ResetScheduleSearch(_ref2) {
+  var search = _ref2.search;
+  (0, _react.useEffect)(function () {
+    if (search._resetScheduleSearch) {
+      search._resetScheduleSearch();
+    }
+  }, [search]);
+  return null;
 }

package/dist/cjs/hooks/useConnector.js

@@ -14,8 +14,9 @@ var _useInstantSearchServerContext = require("../lib/useInstantSearchServerConte
 var _useInstantSearchSSRContext = require("../lib/useInstantSearchSSRContext");
 var _useStableValue = require("../lib/useStableValue");
 var _useWidget = require("../lib/useWidget");
-var _excluded = ["instantSearchInstance", "widgetParams"],
-  _excluded2 = ["widgetParams"];
+var _excluded = ["skipSuspense"],
+  _excluded2 = ["instantSearchInstance", "widgetParams"],
+  _excluded3 = ["widgetParams"];
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -31,7 +32,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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]; } return target; }
 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(_ref, _excluded);
   var serverContext = (0, _useInstantSearchServerContext.useInstantSearchServerContext)();
   var ssrContext = (0, _useInstantSearchSSRContext.useInstantSearchSSRContext)();
   var search = (0, _useInstantSearchContext.useInstantSearchContext)();
@@ -65,7 +69,7 @@ function useConnector(connector) {
       if (shouldSetStateRef.current) {
         var instantSearchInstance = connectorState.instantSearchInstance,
           widgetParams = connectorState.widgetParams,
-          renderState = _objectWithoutProperties(connectorState, _excluded);
+          renderState = _objectWithoutProperties(connectorState, _excluded2);
 
         // We only update the state when a widget render state param changes,
         // except for functions. We ignore function reference changes to avoid
@@ -121,7 +125,7 @@ function useConnector(connector) {
             error: search.error
           }),
           widgetParams = _widget$getWidgetRend.widgetParams,
-          renderState = _objectWithoutProperties(_widget$getWidgetRend, _excluded2);
+          renderState = _objectWithoutProperties(_widget$getWidgetRend, _excluded3);
         return renderState;
       }
       return {};
@@ -133,7 +137,8 @@ function useConnector(connector) {
     widget: widget,
     parentIndex: parentIndex,
     props: stableProps,
-    shouldSsr: Boolean(serverContext)
+    shouldSsr: Boolean(serverContext),
+    skipSuspense: skipSuspense
   });
   return state;
 }

package/dist/cjs/index.js

@@ -457,6 +457,18 @@ Object.keys(_InstantSearchRSCContext).forEach(function (key) {
     }
   });
 });
+var _InstantSearchSSRContext = require("./lib/InstantSearchSSRContext");
+Object.keys(_InstantSearchSSRContext).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _InstantSearchSSRContext[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _InstantSearchSSRContext[key];
+    }
+  });
+});
 var _server = require("./server");
 Object.keys(_server).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/dist/cjs/lib/InstantSearchRSCContext.js

@@ -5,4 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.InstantSearchRSCContext = void 0;
 var _react = require("react");
-var InstantSearchRSCContext = exports.InstantSearchRSCContext = /*#__PURE__*/(0, _react.createContext)(null);
+var InstantSearchRSCContext = exports.InstantSearchRSCContext = /*#__PURE__*/(0, _react.createContext)({
+  countRef: {
+    current: 0
+  },
+  waitForResultsRef: null,
+  ignoreMultipleHooksWarning: false
+});

package/dist/cjs/lib/useIndex.js

@@ -32,7 +32,8 @@ function useIndex(props) {
     widget: indexWidget,
     parentIndex: parentIndex,
     props: stableProps,
-    shouldSsr: Boolean(serverContext || initialResults)
+    shouldSsr: Boolean(serverContext || initialResults),
+    skipSuspense: true
   });
   return indexWidget;
 }

package/dist/cjs/lib/useInstantSearchApi.js

@@ -12,7 +12,7 @@ var _dequal = require("./dequal");
 var _useForceUpdate = require("./useForceUpdate");
 var _useInstantSearchServerContext = require("./useInstantSearchServerContext");
 var _useInstantSearchSSRContext = require("./useInstantSearchSSRContext");
-var _useRSCContext = require("./useRSCContext");
+var _useRSCContext2 = require("./useRSCContext");
 var _warn = require("./warn");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -32,15 +32,16 @@ function useInstantSearchApi(props) {
   var forceUpdate = (0, _useForceUpdate.useForceUpdate)();
   var serverContext = (0, _useInstantSearchServerContext.useInstantSearchServerContext)();
   var serverState = (0, _useInstantSearchSSRContext.useInstantSearchSSRContext)();
-  var waitingForResultsRef = (0, _useRSCContext.useRSCContext)();
+  var _useRSCContext = (0, _useRSCContext2.useRSCContext)(),
+    waitForResultsRef = _useRSCContext.waitForResultsRef;
   var initialResults = serverState === null || serverState === void 0 ? void 0 : serverState.initialResults;
   var prevPropsRef = (0, _react.useRef)(props);
-  var shouldRenderAtOnce = serverContext || initialResults || waitingForResultsRef;
+  var shouldRenderAtOnce = serverContext || initialResults || waitForResultsRef;
   var searchRef = (0, _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) {
@@ -67,6 +68,10 @@ function useInstantSearchApi(props) {
       // an additional network request. (This is equivalent to monkey-patching
       // `scheduleSearch` to a noop.)
       search._initialResults = initialResults || {};
+      // We don't rely on the `defer` to reset the schedule search, but will call
+      // `search._resetScheduleSearch()` manually in the effect after children
+      // mount in `InstantSearch`.
+      search._manuallyResetScheduleSearch = true;
     }
     addAlgoliaAgents(props.searchClient, [].concat(defaultUserAgents, [serverContext && serverUserAgent, nextUserAgent(getNextVersion())]));
 
@@ -84,7 +89,7 @@ function useInstantSearchApi(props) {
       });
     }
     warnNextRouter(props.routing);
-    warnNextAppDir(Boolean(waitingForResultsRef));
+    warnNextAppDir(Boolean(waitForResultsRef));
     searchRef.current = search;
   }
   {
@@ -151,6 +156,9 @@ function useInstantSearchApi(props) {
       search._preventWidgetCleanup = false;
     }
     return function () {
+      if (serverState !== null && serverState !== void 0 && serverState.ssrSearchRef) {
+        return;
+      }
       function cleanup() {
         search.dispose();
       }
@@ -162,13 +170,12 @@ function useInstantSearchApi(props) {
       // 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;
@@ -200,7 +207,7 @@ function warnNextAppDir(isRscContextDefined) {
   if (!(process.env.NODE_ENV === 'development') || typeof window === 'undefined' || isRscContextDefined) {
     return;
   }
-  process.env.NODE_ENV === 'development' ? (0, _warn.warn)(Boolean((_next = window.next) === null || _next === void 0 ? void 0 : _next.appDir) === false, "\nWe've detected you are using Next.js with the App Router.\nWe released an **experimental** package called \"react-instantsearch-nextjs\" that makes SSR work with the App Router.\nPlease check its usage instructions: https://www.algolia.com/doc/guides/building-search-ui/going-further/server-side-rendering/react/#with-nextjs\n\nThis warning will not be outputted in production builds.") : void 0;
+  process.env.NODE_ENV === 'development' ? (0, _warn.warn)(Boolean((_next = window.next) === null || _next === void 0 ? void 0 : _next.appDir) === false, "\nWe've detected you are using Next.js with the App Router.\nWe released a package called \"react-instantsearch-nextjs\" that makes SSR work with the App Router.\nPlease check its usage instructions: https://www.algolia.com/doc/guides/building-search-ui/going-further/server-side-rendering/react/#with-nextjs-app-router\n\nThis warning will not be outputted in production builds.") : void 0;
 }
 
 /**

package/dist/cjs/lib/useWidget.js

@@ -9,14 +9,19 @@ var _dequal = require("./dequal");
 var _use = require("./use");
 var _useInstantSearchContext = require("./useInstantSearchContext");
 var _useIsomorphicLayoutEffect = require("./useIsomorphicLayoutEffect");
-var _useRSCContext = require("./useRSCContext");
+var _useRSCContext2 = require("./useRSCContext");
+var _warn = require("./warn");
 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 = (0, _useRSCContext.useRSCContext)();
+    shouldSsr = _ref.shouldSsr,
+    skipSuspense = _ref.skipSuspense;
+  var _useRSCContext = (0, _useRSCContext2.useRSCContext)(),
+    waitForResultsRef = _useRSCContext.waitForResultsRef,
+    countRef = _useRSCContext.countRef,
+    ignoreMultipleHooksWarning = _useRSCContext.ignoreMultipleHooksWarning;
   var prevPropsRef = (0, _react.useRef)(props);
   (0, _react.useEffect)(function () {
     prevPropsRef.current = props;
@@ -76,18 +81,20 @@ function useWidget(_ref) {
       });
     };
   }, [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;
-    (0, _use.use)(waitingForResultsRef.current);
+    (0, _use.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) {
-      (0, _use.use)(waitingForResultsRef.current);
+      (0, _use.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;
+    process.env.NODE_ENV === 'development' ? (0, _warn.warn)(countRef.current > parentIndex.getWidgets().length && !ignoreMultipleHooksWarning, "We detected you may have a component with multiple InstantSearch hooks.\n\nWith Next.js, you need to set `skipSuspense` to `true` for all but the last hook in the component, otherwise, only the first hook will be rendered on the server.\n\nThis warning can be a false positive if you are using dynamic widgets or multi-index, in which case you can ignore it by setting `ignoreMultipleHooksWarning` to `true` in `<InstantSearchNext`.\n\nFor more information, see https://www.algolia.com/doc/guides/building-search-ui/going-further/server-side-rendering/react/#composing-hooks") : void 0;
+  }
 }

package/dist/cjs/version.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = exports.default = '7.15.8';
+var _default = exports.default = '7.16.1';

package/dist/es/components/InstantSearch.js

@@ -1,7 +1,7 @@
 var _excluded = ["children"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; 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]; } } return target; }
 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]; } return target; }
-import React from 'react';
+import React, { useEffect } from 'react';
 import { IndexContext } from "../lib/IndexContext.js";
 import { InstantSearchContext } from "../lib/InstantSearchContext.js";
 import { useInstantSearchApi } from "../lib/useInstantSearchApi.js";
@@ -16,5 +16,16 @@ export function InstantSearch(_ref) {
     value: search
   }, /*#__PURE__*/React.createElement(IndexContext.Provider, {
     value: search.mainIndex
-  }, children));
+  }, children, /*#__PURE__*/React.createElement(ResetScheduleSearch, {
+    search: search
+  })));
+}
+function ResetScheduleSearch(_ref2) {
+  var search = _ref2.search;
+  useEffect(function () {
+    if (search._resetScheduleSearch) {
+      search._resetScheduleSearch();
+    }
+  }, [search]);
+  return null;
 }

package/dist/es/hooks/useConnector.d.ts

@@ -1,3 +1,5 @@
 import type { Connector, Widget, WidgetDescription } from 'instantsearch.js';
-export type AdditionalWidgetProperties = Partial<Widget<WidgetDescription>>;
-export declare function useConnector<TProps extends Record<string, unknown>, TDescription extends WidgetDescription>(connector: Connector<TDescription, TProps>, props?: TProps, additionalWidgetProperties?: AdditionalWidgetProperties): TDescription['renderState'];
+export type AdditionalWidgetProperties = Partial<Widget<WidgetDescription>> & {
+    skipSuspense?: boolean;
+};
+export declare function useConnector<TProps extends Record<string, unknown>, TDescription extends WidgetDescription>(connector: Connector<TDescription, TProps>, props?: TProps, { skipSuspense, ...additionalWidgetProperties }?: AdditionalWidgetProperties): TDescription['renderState'];

package/dist/es/hooks/useConnector.js

@@ -1,6 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _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; }, _typeof(o); }
-var _excluded = ["instantSearchInstance", "widgetParams"],
-  _excluded2 = ["widgetParams"];
+var _excluded = ["skipSuspense"],
+  _excluded2 = ["instantSearchInstance", "widgetParams"],
+  _excluded3 = ["widgetParams"];
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -25,7 +26,10 @@ import { useStableValue } from "../lib/useStableValue.js";
 import { useWidget } from "../lib/useWidget.js";
 export 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(_ref, _excluded);
   var serverContext = useInstantSearchServerContext();
   var ssrContext = useInstantSearchSSRContext();
   var search = useInstantSearchContext();
@@ -59,7 +63,7 @@ export function useConnector(connector) {
       if (shouldSetStateRef.current) {
         var instantSearchInstance = connectorState.instantSearchInstance,
           widgetParams = connectorState.widgetParams,
-          renderState = _objectWithoutProperties(connectorState, _excluded);
+          renderState = _objectWithoutProperties(connectorState, _excluded2);
 
         // We only update the state when a widget render state param changes,
         // except for functions. We ignore function reference changes to avoid
@@ -115,7 +119,7 @@ export function useConnector(connector) {
             error: search.error
           }),
           widgetParams = _widget$getWidgetRend.widgetParams,
-          renderState = _objectWithoutProperties(_widget$getWidgetRend, _excluded2);
+          renderState = _objectWithoutProperties(_widget$getWidgetRend, _excluded3);
         return renderState;
       }
       return {};
@@ -127,7 +131,8 @@ export function useConnector(connector) {
     widget: widget,
     parentIndex: parentIndex,
     props: stableProps,
-    shouldSsr: Boolean(serverContext)
+    shouldSsr: Boolean(serverContext),
+    skipSuspense: skipSuspense
   });
   return state;
 }

package/dist/es/index.d.ts

@@ -36,4 +36,5 @@ export * from './lib/wrapPromiseWithState';
 export * from './lib/useInstantSearchContext';
 export * from './lib/useRSCContext';
 export * from './lib/InstantSearchRSCContext';
+export * from './lib/InstantSearchSSRContext';
 export * from './server';

package/dist/es/index.js

@@ -36,4 +36,5 @@ export * from "./lib/wrapPromiseWithState.js";
 export * from "./lib/useInstantSearchContext.js";
 export * from "./lib/useRSCContext.js";
 export * from "./lib/InstantSearchRSCContext.js";
+export * from "./lib/InstantSearchSSRContext.js";
 export * from "./server/index.js";

package/dist/es/lib/InstantSearchRSCContext.d.ts

@@ -1,4 +1,8 @@
 import type { PromiseWithState } from './wrapPromiseWithState';
-import type { MutableRefObject } from 'react';
-export type InstantSearchRSCContextApi = MutableRefObject<PromiseWithState<void> | null> | null;
+import type { RefObject } from 'react';
+export type InstantSearchRSCContextApi = {
+    waitForResultsRef: RefObject<PromiseWithState<void> | null> | null;
+    countRef: RefObject<number>;
+    ignoreMultipleHooksWarning: boolean;
+};
 export declare const InstantSearchRSCContext: import("react").Context<InstantSearchRSCContextApi>;

package/dist/es/lib/InstantSearchRSCContext.js

@@ -1,2 +1,8 @@
 import { createContext } from 'react';
-export var InstantSearchRSCContext = /*#__PURE__*/createContext(null);
+export var InstantSearchRSCContext = /*#__PURE__*/createContext({
+  countRef: {
+    current: 0
+  },
+  waitForResultsRef: null,
+  ignoreMultipleHooksWarning: false
+});

package/dist/es/lib/useIndex.js

@@ -25,7 +25,8 @@ export function useIndex(props) {
     widget: indexWidget,
     parentIndex: parentIndex,
     props: stableProps,
-    shouldSsr: Boolean(serverContext || initialResults)
+    shouldSsr: Boolean(serverContext || initialResults),
+    skipSuspense: true
   });
   return indexWidget;
 }

package/dist/es/lib/useInstantSearchApi.js

@@ -23,15 +23,16 @@ export function useInstantSearchApi(props) {
   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 = useRef(props);
-  var shouldRenderAtOnce = serverContext || initialResults || waitingForResultsRef;
+  var shouldRenderAtOnce = serverContext || initialResults || waitForResultsRef;
   var searchRef = 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) {
@@ -58,6 +59,10 @@ export function useInstantSearchApi(props) {
       // an additional network request. (This is equivalent to monkey-patching
       // `scheduleSearch` to a noop.)
       search._initialResults = initialResults || {};
+      // We don't rely on the `defer` to reset the schedule search, but will call
+      // `search._resetScheduleSearch()` manually in the effect after children
+      // mount in `InstantSearch`.
+      search._manuallyResetScheduleSearch = true;
     }
     addAlgoliaAgents(props.searchClient, [].concat(defaultUserAgents, [serverContext && serverUserAgent, nextUserAgent(getNextVersion())]));
 
@@ -75,7 +80,7 @@ export function useInstantSearchApi(props) {
       });
     }
     warnNextRouter(props.routing);
-    warnNextAppDir(Boolean(waitingForResultsRef));
+    warnNextAppDir(Boolean(waitForResultsRef));
     searchRef.current = search;
   }
   {
@@ -142,6 +147,9 @@ export function useInstantSearchApi(props) {
       search._preventWidgetCleanup = false;
     }
     return function () {
+      if (serverState !== null && serverState !== void 0 && serverState.ssrSearchRef) {
+        return;
+      }
       function cleanup() {
         search.dispose();
       }
@@ -153,13 +161,12 @@ export function useInstantSearchApi(props) {
       // 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;
@@ -191,7 +198,7 @@ function warnNextAppDir(isRscContextDefined) {
   if (!(process.env.NODE_ENV === 'development') || typeof window === 'undefined' || isRscContextDefined) {
     return;
   }
-  process.env.NODE_ENV === 'development' ? warn(Boolean((_next = window.next) === null || _next === void 0 ? void 0 : _next.appDir) === false, "\nWe've detected you are using Next.js with the App Router.\nWe released an **experimental** package called \"react-instantsearch-nextjs\" that makes SSR work with the App Router.\nPlease check its usage instructions: https://www.algolia.com/doc/guides/building-search-ui/going-further/server-side-rendering/react/#with-nextjs\n\nThis warning will not be outputted in production builds.") : void 0;
+  process.env.NODE_ENV === 'development' ? warn(Boolean((_next = window.next) === null || _next === void 0 ? void 0 : _next.appDir) === false, "\nWe've detected you are using Next.js with the App Router.\nWe released a package called \"react-instantsearch-nextjs\" that makes SSR work with the App Router.\nPlease check its usage instructions: https://www.algolia.com/doc/guides/building-search-ui/going-further/server-side-rendering/react/#with-nextjs-app-router\n\nThis warning will not be outputted in production builds.") : void 0;
 }
 
 /**

package/dist/es/lib/useWidget.d.ts

@@ -1,8 +1,9 @@
 import type { Widget } from 'instantsearch.js';
 import type { IndexWidget } from 'instantsearch.js/es/widgets/index/index';
-export declare function useWidget<TWidget extends Widget | IndexWidget, TProps>({ widget, parentIndex, props, shouldSsr, }: {
+export declare function useWidget<TWidget extends Widget | IndexWidget, TProps>({ widget, parentIndex, props, shouldSsr, skipSuspense, }: {
     widget: TWidget;
     parentIndex: IndexWidget;
     props: TProps;
     shouldSsr: boolean;
+    skipSuspense: boolean;
 }): void;

package/dist/es/lib/useWidget.js

@@ -4,13 +4,18 @@ import { use } from "./use.js";
 import { useInstantSearchContext } from "./useInstantSearchContext.js";
 import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect.js";
 import { useRSCContext } from "./useRSCContext.js";
+import { warn } from "./warn.js";
 export 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 = useRef(props);
   useEffect(function () {
     prevPropsRef.current = props;
@@ -70,18 +75,20 @@ export function useWidget(_ref) {
       });
     };
   }, [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;
+    process.env.NODE_ENV === 'development' ? warn(countRef.current > parentIndex.getWidgets().length && !ignoreMultipleHooksWarning, "We detected you may have a component with multiple InstantSearch hooks.\n\nWith Next.js, you need to set `skipSuspense` to `true` for all but the last hook in the component, otherwise, only the first hook will be rendered on the server.\n\nThis warning can be a false positive if you are using dynamic widgets or multi-index, in which case you can ignore it by setting `ignoreMultipleHooksWarning` to `true` in `<InstantSearchNext`.\n\nFor more information, see https://www.algolia.com/doc/guides/building-search-ui/going-further/server-side-rendering/react/#composing-hooks") : void 0;
+  }
 }

package/dist/es/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "7.15.8";
+declare const _default: "7.16.1";
 export default _default;

package/dist/es/version.js

@@ -1 +1 @@
-export default '7.15.8';
+export default '7.16.1';