fix(connectors): check facet is refined before removing it. hierarchicalMenu / menu

* fix(hierarchicalMenu): check is facet refined first
* fix(connectMenu): check facet refined is applied before removing it
* refactor(dispose): initialize with `state = nextState`

Author: Maxime Janton

src/connectors/hierarchical-menu/connectHierarchicalMenu.js

@@ -197,9 +197,15 @@ export default function connectHierarchicalMenu(renderFn, unmountFn) {
         unmountFn();
 
         // compute nextState for the search
-        const nextState = state
-          .removeHierarchicalFacetRefinement(hierarchicalFacetName)
-          .removeHierarchicalFacet(hierarchicalFacetName);
+        let nextState = state;
+
+        if (state.isHierarchicalFacetRefined(hierarchicalFacetName)) {
+          nextState = state.removeHierarchicalFacetRefinement(
+            hierarchicalFacetName
+          );
+        }
+
+        nextState = nextState.removeHierarchicalFacet(hierarchicalFacetName);
 
         if (nextState.maxValuesPerFacet === limit) {
           nextState.setQueryParameters('maxValuesPerFacet', undefined);

src/connectors/menu/connectMenu.js

@@ -233,9 +233,20 @@ export default function connectMenu(renderFn, unmountFn) {
       dispose({ state }) {
         unmountFn();
 
-        const nextState = state
-          .removeHierarchicalFacetRefinement(attributeName)
-          .removeHierarchicalFacet(attributeName);
+        let nextState = state;
+
+        if (state.isHierarchicalFacetRefined(attributeName)) {
+          nextState = state.removeHierarchicalFacetRefinement(attributeName);
+        }
+
+        nextState = nextState.removeHierarchicalFacet(attributeName);
+
+        if (
+          nextState.maxValuesPerFacet === limit ||
+          (showMoreLimit && nextState.maxValuesPerFacet === showMoreLimit)
+        ) {
+          nextState.setQueryParameters('maxValuesPerFacet', undefined);
+        }
 
         return nextState;
       },