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

Jump to bottom

feat(radio): add feature targeting for styles #4270

Merged
merged 2 commits into from
Jan 25, 2019
Merged

feat(radio): add feature targeting for styles #4270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f97a1ba
feat(radio): add feature targeting for styles
mmalerba Jan 18, 2019
5c20ea2
Merge branch 'master' into radio-sass
kfranqueiro Jan 25, 2019
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
211 changes: 211 additions & 0 deletions packages/mdc-radio/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,221 @@
// THE SOFTWARE.
//

@import "@material/animation/functions";
@import "@material/feature-targeting/functions";
@import "@material/feature-targeting/mixins";
@import "@material/ripple/mixins";
@import "@material/ripple/variables";
@import "@material/theme/mixins";
@import "@material/theme/variables";
@import "./functions";
@import "./variables";

@mixin mdc-radio($query: mdc-feature-all()) {
// postcss-bem-linter: define radio

$feat-animation: mdc-feature-create-target($query, animation);
$feat-color: mdc-feature-create-target($query, color);
$feat-structure: mdc-feature-create-target($query, structure);

@include mdc-ripple-common($query);

.mdc-radio {
@include mdc-feature-targets($feat-color) {
@include mdc-radio-unchecked-stroke-color($mdc-radio-unchecked-color);
@include mdc-radio-checked-stroke-color($mdc-radio-baseline-theme-color);
@include mdc-radio-ink-color($mdc-radio-baseline-theme-color);
@include mdc-radio-focus-indicator-color($mdc-radio-baseline-theme-color);
}

@include mdc-ripple-surface($query);

@include mdc-feature-targets($feat-structure) {
@include mdc-ripple-radius-unbounded;
}

@include mdc-states($mdc-radio-baseline-theme-color, $query: $query);

@include mdc-feature-targets($feat-structure) {
display: inline-block;
position: relative;
flex: 0 0 auto;
box-sizing: border-box;
width: $mdc-radio-touch-area;
height: $mdc-radio-touch-area;
padding: ($mdc-radio-touch-area - $mdc-radio-ui-size) / 2;
cursor: pointer;
/* @alternate */
will-change: opacity, transform, border-color, color;
}

// Container for radio circles and ripple.
&__background {
@include mdc-feature-targets($feat-structure) {
display: inline-block;
position: absolute;
left: ($mdc-radio-touch-area - $mdc-radio-ui-size) / 2;
box-sizing: border-box;
width: $mdc-radio-ui-pct;
height: $mdc-radio-ui-pct;

&::before {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
transform: scale(0, 0);
border-radius: 50%;
opacity: 0;
pointer-events: none;
content: "";
}
}

@include mdc-feature-targets($feat-animation) {
&::before {
transition: mdc-radio-exit(opacity), mdc-radio-exit(transform);
}
}
}

&__outer-circle {
@include mdc-feature-targets($feat-structure) {
position: absolute;
top: 0;
left: 0;
box-sizing: border-box;
width: 100%;
height: 100%;
border-width: 2px;
border-style: solid;
border-radius: 50%;
}

@include mdc-feature-targets($feat-animation) {
transition: mdc-radio-exit(border-color);
}
}

&__inner-circle {
@include mdc-feature-targets($feat-structure) {
position: absolute;
top: 0;
left: 0;
box-sizing: border-box;
width: 100%;
height: 100%;
transform: scale(0, 0);
border-width: 10px;
border-style: solid;
border-radius: 50%;
}

@include mdc-feature-targets($feat-animation) {
transition: mdc-radio-exit(transform), mdc-radio-exit(border-color);
}
}

@include mdc-feature-targets($feat-structure) {
&__native-control {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
margin: 0;
padding: 0;
opacity: 0;
cursor: inherit;
z-index: 1;
}

// stylelint-disable plugin/selector-bem-pattern

&.mdc-ripple-upgraded--background-focused {
.mdc-radio__background::before {
content: none;
}
}

// stylelint-enable plugin/selector-bem-pattern
}
}

@include mdc-feature-targets($feat-animation) {
.mdc-radio__native-control:checked,
.mdc-radio__native-control:disabled {
+ .mdc-radio__background {
transition: mdc-radio-enter(opacity), mdc-radio-enter(transform);

.mdc-radio__outer-circle {
transition: mdc-radio-enter(border-color);
}

.mdc-radio__inner-circle {
transition: mdc-radio-enter(transform), mdc-radio-enter(border-color);
}
}
}
}

@include mdc-feature-targets($feat-structure) {
.mdc-radio--disabled {
cursor: default;
pointer-events: none;
}
}

.mdc-radio__native-control:checked {
+ .mdc-radio__background {
.mdc-radio__inner-circle {
@include mdc-feature-targets($feat-structure) {
transform: scale(.5);
}

@include mdc-feature-targets($feat-animation) {
transition: mdc-radio-enter(transform), mdc-radio-enter(border-color);
}
}
}
}

.mdc-radio__native-control:disabled,
[aria-disabled="true"] .mdc-radio__native-control {
+ .mdc-radio__background {
@include mdc-feature-targets($feat-structure) {
cursor: default;
}

@include mdc-feature-targets($feat-color) {
.mdc-radio__outer-circle {
border-color: $mdc-radio-circle-color;
}

.mdc-radio__inner-circle {
border-color: $mdc-radio-circle-color;
}
}
}
}

.mdc-radio__native-control:focus {
+ .mdc-radio__background::before {
@include mdc-feature-targets($feat-structure) {
transform: scale(2, 2);
opacity: map-get($mdc-ripple-dark-ink-opacities, focus);
}

@include mdc-feature-targets($feat-animation) {
transition: mdc-radio-enter(opacity), mdc-radio-enter(transform);
}
}
}

// postcss-bem-linter: end
}

@mixin mdc-radio-unchecked-stroke-color($color) {
// stylelint-disable-next-line selector-max-specificity
.mdc-radio__native-control:enabled:not(:checked) + .mdc-radio__background .mdc-radio__outer-circle {
Expand Down
155 changes: 1 addition & 154 deletions packages/mdc-radio/mdc-radio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,158 +20,5 @@
// THE SOFTWARE.
//

@import "@material/animation/functions";
@import "@material/ripple/common";
@import "@material/ripple/mixins";
@import "@material/ripple/variables";
@import "./functions";
@import "./mixins";
@import "./variables";

// postcss-bem-linter: define radio
.mdc-radio {
@include mdc-radio-unchecked-stroke-color($mdc-radio-unchecked-color);
@include mdc-radio-checked-stroke-color($mdc-radio-baseline-theme-color);
@include mdc-radio-ink-color($mdc-radio-baseline-theme-color);
@include mdc-radio-focus-indicator-color($mdc-radio-baseline-theme-color);
@include mdc-ripple-surface;
@include mdc-ripple-radius-unbounded;
@include mdc-states($mdc-radio-baseline-theme-color);

display: inline-block;
position: relative;
flex: 0 0 auto;
box-sizing: border-box;
width: $mdc-radio-touch-area;
height: $mdc-radio-touch-area;
padding: ($mdc-radio-touch-area - $mdc-radio-ui-size) / 2;
cursor: pointer;
/* @alternate */
will-change: opacity, transform, border-color, color;

// Container for radio circles and ripple.
&__background {
display: inline-block;
position: absolute;
left: ($mdc-radio-touch-area - $mdc-radio-ui-size) / 2;
box-sizing: border-box;
width: $mdc-radio-ui-pct;
height: $mdc-radio-ui-pct;

&::before {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
transform: scale(0, 0);
transition: mdc-radio-exit(opacity), mdc-radio-exit(transform);
border-radius: 50%;
opacity: 0;
pointer-events: none;
content: "";
}
}

&__outer-circle {
position: absolute;
top: 0;
left: 0;
box-sizing: border-box;
width: 100%;
height: 100%;
transition: mdc-radio-exit(border-color);
border-width: 2px;
border-style: solid;
border-radius: 50%;
}

&__inner-circle {
position: absolute;
top: 0;
left: 0;
box-sizing: border-box;
width: 100%;
height: 100%;
transform: scale(0, 0);
transition: mdc-radio-exit(transform), mdc-radio-exit(border-color);
border-width: 10px;
border-style: solid;
border-radius: 50%;
}

&__native-control {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
margin: 0;
padding: 0;
opacity: 0;
cursor: inherit;
z-index: 1;
}

// stylelint-disable plugin/selector-bem-pattern
&.mdc-ripple-upgraded--background-focused {
.mdc-radio__background::before {
content: none;
}
}
// stylelint-enable plugin/selector-bem-pattern
}

.mdc-radio__native-control:checked,
.mdc-radio__native-control:disabled {
+ .mdc-radio__background {
transition: mdc-radio-enter(opacity), mdc-radio-enter(transform);

.mdc-radio__outer-circle {
transition: mdc-radio-enter(border-color);
}

.mdc-radio__inner-circle {
transition: mdc-radio-enter(transform), mdc-radio-enter(border-color);
}
}
}

.mdc-radio--disabled {
cursor: default;
pointer-events: none;
}

.mdc-radio__native-control:checked {
+ .mdc-radio__background {
.mdc-radio__inner-circle {
transform: scale(.5);
transition: mdc-radio-enter(transform), mdc-radio-enter(border-color);
}
}
}

.mdc-radio__native-control:disabled,
[aria-disabled="true"] .mdc-radio__native-control {
+ .mdc-radio__background {
cursor: default;

.mdc-radio__outer-circle {
border-color: $mdc-radio-circle-color;
}

.mdc-radio__inner-circle {
border-color: $mdc-radio-circle-color;
}
}
}

.mdc-radio__native-control:focus {
+ .mdc-radio__background::before {
transform: scale(2, 2);
transition: mdc-radio-enter(opacity), mdc-radio-enter(transform);
opacity: map-get($mdc-ripple-dark-ink-opacities, focus);
}
}

// postcss-bem-linter: end
@include mdc-radio;
2 changes: 2 additions & 0 deletions test/scss/feature-targeting.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "@material/feature-targeting/functions";
@import "@material/button/mixins";
@import "@material/radio/mixins";
@include mdc-button($query: mdc-feature-any());
@include mdc-radio($query: mdc-feature-any());