Merge pull request #441 from skyflowapi/SK-1535

SK-1535: get latest format for card number before assigning value
skyflowapi · Jul 29, 2024 · 32a72df · 32a72df
2 parents 27df51d + 72bdf22
commit 32a72df
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/src/core/internal/index.ts b/src/core/internal/index.ts
@@ -594,14 +594,32 @@ export class FrameElement {
       const target = event.target as HTMLInputElement;
       const { mask } = this.iFrameFormElement;
       const value = this.domInput?.value || this.iFrameFormElement.getValue();
+      let updatedMask;
       if (mask) {
+        updatedMask = [...mask];
+      }
+      if (
+        this.iFrameFormElement.fieldType === ELEMENTS.CARD_NUMBER.name
+        && this.iFrameFormElement.mask
+      ) {
+        const cardType = detectCardType(value);
+        const cardNumberMask = addSeperatorToCardNumberMask(
+          CARD_NUMBER_MASK[cardType],
+          this.options?.cardSeperator,
+        );
+        updatedMask[0] = cardNumberMask[0];
+        updatedMask[1] = null;
+        updatedMask[2] = cardNumberMask[1];
+        this.iFrameFormElement.setMask(cardNumberMask as string[]);
+      }
+      if (updatedMask) {
         const translation = {};
-        if (mask[2]) {
-          Object.keys(mask[2]).forEach((key) => {
-            translation[key] = { pattern: mask[2][key] };
+        if (updatedMask[2]) {
+          Object.keys(updatedMask[2]).forEach((key) => {
+            translation[key] = { pattern: updatedMask[2][key] };
           });
         }
-        const output = getMaskedOutput(target?.value, mask[0], translation);
+        const output = getMaskedOutput(target?.value, updatedMask[0], translation);
         if (output.length >= value.length) {
           this.iFrameFormElement.setValue(output, target?.checkValidity());
         } else if (output === '' && target?.value === '') {

diff --git a/tests/core/internal/frame-controller.test.js b/tests/core/internal/frame-controller.test.js
@@ -1153,7 +1153,7 @@ describe('test frame controller', () => {
     }, div);
 
     element.onInputChange(inputEvent);
-    expect(formElement.getValue()).toBe('4111111111111111')
+    expect(formElement.getValue()).toBe('4111 1111 1111 1111')
   })
 
 
@@ -1182,7 +1182,7 @@ describe('test frame controller', () => {
     }, div);
 
     element.onInputChange(inputEvent);
-    expect(formElement.getValue()).toBe("   ");
+    expect(formElement.getValue()).toBe("4111 1111 1111 1111");
   })
 
   test('card_number extra input on FrameElement', () => {