Merge branch '4.x' into fix/FRA-number-field-4x

vtex · Sep 16, 2024 · a7ca385 · a7ca385
2 parents b066088 + 1d13dc2
commit a7ca385
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Changed the rules for France (FRA) so the number field is shown to users.
 
+## [4.25.0] - 2024-09-13
+
+### Fixed
+- Logic to validate if a country should use Number Keyboard (shouldShowNumberKeyboard).
+
 ## [4.24.7] - 2024-08-30
 
 ### Added

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "address-form",
   "vendor": "vtex",
-  "version": "4.24.7",
+  "version": "4.25.0",
   "title": "address-form React component",
   "description": "address-form React component",
   "defaultLocale": "en",

diff --git a/react/PostalCodeGetter.js b/react/PostalCodeGetter.js
@@ -89,9 +89,12 @@ class PostalCodeGetter extends Component {
       default:
       case POSTAL_CODE: {
         const field = getField('postalCode', rules)
-        const shouldShowNumberKeyboard = !Number.isNaN(
-          removeNonWords(field.mask)
-        )
+        const numericString = field.mask ? removeNonWords(field.mask) : ''
+        const isPurelyNumeric =
+          numericString === '' || /^\d+$/.test(numericString)
+        const shouldShowNumberKeyboard = isNaN(field.mask)
+          ? isPurelyNumeric
+          : false
 
         return (
           <InputFieldContainer

diff --git a/react/country/GBR.js b/react/country/GBR.js
@@ -17,7 +17,8 @@ export default {
       maxLength: 50,
       fixedLabel: 'Postcode',
       required: true,
-      mask: '',
+      // UK has different patterns for postal codes alphanumericals, so we need can't use a mask.
+      mask: NaN,
       regex: /^([A-Za-z][A-Ha-hJ-Yj-y]?[0-9][A-Za-z0-9]? ?[0-9][A-Za-z]{2}|[Gg][Ii][Rr] ?0[Aa]{2})$/,
       postalCodeAPI: false,
       size: 'small',

diff --git a/react/country/IRL.js b/react/country/IRL.js
@@ -18,7 +18,7 @@ export default {
       maxLength: 8,
       label: 'postalCode',
       required: true,
-      mask: '999 9999',
+      mask: 'A99 A9A9',
       regex: /(?:^[AC-FHKNPRTV-Y][0-9]{2}|D6W)[ -]?[0-9AC-FHKNPRTV-Y]{4}$/,
       postalCodeAPI: true,
       size: 'small',

diff --git a/react/package.json b/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vtex/address-form",
-  "version": "4.24.7",
+  "version": "4.25.0",
   "description": "address-form React component",
   "main": "lib/index.js",
   "files": [