Merge 4da8dc4 into f3f79a6

dineeek · May 19, 2023 · 2b6ef2c · 2b6ef2c
2 parents f3f79a6 + 4da8dc4
commit 2b6ef2c
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/libs/ngx-pass-code/src/lib/component/pass-code.component.ts b/libs/ngx-pass-code/src/lib/component/pass-code.component.ts
@@ -7,6 +7,7 @@ import {
   OnInit
 } from '@angular/core'
 import {
+  AbstractControl,
   ControlValueAccessor,
   FormArray,
   FormControl,
@@ -110,8 +111,12 @@ export class PassCodeComponent
     return errors.length ? errors : null
   }
 
+  private get parentControl(): AbstractControl<any, any> {
+    return this.controlDirective.control as AbstractControl<any, any>
+  }
+
   private setSyncValidatorsFromParent(): void {
-    const parentValidators = this.controlDirective.control.validator
+    const parentValidators = this.parentControl.validator
 
     if (!parentValidators) {
       return
@@ -124,14 +129,12 @@ export class PassCodeComponent
   }
 
   private updateParentControlValidation(): void {
-    const parentControl = this.controlDirective.control
-
-    if (!parentControl) {
+    if (!this.parentControl) {
       return
     }
 
-    parentControl.setValidators(this.validate.bind(this))
-    parentControl.updateValueAndValidity({ emitEvent: false })
+    this.parentControl.setValidators(this.validate.bind(this))
+    this.parentControl.updateValueAndValidity({ emitEvent: false })
   }
 
   private propagateModelValueToView(value: string): void {
@@ -187,14 +190,14 @@ export class PassCodeComponent
   private updateCodeValidity(): void {
     const allControlsAreInvalid = this.validate()?.['length'] === this.length
     this.isCodeInvalid = allControlsAreInvalid && this.passCodes.dirty
-    this.controlDirective.control.updateValueAndValidity({ emitEvent: false })
+    this.parentControl.updateValueAndValidity({ emitEvent: false })
   }
 
   private disableControls(isDisabled: boolean): void {
     isDisabled
       ? this.passCodes.disable({ emitEvent: false })
       : this.passCodes.enable({ emitEvent: false })
 
-    this.controlDirective.control.updateValueAndValidity({ emitEvent: false })
+    this.parentControl.updateValueAndValidity({ emitEvent: false })
   }
 }