react-instantsearch-core 6.23.2 → 6.24.0

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; }
@@ -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) {
@@ -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) {
@@ -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.2';
+var _default = '6.24.0';
 exports.default = _default;

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];
 };
@@ -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) {
@@ -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) {
@@ -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.2';
+export default '6.24.0';

package/dist/umd/ReactInstantSearchCore.js

@@ -1,4 +1,4 @@
-/*! React InstantSearchCore 6.23.2 | © Algolia, inc. | https://github.com/algolia/react-instantsearch */
+/*! React InstantSearchCore 6.24.0 | © Algolia, inc. | https://github.com/algolia/react-instantsearch */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react')) :
   typeof define === 'function' && define.amd ? define(['exports', 'react'], factory) :
@@ -437,6 +437,9 @@
       return current ? current[key] : undefined;
     }, object);
   };
+  function unescapeFacetValue(value) {
+    return value.replace(/^\\-/, '-');
+  }
 
   var instantSearchContext = /*#__PURE__*/React.createContext({
     onInternalStateUpdate: function onInternalStateUpdate() {
@@ -839,7 +842,7 @@
     });
   }
 
-  var version = '6.23.2';
+  var version = '6.24.0';
 
   function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -3243,13 +3246,13 @@
    * @param {string} value the escaped facet value
    * @returns string
    */
-  function unescapeFacetValue(value) {
+  function unescapeFacetValue$1(value) {
     return value.replace(/^\\-/, '-');
   }
 
   var escapeFacetValue_1 = {
     escapeFacetValue: escapeFacetValue,
-    unescapeFacetValue: unescapeFacetValue
+    unescapeFacetValue: unescapeFacetValue$1
   };
 
   var generateHierarchicalTree_1 = generateTrees;
@@ -3259,7 +3262,7 @@
 
 
   var escapeFacetValue$1 = escapeFacetValue_1.escapeFacetValue;
-  var unescapeFacetValue$1 = escapeFacetValue_1.unescapeFacetValue;
+  var unescapeFacetValue$2 = escapeFacetValue_1.unescapeFacetValue;
 
   function generateTrees(state) {
     return function generate(hierarchicalFacetResult, hierarchicalFacetIndex) {
@@ -3382,7 +3385,7 @@
               facetCount,
               facetValue,
               hierarchicalSeparator,
-              unescapeFacetValue$1(currentRefinement),
+              unescapeFacetValue$2(currentRefinement),
               hierarchicalFacetResult.exhaustive
             );
           }),
@@ -3456,7 +3459,7 @@
   }
 
   var escapeFacetValue$2 = escapeFacetValue_1.escapeFacetValue;
-  var unescapeFacetValue$2 = escapeFacetValue_1.unescapeFacetValue;
+  var unescapeFacetValue$3 = escapeFacetValue_1.unescapeFacetValue;
 
 
 
@@ -3958,7 +3961,7 @@
             state.disjunctiveFacetsRefinements[dfacet].forEach(function(refinementValue) {
               // add the disjunctive refinements if it is no more retrieved
               if (!self.disjunctiveFacets[position].data[refinementValue] &&
-                state.disjunctiveFacetsRefinements[dfacet].indexOf(unescapeFacetValue$2(refinementValue)) > -1) {
+                state.disjunctiveFacetsRefinements[dfacet].indexOf(unescapeFacetValue$3(refinementValue)) > -1) {
                 self.disjunctiveFacets[position].data[refinementValue] = 0;
               }
             });
@@ -7493,6 +7496,7 @@
     var skip = false;
     var stalledSearchTimer = null;
     var initialSearchParameters = helper.state;
+    var searchCounter;
     var widgetsManager = createWidgetsManager(onWidgetsUpdate);
     hydrateSearchClient(searchClient, resultsState);
     var store = createStore({
@@ -7578,12 +7582,13 @@
       if (!skip) {
         var _getSearchParameters = getSearchParameters(),
             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.
@@ -7619,6 +7624,7 @@
     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
@@ -7648,7 +7654,7 @@
         store.setState(_objectSpread$5(_objectSpread$5({}, partialState), {}, {
           results: results,
           isSearchStalled: nextIsSearchStalled,
-          searching: false,
+          searching: searchCounter > 0,
           error: null
         }));
       };
@@ -8940,7 +8946,7 @@
         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$3(props, nextState, '', {
@@ -9566,7 +9572,7 @@
           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$4(props, nextState, '', {
@@ -10481,7 +10487,7 @@
           },
           items: getCurrentRefinement$9(props, searchState, context).map(function (item) {
             return {
-              label: "".concat(item),
+              label: unescapeFacetValue("".concat(item)),
               value: function value(nextState) {
                 var nextSelectedItems = getCurrentRefinement$9(props, nextState, context).filter(function (other) {
                   return other !== item;