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

fix(SegmentedRadioGroup): icon modifier specificity #2120

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+102 −110
Open

fix(SegmentedRadioGroup): icon modifier specificity #2120

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
212 changes: 102 additions & 110 deletions src/components/SegmentedRadioGroup/SegmentedRadioGroup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

$block: '.#{variables.$ns}segmented-radio-group';

$option-sizes: (
's': 24px,
'm': 28px,
'l': 36px,
'xl': 44px,
);

$text-spacings: (
's': 10px,
'm': 13px,
'l': 18px,
'xl': 25px,
);

#{$block} {
--_--border-width: 1px;
--_--transition-time: 0.15s;
Expand All @@ -13,6 +27,32 @@ $block: '.#{variables.$ns}segmented-radio-group';
font-weight: var(--g-text-body-font-weight);
position: relative;

&_size {
&_s {
--_--border-radius: var(--g-border-radius-s);
}

&_m {
--_--border-radius: var(--g-border-radius-m);
}

&_l {
--_--border-radius: var(--g-border-radius-l);
}

&_xl {
--_--border-radius: var(--g-border-radius-xl);
}
}

&_width_auto {
max-width: 100%;
}

&_width_max {
width: 100%;
}

&__option {
position: relative;
flex: 1 1 auto;
Expand All @@ -24,7 +64,24 @@ $block: '.#{variables.$ns}segmented-radio-group';
transform: scale(1);
transition: color var(--_--transition-time) linear;

#{$block}_width_auto &,
#{$block}_width_max & {
overflow: hidden;
}

@each $size, $height in $option-sizes {
#{$block}_size_#{$size} & {
height: $height;
line-height: $height;

@if $size == xl {
font-size: var(--g-text-body-2-font-size);
}
}
}

&::before {
z-index: -1;
position: absolute;
inset-inline-start: 0;
inset-block: var(--_--border-width);
Expand Down Expand Up @@ -82,55 +139,17 @@ $block: '.#{variables.$ns}segmented-radio-group';
&::after {
background-color: var(--g-color-base-simple-hover);
}

#{$block}__option-text {
color: var(--g-color-text-primary);
}
}

&:has(#{&}-control:focus-visible) {
outline: 2px solid var(--g-color-line-misc);
outline-offset: calc(-1 * var(--_--border-width));
}

&-control {
position: absolute;
inset-block-start: 0;
inset-inline-start: 0;
width: 100%;
height: 100%;
margin: 0;
padding: 0;
border: none;
outline: none;
opacity: 0;
cursor: inherit;
}

&-text {
display: inline-flex;
justify-content: center;
align-items: center;
gap: 8px;
white-space: nowrap;
color: var(--g-color-text-complementary);
overflow: hidden;

&_icon {
height: 100%;
display: flex;
align-items: center;
}
}

&_checked {
cursor: default;
border-color: var(--g-color-line-brand);

#{$block}__option-text {
color: var(--g-color-text-brand-heavy);
}

&::after {
background-color: var(--g-color-base-selection);
border-color: var(--g-color-line-brand);
Expand All @@ -148,100 +167,73 @@ $block: '.#{variables.$ns}segmented-radio-group';
&::after {
background-color: var(--g-color-base-generic);
}

#{$block}__option-text {
color: var(--g-color-text-hint);
}
}

&_disabled#{&}_checked {
&::after {
background-color: var(--g-color-base-generic-accent);
border-color: var(--g-color-line-generic-accent);
}

#{$block}__option-text {
color: var(--g-color-text-secondary);
}
}
}

&__option::before {
z-index: -1;
&__option-control {
position: absolute;
inset-block-start: 0;
inset-inline-start: 0;
width: 100%;
height: 100%;
margin: 0;
padding: 0;
border: none;
outline: none;
opacity: 0;
cursor: inherit;
}

&_size {
&_s {
#{$block}__option {
height: 24px;
line-height: 24px;

&-text {
margin: 0 10px;
}
}

--_--border-radius: var(--g-border-radius-s);
&__option-text {
display: inline-flex;
justify-content: center;
align-items: center;
gap: 8px;
white-space: nowrap;
color: var(--g-color-text-complementary);
overflow: hidden;

#{$block}_width_auto &,
#{$block}_width_max & {
display: block;
overflow: hidden;
text-overflow: ellipsis;
}

&_m {
#{$block}__option {
height: 28px;
line-height: 28px;

&-text {
margin: 0 13px;
}
}

--_--border-radius: var(--g-border-radius-m);
#{$block}_width_auto &_icon,
#{$block}_width_max &_icon,
&_icon {
height: 100%;
display: flex;
align-items: center;
}

&_l {
#{$block}__option {
height: 36px;
line-height: 36px;

&-text {
margin: 0 18px;
}
}

--_--border-radius: var(--g-border-radius-l);
#{$block}__option:not(#{$block}__option_checked):not(#{$block}__option_disabled):hover & {
color: var(--g-color-text-primary);
}

&_xl {
#{$block}__option {
height: 44px;
line-height: 44px;
font-size: var(--g-text-body-2-font-size);

&-text {
margin: 0 25px;
}
}
Comment on lines -214 to -222
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved element styles from modificators to element styles itself


--_--border-radius: var(--g-border-radius-xl);
#{$block}__option_checked & {
color: var(--g-color-text-brand-heavy);
}
}

&_width_auto {
max-width: 100%;
}

&_width_max {
width: 100%;
}
Comment on lines -228 to -234
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved block modificators up

#{$block}__option_disabled & {
color: var(--g-color-text-hint);
}

&_width_auto,
&_width_max {
#{$block}__option {
overflow: hidden;
#{$block}__option_disabled#{$block}__option_checked & {
color: var(--g-color-text-secondary);
}

&-text {
display: block;
overflow: hidden;
text-overflow: ellipsis;
@each $size, $margin in $text-spacings {
#{$block}_size_#{$size} & {
margin: 0 $margin;
}
}
}
Expand Down
Loading