Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

fix(radio): Remove native control adapter methods #1498

Merged
merged 3 commits into from
Oct 30, 2018
Merged

fix(radio): Remove native control adapter methods #1498

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
249775d
feat: Upgrade to material-components-web v0.41.0
trimox Oct 29, 2018
dec748b
fix(radio): Remove native control adapter methods
trimox Oct 29, 2018
a02132a
Merge branch 'master' into fix/radio-remove-adapter-methods
trimox Oct 30, 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
15 changes: 6 additions & 9 deletions packages/radio/radio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,14 @@ export class MdcRadio implements AfterViewInit, OnDestroy, MdcFormFieldControl<a
return {
addClass: (className: string) => this._getHostElement().classList.add(className),
removeClass: (className: string) => this._getHostElement().classList.remove(className),
getNativeControl: () => this._getInputElement()
setNativeControlDisabled: (disabled: boolean) => this.disabled = disabled
};
}

private _foundation: {
init(): void,
destroy(): void,
isChecked(): boolean,
setChecked(checked: boolean): void,
setDisabled(disabled: boolean): void,
isDisabled(): boolean,
getValue(): any,
setValue(value: any): void
setDisabled(disabled: boolean): void
} = new MDCRadioFoundation(this.createAdapter());

constructor(
Expand Down Expand Up @@ -232,7 +227,8 @@ export class MdcRadio implements AfterViewInit, OnDestroy, MdcFormFieldControl<a

if (this._checked !== newCheckedState) {
this._checked = newCheckedState;
this._foundation.setChecked(newCheckedState);
this._getInputElement().checked = newCheckedState;

if (newCheckedState && this.radioGroup && this.radioGroup.value !== this.value) {
this.radioGroup.selected = this;
} else if (!newCheckedState && this.radioGroup && this.radioGroup.value === this.value) {
Expand All @@ -253,7 +249,8 @@ export class MdcRadio implements AfterViewInit, OnDestroy, MdcFormFieldControl<a
setValue(value: any): void {
if (this._value !== value) {
this._value = value;
this._foundation.setValue(value);
this._getInputElement().value = this._value;

if (this.radioGroup !== null) {
if (!this.checked) {
// Update checked when the value changed to match the radio group's value
Expand Down