Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3550 Fixed an issue with the initial validation fix. #3603

Merged
merged 5 commits into from
Jan 16, 2019
Merged

#3550 Fixed an issue with the initial validation fix. #3603

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6402b69
fix(Input): #3550 CheckValidity in onChanges().
gedinakova Jan 11, 2019
493d96a
fix(Input): #3550 Fixed a bad validation check.
gedinakova Jan 14, 2019
c8381e3
Merge branch '6.2.x' into fix-3550-6.2.x
rkaraivanov Jan 15, 2019
6b0947c
fix(Input): #3550 Fixed failing test.
gedinakova Jan 16, 2019
a504c7b
fix(Input): #3550 Removed f.
gedinakova Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions projects/igniteui-angular/src/lib/directives/input/input.directive.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,21 +200,24 @@ describe('IgxInput', () => {
const igxInput = fixture.componentInstance.igxInput;
const inputElement = fixture.debugElement.query(By.directive(IgxInputDirective)).nativeElement;

const inputGroupElement = fixture.debugElement.query(By.css('igx-input-group')).nativeElement;
expect(inputGroupElement.classList.contains(INPUT_GROUP_INVALID_CSS_CLASS)).toBe(false);
expect(igxInput.valid).toBe(IgxInputState.INITIAL);

dispatchInputEvent('focus', inputElement, fixture);
dispatchInputEvent('blur', inputElement, fixture);

const inputGroupElement = fixture.debugElement.query(By.css('igx-input-group')).nativeElement;
expect(inputGroupElement.classList.contains(INPUT_GROUP_INVALID_CSS_CLASS)).toBe(true);
expect(igxInput.valid).toBe(IgxInputState.INVALID);

igxInput.value = 'test';
fixture.componentInstance.value = 'test';
fixture.detectChanges();

expect(inputGroupElement.classList.contains(INPUT_GROUP_INVALID_CSS_CLASS)).toBe(false);
expect(igxInput.valid).toBe(IgxInputState.VALID);


igxInput.value = '';
fixture.componentInstance.value = '';
fixture.detectChanges();

dispatchInputEvent('focus', inputElement, fixture);
Expand Down Expand Up @@ -386,11 +389,12 @@ class DisabledInputComponent {

@Component({ template: `<igx-input-group #igxInputGroup>
<label for="test" igxLabel>Test</label>
<input name="test" #igxInput type="text" igxInput required="required" />
<input name="test" #igxInput type="text" igxInput [value]="value" required="required" />
</igx-input-group>` })
class RequiredInputComponent {
@ViewChild('igxInputGroup') public igxInputGroup: IgxInputGroupComponent;
@ViewChild(IgxInputDirective) public igxInput: IgxInputDirective;
value = '';
}

@Component({ template: `<igx-input-group #igxInputGroup>
Expand Down
6 changes: 4 additions & 2 deletions projects/igniteui-angular/src/lib/directives/input/input.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import {
Input,
OnDestroy,
Optional,
Self
Self,
OnChanges,
SimpleChanges
} from '@angular/core';
import { AbstractControl, FormControlName, NgControl, NgModel } from '@angular/forms';
import { Subscription } from 'rxjs';
Expand Down Expand Up @@ -295,7 +297,7 @@ export class IgxInputDirective implements AfterViewInit, OnDestroy {
}

private checkValidity() {
if (!this.ngControl && this._hasValidators) {
if (!this.ngControl && this._hasValidators()) {
this._valid = this.nativeElement.checkValidity() ? IgxInputState.VALID : IgxInputState.INVALID;
}
}
Expand Down