Skip to content

refactor(radio): remove usage of mixinDisabled #14666

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
Jan 4, 2019
Merged

refactor(radio): remove usage of mixinDisabled #14666

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
19 changes: 2 additions & 17 deletions src/lib/radio/radio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,11 @@ import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
import {
CanColor,
CanColorCtor,
CanDisable,
CanDisableCtor,
CanDisableRipple,
CanDisableRippleCtor,
HasTabIndex,
HasTabIndexCtor,
mixinColor,
mixinDisabled,
mixinDisableRipple,
mixinTabIndex,
} from '@angular/material/core';
Expand Down Expand Up @@ -71,13 +68,6 @@ export class MatRadioChange {
public value: any) {}
}


// Boilerplate for applying mixins to MatRadioGroup.
/** @docs-private */
export class MatRadioGroupBase { }
export const _MatRadioGroupMixinBase: CanDisableCtor & typeof MatRadioGroupBase =
mixinDisabled(MatRadioGroupBase);

/**
* A group of radio buttons. May contain one or more `<mat-radio-button>` elements.
*/
Expand All @@ -89,11 +79,8 @@ export const _MatRadioGroupMixinBase: CanDisableCtor & typeof MatRadioGroupBase
'role': 'radiogroup',
'class': 'mat-radio-group',
},
inputs: ['disabled'],
})
export class MatRadioGroup extends _MatRadioGroupMixinBase
implements AfterContentInit, ControlValueAccessor, CanDisable {

export class MatRadioGroup implements AfterContentInit, ControlValueAccessor {
/** Selected value for the radio group. */
private _value: any = null;

Expand Down Expand Up @@ -205,9 +192,7 @@ export class MatRadioGroup extends _MatRadioGroupMixinBase
this._markRadiosForCheck();
}

constructor(private _changeDetector: ChangeDetectorRef) {
super();
}
constructor(private _changeDetector: ChangeDetectorRef) { }

/**
* Initialize properties once content children are available.
Expand Down