@orderingstack/front-components-product-configurator 1.4.2-beta.23 → 1.4.2-beta.25

package/dist/index.es.js

@@ -6915,12 +6915,10 @@ const selectProductsInForm = (productToSelect, setValueInForm, initialSelectedSt
 };
 function useMenuOptions(product, nestedLvl, parentKind, parentSelCtx) {
   const { selCtx, attrs = {} } = product;
-  useStore((state) => state.filter);
   const initialSelected = useStore((state) => state.initialSelected);
   const currency = useStore((state) => state.currency);
-  const { setValue, getValues, watch } = useFormContext();
-  const selected = watch("selected");
-  const filter = watch("filter");
+  const { setValue, getValues } = useFormContext();
+  const { selected = {}, filter = {} } = getValues();
   const isFilterValidated = validateProductFilter(product, filter);
   const isOnSubmitted = useStore((state) => state.isOnSubmitted);
   const setValidationMap = useStore((state) => state.setValidationMap);
@@ -6947,9 +6945,9 @@ function useMenuOptions(product, nestedLvl, parentKind, parentSelCtx) {
     console.log("LOG1 useMenuOptions useEffect isFilterValidated", isFilterValidated, product);
     console.log("LOG1 useMenuOptions useEffect productsToUnselect", productsToUnselect);
     console.log("LOG1 useMenuOptions useEffect productsToSelect", productsToSelect);
-    selectProductsInForm(productsToSelect, setValue, initialSelected);
     unselectProductsInForm(productsToUnselect, setValue);
-  }, [isFilterValidated]);
+    selectProductsInForm(productsToSelect, setValue, initialSelected);
+  }, [filter, isFilterValidated, selected]);
   return {
     isFilterValidated,
     selected,
@@ -8942,16 +8940,16 @@ const selectUnselectProduct = (setValue, getValues, product, isChecked, unregist
       });
     };
     checkSubProducts(items);
-    (_a = Object.keys(emit)) == null ? void 0 : _a.forEach((x2) => {
-      const formPath = `filterWithCnt.${fltCtx}.${x2}.${emit[x2]}`;
-      const cnt = getValues(formPath) || 0;
-      if (cnt < 2) {
-        unregister(formPath);
-      } else {
-        setValue(formPath, cnt - 1);
-      }
-    });
     if (nestedLvl && nestedLvl < 2 && !isEmpty(emit)) {
+      (_a = Object.keys(emit)) == null ? void 0 : _a.forEach((x2) => {
+        const formPath = `filterWithCnt.${fltCtx}.${x2}.${emit[x2]}`;
+        const cnt = getValues(formPath) || 0;
+        if (cnt < 2) {
+          unregister(formPath);
+        } else {
+          setValue(formPath, cnt - 1);
+        }
+      });
       const groupsPath = `filterWithCnt.${fltCtx}`;
       const groupCntPath = `filterWithCnt.${fltCtx}.${selCtx}`;
       const fltCtxPath = `filter.${fltCtx}`;