fix(ngDoCheck): check error on markAllAsTouched()

rbalet · Apr 15, 2024 · e4d0258 · e4d0258
1 parent 6a4038b
commit e4d0258
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-mat-birthday-input",
-  "version": "17.3.0",
+  "version": "17.4.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

diff --git a/projects/ngx-mat-birthday-input-tester/src/index.html b/projects/ngx-mat-birthday-input-tester/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>ngxBackButtonTester</title>
+    <title>ngxMatBirthdayInput</title>
     <base href="/" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />

diff --git a/projects/ngx-mat-birthday-input/package.json b/projects/ngx-mat-birthday-input/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-mat-birthday-input",
-  "version": "17.3.0",
+  "version": "17.4.0",
   "author": {
     "name": "Raphaël Balet",
     "email": "raphael.balet@outlook.com"

diff --git a/projects/ngx-mat-birthday-input/src/lib/ngx-mat-birthday-input.component.ts b/projects/ngx-mat-birthday-input/src/lib/ngx-mat-birthday-input.component.ts
@@ -221,13 +221,17 @@ export class NgxMatBirthdayInputComponent
 
   ngDoCheck(): void {
     if (this.ngControl) {
-      const isInvalide = this.errorStateMatcher.isErrorState(
-        this.ngControl.control,
-        this._parentForm,
-      )
+      const oldState = this.errorState
+      const newState = this.errorStateMatcher.isErrorState(this.ngControl.control, this._parentForm)
 
       this.errorState =
-        (isInvalide && !this.ngControl.control?.value) || (!this.focused ? isInvalide : false)
+        (newState && (!this.ngControl.control?.value || this.ngControl.control?.touched)) ||
+        (!this.focused ? newState : false)
+
+      if (oldState !== newState) {
+        this.errorState = newState
+        this.stateChanges.next()
+      }
     }
   }
 
@@ -263,10 +267,12 @@ export class NgxMatBirthdayInputComponent
   }
 
   registerOnChange(fn: any): void {
+    console.log('registerOnChange')
     this.propagateChange = fn
   }
 
   registerOnTouched(fn: any): void {
+    console.log('registerOnTouched')
     this.onTouched = fn
   }
 
@@ -277,6 +283,7 @@ export class NgxMatBirthdayInputComponent
   }
 
   writeValue(value: any): void {
+    console.log('writeValue')
     this._updateItemForm(value)
 
     // Value is set from outside using setValue()