Skip to content

Revert "fix(checkbox): redirect focus to underlying input element" #14469

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

Merged
merged 7 commits into from
Dec 11, 2018
Merged

Revert "fix(checkbox): redirect focus to underlying input element" #14469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1accd24
Revert "Revert "fix(radio): host element unable to receive focus even…
mmalerba Dec 11, 2018
ce9df7b
Revert "Revert "fix(a11y): activeItem out of date if active index is …
mmalerba Dec 11, 2018
ab58d0b
Revert "build: update sauce connect (#14422)"
mmalerba Dec 11, 2018
2e34f86
Revert "build: changelog script not filtering duplicate entries (#144…
mmalerba Dec 11, 2018
cc79994
Revert "build: update to angular 7.1.2 (#14418)"
mmalerba Dec 11, 2018
456cc76
Revert "refactor(drag-drop): move logic out of directives (#14350)"
mmalerba Dec 11, 2018
9a5d408
Revert "fix(checkbox): redirect focus to underlying input element (#1…
mmalerba Dec 11, 2018
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
1 change: 0 additions & 1 deletion src/lib/checkbox/checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;

cursor: pointer;
-webkit-tap-highlight-color: transparent;
outline: 0;

.mat-ripple-element:not(.mat-checkbox-persistent-ripple) {
opacity: 0.16;
Expand Down
11 changes: 1 addition & 10 deletions src/lib/checkbox/checkbox.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,15 +370,6 @@ describe('MatCheckbox', () => {
expect(document.activeElement).toBe(inputElement);
});

it('should focus on underlying input element when the host is focused', () => {
expect(document.activeElement).not.toBe(inputElement);

checkboxNativeElement.focus();
fixture.detectChanges();

expect(document.activeElement).toBe(inputElement);
});

it('should forward the value to input element', () => {
testComponent.checkboxValue = 'basic_checkbox';
fixture.detectChanges();
Expand Down Expand Up @@ -799,7 +790,7 @@ describe('MatCheckbox', () => {
fixture.detectChanges();

const checkbox = fixture.debugElement.query(By.directive(MatCheckbox)).nativeElement;
expect(checkbox.getAttribute('tabindex')).toBe('-1');
expect(checkbox.getAttribute('tabindex')).toBeFalsy();
});
});

Expand Down
3 changes: 1 addition & 2 deletions src/lib/checkbox/checkbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,12 @@ export const _MatCheckboxMixinBase:
host: {
'class': 'mat-checkbox',
'[id]': 'id',
'[attr.tabindex]': '-1', // Reset back to -1 so that the `focus` event still works.
'[attr.tabindex]': 'null',
'[class.mat-checkbox-indeterminate]': 'indeterminate',
'[class.mat-checkbox-checked]': 'checked',
'[class.mat-checkbox-disabled]': 'disabled',
'[class.mat-checkbox-label-before]': 'labelPosition == "before"',
'[class._mat-animation-noopable]': `_animationMode === 'NoopAnimations'`,
'(focus)': '_inputElement.nativeElement.focus()',
},
providers: [MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR],
inputs: ['disableRipple', 'color', 'tabIndex'],
Expand Down