@nuskin/shipping-address-form 1.7.7 → 1.7.8-address-fixes.2

package/dist/addressLookup/components/SmartyIntlResults.js

@@ -168,18 +168,29 @@ const SmartyIntlResults = ({
       return;
     }
     setShowAllRequiredErrors(true);
+    const currentStatus = (0, _addressStatus.buildAddressStatus)({
+      countryCode,
+      addressForm: resolvedAddressForm,
+      formData,
+      verificationStatus,
+      mode,
+      requireValidation: allowValidation
+    });
     onSelect === null || onSelect === void 0 || onSelect({
       type: 'validation-request',
       address: formData,
-      status: (0, _addressStatus.buildAddressStatus)({
-        countryCode,
-        addressForm: resolvedAddressForm,
-        formData,
-        verificationStatus,
-        mode,
-        requireValidation: allowValidation
-      })
+      status: currentStatus
     });
+    if (allowValidation && currentStatus.needsValidation && String(formData[lookupField] || '').trim()) {
+      clearServiceErrors({
+        lookup: false,
+        validation: true,
+        custom: false
+      });
+      setShowValidationSuggestions(true);
+      setValidationTriggerSource('save');
+      setValidationTrigger(prev => prev + 1);
+    }
   }, [allowValidation, validationRequestId]);
   (0, _react.useEffect)(() => {
     if (!error) {
@@ -332,7 +343,7 @@ const SmartyIntlResults = ({
     (_getLookupInputElemen = getLookupInputElement()) === null || _getLookupInputElemen === void 0 || _getLookupInputElemen.focus();
   }, [isAutocompleteMode, selectedIntlAddressId, suggestions, selectedAddress, loading]);
   (0, _react.useEffect)(() => {
-    if (validationTrigger > 0 && ['autocomplete', 'map', 'initial'].includes(validationTriggerSource)) {
+    if (validationTrigger > 0 && ['autocomplete', 'map', 'initial', 'save'].includes(validationTriggerSource)) {
       autoApplyValidationStartedRef.current = false;
     }
   }, [validationTrigger, validationTriggerSource]);
@@ -340,7 +351,7 @@ const SmartyIntlResults = ({
     if (validationTriggerSource === 'map' && validationLoading) {
       mapValidationStartedRef.current = true;
     }
-    if (validationLoading && ['autocomplete', 'map', 'initial'].includes(validationTriggerSource)) {
+    if (validationLoading && ['autocomplete', 'map', 'initial', 'save'].includes(validationTriggerSource)) {
       autoApplyValidationStartedRef.current = true;
     }
   }, [validationLoading, validationTriggerSource]);
@@ -491,13 +502,21 @@ const SmartyIntlResults = ({
     }
     return !(0, _validators.isValidEmail)(value);
   };
+  const hasIllegalCharacters = field => {
+    const fieldConfig = ((resolvedAddressForm === null || resolvedAddressForm === void 0 ? void 0 : resolvedAddressForm.addressElements) || []).find(el => el.field === field);
+    if (!(fieldConfig !== null && fieldConfig !== void 0 && fieldConfig.allowedCharacters)) {
+      return false;
+    }
+    const value = String(formData[field] || '').trim();
+    return value !== '' && !fieldConfig.allowedCharacters.test(value);
+  };
   const shouldShowFieldError = field => {
     const shouldShowValidation = Boolean(showAllRequiredErrors || touchedFields[field]);
     if (!shouldShowValidation) {
       return false;
     }
     const requiredError = isFieldRequired(field) && isFieldBlank(field);
-    return requiredError || hasInvalidPostalCodeFormat(field) || hasInvalidEmailFormat(field);
+    return requiredError || hasInvalidPostalCodeFormat(field) || hasInvalidEmailFormat(field) || hasIllegalCharacters(field);
   };
   const handleFieldBlur = field => {
     if (readOnlyView) {
@@ -524,6 +543,9 @@ const SmartyIntlResults = ({
     if (hasInvalidEmailFormat(field)) {
       return areLabelsLoading ? '' : fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.invalidEmail;
     }
+    if (hasIllegalCharacters(field)) {
+      return areLabelsLoading ? '' : (fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.illegalCharacters) || 'Contains invalid characters.';
+    }
     return '';
   };
   const hasVisibleFieldError = field => shouldShowFieldError(field);
@@ -631,6 +653,7 @@ const SmartyIntlResults = ({
       }
     })();
     const normalizedFormData = buildTrackedAddress(updatedFormData, currentVerificationStatus, 'smarty-intl');
+    const wasTriggeredBySave = validationTriggerSource === 'save';
     setShowValidationSuggestions(false);
     setValidationTriggerSource(null);
     setFormData(normalizedFormData);
@@ -645,19 +668,27 @@ const SmartyIntlResults = ({
       setShowMapModal(true);
     }
     mapValidationStartedRef.current = false;
+    const validationStatus = (0, _addressStatus.buildAddressStatus)({
+      countryCode,
+      addressForm: resolvedAddressForm,
+      formData: normalizedFormData,
+      verificationStatus: currentVerificationStatus,
+      mode,
+      requireValidation: allowValidation
+    });
     onSelect === null || onSelect === void 0 || onSelect({
       type: 'validation',
       address: normalizedFormData,
       verification: validatedAddress.analysis,
-      status: (0, _addressStatus.buildAddressStatus)({
-        countryCode,
-        addressForm: resolvedAddressForm,
-        formData: normalizedFormData,
-        verificationStatus: currentVerificationStatus,
-        mode,
-        requireValidation: allowValidation
-      })
+      status: validationStatus
     });
+    if (wasTriggeredBySave) {
+      onSelect === null || onSelect === void 0 || onSelect({
+        type: 'validation-request',
+        address: normalizedFormData,
+        status: validationStatus
+      });
+    }
   };
   const handleValidate = () => {
     if (!allowValidation) {
@@ -744,14 +775,16 @@ const SmartyIntlResults = ({
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_LocationPinIcon.default, {
         className: "ns-address-lookup__icon"
       })
-    }), !isAutocompleteMode && allowValidation && /*#__PURE__*/(0, _jsxRuntime.jsx)(_foundationUiComponents.NsButton, {
+    }), !isAutocompleteMode && allowValidation && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_foundationUiComponents.NsButton, {
       type: "button",
       onClick: handleValidate,
       disabled: validationLoading || !String(formData[lookupField] || '').trim(),
       variant: "contained",
       color: "primary",
       size: "small",
-      children: validationLoading ? (fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.validatingAddress) || 'Validating...' : (fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.validateAddress) || 'Validate Address'
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_LocationPinIcon.default, {
+        className: "ns-address-lookup__icon"
+      }), validationLoading ? (fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.validatingAddress) || 'Validating...' : (fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.validateAddress) || 'Validate Address']
     }), entryMode === 'both' && /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
       type: "button",
       onClick: () => {
@@ -884,7 +917,7 @@ const SmartyIntlResults = ({
     return null;
   };
   (0, _react.useEffect)(() => {
-    if (['autocomplete', 'map'].includes(validationTriggerSource) && validationSuggestions.length === 1 && autoApplyValidationStartedRef.current) {
+    if (['autocomplete', 'map', 'save'].includes(validationTriggerSource) && validationSuggestions.length === 1 && autoApplyValidationStartedRef.current) {
       handleValidationSelect(validationSuggestions[0]);
     }
     if (validationTriggerSource === 'initial' && validationSuggestions.length === 1 && autoApplyValidationStartedRef.current && isAcceptableInitialValidationResult(validationSuggestions[0])) {
@@ -911,7 +944,7 @@ const SmartyIntlResults = ({
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("label", {
           htmlFor: fieldId,
           className: "MuiFormLabel-root MuiFormLabel-colorPrimary css-1ef1ceb-MuiFormLabel-root",
-          children: [fieldLabel, fieldConfig.required && !areLabelsLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          children: [fieldLabel, (fieldConfig.required || isFieldRequired(fieldConfig.field)) && !areLabelsLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
             "aria-hidden": "true",
             className: "MuiFormLabel-asterisk",
             children: ' *'