feat(FormTouchOnHover): markFormGroupTouched() is now a static method ⚡

Jaspero · Jun 27, 2018 · 260d689 · 260d689
1 parent 7133022
commit 260d689
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/projects/ng-helpers/package.json b/projects/ng-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jaspero/ng-helpers",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "peerDependencies": {
     "@angular/common": "^6.0.0",
     "@angular/core": "^6.0.0"

diff --git a/projects/ng-helpers/src/directives/form-touch-on-hover/form-touch-on-hover.directive.ts b/projects/ng-helpers/src/directives/form-touch-on-hover/form-touch-on-hover.directive.ts
@@ -6,29 +6,14 @@ import {FormGroup, FormArray} from '@angular/forms';
 })
 export class FormTouchOnHoverDirective {
 
-  /**
-   * Entry FormGroup which to iterate over
-   */
-  @Input() jpFormTouchOnHover: FormGroup | FormArray;
-
-  /**
-   * Outputs when form finish iterating
-   */
-  @Output() jpFormTouched = new EventEmitter();
-
-  @HostListener('mouseenter')
-  enter() {
-    this._markFormGroupTouched(this.jpFormTouchOnHover);
-  }
-
-  private _markFormGroupTouched(formGroup: (FormGroup | FormArray)) {
+  static markFormGroupTouched(formGroup: (FormGroup | FormArray)) {
     (Object as any).values(formGroup.controls)
       .forEach(control => {
         control.markAsTouched();
 
         if (control && control.controls) {
           if (Array.isArray(control.controls)) {
-            control.controls.forEach(c => this._markFormGroupTouched(c));
+            control.controls.forEach(c => FormTouchOnHoverDirective.markFormGroupTouched(c));
           } else {
             for (const key in control.controls) {
               if (control.controls.hasOwnProperty(key)) {
@@ -38,7 +23,21 @@ export class FormTouchOnHoverDirective {
           }
         }
       });
+  }
 
+  /**
+   * Entry FormGroup which to iterate over
+   */
+  @Input() jpFormTouchOnHover: FormGroup | FormArray;
+
+  /**
+   * Outputs when form finish iterating
+   */
+  @Output() jpFormTouched = new EventEmitter();
+
+  @HostListener('mouseenter')
+  enter() {
+    FormTouchOnHoverDirective.markFormGroupTouched(this.jpFormTouchOnHover);
     this.jpFormTouched.emit();
   }
 }