fix: set value on checkbox and forms generic types

italia · Jul 14, 2023 · 571f9b7 · 571f9b7
1 parent 698adfd
commit 571f9b7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/projects/design-angular-kit/src/lib/components/form/checkbox/checkbox.component.ts b/projects/design-angular-kit/src/lib/components/form/checkbox/checkbox.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
 import { ItAbstractFormComponent } from '../../../abstracts/abstract-form.component';
 import { BooleanInput, isTrueBooleanInput } from '../../../utils/boolean-input';
 import { AsyncPipe, NgIf, NgTemplateOutlet } from '@angular/common';
@@ -11,7 +11,7 @@ import { ReactiveFormsModule } from '@angular/forms';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [NgIf, NgTemplateOutlet, ReactiveFormsModule, AsyncPipe]
 })
-export class ItCheckboxComponent extends ItAbstractFormComponent<boolean> implements OnInit {
+export class ItCheckboxComponent extends ItAbstractFormComponent<boolean | null | undefined> implements OnInit, OnChanges {
 
   /**
    * If show checkbox as toggle
@@ -48,7 +48,16 @@ export class ItCheckboxComponent extends ItAbstractFormComponent<boolean> implem
 
   override ngOnInit() {
     super.ngOnInit();
+    this.markAsChecked();
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes['checked']) {
+      this.markAsChecked();
+    }
+  }
 
+  private markAsChecked(): void {
     if (this.control.value || this.checked === undefined) {
       return;
     }

diff --git a/projects/design-angular-kit/src/lib/components/form/input/input.component.ts b/projects/design-angular-kit/src/lib/components/form/input/input.component.ts
@@ -18,7 +18,7 @@ import { MarkMatchingTextPipe } from '../../../pipes/mark-matching-text.pipe';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [NgIf, ReactiveFormsModule, TranslateModule, AsyncPipe, ItIconComponent, MarkMatchingTextPipe, NgTemplateOutlet, NgForOf]
 })
-export class ItInputComponent extends ItAbstractFormComponent<string | number> implements OnInit {
+export class ItInputComponent extends ItAbstractFormComponent<string | number | null | undefined> implements OnInit {
 
   /**
    * The input type

diff --git a/...cts/design-angular-kit/src/lib/components/form/password-input/password-input.component.ts b/...cts/design-angular-kit/src/lib/components/form/password-input/password-input.component.ts
@@ -17,7 +17,7 @@ import { TranslateModule } from '@ngx-translate/core';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [NgIf, ReactiveFormsModule, ItIconComponent, AsyncPipe, TranslateModule]
 })
-export class ItPasswordInputComponent extends ItAbstractFormComponent<string> implements OnInit, AfterViewInit {
+export class ItPasswordInputComponent extends ItAbstractFormComponent<string | null | undefined> implements OnInit, AfterViewInit {
 
   /**
    * The field is required

diff --git a/projects/design-angular-kit/src/lib/components/form/radio-button/radio-button.component.ts b/projects/design-angular-kit/src/lib/components/form/radio-button/radio-button.component.ts
@@ -12,12 +12,12 @@ import { AsyncPipe, NgIf } from '@angular/common';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [ReactiveFormsModule, NgIf, AsyncPipe]
 })
-export class ItRadioButtonComponent extends ItAbstractFormComponent<string | number | undefined> implements OnInit {
+export class ItRadioButtonComponent extends ItAbstractFormComponent<string | number | null | undefined> implements OnInit {
 
   /**
    * The radio value
    */
-  @Input() value: string | number | undefined;
+  @Input() value: string | number | undefined | null;
 
   /**
    * If show radio inline

diff --git a/projects/design-angular-kit/src/lib/components/form/rating/rating.component.ts b/projects/design-angular-kit/src/lib/components/form/rating/rating.component.ts
@@ -12,7 +12,7 @@ import { ItIconComponent } from '../../utils/icon/icon.component';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [TranslateModule, NgForOf, ReactiveFormsModule, ItIconComponent]
 })
-export class ItRatingComponent extends ItAbstractFormComponent<number> implements OnInit, OnChanges {
+export class ItRatingComponent extends ItAbstractFormComponent<number | null | undefined> implements OnInit, OnChanges {
 
   /**
    * The rating value

diff --git a/projects/design-angular-kit/src/lib/components/form/textarea/textarea.component.ts b/projects/design-angular-kit/src/lib/components/form/textarea/textarea.component.ts
@@ -12,7 +12,7 @@ import { ReactiveFormsModule } from '@angular/forms';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [NgIf, ReactiveFormsModule, AsyncPipe]
 })
-export class ItTextareaComponent extends ItAbstractFormComponent<string> {
+export class ItTextareaComponent extends ItAbstractFormComponent<string | null | undefined> {
 
   /**
    * Textarea Rows