fix(input-mask): keep model value if deactiveMask is set (#607)

allianz · Jun 21, 2022 · 388dba6 · 388dba6
1 parent 13425fe
commit 388dba6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/projects/ng-aquila/documentation/examples/mask/mask-deactivate/mask-deactivate-example.ts b/projects/ng-aquila/documentation/examples/mask/mask-deactivate/mask-deactivate-example.ts
@@ -9,6 +9,6 @@ import { Component } from '@angular/core';
     styleUrls: ['./mask-deactivate-example.css'],
 })
 export class MaskDeactivateExampleComponent {
-    modelVal!: string;
-    templateModel: string = 'deactivate';
+    modelVal = 'SSAAAAA';
+    templateModel = 'deactivate';
 }
diff --git a/projects/ng-aquila/src/mask/mask.directive.spec.ts b/projects/ng-aquila/src/mask/mask.directive.spec.ts
@@ -402,6 +402,14 @@ describe('NxMaskDirective', () => {
             assertInputValue(nativeElement, 'test', 'test');
             expect(testInstance.modelVal).toBe('test');
         });
+
+        it('should keep preset model value if deactiveMask set', () => {
+            createTestComponent(PresetDeactiveMaskComponent);
+            setMask('AA-AA');
+
+            fixture.detectChanges();
+            expect(testInstance.modelVal).toBe('AAAA');
+        });
     });
 
     it('should not accept characters if mask is filled up', () => {
@@ -975,6 +983,13 @@ class ConfigurableMaskComponent extends MaskTest {}
 })
 class ValidationMaskComponent extends MaskTest {}
 
+@Component({
+    template: ` <input [nxMask]="mask" [(ngModel)]="modelVal" [deactivateMask]="true" /> `,
+})
+class PresetDeactiveMaskComponent extends MaskTest {
+    modelVal = 'AAAA';
+}
+
 @Component({
     template: `<input [nxMask]="mask" [separators]="separators" />`,
 })

diff --git a/projects/ng-aquila/src/mask/mask.directive.ts b/projects/ng-aquila/src/mask/mask.directive.ts
@@ -498,7 +498,7 @@ export class NxMaskDirective implements ControlValueAccessor, Validator {
 
         this.cvaModelChange.next(value);
         if (this.deactivateMask) {
-            this.updateValue(this.getUnmaskedValue());
+            this.updateValue(value || this.getUnmaskedValue());
         } else {
             this.updateValue(this.getMaskedString(value));
         }