chore: rebase with feat/extend-validators

dnbexperience · Sep 6, 2024 · 9f602db · 9f602db
1 parent b3c01a4
commit 9f602db
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/...portal/src/docs/uilib/extensions/forms/feature-fields/NationalIdentityNumber/Examples.tsx b/...portal/src/docs/uilib/extensions/forms/feature-fields/NationalIdentityNumber/Examples.tsx
@@ -170,18 +170,23 @@ export const ValidationExtendValidator = () => {
             ? { status: 'valid' }
             : { status: 'invalid' }
 
-        const validator = (value, errorMessages) => {
+        const myValidator = (
+          value,
+          { validators: { dnrValidator, fnrValidator } },
+        ) => {
           const result = bornInApril(value)
-          return result.status === 'invalid'
-            ? new Error(errorMessages.pattern)
-            : undefined
+          if (result.status === 'invalid') {
+            return new Error('My error')
+          }
+
+          return [dnrValidator, fnrValidator]
         }
 
         return (
           <Field.NationalIdentityNumber
             required
             value="53050129159"
-            validator={validator}
+            validator={myValidator}
             validateInitially
           />
         )

diff --git a/.../dnb-eufemia/src/extensions/forms/Field/NationalIdentityNumber/NationalIdentityNumber.tsx b/.../dnb-eufemia/src/extensions/forms/Field/NationalIdentityNumber/NationalIdentityNumber.tsx
@@ -94,6 +94,7 @@ function NationalIdentityNumber(props: Props) {
     validator: validate
       ? props.validator || dnrAndFnrValidator
       : undefined,
+    exportValidators: { dnrValidator, fnrValidator },
   }
 
   return <StringField {...StringFieldProps} />

diff --git a/...c/extensions/forms/Field/NationalIdentityNumber/__tests__/NationalIdentityNumber.test.tsx b/...c/extensions/forms/Field/NationalIdentityNumber/__tests__/NationalIdentityNumber.test.tsx
@@ -328,11 +328,16 @@ describe('Field.NationalIdentityNumber', () => {
         ? { status: 'valid' }
         : { status: 'invalid' }
 
-    const customValidator = (value) => {
+    const customValidator = (
+      value,
+      { validators: { dnrValidator, fnrValidator } }
+    ) => {
       const result = bornInApril(value)
-      return result.status === 'invalid'
-        ? new Error('custom error')
-        : undefined
+      if (result.status === 'invalid') {
+        return new Error('custom error')
+      }
+
+      return [dnrValidator, fnrValidator]
     }
 
     it.each(validIds)('Valid identity number: %s', async (fnrNum) => {