Skip to content

fix(radio): radios aren't checkable when the value is falsy #10315

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 1 commit into from
Apr 18, 2018
Merged

fix(radio): radios aren't checkable when the value is falsy #10315

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
29 changes: 14 additions & 15 deletions src/lib/radio/radio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export class MatRadioGroup extends _MatRadioGroupMixinBase
@Input()
get value(): any { return this._value; }
set value(newValue: any) {
if (this._value != newValue) {
if (this._value !== newValue) {
// Set this before proceeding to ensure no circular loop occurs with selection.
this._value = newValue;

Expand Down Expand Up @@ -231,12 +231,12 @@ export class MatRadioGroup extends _MatRadioGroupMixinBase
/** Updates the `selected` radio button from the internal _value state. */
private _updateSelectedRadioFromValue(): void {
// If the value already matches the selected radio, do nothing.
const isAlreadySelected = this._selected != null && this._selected.value == this._value;
const isAlreadySelected = this._selected !== null && this._selected.value === this._value;

if (this._radios != null && !isAlreadySelected) {
if (this._radios && !isAlreadySelected) {
this._selected = null;
this._radios.forEach(radio => {
radio.checked = this.value == radio.value;
radio.checked = this.value === radio.value;
if (radio.checked) {
this._selected = radio;
}
Expand Down Expand Up @@ -357,13 +357,12 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
get checked(): boolean { return this._checked; }
set checked(value: boolean) {
const newCheckedState = coerceBooleanProperty(value);

if (this._checked != newCheckedState) {
if (this._checked !== newCheckedState) {
this._checked = newCheckedState;

if (newCheckedState && this.radioGroup && this.radioGroup.value != this.value) {
if (newCheckedState && this.radioGroup && this.radioGroup.value !== this.value) {
this.radioGroup.selected = this;
} else if (!newCheckedState && this.radioGroup && this.radioGroup.value == this.value) {
} else if (!newCheckedState && this.radioGroup && this.radioGroup.value === this.value) {

// When unchecking the selected radio button, update the selected radio
// property on the group.
this.radioGroup.selected = null;
Expand All @@ -381,12 +380,12 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
@Input()
get value(): any { return this._value; }
set value(value: any) {
if (this._value != value) {
if (this._value !== value) {
this._value = value;
if (this.radioGroup != null) {
if (this.radioGroup !== null) {
if (!this.checked) {
// Update checked when the value changed to match the radio group's value
this.checked = this.radioGroup.value == value;
this.checked = this.radioGroup.value === value;
}
if (this.checked) {
this.radioGroup.selected = this;
Expand All @@ -408,7 +407,7 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
/** Whether the radio button is disabled. */
@Input()
get disabled(): boolean {
return this._disabled || (this.radioGroup != null && this.radioGroup.disabled);
return this._disabled || (this.radioGroup !== null && this.radioGroup.disabled);
}
set disabled(value: boolean) {
this._disabled = coerceBooleanProperty(value);
Expand Down Expand Up @@ -473,7 +472,7 @@ export class MatRadioButton extends _MatRadioButtonMixinBase

this._removeUniqueSelectionListener =
_radioDispatcher.listen((id: string, name: string) => {
if (id != this.id && name == this.name) {
if (id !== this.id && name === this.name) {
this.checked = false;
}
});
Expand Down Expand Up @@ -545,7 +544,7 @@ export class MatRadioButton extends _MatRadioButtonMixinBase
// emit its event object to the `change` output.
event.stopPropagation();

const groupValueChanged = this.radioGroup && this.value != this.radioGroup.value;
const groupValueChanged = this.radioGroup && this.value !== this.radioGroup.value;
this.checked = true;
this._emitChangeEvent();

Expand Down