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

fix(radio): host element unable to receive focus events #14472

Merged
merged 1 commit into from
Dec 20, 2018
Merged

fix(radio): host element unable to receive focus events #14472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/lib/radio/radio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $mat-radio-ripple-radius: 20px;
.mat-radio-button {
display: inline-block;
-webkit-tap-highlight-color: transparent;
outline: 0;
}

// Inner label container, wrapping entire element.
Expand Down Expand Up @@ -141,7 +142,7 @@ $mat-radio-ripple-radius: 20px;
opacity: 0.04;
}

.mat-radio-button.cdk-focused & {
.mat-radio-button:not(.mat-radio-disabled).cdk-focused & {
opacity: 0.12;
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/radio/radio.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ describe('MatRadio', () => {
const radioButtonEl =
predefinedFixture.debugElement.query(By.css('.mat-radio-button')).nativeElement;

expect(radioButtonEl.getAttribute('tabindex')).toBeFalsy();
expect(radioButtonEl.getAttribute('tabindex')).toBe('-1');
});

});
Expand Down
3 changes: 2 additions & 1 deletion src/lib/radio/radio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,8 @@ export const _MatRadioButtonMixinBase:
'[class.mat-radio-checked]': 'checked',
'[class.mat-radio-disabled]': 'disabled',
'[class._mat-animation-noopable]': '_animationMode === "NoopAnimations"',
'[attr.tabindex]': 'null',
// Needs to be -1 so the `focus` event still fires.
'[attr.tabindex]': '-1',
'[attr.id]': 'id',
// Note: under normal conditions focus shouldn't land on this element, however it may be
// programmatically set, for example inside of a focus trap, in this case we want to forward
Expand Down