feat(select): add support for custom error state matcher #7443
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
googlebot
added
the
cla: yes
crisbeto
force-pushed
the
select-error-state-matcher-resubmit
branch
from
dfeaa7f
to
ee63ccd
Compare
mmalerba
reviewed
Sep 30, 2017
src/lib/input/input.ts
Outdated
| @@ -232,7 +223,8 @@ export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy, | |||
| const oldState = this.errorState; | |||
| const ngControl = this.ngControl; | |||
| const parent = this._parentFormGroup || this._parentForm; | |||
| const newState = ngControl && this.errorStateMatcher(ngControl.control as FormControl, parent); | |||
| const matcher = this.errorStateMatcher || this._defaultErrorStateMatcher; | |||
| const newState = ngControl && matcher.isErrorState(ngControl, parent); | |||
There was a problem hiding this comment.
isErrorState accepts null ngControl, so no need to check here
src/lib/select/select.ts
Outdated
|
|
||
| return !!(isInvalid && (isTouched || isSubmitted)); | ||
| return ngControl && matcher.isErrorState(ngControl, parent); |
There was a problem hiding this comment.
same, no need to check that ngControl is non-null
crisbeto
force-pushed
the
select-error-state-matcher-resubmit
branch
from
ee63ccd
to
21ec8ee
Compare
mmalerba
reviewed
Sep 30, 2017
src/lib/core/error/error-options.ts
Outdated
| @Injectable() | ||
| export class ShowOnDirtyErrorStateMatcher implements ErrorStateMatcher { | ||
| isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean { | ||
| return control ? !!(control.invalid && (control.dirty || (form && form.submitted))) : false; |
There was a problem hiding this comment.
would this work? return !!(control && control.invalid && (control.dirty || form && form.submitted))
There was a problem hiding this comment.
It should, I don't remember why we went with the ternary initially.
src/lib/core/error/error-options.ts
Outdated
| @Injectable() | ||
| export class ErrorStateMatcher { | ||
| isErrorState(control: NgControl | null, form: FormGroupDirective | NgForm | null): boolean { | ||
| return control ? !!(control.invalid && (control.touched || (form && form.submitted))) : false; |
There was a problem hiding this comment.
return !!(control && control.invalid && (control.touched || form && form.submitted))
|
fixes #7419 |
crisbeto
force-pushed
the
select-error-state-matcher-resubmit
branch
from
21ec8ee
to
de279dc
Compare
|
Addressed the feedback @mmalerba. |
mmalerba
approved these changes
Oct 1, 2017
mmalerba
added
pr: lgtm
action: merge
|
Breaking changes comment for switching from function to ErrorStateMatcher class? |
|
@crisbeto Rebase? |
kara
added
pr: needs rebase
and removed
action: merge
crisbeto
force-pushed
the
select-error-state-matcher-resubmit
branch
from
de279dc
to
ad38bb9
Compare
crisbeto
added
action: merge
|
Rebased. |
kara
added
pr: needs rebase
and removed
action: merge
* Allows for the select's error state matcher to be overwritten through an `@Input`. * Switches `MatSelect` over to use the same global provider for its error state as `MatInput`. **Note:** This is a resubmit of angular#6147 that works with our latest setup and excludes a few changes. Fixes angular#7419.
crisbeto
force-pushed
the
select-error-state-matcher-resubmit
branch
from
ad38bb9
to
a3c364c
Compare
crisbeto
added
action: merge
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@Input.MatSelectover to use the same global provider for its error state asMatInput.Note: This is a resubmit of #6147 that works with our latest setup and excludes a few changes.
Fixes #7419