-
Notifications
You must be signed in to change notification settings - Fork 6.8k
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.
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
Add support for color
attribute to radio
#4039
Closed
Closed
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
344aabd
Add support for `color` attribute to radio
rtrompier eae54b1
Merge branch 'master' into radio-color
rtrompier ecdaa67
Add mixin & default color
rtrompier d166384
Fix lint error
rtrompier b08104a
Merge branch 'master' of https://github.com/angular/material2 into ra…
rtrompier 0d39d54
fix(Radio): Fix adding class with renderer 2
rtrompier File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -374,6 +374,16 @@ export class MdRadioButton implements OnInit, AfterViewInit, OnDestroy { | |
this._disabled = (value != null && value !== false) ? true : null; | ||
} | ||
|
||
/** The color of the button. Can be `primary`, `accent`, or `warn`. */ | ||
@Input() | ||
get color(): string { | ||
return this._color; | ||
} | ||
|
||
set color(value: string) { | ||
this._updateColor(value); | ||
} | ||
|
||
/** | ||
* Event emitted when the checked state of this radio button changes. | ||
* Change events are only emitted when the value changes due to user interaction with | ||
|
@@ -402,6 +412,9 @@ export class MdRadioButton implements OnInit, AfterViewInit, OnDestroy { | |
/** Whether the ripple effect on click should be disabled. */ | ||
private _disableRipple: boolean; | ||
|
||
/** Current color. Can be `primary`, `accent`, or `warn`. */ | ||
private _color: string; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The type should use the string literal values private _color: 'primary' | 'accent' | 'warn'; There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is there any way to use straight color values like for example |
||
|
||
/** The child ripple instance. */ | ||
@ViewChild(MdRipple) _ripple: MdRipple; | ||
|
||
|
@@ -498,6 +511,18 @@ export class MdRadioButton implements OnInit, AfterViewInit, OnDestroy { | |
} | ||
} | ||
|
||
_updateColor(newColor: string) { | ||
this._setElementColor(this._color, false); | ||
this._setElementColor(newColor, true); | ||
this._color = newColor; | ||
} | ||
|
||
_setElementColor(color: string, isAdd: boolean) { | ||
if (color != null && color != '') { | ||
this._renderer.setElementClass(this._elementRef.nativeElement, `mat-${color}`, isAdd); | ||
} | ||
} | ||
|
||
/** Function is called whenever the focus changes for the input element. */ | ||
private _onInputFocusChange(focusOrigin: FocusOrigin) { | ||
if (!this._focusRipple && focusOrigin === 'keyboard') { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have the feeling that we could move that into a mixin? So we don't have to repeat code three times.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes sure ;)
I will create a mixin, you're right.