@orderingstack/front-components-product-configurator 1.4.2-beta.7 → 1.5.1-beta.1

package/dist/index.es.js

@@ -6275,6 +6275,160 @@ const cleanSelected = (selected) => {
 const decodeSelected = (selected) => {
   return decodeValue("selected", selected);
 };
+var EPaymentStatus;
+(function(EPaymentStatus2) {
+  EPaymentStatus2["UNINITIALIZED"] = "UNINITIALIZED";
+  EPaymentStatus2["PROCESSING"] = "PROCESSING";
+  EPaymentStatus2["PAID"] = "PAID";
+  EPaymentStatus2["FAILED"] = "FAILED";
+  EPaymentStatus2["PRINTING_RECEIPT"] = "PRINTING_RECEIPT";
+  EPaymentStatus2["PRINTING_RECEIPT_SUCCESS"] = "PRINTING_RECEIPT_SUCCESS";
+  EPaymentStatus2["SENDING_RECEIPT"] = "SENDING_RECEIPT";
+  EPaymentStatus2["SENDING_RECEIPT_SUCCESS"] = "SENDING_RECEIPT_SUCCESS";
+  EPaymentStatus2["ERROR"] = "ERROR";
+})(EPaymentStatus || (EPaymentStatus = {}));
+var ECouponViewType;
+(function(ECouponViewType2) {
+  ECouponViewType2["CAROUSEL"] = "carousel";
+  ECouponViewType2["NORMAL"] = "normal";
+  ECouponViewType2["IMAGE"] = "image";
+})(ECouponViewType || (ECouponViewType = {}));
+var EProductKind;
+(function(EProductKind2) {
+  EProductKind2["GROUP"] = "3e/group";
+  EProductKind2["PRODUCT"] = "3e/product";
+  EProductKind2["CATEGORY"] = "3e/group/category";
+  EProductKind2["OPTIONS"] = "3e/group/options";
+  EProductKind2["CONFIG"] = "3e/group/config";
+  EProductKind2["STATIC"] = "3e/static";
+  EProductKind2["REF"] = "3e/ref";
+  EProductKind2["QUERY"] = "3e/query";
+  EProductKind2["CMS"] = "3e/cms";
+})(EProductKind || (EProductKind = {}));
+var EProductKindBucket;
+(function(EProductKindBucket2) {
+  EProductKindBucket2["GROUP"] = "group";
+  EProductKindBucket2["PRODUCT"] = "product";
+})(EProductKindBucket || (EProductKindBucket = {}));
+var EOrderUserRole;
+(function(EOrderUserRole2) {
+  EOrderUserRole2["CREATOR"] = "CREATOR";
+  EOrderUserRole2["CUSTOMER"] = "CUSTOMER";
+  EOrderUserRole2["COUPONS"] = "COUPON";
+  EOrderUserRole2["KIOSK"] = "KIOSK";
+  EOrderUserRole2["WAITER"] = "WAITER";
+  EOrderUserRole2["MANAGER"] = "MANAGER";
+  EOrderUserRole2["VIEWER"] = "VIEWER";
+  EOrderUserRole2["DRIVER"] = "DRIVER";
+  EOrderUserRole2["STAFF"] = "STAFF";
+})(EOrderUserRole || (EOrderUserRole = {}));
+var EOrderType;
+(function(EOrderType2) {
+  EOrderType2["TAKE_AWAY"] = "TAKE_AWAY";
+  EOrderType2["DELIVERY"] = "DELIVERY";
+  EOrderType2["DINE_IN"] = "DINE_IN";
+  EOrderType2["DINE_IN_OPEN"] = "DINE_IN_OPEN";
+  EOrderType2["GLOVO_DELIVERY"] = "GLOVO_DELIVERY";
+  EOrderType2["GLOVO_TAKE_AWAY"] = "GLOVO_TAKE_AWAY";
+  EOrderType2["JUSTEAT_DELIVERY"] = "JUSTEAT_DELIVERY";
+  EOrderType2["JUSTEAT_TAKE_AWAY"] = "JUSTEAT_TAKE_AWAY";
+  EOrderType2["UBER_DELIVERY"] = "UBER_DELIVERY";
+  EOrderType2["UBER_TAKE_AWAY"] = "UBER_TAKE_AWAY";
+  EOrderType2["UBER_DINE_IN"] = "UBER_DINE_IN";
+  EOrderType2["WOLT_DELIVERY"] = "WOLT_DELIVERY";
+  EOrderType2["WOLT_TAKE_AWAY"] = "WOLT_TAKE_AWAY";
+  EOrderType2["WOLT_DINE_IN"] = "WOLT_DINE_IN";
+  EOrderType2["BOLT_DELIVERY"] = "BOLT_DELIVERY";
+  EOrderType2["BOLT_TAKE_AWAY"] = "BOLT_TAKE_AWAY";
+  EOrderType2["BOLT_DINE_IN"] = "BOLT_DINE_IN";
+  EOrderType2["TAZZ_DELIVERY"] = "TAZZ_DELIVERY";
+  EOrderType2["TAZZ_TAKE_AWAY"] = "TAZZ_TAKE_AWAY";
+  EOrderType2["UPMENU_DELIVERY"] = "UPMENU_DELIVERY";
+  EOrderType2["UPMENU_TAKE_AWAY"] = "UPMENU_TAKE_AWAY";
+  EOrderType2["UPMENU_DINE_IN"] = "UPMENU_DINE_IN";
+})(EOrderType || (EOrderType = {}));
+var EOrderSource;
+(function(EOrderSource2) {
+  EOrderSource2["KIOSK"] = "KIOSK";
+  EOrderSource2["WEB"] = "WEB";
+  EOrderSource2["JUST_EAT_TAKE_AWAY"] = "JUSTEATTAKEAWAY";
+  EOrderSource2["GLOVO"] = "GLOVO";
+  EOrderSource2["PYSZNE"] = "PYSZNE";
+  EOrderSource2["WOLT"] = "WOLT";
+  EOrderSource2["UBER"] = "UBER";
+  EOrderSource2["BOLT"] = "BOLT";
+  EOrderSource2["TAZZ"] = "TAZZ";
+  EOrderSource2["POS"] = "POS";
+  EOrderSource2["UPMENU"] = "UPMENU";
+})(EOrderSource || (EOrderSource = {}));
+var EChannelName;
+(function(EChannelName2) {
+  EChannelName2["DINE_IN"] = "DINE_IN";
+  EChannelName2["TAKE_AWAY"] = "TAKE_AWAY";
+  EChannelName2["DELIVERY"] = "DELIVERY";
+  EChannelName2["GLOVO"] = "GLOVO";
+  EChannelName2["JUSTEAT"] = "JUSTEAT";
+  EChannelName2["UBER"] = "UBER";
+  EChannelName2["BOLT"] = "BOLT";
+  EChannelName2["WOLT"] = "WOLT";
+  EChannelName2["TAZZ"] = "TAZZ";
+  EChannelName2["UPMENU"] = "UPMENU";
+})(EChannelName || (EChannelName = {}));
+var EOrderStatus;
+(function(EOrderStatus2) {
+  EOrderStatus2["NEW"] = "NEW";
+  EOrderStatus2["COMPLETED"] = "COMPLETED";
+  EOrderStatus2["VERIFIED"] = "VERIFIED";
+  EOrderStatus2["DELIVER"] = "DELIVER";
+  EOrderStatus2["DELIVERED"] = "DELIVERED";
+  EOrderStatus2["CLOSED"] = "CLOSED";
+  EOrderStatus2["ABANDONED"] = "ABANDONED";
+  EOrderStatus2["CANCELLED"] = "CANCELLED";
+  EOrderStatus2["PICKED"] = "PICKED";
+})(EOrderStatus || (EOrderStatus = {}));
+var EOrderPaymentType;
+(function(EOrderPaymentType2) {
+  EOrderPaymentType2["CASH"] = "CASH";
+  EOrderPaymentType2["CARD"] = "CARD";
+  EOrderPaymentType2["COD"] = "COD";
+  EOrderPaymentType2["TERMINAL"] = "TERMINAL";
+  EOrderPaymentType2["EPAYMENT"] = "EPAYMENT";
+  EOrderPaymentType2["COUPON"] = "COUPON";
+  EOrderPaymentType2["WALLET"] = "WALLET";
+  EOrderPaymentType2["PREAUTHORIZED"] = "PREAUTHORIZED";
+  EOrderPaymentType2["RETURN"] = "RETURN";
+  EOrderPaymentType2["EXTERNAL"] = "EXTERNAL";
+})(EOrderPaymentType || (EOrderPaymentType = {}));
+var ERbiOrderExtra;
+(function(ERbiOrderExtra2) {
+  ERbiOrderExtra2["POINTS_TOTAL"] = "x-rbi-loyalty-points";
+  ERbiOrderExtra2["POINTS_EARNED"] = "x-rbi-points-earned";
+  ERbiOrderExtra2["REWARDS"] = "x-rbi-rewards";
+  ERbiOrderExtra2["OFFERS"] = "x-rbi-offers";
+  ERbiOrderExtra2["CUSTOMER_NAME"] = "x-customer-name";
+})(ERbiOrderExtra || (ERbiOrderExtra = {}));
+var EOrderLineStatus;
+(function(EOrderLineStatus2) {
+  EOrderLineStatus2["NEW"] = "NEW";
+  EOrderLineStatus2["TECHNICAL"] = "TECHNICAL";
+  EOrderLineStatus2["CONFIRMED"] = "CONFIRMED";
+  EOrderLineStatus2["PROCESSING"] = "PROCESSING";
+  EOrderLineStatus2["PROCESSED"] = "PROCESSED";
+  EOrderLineStatus2["VOID"] = "VOID";
+  EOrderLineStatus2["WASTE"] = "WASTE";
+})(EOrderLineStatus || (EOrderLineStatus = {}));
+var EOrderProductKind;
+(function(EOrderProductKind2) {
+  EOrderProductKind2["GROUP"] = "group";
+  EOrderProductKind2["PRODUCT"] = "product";
+})(EOrderProductKind || (EOrderProductKind = {}));
+var ENotificationType;
+(function(ENotificationType2) {
+  ENotificationType2["ORDER_EVENT_ERROR"] = "OrderEventError";
+  ENotificationType2["ORDER_APPLIED_EVENTS"] = "OrderAppliedEvents";
+  ENotificationType2["ORDER_EVENT_FISCAL"] = "OrderEventFiscal";
+  ENotificationType2["ORDER_UPSELL"] = "OrderUpsell";
+})(ENotificationType || (ENotificationType = {}));
 const isApiBooleanTrue = (value) => {
   if (value === "true" || value === true) {
     return true;
@@ -6302,6 +6456,25 @@ const isVisible = (item) => {
   const isHidden = ((_a = item == null ? void 0 : item.attrs) == null ? void 0 : _a.hidden) === true || ((_b = item == null ? void 0 : item["_"]) == null ? void 0 : _b.hidden) === "true";
   return !isHidden;
 };
+function findGroupInProductItemsBySelCtx(selCtx, parent) {
+  var _a;
+  if (!parent.items) {
+    return null;
+  }
+  for (let i2 = 0; i2 < ((_a = parent.items) == null ? void 0 : _a.length); i2++) {
+    const prod = parent.items[i2];
+    if (prod.selCtx === selCtx && prod.kind === EProductKind.OPTIONS) {
+      return prod;
+    }
+    if (prod.items && prod.items.length > 0) {
+      const found = findGroupInProductItemsBySelCtx(selCtx, prod);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return null;
+}
 function createStore(createState) {
   let state;
   const listeners = /* @__PURE__ */ new Set();
@@ -6650,7 +6823,9 @@ function getValidSelectedState(product, selected) {
 }
 function useProductConfigurator(product) {
   var _a;
-  const [productQuantity, setProductQuantity] = useState(Number(product.quantity) || 1);
+  const [productQuantity, setProductQuantity] = useState(
+    Number(product.quantity) || 1
+  );
   const encodedProduct = encodeProduct(product);
   const { state: { filter: initFilter = {} } = {} } = encodedProduct;
   const initSelected = getValidSelectedState(
@@ -6666,9 +6841,8 @@ function useProductConfigurator(product) {
   const setIsOnSubmittedOnTrue = useStore(
     (state) => state.setIsOnSubmittedOnTrue
   );
-  useStore((state) => state.refreshFormDt);
+  const refreshFormDt = useStore((state) => state.refreshFormDt);
   const getInvalidSelCtxArray = useStore((state) => state.getInvalidSelCtxArray);
-  const getValidationMap = useStore((state) => state.getValidationMap);
   const increaseProductQuantity = () => {
     setProductQuantity((productQuantity2) => productQuantity2 + 1);
   };
@@ -6692,176 +6866,22 @@ function useProductConfigurator(product) {
     setIsOnSubmittedOnTrue,
     getInvalidSelCtxArray,
     productQuantity,
-    getValidationMap,
     increaseProductQuantity,
-    decreaseProductQuantity
+    decreaseProductQuantity,
+    refreshFormDt
   };
 }
-var EPaymentStatus;
-(function(EPaymentStatus2) {
-  EPaymentStatus2["UNINITIALIZED"] = "UNINITIALIZED";
-  EPaymentStatus2["PROCESSING"] = "PROCESSING";
-  EPaymentStatus2["PAID"] = "PAID";
-  EPaymentStatus2["FAILED"] = "FAILED";
-  EPaymentStatus2["PRINTING_RECEIPT"] = "PRINTING_RECEIPT";
-  EPaymentStatus2["PRINTING_RECEIPT_SUCCESS"] = "PRINTING_RECEIPT_SUCCESS";
-  EPaymentStatus2["SENDING_RECEIPT"] = "SENDING_RECEIPT";
-  EPaymentStatus2["SENDING_RECEIPT_SUCCESS"] = "SENDING_RECEIPT_SUCCESS";
-  EPaymentStatus2["ERROR"] = "ERROR";
-})(EPaymentStatus || (EPaymentStatus = {}));
-var ECouponViewType;
-(function(ECouponViewType2) {
-  ECouponViewType2["CAROUSEL"] = "carousel";
-  ECouponViewType2["NORMAL"] = "normal";
-  ECouponViewType2["IMAGE"] = "image";
-})(ECouponViewType || (ECouponViewType = {}));
-var EProductKind;
-(function(EProductKind2) {
-  EProductKind2["GROUP"] = "3e/group";
-  EProductKind2["PRODUCT"] = "3e/product";
-  EProductKind2["CATEGORY"] = "3e/group/category";
-  EProductKind2["OPTIONS"] = "3e/group/options";
-  EProductKind2["CONFIG"] = "3e/group/config";
-  EProductKind2["STATIC"] = "3e/static";
-  EProductKind2["REF"] = "3e/ref";
-  EProductKind2["QUERY"] = "3e/query";
-  EProductKind2["CMS"] = "3e/cms";
-})(EProductKind || (EProductKind = {}));
-var EProductKindBucket;
-(function(EProductKindBucket2) {
-  EProductKindBucket2["GROUP"] = "group";
-  EProductKindBucket2["PRODUCT"] = "product";
-})(EProductKindBucket || (EProductKindBucket = {}));
-var EOrderUserRole;
-(function(EOrderUserRole2) {
-  EOrderUserRole2["CREATOR"] = "CREATOR";
-  EOrderUserRole2["CUSTOMER"] = "CUSTOMER";
-  EOrderUserRole2["COUPONS"] = "COUPON";
-  EOrderUserRole2["KIOSK"] = "KIOSK";
-  EOrderUserRole2["WAITER"] = "WAITER";
-  EOrderUserRole2["MANAGER"] = "MANAGER";
-  EOrderUserRole2["VIEWER"] = "VIEWER";
-  EOrderUserRole2["DRIVER"] = "DRIVER";
-  EOrderUserRole2["STAFF"] = "STAFF";
-})(EOrderUserRole || (EOrderUserRole = {}));
-var EOrderType;
-(function(EOrderType2) {
-  EOrderType2["TAKE_AWAY"] = "TAKE_AWAY";
-  EOrderType2["DELIVERY"] = "DELIVERY";
-  EOrderType2["DINE_IN"] = "DINE_IN";
-  EOrderType2["DINE_IN_OPEN"] = "DINE_IN_OPEN";
-  EOrderType2["GLOVO_DELIVERY"] = "GLOVO_DELIVERY";
-  EOrderType2["GLOVO_TAKE_AWAY"] = "GLOVO_TAKE_AWAY";
-  EOrderType2["JUSTEAT_DELIVERY"] = "JUSTEAT_DELIVERY";
-  EOrderType2["JUSTEAT_TAKE_AWAY"] = "JUSTEAT_TAKE_AWAY";
-  EOrderType2["UBER_DELIVERY"] = "UBER_DELIVERY";
-  EOrderType2["UBER_TAKE_AWAY"] = "UBER_TAKE_AWAY";
-  EOrderType2["UBER_DINE_IN"] = "UBER_DINE_IN";
-  EOrderType2["WOLT_DELIVERY"] = "WOLT_DELIVERY";
-  EOrderType2["WOLT_TAKE_AWAY"] = "WOLT_TAKE_AWAY";
-  EOrderType2["WOLT_DINE_IN"] = "WOLT_DINE_IN";
-  EOrderType2["BOLT_DELIVERY"] = "BOLT_DELIVERY";
-  EOrderType2["BOLT_TAKE_AWAY"] = "BOLT_TAKE_AWAY";
-  EOrderType2["BOLT_DINE_IN"] = "BOLT_DINE_IN";
-  EOrderType2["TAZZ_DELIVERY"] = "TAZZ_DELIVERY";
-  EOrderType2["TAZZ_TAKE_AWAY"] = "TAZZ_TAKE_AWAY";
-  EOrderType2["UPMENU_DELIVERY"] = "UPMENU_DELIVERY";
-  EOrderType2["UPMENU_TAKE_AWAY"] = "UPMENU_TAKE_AWAY";
-  EOrderType2["UPMENU_DINE_IN"] = "UPMENU_DINE_IN";
-})(EOrderType || (EOrderType = {}));
-var EOrderSource;
-(function(EOrderSource2) {
-  EOrderSource2["KIOSK"] = "KIOSK";
-  EOrderSource2["WEB"] = "WEB";
-  EOrderSource2["JUST_EAT_TAKE_AWAY"] = "JUSTEATTAKEAWAY";
-  EOrderSource2["GLOVO"] = "GLOVO";
-  EOrderSource2["PYSZNE"] = "PYSZNE";
-  EOrderSource2["WOLT"] = "WOLT";
-  EOrderSource2["UBER"] = "UBER";
-  EOrderSource2["BOLT"] = "BOLT";
-  EOrderSource2["TAZZ"] = "TAZZ";
-  EOrderSource2["POS"] = "POS";
-  EOrderSource2["UPMENU"] = "UPMENU";
-})(EOrderSource || (EOrderSource = {}));
-var EChannelName;
-(function(EChannelName2) {
-  EChannelName2["DINE_IN"] = "DINE_IN";
-  EChannelName2["TAKE_AWAY"] = "TAKE_AWAY";
-  EChannelName2["DELIVERY"] = "DELIVERY";
-  EChannelName2["GLOVO"] = "GLOVO";
-  EChannelName2["JUSTEAT"] = "JUSTEAT";
-  EChannelName2["UBER"] = "UBER";
-  EChannelName2["BOLT"] = "BOLT";
-  EChannelName2["WOLT"] = "WOLT";
-  EChannelName2["TAZZ"] = "TAZZ";
-  EChannelName2["UPMENU"] = "UPMENU";
-})(EChannelName || (EChannelName = {}));
-var EOrderStatus;
-(function(EOrderStatus2) {
-  EOrderStatus2["NEW"] = "NEW";
-  EOrderStatus2["COMPLETED"] = "COMPLETED";
-  EOrderStatus2["VERIFIED"] = "VERIFIED";
-  EOrderStatus2["DELIVER"] = "DELIVER";
-  EOrderStatus2["DELIVERED"] = "DELIVERED";
-  EOrderStatus2["CLOSED"] = "CLOSED";
-  EOrderStatus2["ABANDONED"] = "ABANDONED";
-  EOrderStatus2["CANCELLED"] = "CANCELLED";
-  EOrderStatus2["PICKED"] = "PICKED";
-})(EOrderStatus || (EOrderStatus = {}));
-var EOrderPaymentType;
-(function(EOrderPaymentType2) {
-  EOrderPaymentType2["CASH"] = "CASH";
-  EOrderPaymentType2["CARD"] = "CARD";
-  EOrderPaymentType2["COD"] = "COD";
-  EOrderPaymentType2["TERMINAL"] = "TERMINAL";
-  EOrderPaymentType2["EPAYMENT"] = "EPAYMENT";
-  EOrderPaymentType2["COUPON"] = "COUPON";
-  EOrderPaymentType2["WALLET"] = "WALLET";
-  EOrderPaymentType2["PREAUTHORIZED"] = "PREAUTHORIZED";
-  EOrderPaymentType2["RETURN"] = "RETURN";
-  EOrderPaymentType2["EXTERNAL"] = "EXTERNAL";
-})(EOrderPaymentType || (EOrderPaymentType = {}));
-var ERbiOrderExtra;
-(function(ERbiOrderExtra2) {
-  ERbiOrderExtra2["POINTS_TOTAL"] = "x-rbi-loyalty-points";
-  ERbiOrderExtra2["POINTS_EARNED"] = "x-rbi-points-earned";
-  ERbiOrderExtra2["REWARDS"] = "x-rbi-rewards";
-  ERbiOrderExtra2["OFFERS"] = "x-rbi-offers";
-  ERbiOrderExtra2["CUSTOMER_NAME"] = "x-customer-name";
-})(ERbiOrderExtra || (ERbiOrderExtra = {}));
-var EOrderLineStatus;
-(function(EOrderLineStatus2) {
-  EOrderLineStatus2["NEW"] = "NEW";
-  EOrderLineStatus2["TECHNICAL"] = "TECHNICAL";
-  EOrderLineStatus2["CONFIRMED"] = "CONFIRMED";
-  EOrderLineStatus2["PROCESSING"] = "PROCESSING";
-  EOrderLineStatus2["PROCESSED"] = "PROCESSED";
-  EOrderLineStatus2["VOID"] = "VOID";
-  EOrderLineStatus2["WASTE"] = "WASTE";
-})(EOrderLineStatus || (EOrderLineStatus = {}));
-var EOrderProductKind;
-(function(EOrderProductKind2) {
-  EOrderProductKind2["GROUP"] = "group";
-  EOrderProductKind2["PRODUCT"] = "product";
-})(EOrderProductKind || (EOrderProductKind = {}));
-var ENotificationType;
-(function(ENotificationType2) {
-  ENotificationType2["ORDER_EVENT_ERROR"] = "OrderEventError";
-  ENotificationType2["ORDER_APPLIED_EVENTS"] = "OrderAppliedEvents";
-  ENotificationType2["ORDER_EVENT_FISCAL"] = "OrderEventFiscal";
-  ENotificationType2["ORDER_UPSELL"] = "OrderUpsell";
-})(ENotificationType || (ENotificationType = {}));
 const validateProductFilter = (product, stateFilter) => {
   var _a;
   const { filter: productFilters = {}, fltCtx = "" } = product;
-  const stateFiltersWithFltCtx = stateFilter[fltCtx];
+  const stateFiltersWithFltCtx = (stateFilter == null ? void 0 : stateFilter[fltCtx]) || {};
   if (!productFilters || !Object.keys(productFilters).length || !stateFiltersWithFltCtx) {
     return true;
   }
   const commonFilters = (_a = Object.keys(stateFiltersWithFltCtx)) == null ? void 0 : _a.filter(
     (filterName) => {
       var _a2;
-      const matchingFilters = (_a2 = Object.keys(productFilters == null ? void 0 : productFilters[filterName])) == null ? void 0 : _a2.filter((x2) => {
+      const matchingFilters = (_a2 = Object.keys((productFilters == null ? void 0 : productFilters[filterName]) || {})) == null ? void 0 : _a2.filter((x2) => {
         var _a3;
         if (((_a3 = productFilters == null ? void 0 : productFilters[filterName]) == null ? void 0 : _a3[x2]) === (stateFiltersWithFltCtx == null ? void 0 : stateFiltersWithFltCtx[filterName])) {
           return true;
@@ -6895,12 +6915,14 @@ const getProductToChangeInForm = (product, isFilterValidated) => {
   return { productsToSelect, productsToUnselect };
 };
 const unselectProductsInForm = (productsToUnselect, setValueInForm) => {
+  console.log("LOG1 productsToUnselect", productsToUnselect);
   productsToUnselect.map(({ selCtx, id }) => {
     setValueInForm(`selected.${selCtx}.${id}`, false);
   });
 };
-const selectProductsInForm = (productToUnselect, setValueInForm, initialSelectedState) => {
-  productToUnselect.map(({ selCtx, id }) => {
+const selectProductsInForm = (productToSelect, setValueInForm, initialSelectedState) => {
+  console.log("LOG1 productToSelect", productToSelect);
+  productToSelect.map(({ selCtx, id }) => {
     var _a;
     const productInInitialState = (_a = initialSelectedState[selCtx]) == null ? void 0 : _a[id];
     if (productInInitialState) {
@@ -6913,12 +6935,11 @@ const selectProductsInForm = (productToUnselect, setValueInForm, initialSelected
 };
 function useMenuOptions(product, nestedLvl, parentKind, parentSelCtx) {
   const { selCtx, attrs = {} } = product;
-  const stateFilter = useStore((state) => state.filter);
   const initialSelected = useStore((state) => state.initialSelected);
   const currency = useStore((state) => state.currency);
   const { setValue, getValues } = useFormContext();
-  const { selected = {} } = getValues();
-  const isFilterValidated = validateProductFilter(product, stateFilter);
+  const { selected = {}, filter = {} } = getValues();
+  const isFilterValidated = validateProductFilter(product, filter);
   const isOnSubmitted = useStore((state) => state.isOnSubmitted);
   const setValidationMap = useStore((state) => state.setValidationMap);
   const [selCnt, qtyCnt] = getSelCtxCntFromSelectedState(
@@ -6941,9 +6962,8 @@ function useMenuOptions(product, nestedLvl, parentKind, parentSelCtx) {
       product,
       isFilterValidated
     );
-    unselectProductsInForm(productsToUnselect, setValue);
     selectProductsInForm(productsToSelect, setValue, initialSelected);
-  }, [stateFilter]);
+  }, [isFilterValidated]);
   return {
     isFilterValidated,
     selected,
@@ -8804,15 +8824,63 @@ function Counter(props) {
     })]
   });
 }
-function useEmitFilter(product) {
-  const { watch, setValue } = useFormContext();
-  const setFilter = useStore((state) => state.setFilter);
+function useEmitFilter(product, isRadio, nestedLvl) {
+  const { watch, setValue, getValues, unregister } = useFormContext();
   const { id, selCtx, emit = {}, fltCtx } = product;
   const value = watch(`selected.${selCtx}.${id}`);
   useEffect(() => {
+    var _a, _b, _c;
+    if (!nestedLvl || nestedLvl > 1) {
+      return;
+    }
+    const groupsPath = `filterWithCnt.${fltCtx}`;
+    const groupCntPath = `filterWithCnt.${fltCtx}.${selCtx}`;
+    const fltCtxPath = `filter.${fltCtx}`;
+    if (isRadio && value && fltCtx) {
+      if (isEmpty(emit)) {
+        const groupValues = getValues(groupCntPath);
+        (_a = Object.keys(groupValues || {})) == null ? void 0 : _a.forEach((x2) => {
+          unregister(`${groupCntPath}.${x2}`);
+          const groupsKeys = Object.keys(getValues(groupsPath) || {});
+          if (isEmpty(groupsKeys)) {
+            unregister(`${fltCtxPath}.${x2}`);
+          } else {
+            groupsKeys.forEach((groupSelCtx) => {
+              if (groupSelCtx !== selCtx && !getValues(`${groupsPath}.${groupSelCtx}.${x2}`)) {
+                unregister(`${fltCtxPath}.${x2}`);
+              }
+            });
+          }
+        });
+        return;
+      } else {
+        const productGroupCntKeys = getValues(groupCntPath);
+        const groupsCntKeys = getValues(groupsPath);
+        (_b = Object.keys(emit)) == null ? void 0 : _b.forEach((x2) => {
+          var _a2;
+          (_a2 = Object.keys(productGroupCntKeys || {})) == null ? void 0 : _a2.forEach((productGroupCntKey) => {
+            if (!emit[productGroupCntKey]) {
+              unregister(`${fltCtxPath}.${productGroupCntKey}`);
+              unregister(`${groupCntPath}.${productGroupCntKey}`);
+            }
+          });
+          Object.keys(groupsCntKeys || {}).forEach((groupSelCtx) => {
+            if (groupSelCtx !== selCtx && x2 in getValues(groupsPath == null ? void 0 : groupsPath[groupSelCtx])) {
+              unregister(`${groupsPath}.${groupSelCtx}.${x2}`);
+            }
+          });
+          setValue(`${fltCtxPath}.${x2}`, emit[x2]);
+          setValue(`${groupCntPath}.${x2}`, { cnt: 1, value: emit[x2] });
+        });
+        return;
+      }
+    }
     if (value && fltCtx && !isEmpty(emit)) {
-      setFilter(fltCtx, emit);
-      setValue(`filter.${fltCtx}`, emit);
+      (_c = Object.keys(emit)) == null ? void 0 : _c.forEach((x2) => {
+        setValue(`filter.${fltCtx}.${x2}`, emit[x2]);
+        const groupKeyCnt = getValues(`${groupCntPath}.${x2}.cnt`) || 0;
+        setValue(`${groupCntPath}.${x2}`, { cnt: groupKeyCnt + 1, value: emit[x2] });
+      });
     }
   }, [value]);
   return {};
@@ -8836,6 +8904,7 @@ const addProductToState = (selected, setValue) => {
 };
 const removeProductFromState = (selCtx, getValues, setValue) => {
   const changedSelCtx = getValues(`selected.${selCtx}`);
+  console.log("changedSelCtx", changedSelCtx);
   setValue(
     `selected.${selCtx}`,
     Object.keys(changedSelCtx).reduce((acc, key) => {
@@ -8844,70 +8913,133 @@ const removeProductFromState = (selCtx, getValues, setValue) => {
     }, {})
   );
 };
-const selectUnselectProduct = (setValue, getValues, items, isChecked, state) => {
+const selectUnselectProduct = (setValue, getValues, product, isChecked, unregister, nestedLvl) => {
+  var _a, _b;
+  const { items, state, emit, fltCtx, selCtx } = product;
   const { selected = {} } = state || {};
+  console.log("selected/unselected product", product, isChecked);
   if (isChecked) {
     addProductToState(selected, setValue);
     const checkSubProducts = (items2) => {
-      var _a;
+      var _a2;
       if (!Array.isArray(items2) || isEmpty(state == null ? void 0 : state.selected))
         return;
-      (_a = items2 == null ? void 0 : items2.filter((x2) => {
-        var _a2, _b;
-        return !!((_b = (_a2 = state.selected) == null ? void 0 : _a2[`${x2.selCtx}`]) == null ? void 0 : _b[`${x2.id}`]);
-      })) == null ? void 0 : _a.map((product) => {
-        if (product.state && "selected" in product.state) {
+      (_a2 = items2 == null ? void 0 : items2.filter((x2) => {
+        var _a3, _b2;
+        return !!((_b2 = (_a3 = state.selected) == null ? void 0 : _a3[`${x2.selCtx}`]) == null ? void 0 : _b2[`${x2.id}`]);
+      })) == null ? void 0 : _a2.map((product2) => {
+        if (product2.state && "selected" in product2.state) {
           const {
             state: { selected: selected2 }
-          } = product;
+          } = product2;
           addProductToState(selected2, setValue);
         }
-        if (Array.isArray(product.items)) {
-          checkSubProducts(product.items);
+        if (Array.isArray(product2.items)) {
+          checkSubProducts(product2.items);
         }
       });
     };
     checkSubProducts(items);
   } else {
-    Object.keys(selected).forEach((selCtx) => {
-      removeProductFromState(selCtx, getValues, setValue);
+    Object.keys(selected).forEach((selCtx2) => {
+      removeProductFromState(selCtx2, getValues, setValue);
     });
     const checkSubProducts = (items2) => {
       if (!Array.isArray(items2))
         return;
-      items2.map((product) => {
-        const { selCtx } = product;
-        const changedSelCtx = getValues(`selected.${selCtx}`);
+      items2.map((product2) => {
+        const { selCtx: selCtx2 } = product2;
+        const changedSelCtx = getValues(`selected.${selCtx2}`);
         if (changedSelCtx) {
-          removeProductFromState(selCtx, getValues, setValue);
+          removeProductFromState(selCtx2, getValues, setValue);
         }
-        checkSubProducts(product.items);
+        checkSubProducts(product2.items);
       });
     };
     checkSubProducts(items);
+    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}`;
+      (_b = Object.keys(emit)) == null ? void 0 : _b.forEach((emitKey) => {
+        var _a2, _b2, _c;
+        const groupValue = getValues(`${groupCntPath}.${emitKey}`) || 0;
+        if (groupValue) {
+          if (groupValue > 1) {
+            setValue(`${groupCntPath}.${emitKey}`, groupValue - 1);
+          } else {
+            unregister(`${groupCntPath}.${emitKey}`);
+            const groupKeysObj = getValues(groupsPath) || {};
+            const otherGroupsCntKeys = (_a2 = Object.keys(groupKeysObj)) == null ? void 0 : _a2.filter((x2) => x2 !== selCtx);
+            if (!otherGroupsCntKeys) {
+              unregister(`${fltCtxPath}.${emitKey}`);
+            } else {
+              const sameKeyOtherGroup = otherGroupsCntKeys == null ? void 0 : otherGroupsCntKeys.find((groupSelCtx) => {
+                var _a3;
+                return !!((_a3 = groupKeysObj == null ? void 0 : groupKeysObj[`${groupSelCtx}`]) == null ? void 0 : _a3[`${emitKey}`]);
+              });
+              if (!sameKeyOtherGroup) {
+                unregister(`${fltCtxPath}.${emitKey}`);
+              } else {
+                const newValue = (_c = (_b2 = groupKeysObj == null ? void 0 : groupKeysObj[`${sameKeyOtherGroup}`]) == null ? void 0 : _b2[`${emitKey}`]) == null ? void 0 : _c.value;
+                setValue(`${fltCtxPath}.${emitKey}`, newValue);
+              }
+            }
+          }
+        }
+      });
+    }
+  }
+};
+const findProductInParentProductBySelCtx = (parent, selCtx) => {
+  var _a;
+  if (!parent.items || isEmpty(parent.items)) {
+    return null;
+  }
+  for (let i2 = 0; i2 < ((_a = parent.items) == null ? void 0 : _a.length); i2++) {
+    const prod = parent.items[i2];
+    if (prod.selCtx) {
+      if (prod.selCtx === selCtx && prod.kind === EProductKind.PRODUCT) {
+        return prod;
+      }
+    }
+    if (prod.kind === EProductKind.OPTIONS && prod.items && prod.items.length > 0) {
+      const found = findProductInParentProductBySelCtx(prod, selCtx);
+      if (found) {
+        return found;
+      }
+    }
   }
+  return null;
 };
-function useMenuProduct(product, parentAttrs) {
+function useMenuProduct(product, parentAttrs, nestedLvl, parentPriduct) {
   var _a;
-  const { id, selCtx } = product;
+  const { id, selCtx, emit = {}, fltCtx } = product;
   const {
     allowMultiple: parentAllowMultiple,
     selMin: parentSelMin,
     selMax: parentSelMax
   } = parentAttrs;
-  useEmitFilter(product);
   const { isInputEnabled: isInputEnabled2, isInputCounterIncrementEnabled: isInputCounterIncrementEnabled2 } = useValidate();
   const refreshForm = useStore((state) => state.refreshForm);
   const currency = useStore((state) => state.currency);
-  const { watch, getValues, setValue, register } = useFormContext();
+  const { watch, getValues, setValue, register, unregister } = useFormContext();
   const value = watch(`selected.${selCtx}.${id}`);
   const { selected = {} } = getValues();
   const valueNumber = Number(value || 0);
-  const stateFilter = useStore((state) => state.filter);
   const isRadio = parentSelMin === "1" && parentSelMax === "1";
+  useEmitFilter(product, isRadio, nestedLvl);
   const isCheckbox = !isRadio;
   const isCounter = isApiBooleanTrue(parentAllowMultiple);
-  const isFilterValidated = validateProductFilter(product, stateFilter);
   const isDecrementEnabled = valueNumber > (isRadio ? 1 : 0);
   const isIncrementEnabled = isInputCounterIncrementEnabled2(product, selected) && (isInputEnabled2(product) || valueNumber);
   const isChecked = Number(((_a = selected == null ? void 0 : selected[selCtx]) == null ? void 0 : _a[id]) || 0) > 0;
@@ -8919,13 +9051,38 @@ function useMenuProduct(product, parentAttrs) {
     }
   });
   const handleCounterIncrementQty = () => {
+    var _a2, _b;
     setValue(`selected.${selCtx}.${id}`, `${valueNumber + 1}`);
+    const importantSubProductsInState = (_b = (_a2 = Object.keys(selected)) == null ? void 0 : _a2.map((y2) => {
+      var _a3;
+      return { key: y2, subProductId: (_a3 = findProductInParentProductBySelCtx(product, y2)) == null ? void 0 : _a3.id };
+    })) == null ? void 0 : _b.filter((x2) => !!x2.subProductId);
+    importantSubProductsInState == null ? void 0 : importantSubProductsInState.forEach((x2) => {
+      setValue(`selected.${x2.key}.${x2.subProductId}`, `${valueNumber + 1}`);
+    });
   };
   const handleCounterDecrementQty = () => {
+    var _a2, _b, _c, _d;
     const decrementedValue = valueNumber - 1;
     setValue(`selected.${selCtx}.${id}`, `${decrementedValue}`);
+    const importantSubProductsInState = (_b = (_a2 = Object.keys(selected)) == null ? void 0 : _a2.map((y2) => {
+      var _a3;
+      return { key: y2, subProductId: (_a3 = findProductInParentProductBySelCtx(product, y2)) == null ? void 0 : _a3.id };
+    })) == null ? void 0 : _b.filter((x2) => !!x2.subProductId);
+    importantSubProductsInState == null ? void 0 : importantSubProductsInState.forEach((x2) => {
+      setValue(`selected.${x2.key}.${x2.subProductId}`, `${decrementedValue}`);
+    });
     if (isCheckbox && decrementedValue === 0) {
       setValue(`selected.${selCtx}.${id}`, false);
+      (_c = Object.keys(emit)) == null ? void 0 : _c.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 checkSubProducts = (items) => {
         if (!Array.isArray(items))
           return;
@@ -8939,15 +9096,55 @@ function useMenuProduct(product, parentAttrs) {
         });
       };
       checkSubProducts(product.items);
+      if (nestedLvl && nestedLvl < 2 && !isEmpty(emit)) {
+        const groupsPath = `filterWithCnt.${fltCtx}`;
+        const groupCntPath = `filterWithCnt.${fltCtx}.${selCtx}`;
+        const fltCtxPath = `filter.${fltCtx}`;
+        (_d = Object.keys(emit)) == null ? void 0 : _d.forEach((emitKey) => {
+          var _a3, _b2, _c2;
+          const groupValue = getValues(`${groupCntPath}.${emitKey}`) || 0;
+          if (groupValue) {
+            if (groupValue > 1) {
+              setValue(`${groupCntPath}.${emitKey}`, groupValue - 1);
+            } else {
+              unregister(`${groupCntPath}.${emitKey}`);
+              const groupKeysObj = getValues(groupsPath) || {};
+              const otherGroupsCntKeys = (_a3 = Object.keys(groupKeysObj)) == null ? void 0 : _a3.filter((x2) => x2 !== selCtx);
+              if (!otherGroupsCntKeys) {
+                unregister(`${fltCtxPath}.${emitKey}`);
+              } else {
+                const sameKeyOtherGroup = otherGroupsCntKeys == null ? void 0 : otherGroupsCntKeys.find((groupSelCtx) => {
+                  var _a4;
+                  return !!((_a4 = groupKeysObj == null ? void 0 : groupKeysObj[`${groupSelCtx}`]) == null ? void 0 : _a4[`${emitKey}`]);
+                });
+                if (!sameKeyOtherGroup) {
+                  unregister(`${fltCtxPath}.${emitKey}`);
+                } else {
+                  const newValue = (_c2 = (_b2 = groupKeysObj == null ? void 0 : groupKeysObj[`${sameKeyOtherGroup}`]) == null ? void 0 : _b2[`${emitKey}`]) == null ? void 0 : _c2.value;
+                  setValue(`${fltCtxPath}.${emitKey}`, newValue);
+                }
+              }
+            }
+          }
+        });
+      }
     }
   };
   const handleOnInputChange = (e2) => {
+    var _a2;
     const {
       target: { checked, name: selCtx2, defaultValue: productId }
     } = e2;
-    selectUnselectProduct(setValue, getValues, product.items, checked, product.state);
+    selectUnselectProduct(setValue, getValues, product, checked, unregister, nestedLvl);
     if (isRadio) {
       console.log("handleOnInputChange radio", selCtx2, productId);
+      const otherGroupItems = (_a2 = parentPriduct == null ? void 0 : parentPriduct.items) == null ? void 0 : _a2.filter((x2) => x2.id !== product.id);
+      for (const key of Object.keys(selected || {})) {
+        const isItemToClear = (otherGroupItems == null ? void 0 : otherGroupItems.some((x2) => !!findProductInParentProductBySelCtx(x2, key))) ? key : false;
+        if (isItemToClear) {
+          setValue(`selected.${key}`, false);
+        }
+      }
       const selectedContextName = "selected." + selCtx2.replace("radio.", "").split(".")[0];
       setValue(selectedContextName, { [productId]: "1" });
       refreshForm();
@@ -8968,8 +9165,7 @@ function useMenuProduct(product, parentAttrs) {
     handleOnInputChange,
     inputId: `${selCtx}.${id}`,
     radioInputValue: id,
-    currency,
-    isFilterValidated
+    currency
   };
 }
 const MenuProduct = (props) => {
@@ -8994,9 +9190,8 @@ const MenuProduct = (props) => {
     counterValue,
     handleCounterIncrementQty,
     handleCounterDecrementQty,
-    currency,
-    isFilterValidated
-  } = useMenuProduct(product, parentAttrs);
+    currency
+  } = useMenuProduct(product, parentAttrs, nestedLvl, parentProduct);
   const {
     MenuProductUI
   } = useComponents();
@@ -9017,8 +9212,7 @@ const MenuProduct = (props) => {
     handleCounterIncrementQty,
     handleCounterDecrementQty,
     currency,
-    parentProduct,
-    isFilterValidated
+    parentProduct
   };
   const MenuItemsDispatcherWrapper = /* @__PURE__ */ jsx(MenuItemsDispatcher, {
     productItems: product.items,
@@ -9234,11 +9428,13 @@ const DisplayState = () => {
   } = useFormContext();
   const selected = watch("selected");
   const filter = watch("filter");
+  const filterWithCnt = watch("filterWithCnt");
   const validationMap = useStore((state) => state.validationMap);
   console.log({
     selected,
     validationMap,
-    filter
+    filter,
+    filterWithCnt
   });
   return /* @__PURE__ */ jsxs("div", {
     className: "flex flex-col items-center py-4",
@@ -10833,6 +11029,81 @@ function MenuProductRootDefaultUI(props) {
     })
   });
 }
+const getValidationMap2 = (product, selected = {}, filter, map, nestedLvl = 0) => {
+  var _a, _b;
+  const res = map || {};
+  if (nestedLvl === 0 || ((_a = selected[product.selCtx]) == null ? void 0 : _a[product.id])) {
+    (_b = product == null ? void 0 : product.items) == null ? void 0 : _b.forEach((x2) => {
+      var _a2, _b2, _c, _d, _e2, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+      if (x2.kind === EProductKind.OPTIONS && (((_a2 = x2.attrs) == null ? void 0 : _a2.vital) || ((_b2 = x2 == null ? void 0 : x2.attrs) == null ? void 0 : _b2.selMin) || ((_c = x2.attrs) == null ? void 0 : _c.selMax) || ((_d = x2.attrs) == null ? void 0 : _d.qtyMin) || ((_e2 = x2.attrs) == null ? void 0 : _e2.qtyMax) || ((_f = x2.attrs) == null ? void 0 : _f.allowMultiple))) {
+        const [selCnt, qtyCnt] = getSelCtxCntFromSelectedState(
+          x2.selCtx,
+          selected,
+          x2.items
+        );
+        const isFilterValidated = validateProductFilter(product, filter);
+        res[x2.selCtx] = {
+          isSelCntAllowedToIncrement: selCnt < Number(((_g = x2 == null ? void 0 : x2.attrs) == null ? void 0 : _g.selMax) || Number.MAX_SAFE_INTEGER),
+          isQtyCntAllowedToIncrement: qtyCnt < Number(((_h = x2 == null ? void 0 : x2.attrs) == null ? void 0 : _h.qtyMax) || Number.MAX_SAFE_INTEGER),
+          nestedLvl,
+          isPassedFiltering: isFilterValidated,
+          isValid: inRange(
+            selCnt,
+            Number(((_i = x2.attrs) == null ? void 0 : _i.selMin) || 0),
+            Number(((_j = x2.attrs) == null ? void 0 : _j.selMax) || Number.MAX_SAFE_INTEGER) + 1
+          ) && inRange(
+            qtyCnt,
+            Number(((_k = x2.attrs) == null ? void 0 : _k.qtyMin) || 0),
+            Number(((_l = x2.attrs) == null ? void 0 : _l.qtyMax) || Number.MAX_SAFE_INTEGER) + 1
+          ) && (((_m = x2.attrs) == null ? void 0 : _m.vital) !== true || ((_n = x2.attrs) == null ? void 0 : _n.vital) === true && selCnt > 0) && (((_o = x2.attrs) == null ? void 0 : _o.allowMultiple) === true || !((_p = x2.attrs) == null ? void 0 : _p.allowMultiple) && selCnt <= 1)
+        };
+      }
+      if ((x2 == null ? void 0 : x2.items) && ((_q = x2.items) == null ? void 0 : _q.length) > 0) {
+        (_r = x2.items) == null ? void 0 : _r.forEach((item) => {
+          getValidationMap2(item, selected, filter, res, nestedLvl + 1);
+        });
+      }
+    });
+  }
+  return res;
+};
+const GroupsValidationContext = React__default.createContext(null);
+function GroupsValidationProvivider({
+  rootProduct,
+  children
+}) {
+  return /* @__PURE__ */ jsx(GroupsValidationContext.Provider, {
+    value: {
+      rootProduct
+    },
+    children
+  });
+}
+function useGroupsValidation(product) {
+  const context = useContext(GroupsValidationContext);
+  const selected = useWatch({
+    name: "selected"
+  });
+  const filter = useWatch({
+    name: "filter"
+  });
+  const [validationMap2, setValidationMap2] = useState(void 0);
+  if (!context) {
+    throw new Error("Missing ComponentsContext");
+  }
+  useEffect(() => {
+    console.log("useGroupsValidation validationMap2 change");
+  }, [validationMap2]);
+  useEffect(() => {
+    const newMap = getValidationMap2(product, selected, filter);
+    if (!isEqual(newMap, validationMap2)) {
+      setValidationMap2(newMap);
+    }
+  }, [selected, filter]);
+  return {
+    validationMap2
+  };
+}
 const MenuProductRoot = (props) => {
   const {
     product
@@ -10840,6 +11111,9 @@ const MenuProductRoot = (props) => {
   const {
     MenuProductRootUI
   } = useComponents();
+  const {
+    validationMap2
+  } = useGroupsValidation(product);
   const MenuItemsDispatcherWrapper = !isEmpty(product.items) ? /* @__PURE__ */ jsx(MenuItemsDispatcher, {
     productItems: product.items,
     parentProduct: product,
@@ -10848,11 +11122,13 @@ const MenuProductRoot = (props) => {
   if (MenuProductRootUI) {
     return /* @__PURE__ */ jsx(MenuProductRootUI, {
       ...props,
+      validationMap: validationMap2 || {},
       children: MenuItemsDispatcherWrapper
     });
   }
   return /* @__PURE__ */ jsx(MenuProductRootDefaultUI, {
     ...props,
+    validationMap: validationMap2 || {},
     children: MenuItemsDispatcherWrapper
   });
 };
@@ -10894,28 +11170,19 @@ function ProductConfigurator(props) {
     encodedProduct,
     initSelected,
     initFilter,
-    filter,
     productQuantity,
     setIsOnSubmittedOnTrue,
     getInvalidSelCtxArray,
-    getValidationMap,
     increaseProductQuantity,
     decreaseProductQuantity,
     setCurrency
   } = useProductConfigurator(product);
-  const [validationMap, setValidationMap] = useState(getValidationMap());
   useEffect(() => {
     instance.changeLanguage(lang);
   }, [lang]);
   useEffect(() => {
     setCurrency(currency);
   }, [currency]);
-  useEffect(() => {
-    const validationMapNew = getValidationMap();
-    if (!isEqual(validationMapNew, validationMap)) {
-      setValidationMap(validationMapNew);
-    }
-  });
   const methods = useForm({
     defaultValues: {
       selected: initSelected,
@@ -10927,6 +11194,7 @@ function ProductConfigurator(props) {
   } = methods;
   const countedProductPrice = Number((parseFloat(price || "0") + countPrice(getValues("selected"), encodedProduct)).toFixed(2));
   const onSubmit = () => {
+    var _a;
     console.log("onSubmit");
     setIsOnSubmittedOnTrue();
     const invalidContextNames = getInvalidSelCtxArray();
@@ -10938,6 +11206,16 @@ function ProductConfigurator(props) {
     } else {
       console.log("selected", getValues("selected"));
       const decodedCleanedSelected = decodeSelected(cleanSelected(getValues("selected")));
+      const filter = getValues("filter");
+      (_a = Object.keys(decodedCleanedSelected || {})) == null ? void 0 : _a.forEach((x2) => {
+        const group = findGroupInProductItemsBySelCtx(x2, product);
+        if (group) {
+          const isFilterValidated = validateProductFilter(group, filter);
+          if (!isFilterValidated) {
+            delete decodedCleanedSelected[x2];
+          }
+        }
+      });
       console.log("decodedCleanedSelected: ", decodedCleanedSelected);
       handleAddToCart({
         price: countedProductPrice,
@@ -10959,19 +11237,21 @@ function ProductConfigurator(props) {
             children: [showDebugState && /* @__PURE__ */ jsx("div", {
               className: "hidden",
               children: /* @__PURE__ */ jsx(DisplayState, {})
-            }), /* @__PURE__ */ jsx(MenuProductRoot, {
-              product: encodedProduct,
-              productQuantity,
-              validationMap,
-              isOpen,
-              handleClose,
-              handleGoBack,
-              handleOnSubmit,
-              countedProductPrice,
-              countedProductTotalPrice: countedProductPrice * productQuantity,
-              increaseProductQuantity,
-              decreaseProductQuantity,
-              currency
+            }), /* @__PURE__ */ jsx(GroupsValidationProvivider, {
+              rootProduct: encodedProduct,
+              children: /* @__PURE__ */ jsx(MenuProductRoot, {
+                product: encodedProduct,
+                productQuantity,
+                isOpen,
+                handleClose,
+                handleGoBack,
+                handleOnSubmit,
+                countedProductPrice,
+                countedProductTotalPrice: countedProductPrice * productQuantity,
+                increaseProductQuantity,
+                decreaseProductQuantity,
+                currency
+              })
             })]
           })
         })
@@ -10979,5 +11259,5 @@ function ProductConfigurator(props) {
     })
   });
 }
-export { ContextType, MainView, ProductConfigurator, ProductKinds, ProductTypes, SelMinSelMaxStatus, getProductToChangeInForm, index_esm as hookForm, selectProductsInForm, unselectProductsInForm, useProductData, validateProductFilter };
+export { ContextType, MainView, ProductConfigurator, ProductKinds, ProductTypes, SelMinSelMaxStatus, getProductToChangeInForm, index_esm as hookForm, selectProductsInForm, unselectProductsInForm, useMenuOptions, useProductData, useStore, validateProductFilter };
 //# sourceMappingURL=index.es.js.map