fix(Input): correctly reflect disabled status to the native element

GetTerminus · Oct 31, 2019 · fa091c7 · fa091c7
1 parent 5eb61ba
commit fa091c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/terminus-ui/input/src/input.component.html b/terminus-ui/input/src/input.component.html
@@ -94,7 +94,7 @@
       [attr.autocapitalize]="autocapitalize ? 'on' : 'off'"
       [attr.autocomplete]="autocomplete"
       [attr.autofocus]="isFocused ? '' : null"
-      [attr.disabled]="shouldBeDisabled ? '' : null"
+      [disabled]="shouldBeDisabled"
       [attr.name]="name"
       [attr.id]="id"
       [readonly]="readOnly"
@@ -119,7 +119,7 @@
       [attr.autocapitalize]="autocapitalize ? 'on' : 'off'"
       [attr.autocomplete]="autocomplete"
       [attr.autofocus]="isFocused ? '' : null"
-      [attr.disabled]="shouldBeDisabled ? '' : null"
+      [disabled]="shouldBeDisabled"
       [attr.name]="name"
       [attr.id]="id"
       [readonly]="readOnly"
@@ -148,7 +148,7 @@
       [attr.autocapitalize]="autocapitalize ? 'on' : 'off'"
       [attr.autocomplete]="autocomplete"
       [attr.autofocus]="isFocused ? '' : null"
-      [attr.disabled]="shouldBeDisabled ? '' : null"
+      [disabled]="shouldBeDisabled"
       [attr.name]="name"
       [attr.id]="id"
       [attr.rows]="textareaRows"

diff --git a/terminus-ui/input/src/input.component.spec.ts b/terminus-ui/input/src/input.component.spec.ts
@@ -197,17 +197,18 @@ describe(`TsInputComponent`, function() {
     });
 
 
-    test(`should set the disabled flag when appropriate`, () => {
+    test(`should set the disabled flag when appropriate`, fakeAsync(() => {
       const fixture = createComponent(TestComponents.AttrDisabled);
       fixture.detectChanges();
-      const el = getInputElement(fixture);
-      expect(el.getAttribute('disabled')).toEqual(null);
+      const inputElement = getInputElement(fixture);
+      expect(inputElement.disabled).toEqual(false);
 
       fixture.componentInstance.disabled = true;
       fixture.detectChanges();
+      tick();
 
-      expect(el.getAttribute('disabled')).toEqual('');
-    });
+      expect(inputElement.disabled).toEqual(true);
+    }));
 
 
     test(`should set autofocus`, () => {