fix(checkbox): Set aria-checked to mixed for indeterminate checkbox #8089
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
jelbourn
reviewed
Oct 27, 2017
src/lib/checkbox/checkbox.ts
Outdated
| @@ -303,6 +303,10 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc | |||
| this._changeDetectorRef.markForCheck(); | |||
| } | |||
|
|
|||
| getAriaChecked() { | |||
| return this.checked ? true : (this.indeterminate ? 'mixed' : false); | |||
There was a problem hiding this comment.
Return type should be 'true' | 'false' | 'mixed' (since the attr should always be a string)
There was a problem hiding this comment.
Done. Thanks for review!
tinayuangao
force-pushed
the
checkbox-partial
branch
from
ab0d856 to
55d01f8
Compare
jelbourn
reviewed
Oct 28, 2017
src/lib/checkbox/checkbox.ts
Outdated
| @@ -303,6 +303,10 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc | |||
| this._changeDetectorRef.markForCheck(); | |||
| } | |||
|
|
|||
| getAriaChecked(): string { | |||
There was a problem hiding this comment.
Just also realized: method should be internal _getAriaChecked
The return type can really the string literal type 'true' | 'false' | 'mixed'
jelbourn
approved these changes
Nov 1, 2017
src/lib/checkbox/checkbox.spec.ts
Outdated
| @@ -87,13 +87,17 @@ describe('MatCheckbox', () => { | |||
| expect(checkboxNativeElement.classList).not.toContain('mat-checkbox-checked'); | |||
| expect(inputElement.checked).toBe(false); | |||
| expect(inputElement.indeterminate).toBe(false); | |||
| expect(inputElement.getAttribute('aria-checked')) | |||
| .toBe('false', 'Expect aria-checked to be false'); | |||
src/lib/checkbox/checkbox.ts
Outdated
| @@ -303,6 +303,10 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc | |||
| this._changeDetectorRef.markForCheck(); | |||
| } | |||
|
|
|||
| _getAriaChecked(): 'true'|'false'|'mixed' { | |||
There was a problem hiding this comment.
We typically put spaces between the types like this
'true' | 'false' | 'mixed'
tinayuangao
force-pushed
the
checkbox-partial
branch
from
79e3f0a to
11fc952
Compare
|
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.
Fixes #7932