react-instantsearch-core 6.23.0 → 6.23.3

package/dist/cjs/connectors/connectBreadcrumb.js

@@ -34,9 +34,9 @@ function transformValue(values) {
     if (item.isRefined) {
       acc.push({
         label: item.name,
-        // If dealing with a nested "items", "value" is equal to the previous value concatenated with the current label
-        // If dealing with the first level, "value" is equal to the current label
-        value: item.path
+        // If dealing with a nested "items", "value" is equal to the previous value concatenated with the current value
+        // If dealing with the first level, "value" is equal to the current value
+        value: item.escapedValue
       }); // Create a variable in order to keep the same acc for the recursion, otherwise "reduce" returns a new one
 
       if (item.data) {

package/dist/cjs/connectors/connectHierarchicalMenu.js

@@ -17,6 +17,8 @@ var _createConnector = _interopRequireDefault(require("../core/createConnector")
 
 var _indexUtils = require("../core/indexUtils");
 
+var _utils = require("../core/utils");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -38,7 +40,7 @@ function getCurrentRefinement(props, searchState, context) {
   return currentRefinement;
 }
 
-function getValue(path, props, searchState, context) {
+function getValue(value, props, searchState, context) {
   var id = props.id,
       attributes = props.attributes,
       separator = props.separator,
@@ -48,7 +50,7 @@ function getValue(path, props, searchState, context) {
   var nextRefinement;
 
   if (currentRefinement === null) {
-    nextRefinement = path;
+    nextRefinement = value;
   } else {
     var tmpSearchParameters = new _algoliasearchHelper.default.SearchParameters({
       hierarchicalFacets: [{
@@ -59,7 +61,7 @@ function getValue(path, props, searchState, context) {
         showParentLevel: showParentLevel
       }]
     });
-    nextRefinement = tmpSearchParameters.toggleHierarchicalFacetRefinement(id, currentRefinement).toggleHierarchicalFacetRefinement(id, path).getHierarchicalRefinement(id)[0];
+    nextRefinement = tmpSearchParameters.toggleHierarchicalFacetRefinement(id, currentRefinement).toggleHierarchicalFacetRefinement(id, value).getHierarchicalRefinement(id)[0];
   }
 
   return nextRefinement;
@@ -69,7 +71,7 @@ function transformValue(value, props, searchState, context) {
   return value.map(function (v) {
     return {
       label: v.name,
-      value: getValue(v.path, props, searchState, context),
+      value: getValue(v.escapedValue, props, searchState, context),
       count: v.count,
       isRefined: v.isRefined,
       items: v.data && transformValue(v.data, props, searchState, context)
@@ -107,7 +109,7 @@ var sortBy = ['name:asc'];
  * websites. From a UX point of view, we suggest not displaying more than two levels deep.
  * @name connectHierarchicalMenu
  * @requirements To use this widget, your attributes must be formatted in a specific way.
- * If you want for example to have a hiearchical menu of categories, objects in your index
+ * If you want for example to have a hierarchical menu of categories, objects in your index
  * should be formatted this way:
  *
  * ```json
@@ -272,7 +274,7 @@ var _default = (0, _createConnector.default)({
       multiIndexContext: props.indexContextValue
     });
     var items = !currentRefinement ? [] : [{
-      label: "".concat(rootAttribute, ": ").concat(currentRefinement),
+      label: "".concat(rootAttribute, ": ").concat((0, _utils.unescapeFacetValue)(currentRefinement)),
       attribute: rootAttribute,
       value: function value(nextState) {
         return _refine(props, nextState, '', {

package/dist/cjs/connectors/connectMenu.js

@@ -15,6 +15,8 @@ var _createConnector = _interopRequireDefault(require("../core/createConnector")
 
 var _indexUtils = require("../core/indexUtils");
 
+var _utils = require("../core/utils");
+
 var namespace = 'menu';
 
 function getId(props) {
@@ -31,9 +33,9 @@ function getCurrentRefinement(props, searchState, context) {
   return currentRefinement;
 }
 
-function getValue(name, props, searchState, context) {
+function getValue(value, props, searchState, context) {
   var currentRefinement = getCurrentRefinement(props, searchState, context);
-  return name === currentRefinement ? '' : name;
+  return value === currentRefinement ? '' : value;
 }
 
 function getLimit(_ref) {
@@ -129,7 +131,7 @@ var _default = (0, _createConnector.default)({
       items = searchForFacetValuesResults[attribute].map(function (v) {
         return {
           label: v.value,
-          value: getValue(v.value, props, searchState, {
+          value: getValue(v.escapedValue, props, searchState, {
             ais: props.contextValue,
             multiIndexContext: props.indexContextValue
           }),
@@ -149,7 +151,7 @@ var _default = (0, _createConnector.default)({
       }).map(function (v) {
         return {
           label: v.name,
-          value: getValue(v.name, props, searchState, {
+          value: getValue(v.escapedValue, props, searchState, {
             ais: props.contextValue,
             multiIndexContext: props.indexContextValue
           }),
@@ -220,7 +222,7 @@ var _default = (0, _createConnector.default)({
         multiIndexContext: props.indexContextValue
       }),
       items: currentRefinement === null ? [] : [{
-        label: "".concat(props.attribute, ": ").concat(currentRefinement),
+        label: "".concat(props.attribute, ": ").concat((0, _utils.unescapeFacetValue)(currentRefinement)),
         attribute: props.attribute,
         value: function value(nextState) {
           return _refine(props, nextState, '', {

package/dist/cjs/connectors/connectRefinementList.js

@@ -15,6 +15,8 @@ var _createConnector = _interopRequireDefault(require("../core/createConnector")
 
 var _indexUtils = require("../core/indexUtils");
 
+var _utils = require("../core/utils");
+
 var namespace = 'refinementList';
 
 function getId(props) {
@@ -35,12 +37,12 @@ function getCurrentRefinement(props, searchState, context) {
   return [];
 }
 
-function getValue(name, props, searchState, context) {
+function getValue(value, props, searchState, context) {
   var currentRefinement = getCurrentRefinement(props, searchState, context);
-  var isAnewValue = currentRefinement.indexOf(name) === -1;
-  var nextRefinement = isAnewValue ? currentRefinement.concat([name]) // cannot use .push(), it mutates
+  var isAnewValue = currentRefinement.indexOf(value) === -1;
+  var nextRefinement = isAnewValue ? currentRefinement.concat([value]) // cannot use .push(), it mutates
   : currentRefinement.filter(function (selectedValue) {
-    return selectedValue !== name;
+    return selectedValue !== value;
   }); // cannot use .splice(), it mutates
 
   return nextRefinement;
@@ -150,7 +152,7 @@ var _default = (0, _createConnector.default)({
     var items = isFromSearch ? searchForFacetValuesResults[attribute].map(function (v) {
       return {
         label: v.value,
-        value: getValue(v.value, props, searchState, {
+        value: getValue(v.escapedValue, props, searchState, {
           ais: props.contextValue,
           multiIndexContext: props.indexContextValue
         }),
@@ -168,7 +170,7 @@ var _default = (0, _createConnector.default)({
     }).map(function (v) {
       return {
         label: v.name,
-        value: getValue(v.name, props, searchState, {
+        value: getValue(v.escapedValue, props, searchState, {
           ais: props.contextValue,
           multiIndexContext: props.indexContextValue
         }),
@@ -241,7 +243,7 @@ var _default = (0, _createConnector.default)({
         },
         items: getCurrentRefinement(props, searchState, context).map(function (item) {
           return {
-            label: "".concat(item),
+            label: (0, _utils.unescapeFacetValue)("".concat(item)),
             value: function value(nextState) {
               var nextSelectedItems = getCurrentRefinement(props, nextState, context).filter(function (other) {
                 return other !== item;

package/dist/cjs/core/createInstantSearchManager.js

@@ -125,6 +125,7 @@ function createInstantSearchManager(_ref) {
   var skip = false;
   var stalledSearchTimer = null;
   var initialSearchParameters = helper.state;
+  var searchCounter;
   var widgetsManager = (0, _createWidgetsManager.default)(onWidgetsUpdate);
   hydrateSearchClient(searchClient, resultsState);
   var store = (0, _createStore.default)({
@@ -210,12 +211,13 @@ function createInstantSearchManager(_ref) {
     if (!skip) {
       var _getSearchParameters = getSearchParameters(helper.state),
           mainParameters = _getSearchParameters.mainParameters,
-          derivedParameters = _getSearchParameters.derivedParameters; // We have to call `slice` because the method `detach` on the derived
+          derivedParameters = _getSearchParameters.derivedParameters;
+
+      searchCounter = derivedParameters.length + 1; // We have to call `slice` because the method `detach` on the derived
       // helpers mutates the value `derivedHelpers`. The `forEach` loop does
       // not iterate on each value and we're not able to correctly clear the
       // previous derived helpers (memory leak + useless requests).
 
-
       helper.derivedHelpers.slice().forEach(function (derivedHelper) {
         // Since we detach the derived helpers on **every** new search they
         // won't receive intermediate results in case of a stalled search.
@@ -251,6 +253,7 @@ function createInstantSearchManager(_ref) {
   function handleSearchSuccess(_ref3) {
     var indexId = _ref3.indexId;
     return function (event) {
+      searchCounter--;
       var state = store.getState();
       var isDerivedHelpersEmpty = !helper.derivedHelpers.length;
       var results = state.results ? state.results : {}; // Switching from mono index to multi index and vice versa must reset the
@@ -279,7 +282,7 @@ function createInstantSearchManager(_ref) {
       store.setState(_objectSpread(_objectSpread({}, partialState), {}, {
         results: results,
         isSearchStalled: nextIsSearchStalled,
-        searching: false,
+        searching: searchCounter > 0,
         error: null
       }));
     };

package/dist/cjs/core/utils.js

@@ -15,6 +15,7 @@ exports.getPropertyByPath = void 0;
 exports.objectHasKeys = objectHasKeys;
 exports.omit = omit;
 exports.shallowEqual = exports.removeEmptyKey = exports.removeEmptyArraysFromObject = void 0;
+exports.unescapeFacetValue = unescapeFacetValue;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -189,4 +190,8 @@ exports.getPropertyByPath = getPropertyByPath;
 
 function getObjectType(object) {
   return Object.prototype.toString.call(object).slice(8, -1);
+}
+
+function unescapeFacetValue(value) {
+  return value.replace(/^\\-/, '-');
 }

package/dist/cjs/core/version.js

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

package/dist/es/connectors/connectBreadcrumb.js

@@ -21,9 +21,9 @@ function transformValue(values) {
     if (item.isRefined) {
       acc.push({
         label: item.name,
-        // If dealing with a nested "items", "value" is equal to the previous value concatenated with the current label
-        // If dealing with the first level, "value" is equal to the current label
-        value: item.path
+        // If dealing with a nested "items", "value" is equal to the previous value concatenated with the current value
+        // If dealing with the first level, "value" is equal to the current value
+        value: item.escapedValue
       }); // Create a variable in order to keep the same acc for the recursion, otherwise "reduce" returns a new one
 
       if (item.data) {

package/dist/es/connectors/connectHierarchicalMenu.js

@@ -8,6 +8,7 @@ import PropTypes from 'prop-types';
 import algoliasearchHelper from 'algoliasearch-helper';
 import createConnector from "../core/createConnector.js";
 import { cleanUpValue, getIndexId, refineValue, getCurrentRefinementValue, getResults } from "../core/indexUtils.js";
+import { unescapeFacetValue } from "../core/utils.js";
 export var getId = function getId(props) {
   return props.attributes[0];
 };
@@ -23,7 +24,7 @@ function getCurrentRefinement(props, searchState, context) {
   return currentRefinement;
 }
 
-function getValue(path, props, searchState, context) {
+function getValue(value, props, searchState, context) {
   var id = props.id,
       attributes = props.attributes,
       separator = props.separator,
@@ -33,7 +34,7 @@ function getValue(path, props, searchState, context) {
   var nextRefinement;
 
   if (currentRefinement === null) {
-    nextRefinement = path;
+    nextRefinement = value;
   } else {
     var tmpSearchParameters = new algoliasearchHelper.SearchParameters({
       hierarchicalFacets: [{
@@ -44,7 +45,7 @@ function getValue(path, props, searchState, context) {
         showParentLevel: showParentLevel
       }]
     });
-    nextRefinement = tmpSearchParameters.toggleHierarchicalFacetRefinement(id, currentRefinement).toggleHierarchicalFacetRefinement(id, path).getHierarchicalRefinement(id)[0];
+    nextRefinement = tmpSearchParameters.toggleHierarchicalFacetRefinement(id, currentRefinement).toggleHierarchicalFacetRefinement(id, value).getHierarchicalRefinement(id)[0];
   }
 
   return nextRefinement;
@@ -54,7 +55,7 @@ function transformValue(value, props, searchState, context) {
   return value.map(function (v) {
     return {
       label: v.name,
-      value: getValue(v.path, props, searchState, context),
+      value: getValue(v.escapedValue, props, searchState, context),
       count: v.count,
       isRefined: v.isRefined,
       items: v.data && transformValue(v.data, props, searchState, context)
@@ -94,7 +95,7 @@ var sortBy = ['name:asc'];
  * websites. From a UX point of view, we suggest not displaying more than two levels deep.
  * @name connectHierarchicalMenu
  * @requirements To use this widget, your attributes must be formatted in a specific way.
- * If you want for example to have a hiearchical menu of categories, objects in your index
+ * If you want for example to have a hierarchical menu of categories, objects in your index
  * should be formatted this way:
  *
  * ```json
@@ -259,7 +260,7 @@ export default createConnector({
       multiIndexContext: props.indexContextValue
     });
     var items = !currentRefinement ? [] : [{
-      label: "".concat(rootAttribute, ": ").concat(currentRefinement),
+      label: "".concat(rootAttribute, ": ").concat(unescapeFacetValue(currentRefinement)),
       attribute: rootAttribute,
       value: function value(nextState) {
         return _refine(props, nextState, '', {

package/dist/es/connectors/connectMenu.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import PropTypes from 'prop-types';
 import createConnector from "../core/createConnector.js";
 import { getIndexId, cleanUpValue, refineValue, getCurrentRefinementValue, getResults } from "../core/indexUtils.js";
+import { unescapeFacetValue } from "../core/utils.js";
 var namespace = 'menu';
 
 function getId(props) {
@@ -18,9 +19,9 @@ function getCurrentRefinement(props, searchState, context) {
   return currentRefinement;
 }
 
-function getValue(name, props, searchState, context) {
+function getValue(value, props, searchState, context) {
   var currentRefinement = getCurrentRefinement(props, searchState, context);
-  return name === currentRefinement ? '' : name;
+  return value === currentRefinement ? '' : value;
 }
 
 function getLimit(_ref) {
@@ -118,7 +119,7 @@ export default createConnector({
       items = searchForFacetValuesResults[attribute].map(function (v) {
         return {
           label: v.value,
-          value: getValue(v.value, props, searchState, {
+          value: getValue(v.escapedValue, props, searchState, {
             ais: props.contextValue,
             multiIndexContext: props.indexContextValue
           }),
@@ -138,7 +139,7 @@ export default createConnector({
       }).map(function (v) {
         return {
           label: v.name,
-          value: getValue(v.name, props, searchState, {
+          value: getValue(v.escapedValue, props, searchState, {
             ais: props.contextValue,
             multiIndexContext: props.indexContextValue
           }),
@@ -209,7 +210,7 @@ export default createConnector({
         multiIndexContext: props.indexContextValue
       }),
       items: currentRefinement === null ? [] : [{
-        label: "".concat(props.attribute, ": ").concat(currentRefinement),
+        label: "".concat(props.attribute, ": ").concat(unescapeFacetValue(currentRefinement)),
         attribute: props.attribute,
         value: function value(nextState) {
           return _refine(props, nextState, '', {

package/dist/es/connectors/connectRefinementList.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import PropTypes from 'prop-types';
 import createConnector from "../core/createConnector.js";
 import { cleanUpValue, getIndexId, refineValue, getCurrentRefinementValue, getResults } from "../core/indexUtils.js";
+import { unescapeFacetValue } from "../core/utils.js";
 var namespace = 'refinementList';
 
 function getId(props) {
@@ -22,12 +23,12 @@ function getCurrentRefinement(props, searchState, context) {
   return [];
 }
 
-function getValue(name, props, searchState, context) {
+function getValue(value, props, searchState, context) {
   var currentRefinement = getCurrentRefinement(props, searchState, context);
-  var isAnewValue = currentRefinement.indexOf(name) === -1;
-  var nextRefinement = isAnewValue ? currentRefinement.concat([name]) // cannot use .push(), it mutates
+  var isAnewValue = currentRefinement.indexOf(value) === -1;
+  var nextRefinement = isAnewValue ? currentRefinement.concat([value]) // cannot use .push(), it mutates
   : currentRefinement.filter(function (selectedValue) {
-    return selectedValue !== name;
+    return selectedValue !== value;
   }); // cannot use .splice(), it mutates
 
   return nextRefinement;
@@ -137,7 +138,7 @@ export default createConnector({
     var items = isFromSearch ? searchForFacetValuesResults[attribute].map(function (v) {
       return {
         label: v.value,
-        value: getValue(v.value, props, searchState, {
+        value: getValue(v.escapedValue, props, searchState, {
           ais: props.contextValue,
           multiIndexContext: props.indexContextValue
         }),
@@ -155,7 +156,7 @@ export default createConnector({
     }).map(function (v) {
       return {
         label: v.name,
-        value: getValue(v.name, props, searchState, {
+        value: getValue(v.escapedValue, props, searchState, {
           ais: props.contextValue,
           multiIndexContext: props.indexContextValue
         }),
@@ -228,7 +229,7 @@ export default createConnector({
         },
         items: getCurrentRefinement(props, searchState, context).map(function (item) {
           return {
-            label: "".concat(item),
+            label: unescapeFacetValue("".concat(item)),
             value: function value(nextState) {
               var nextSelectedItems = getCurrentRefinement(props, nextState, context).filter(function (other) {
                 return other !== item;

package/dist/es/core/createInstantSearchManager.js

@@ -108,6 +108,7 @@ export default function createInstantSearchManager(_ref) {
   var skip = false;
   var stalledSearchTimer = null;
   var initialSearchParameters = helper.state;
+  var searchCounter;
   var widgetsManager = createWidgetsManager(onWidgetsUpdate);
   hydrateSearchClient(searchClient, resultsState);
   var store = createStore({
@@ -193,12 +194,13 @@ export default function createInstantSearchManager(_ref) {
     if (!skip) {
       var _getSearchParameters = getSearchParameters(helper.state),
           mainParameters = _getSearchParameters.mainParameters,
-          derivedParameters = _getSearchParameters.derivedParameters; // We have to call `slice` because the method `detach` on the derived
+          derivedParameters = _getSearchParameters.derivedParameters;
+
+      searchCounter = derivedParameters.length + 1; // We have to call `slice` because the method `detach` on the derived
       // helpers mutates the value `derivedHelpers`. The `forEach` loop does
       // not iterate on each value and we're not able to correctly clear the
       // previous derived helpers (memory leak + useless requests).
 
-
       helper.derivedHelpers.slice().forEach(function (derivedHelper) {
         // Since we detach the derived helpers on **every** new search they
         // won't receive intermediate results in case of a stalled search.
@@ -234,6 +236,7 @@ export default function createInstantSearchManager(_ref) {
   function handleSearchSuccess(_ref3) {
     var indexId = _ref3.indexId;
     return function (event) {
+      searchCounter--;
       var state = store.getState();
       var isDerivedHelpersEmpty = !helper.derivedHelpers.length;
       var results = state.results ? state.results : {}; // Switching from mono index to multi index and vice versa must reset the
@@ -263,7 +266,7 @@ export default function createInstantSearchManager(_ref) {
       store.setState(_objectSpread(_objectSpread({}, partialState), {}, {
         results: results,
         isSearchStalled: nextIsSearchStalled,
-        searching: false,
+        searching: searchCounter > 0,
         error: null
       }));
     };

package/dist/es/core/utils.js

@@ -148,4 +148,7 @@ export var getPropertyByPath = function getPropertyByPath(object, path) {
 };
 export function getObjectType(object) {
   return Object.prototype.toString.call(object).slice(8, -1);
+}
+export function unescapeFacetValue(value) {
+  return value.replace(/^\\-/, '-');
 }

package/dist/es/core/version.js

@@ -1 +1 @@
-export default '6.23.0';
+export default '6.23.3';