react-instantsearch-nextjs 0.3.18 → 0.3.19

package/dist/cjs/InstantSearchNext.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.InstantSearchNext = InstantSearchNext;
 var _utils = require("instantsearch.js/cjs/lib/utils");
 var _headers = require("next/headers");
+var _navigation = require("next/navigation");
 var _react = _interopRequireWildcard(require("react"));
 var _reactInstantsearchCore = require("react-instantsearch-core");
 var _InitializePromise = require("./InitializePromise");
@@ -20,12 +21,20 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 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; }
 var InstantSearchInitialResults = Symbol.for('InstantSearchInitialResults');
+var InstantSearchLastPath = Symbol.for('InstantSearchLastPath');
 var _ref2 = /*#__PURE__*/_react.default.createElement(_TriggerSearch.TriggerSearch, null);
 function InstantSearchNext(_ref) {
   var children = _ref.children,
     passedRouting = _ref.routing,
     instantSearchProps = _objectWithoutProperties(_ref, _excluded);
   var isMounting = (0, _react.useRef)(true);
+  var isServer = typeof window === 'undefined';
+  var pathname = (0, _navigation.usePathname)();
+  var hasRouteChanged = !isServer && window[InstantSearchLastPath] && window[InstantSearchLastPath] !== pathname;
+
+  // We only want to trigger a search from a server environment
+  // or if a Next.js route change has happened on the client
+  var shouldTriggerSearch = isServer || hasRouteChanged;
   (0, _react.useEffect)(function () {
     isMounting.current = false;
     return function () {
@@ -33,6 +42,9 @@ function InstantSearchNext(_ref) {
       delete window[InstantSearchInitialResults];
     };
   }, []);
+  (0, _react.useEffect)(function () {
+    window[InstantSearchLastPath] = pathname;
+  }, [pathname]);
   var nonce = (0, _utils.safelyRunOnBrowser)(function () {
     return undefined;
   }, {
@@ -52,7 +64,7 @@ function InstantSearchNext(_ref) {
     initialResults: initialResults
   }, /*#__PURE__*/_react.default.createElement(_reactInstantsearchCore.InstantSearch, _extends({}, instantSearchProps, {
     routing: routing
-  }), !initialResults && /*#__PURE__*/_react.default.createElement(_InitializePromise.InitializePromise, {
+  }), shouldTriggerSearch && /*#__PURE__*/_react.default.createElement(_InitializePromise.InitializePromise, {
     nonce: nonce
-  }), children, !initialResults && _ref2)));
+  }), children, shouldTriggerSearch && _ref2)));
 }

package/dist/es/InstantSearchNext.d.ts

@@ -2,9 +2,11 @@ import type { InitialResults, StateMapping, UiState } from 'instantsearch.js';
 import type { BrowserHistoryArgs } from 'instantsearch.js/es/lib/routers/history';
 import type { InstantSearchProps } from 'react-instantsearch-core';
 declare const InstantSearchInitialResults: unique symbol;
+declare const InstantSearchLastPath: unique symbol;
 declare global {
     interface Window {
         [InstantSearchInitialResults]?: InitialResults;
+        [InstantSearchLastPath]?: string;
     }
 }
 export type InstantSearchNextRouting<TUiState, TRouteState> = {

package/dist/es/InstantSearchNext.js

@@ -4,6 +4,7 @@ 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; }
 import { safelyRunOnBrowser } from "instantsearch.js/es/lib/utils/index.js";
 import { headers } from "next/headers.js";
+import { usePathname } from "next/navigation.js";
 import React, { useEffect, useRef } from 'react';
 import { InstantSearch, InstantSearchRSCContext, InstantSearchSSRProvider } from 'react-instantsearch-core';
 import { InitializePromise } from "./InitializePromise.js";
@@ -11,12 +12,20 @@ import { TriggerSearch } from "./TriggerSearch.js";
 import { useInstantSearchRouting } from "./useInstantSearchRouting.js";
 import { warn } from "./warn.js";
 var InstantSearchInitialResults = Symbol.for('InstantSearchInitialResults');
+var InstantSearchLastPath = Symbol.for('InstantSearchLastPath');
 var _ref2 = /*#__PURE__*/React.createElement(TriggerSearch, null);
 export function InstantSearchNext(_ref) {
   var children = _ref.children,
     passedRouting = _ref.routing,
     instantSearchProps = _objectWithoutProperties(_ref, _excluded);
   var isMounting = useRef(true);
+  var isServer = typeof window === 'undefined';
+  var pathname = usePathname();
+  var hasRouteChanged = !isServer && window[InstantSearchLastPath] && window[InstantSearchLastPath] !== pathname;
+
+  // We only want to trigger a search from a server environment
+  // or if a Next.js route change has happened on the client
+  var shouldTriggerSearch = isServer || hasRouteChanged;
   useEffect(function () {
     isMounting.current = false;
     return function () {
@@ -24,6 +33,9 @@ export function InstantSearchNext(_ref) {
       delete window[InstantSearchInitialResults];
     };
   }, []);
+  useEffect(function () {
+    window[InstantSearchLastPath] = pathname;
+  }, [pathname]);
   var nonce = safelyRunOnBrowser(function () {
     return undefined;
   }, {
@@ -43,7 +55,7 @@ export function InstantSearchNext(_ref) {
     initialResults: initialResults
   }, /*#__PURE__*/React.createElement(InstantSearch, _extends({}, instantSearchProps, {
     routing: routing
-  }), !initialResults && /*#__PURE__*/React.createElement(InitializePromise, {
+  }), shouldTriggerSearch && /*#__PURE__*/React.createElement(InitializePromise, {
     nonce: nonce
-  }), children, !initialResults && _ref2)));
+  }), children, shouldTriggerSearch && _ref2)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-instantsearch-nextjs",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "description": "React InstantSearch SSR utilities for Next.js",
   "types": "dist/es/index.d.ts",
   "main": "dist/cjs/index.js",
@@ -49,13 +49,13 @@
     "watch:es": "yarn --silent build:es:base --watch"
   },
   "devDependencies": {
-    "instantsearch.js": "4.75.5",
+    "instantsearch.js": "4.75.6",
     "next": "13.5.1",
-    "react-instantsearch-core": "7.13.8"
+    "react-instantsearch-core": "7.13.9"
   },
   "peerDependencies": {
     "next": ">= 13.4 < 15",
     "react-instantsearch": ">= 7.1.0 < 8"
   },
-  "gitHead": "091acdc7b9d9d46ec6fac6ea3b84a30f6044605b"
+  "gitHead": "57abee485d8d8f7c0981a3fc9d12bb8537decd74"
 }