@licklist/design 0.70.9 → 0.70.10

package/dist/product-set/form/VenueMapSetModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VenueMapSetModal.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/VenueMapSetModal.tsx"],"names":[],"mappings":"AAeA,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IACtC,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,gBAAgB,4CAI1B,qBAAqB,4CAyMvB,CAAA"}
+{"version":3,"file":"VenueMapSetModal.d.ts","sourceRoot":"","sources":["../../../src/product-set/form/VenueMapSetModal.tsx"],"names":[],"mappings":"AAcA,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IACtC,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,gBAAgB,4CAI1B,qBAAqB,4CAyMvB,CAAA"}

package/dist/product-set/form/VenueMapSetModal.js

@@ -3,7 +3,7 @@ import { useContext, useCallback, useMemo } from 'react';
 import { Modal, Form, Button } from 'react-bootstrap';
 import clsx from 'clsx';
 import { useTranslation } from 'react-i18next';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext, useWatch } from 'react-hook-form';
 import HookFormService from '@licklist/plugins/dist/services/Form/HookFormService';
 import '../../static/index.js';
 import { ProductSetLoadingContext } from './context.js';
@@ -219,12 +219,14 @@ var VenueMapSetModal = function(param) {
         'Validation'
     ]).t;
     var _useContext = useContext(ProductSetLoadingContext), _useContext_venueMapSets = _useContext.venueMapSets, venueMapSets = _useContext_venueMapSets === void 0 ? [] : _useContext_venueMapSets, providerHasMap = _useContext.providerHasMap;
-    var _useFormContext = useFormContext(), register = _useFormContext.register, errors = _useFormContext.formState.errors, watch = _useFormContext.watch, setValue = _useFormContext.setValue, trigger = _useFormContext.trigger;
+    var _useFormContext = useFormContext(), register = _useFormContext.register, errors = _useFormContext.formState.errors, watch = _useFormContext.watch, setValue = _useFormContext.setValue, trigger = _useFormContext.trigger, control = _useFormContext.control;
     var key = "steps.".concat(stepIndex, ".venueMapSetId");
     var productPointsKey = "steps.".concat(stepIndex, ".pointProducts");
     var venueMapSetId = watch(key) || null;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    var productCategories = watch("steps.".concat(stepIndex, ".productCategories")) || [];
+    var productCategories = useWatch({
+        control: control,
+        name: "steps.".concat(stepIndex, ".productCategories")
+    });
     var pointProducts = watch(productPointsKey) || [];
     var onCloseModal = function() {
         setIsVisible(false);
@@ -265,9 +267,7 @@ var VenueMapSetModal = function(param) {
     }, // eslint-disable-next-line react-hooks/exhaustive-deps
     []);
     var products = useMemo(function() {
-        if (!productCategories || !productCategories.length) {
-            return [];
-        }
+        if (!(productCategories === null || productCategories === void 0 ? void 0 : productCategories.length)) return [];
         return productCategories.reduce(function(prevProducts, currentCategory) {
             return _to_consumable_array(prevProducts).concat(_to_consumable_array(currentCategory.products || []));
         }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.70.9",
+  "version": "0.70.10",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/product-set/form/VenueMapSetModal.tsx

@@ -2,7 +2,7 @@ import { useCallback, useContext, useMemo } from 'react'
 import { Modal, Button, Form } from 'react-bootstrap'
 import clsx from 'clsx'
 import { useTranslation } from 'react-i18next'
-import { useFormContext } from 'react-hook-form'
+import { useFormContext, useWatch } from 'react-hook-form'
 import HookFormService from '@licklist/plugins/dist/services/Form/HookFormService'
 import { PointProduct } from '@licklist/core/dist/DataMapper/Product/PointProductDataMapper'
 import { VenueMap } from '@licklist/core/dist/DataMapper/Product/VenueMapDataMapper'
@@ -11,7 +11,6 @@ import { WarningMessage } from '../../static'
 import { ProductSetLoadingContext } from './context'
 import { ProductSetFormValues } from './ProductSetForm'
 import { VenueMapsControl } from './VenueMapsControl'
-import { ProductCategory } from '../types'
 
 type VenueMapSetModalProps = {
   isVisible: boolean
@@ -34,6 +33,7 @@ export const VenueMapSetModal = ({
     watch,
     setValue,
     trigger,
+    control,
   } = useFormContext<ProductSetFormValues>()
 
   const key = `steps.${stepIndex}.venueMapSetId` as const
@@ -41,9 +41,10 @@ export const VenueMapSetModal = ({
 
   const venueMapSetId: number | null = watch(key) || null
 
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const productCategories: ProductCategory[] =
-    watch(`steps.${stepIndex}.productCategories` as const) || []
+  const productCategories = useWatch({
+    control,
+    name: `steps.${stepIndex}.productCategories`,
+  })
 
   const pointProducts: Partial<PointProduct>[] = watch(productPointsKey) || []
 
@@ -70,12 +71,10 @@ export const VenueMapSetModal = ({
   )
 
   const products = useMemo(() => {
-    if (!productCategories || !productCategories.length) {
-      return []
-    }
+    if (!productCategories?.length) return []
 
     return productCategories.reduce(
-      (prevProducts, currentCategory: ProductCategory) => [
+      (prevProducts, currentCategory) => [
         ...prevProducts,
         ...(currentCategory.products || []),
       ],