paymob-pixel-alpha 1.1.25 → 1.1.26

package/main.js

@@ -13582,57 +13582,54 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
     formState: {
       errors,
       isDirty,
-      isValid,
-      dirtyFields
+      isValid
     },
     setValue,
     trigger,
     clearErrors,
-    control
+    control,
+    getValues
   } = useForm({
     mode: 'onChange',
     shouldUnregister: true,
     defaultValues: flattenContactFormValues(defaultCountryISO, defaultValues)
   });
+  const countriesSource = useMemo(() => {
+    if (allowedCountries && allowedCountries.length > 0) {
+      return restCountries.filter(c => allowedCountries.includes(c.iso));
+    }
+    return restCountries;
+  }, [allowedCountries, restCountries]);
   const {
     defaultCountry,
     defaultShippingCountry,
     defaultBillingCountry
   } = useMemo(() => {
-    const result = {
-      defaultCountry: {},
-      defaultShippingCountry: {},
-      defaultBillingCountry: {}
+    var _defaultValues$shippi, _defaultValues$billin;
+    const fallback = countriesSource.find(c => c.iso === defaultCountryISO) || countriesSource[0] || null;
+    const shipping = defaultValues != null && (_defaultValues$shippi = defaultValues.shipping) != null && _defaultValues$shippi.country ? countriesSource.find(c => {
+      var _defaultValues$shippi2;
+      return c.iso === ((_defaultValues$shippi2 = defaultValues.shipping) == null ? void 0 : _defaultValues$shippi2.country);
+    }) || null : null;
+    const billing = defaultValues != null && (_defaultValues$billin = defaultValues.billing) != null && _defaultValues$billin.country ? countriesSource.find(c => {
+      var _defaultValues$billin2;
+      return c.iso === ((_defaultValues$billin2 = defaultValues.billing) == null ? void 0 : _defaultValues$billin2.country);
+    }) || null : null;
+    return {
+      defaultCountry: shipping || billing || fallback,
+      defaultShippingCountry: shipping || fallback,
+      defaultBillingCountry: billing || fallback
     };
-    for (const country of restCountries) {
-      var _defaultValues$shippi, _defaultValues$billin, _defaultValues$shippi2, _defaultValues$billin2;
-      if (country.iso === defaultCountryISO) {
-        result.defaultCountry = country;
-      }
-      if (defaultValues != null && (_defaultValues$shippi = defaultValues.shipping) != null && _defaultValues$shippi.country && country.iso === defaultValues.shipping.country) {
-        result.defaultShippingCountry = country;
-      }
-      if (defaultValues != null && (_defaultValues$billin = defaultValues.billing) != null && _defaultValues$billin.country && country.iso === defaultValues.billing.country) {
-        result.defaultBillingCountry = country;
-      }
-      if (!(defaultValues != null && defaultValues.shipping) && !(defaultValues != null && (_defaultValues$shippi2 = defaultValues.shipping) != null && _defaultValues$shippi2.country) && country.iso === defaultCountryISO) {
-        result.defaultShippingCountry = country;
-      }
-      if (!(defaultValues != null && defaultValues.billing) && !(defaultValues != null && (_defaultValues$billin2 = defaultValues.billing) != null && _defaultValues$billin2.country) && country.iso === defaultCountryISO) {
-        result.defaultBillingCountry = country;
-      }
-    }
-    return result;
-  }, [restCountries, defaultCountryISO, JSON.stringify(defaultValues)]);
+  }, [countriesSource, defaultCountryISO, JSON.stringify(defaultValues)]);
   const {
     t
   } = useTranslation('kitComponents');
   const isMobile = useWidth();
   const [country, setCountry] = useState(defaultCountry);
   const [shippingCountry, setShippingCountry] = useState(defaultShippingCountry);
-  const [shippingPhoneCountry, setShippingPhoneCountry] = useState(defaultCountry);
+  const [shippingPhoneCountry, setShippingPhoneCountry] = useState(defaultShippingCountry);
   const [billingCountry, setBillingCountry] = useState(defaultBillingCountry);
-  const [billingPhoneCountry, setBillingPhoneCountry] = useState(defaultCountry);
+  const [billingPhoneCountry, setBillingPhoneCountry] = useState(defaultBillingCountry);
   const [regionData, setRegionData] = useState(null);
   const [isLoadingRegionData, setIsLoadingRegionData] = useState(false);
   const countriesOptions = useMemo(() => {
@@ -13707,6 +13704,27 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
       getRegionData();
     }
   }, []);
+  useEffect(() => {
+    if (!defaultCountryISO || !(allowedCountries != null && allowedCountries.length)) return;
+    if (allowedCountries.includes(defaultCountryISO)) {
+      if (collectShippingAddress) {
+        setValue("shipping_country", defaultCountryISO, {
+          shouldValidate: true,
+          shouldDirty: true
+        });
+        setShippingCountry(countriesSource.find(c => c.iso === defaultCountryISO) || null);
+        setShippingPhoneCountry(countriesSource.find(c => c.iso === defaultCountryISO) || null);
+      }
+      if (collectBillingAddress) {
+        setValue("billing_country", defaultCountryISO, {
+          shouldValidate: true,
+          shouldDirty: true
+        });
+        setBillingCountry(countriesSource.find(c => c.iso === defaultCountryISO) || null);
+        setBillingPhoneCountry(countriesSource.find(c => c.iso === defaultCountryISO) || null);
+      }
+    }
+  }, [defaultCountryISO, allowedCountries, collectShippingAddress, collectBillingAddress, countriesSource, setValue]);
   const createEmailRegister = useCallback(({
     field: _field = 'email'
   } = {}) => {
@@ -13860,14 +13878,14 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
           name: `${prefix}_phone_number`,
           error: errors[`${prefix}_phone_number`],
           selectedCountry: {
-            name: prefix === ADDRESS_TYPES.SHIPPING ? shippingPhoneCountry.name : billingPhoneCountry.name,
-            code: prefix === ADDRESS_TYPES.SHIPPING ? shippingPhoneCountry.code : billingPhoneCountry.code
+            name: prefix === ADDRESS_TYPES.SHIPPING ? shippingPhoneCountry == null ? void 0 : shippingPhoneCountry.name : billingPhoneCountry == null ? void 0 : billingPhoneCountry.name,
+            code: prefix === ADDRESS_TYPES.SHIPPING ? shippingPhoneCountry == null ? void 0 : shippingPhoneCountry.code : billingPhoneCountry == null ? void 0 : billingPhoneCountry.code
           },
           className: getInputClasses(`${prefix}_phone_number`, 'middle'),
           setSelectedCountry: country => prefix === ADDRESS_TYPES.SHIPPING ? setShippingPhoneCountry(country) : setBillingPhoneCountry(country),
           phoneFormRegister: createPhoneRegister({
             field: `${prefix}_phone_number`,
-            countryCode: prefix === ADDRESS_TYPES.SHIPPING ? shippingPhoneCountry.code : billingPhoneCountry.code
+            countryCode: prefix === ADDRESS_TYPES.SHIPPING ? shippingPhoneCountry == null ? void 0 : shippingPhoneCountry.code : billingPhoneCountry == null ? void 0 : billingPhoneCountry.code
           }),
           placeholder: "10 000 000 00",
           allowedCountries: allowedCountries,
@@ -13877,7 +13895,7 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
         }), /*#__PURE__*/_jsx(Controller, {
           name: countryField,
           control: control,
-          defaultValue: country == null ? void 0 : country.iso,
+          defaultValue: (defaultCountry == null ? void 0 : defaultCountry.iso) || '',
           rules: {
             required: t('COUNTRY_IS_REQUIRED')
           },
@@ -13888,9 +13906,9 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
             }
           }) => /*#__PURE__*/_jsx(Dropdown, {
             label: t('COUNTRIES'),
-            onChange: country => {
-              if (country.value !== value) {
-                onChange(country.value);
+            onChange: selected => {
+              if (selected.value !== value) {
+                onChange(selected.value);
                 additionalFields == null || additionalFields.forEach(({
                   field
                 }) => {
@@ -13899,11 +13917,11 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
                     shouldValidate: true
                   });
                 });
-                handleCountryChange(country, prefix);
+                handleCountryChange(selected, prefix);
               }
             },
             options: countriesOptions,
-            defaultOption: (country == null ? void 0 : country.iso) || '',
+            defaultOption: value || (defaultCountry == null ? void 0 : defaultCountry.iso) || '',
             className: `!shadow-none !border-b-0 ${getInputClasses(`${prefix}_country`, 'middle')}`,
             hideCircleIcon: true,
             hideRemoveOptionBtn: true
@@ -14002,7 +14020,7 @@ const ContactForm = /*#__PURE__*/(/* unused pure expression or super */ null &&
                 hideCircleIcon: true,
                 hideRemoveOptionBtn: true,
                 defaultOption: value,
-                disableDropdown: !dirtyFields[countryField]
+                disableDropdown: !getValues(countryField)
               })
             }, key);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paymob-pixel-alpha",
-  "version": "1.1.25",
+  "version": "1.1.26",
   "keywords": ["paymob","pixel","paymob-pixel"],
   "main": "./main.js",
   "license": "MIT",