fix(module:date-picker): set formControl disabled not work (#5126)

close #5118
NG-ZORRO · Apr 24, 2020 · b83e7b5 · b83e7b5
1 parent 1eca795
commit b83e7b5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/components/date-picker/date-picker.component.spec.ts b/components/date-picker/date-picker.component.spec.ts
@@ -876,6 +876,14 @@ describe('NzDatePickerComponent', () => {
       fixture.detectChanges();
       expect(getPickerInput(fixture.debugElement).value!.trim()).toBe('2020-04-08');
     }));
+
+    it('should disabled work', fakeAsync(() => {
+      fixtureInstance.control = new FormControl({ value: new Date('2020-04-24'), disabled: true });
+      fixture.detectChanges();
+      flush();
+      fixture.detectChanges();
+      expect(getPickerInput(fixture.debugElement).getAttribute('disabled')).not.toBeNull();
+    }));
   });
 
   ////////////

diff --git a/components/date-picker/date-picker.component.ts b/components/date-picker/date-picker.component.ts
@@ -307,6 +307,11 @@ export class NzDatePickerComponent implements OnInit, OnChanges, OnDestroy, Cont
     this.onTouchedFn = fn;
   }
 
+  setDisabledState(isDisabled: boolean): void {
+    this.nzDisabled = isDisabled;
+    this.cdr.markForCheck();
+  }
+
   // ------------------------------------------------------------------------
   // | Internal methods
   // ------------------------------------------------------------------------