fix(module:input): fix input disabled OnPush (NG-ZORRO#3786)

close NG-ZORRO#3732
Ricbet · Apr 9, 2020 · a176975 · a176975
1 parent db19452
commit a176975
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/components/input/nz-input.directive.ts b/components/input/nz-input.directive.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
  */
 
-import { Directive, ElementRef, Input, Optional, Renderer2, Self } from '@angular/core';
-import { NgControl } from '@angular/forms';
-import { toBoolean, NzSizeLDSType } from 'ng-zorro-antd/core';
+import { Directive, ElementRef, Input, Renderer2 } from '@angular/core';
+import { InputBoolean, NzSizeLDSType } from 'ng-zorro-antd/core';
 
 @Directive({
   selector: '[nz-input]',
@@ -20,22 +19,10 @@ import { toBoolean, NzSizeLDSType } from 'ng-zorro-antd/core';
   }
 })
 export class NzInputDirective {
-  private _disabled = false;
   @Input() nzSize: NzSizeLDSType = 'default';
+  @Input() @InputBoolean() disabled = false;
 
-  @Input()
-  set disabled(value: boolean) {
-    this._disabled = toBoolean(value);
-  }
-
-  get disabled(): boolean {
-    if (this.ngControl && this.ngControl.disabled !== null) {
-      return this.ngControl.disabled;
-    }
-    return this._disabled;
-  }
-
-  constructor(@Optional() @Self() public ngControl: NgControl, renderer: Renderer2, elementRef: ElementRef) {
+  constructor(renderer: Renderer2, elementRef: ElementRef) {
     renderer.addClass(elementRef.nativeElement, 'ant-input');
   }
 }
diff --git a/components/input/nz-input.module.ts b/components/input/nz-input.module.ts
@@ -8,7 +8,6 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
 import { NzAddOnModule } from 'ng-zorro-antd/core';
 
 import { NzIconModule } from 'ng-zorro-antd/icon';
@@ -21,6 +20,6 @@ import { NzInputDirective } from './nz-input.directive';
 @NgModule({
   declarations: [NzInputDirective, NzInputGroupComponent, NzAutosizeDirective],
   exports: [NzInputDirective, NzInputGroupComponent, NzAutosizeDirective],
-  imports: [CommonModule, FormsModule, NzIconModule, PlatformModule, NzAddOnModule]
+  imports: [CommonModule, NzIconModule, PlatformModule, NzAddOnModule]
 })
 export class NzInputModule {}
diff --git a/components/input/nz-input.spec.ts b/components/input/nz-input.spec.ts
@@ -80,11 +80,11 @@ describe('input', () => {
       });
       it('should set disabled work', fakeAsync(() => {
         flush();
-        expect(inputElement.nativeElement.classList).not.toContain('ant-input-disabled');
+        expect(inputElement.nativeElement.attributes.getNamedItem('disabled')).toBeNull();
         testComponent.disable();
         flush();
         fixture.detectChanges();
-        expect(inputElement.nativeElement.classList).toContain('ant-input-disabled');
+        expect(inputElement.nativeElement.attributes.getNamedItem('disabled')).toBeDefined();
       }));
     });
   });