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

refactor(Label): rewrite styles, use native buttons #1615

Merged
merged 3 commits into from
Jun 4, 2024
Merged

refactor(Label): rewrite styles, use native buttons #1615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d14563
refactor(Label): rewrite styles, use native buttons
amje May 27, 2024
8de89f1
refactor(Label): use box-shadow instead of border-radius
amje May 27, 2024
bb3235a
test(Label): update visual test snapshots
amje May 28, 2024
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
4 changes: 2 additions & 2 deletions playwright/core/expectScreenshotFixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ export const expectScreenshotFixture: PlaywrightFixture<ExpectScreenshotFixture>
...pageScreenshotOptions
} = {}) => {
const captureScreenshot = async (theme: string) => {
const root = page.locator('#root');
const body = page.locator('body');

await root.evaluate((el: HTMLElement | SVGElement, newTheme: string) => {
await body.evaluate((el: HTMLElement | SVGElement, newTheme: string) => {
el.setAttribute('class', `g-root g-root_theme_${newTheme}`);
}, theme);

Expand Down
6 changes: 3 additions & 3 deletions playwright/playwright/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html lang="ru">
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Test component page</title>
</head>
<body>
<div id="root" class="g-root g-root_theme_light"></div>
<body class="g-root g-root_theme_light">
<div id="root"></div>
<script type="module" src="./index.tsx"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions src/components/Button/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $block: '.#{variables.$ns}button';
touch-action: manipulation;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
transition:
transform 0.1s ease-out,
variables.$button-shrink-transition,
color 0.15s linear;
transform: scale(1);
display: inline-flex;
Expand Down Expand Up @@ -77,7 +77,7 @@ $block: '.#{variables.$ns}button';

&:active {
transition: none;
transform: scale(0.96);
transform: variables.$button-shrink-transform;
}

&:active::after {
Expand Down
198 changes: 98 additions & 100 deletions src/components/Label/Label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,35 @@
@use '../../../styles/mixins';

$block: '.#{variables.$ns}label';
$disabled: #{$block}_disabled;
$transitionDuration: 0.15s;
$transitionTimingFunction: ease-in-out;
$hover-opacity: 0.7;

@mixin sizeState($margin, $mainSize, $rAddon, $lAddon, $borderRadius) {
height: $mainSize;
border-radius: $borderRadius;
& #{$block}__text {
line-height: $mainSize;
margin: 0 $margin;
}

& #{$block}__addon {
--addon-size: calc(#{$mainSize} - var(--border-size) * 2);
width: var(--addon-size);
height: var(--addon-size);
}

&#{$block}_has-right-addon #{$block}__text {
margin-inline-end: $rAddon;
}

&#{$block}_has-left-addon #{$block}__text {
margin-inline-start: $lAddon;
}
}
$transition-duration: 0.15s;
$transition-timing-function: ease-in-out;

#{$block} {
--_--bg-color: none;
--_--bg-color-hover: none;
--_--text-color: none;

display: inline-flex;
align-items: center;
position: relative;
height: var(--_--height);
border-radius: var(--_--border-radius);
color: var(--_--text-color);
background-color: var(--_--bg-color);
transition-property: opacity, color, background-color;
transition-duration: $transitionDuration;
transition-timing-function: $transitionTimingFunction;
transition-duration: $transition-duration;
transition-timing-function: $transition-timing-function;
box-sizing: border-box;
/* make new stacking context to isolate z-indexes */
isolation: isolate;

--border-size: 0px;

&__text {
@include mixins.text-body-1();
display: flex;
align-items: baseline;
margin: 0 var(--_--margin-inline);
width: 100%;
line-height: var(--_--height);
text-align: center;
white-space: nowrap;
overflow: hidden;
Expand All @@ -61,157 +44,172 @@ $hover-opacity: 0.7;

&__value {
display: flex;
opacity: $hover-opacity;
opacity: 0.7;
overflow: hidden;
}

&__separator {
margin: 0 4px;
}

&__action-button {
&__main-button {
@include mixins.button-reset();
border-radius: inherit;
z-index: 1;

&:focus-visible {
outline: 2px solid var(--g-color-line-focus);
}

&:empty {
position: absolute;
inset: 0;
}
}

// & selector added to up priority over button styles
& &__addon {
&__addon {
display: flex;
align-items: center;
justify-content: center;
width: var(--_--height);
height: var(--_--height);
border-radius: var(--_--border-radius);

&_side_left,
&_side_right {
&_side_start,
&_side_end {
position: absolute;
inset-block-start: 0;
}

&_side_left {
&_side_start {
inset-inline-start: 2px;
border-start-end-radius: 0;
border-end-end-radius: 0;
}

&_side_right {
&_side_end {
inset-inline-end: 0;
z-index: 2;
border-start-start-radius: 0;
border-end-start-radius: 0;
}

&_interactive {
--g-button-background-color: transparent;

&_type_button {
@include mixins.button-reset();
z-index: 2;
cursor: pointer;
color: inherit;
transition: color, background-color;
transition-duration: $transitionDuration;
transition-timing-function: $transitionTimingFunction;
color: var(--_--text-color);
background-color: transparent;
transition:
color $transition-duration $transition-timing-function,
background-color $transition-duration $transition-timing-function,
variables.$button-shrink-transition;

&:active {
transform: variables.$button-shrink-transform;
}
}
}

&_size {
&_xs {
@include sizeState(8px, 20px, 22px, 24px, var(--g-border-radius-xs));
--_--height: 20px;
--_--border-radius: var(--g-border-radius-xs);
--_--margin-inline: 8px;
--_--margin-addon-start: 24px;
--_--margin-addon-end: 22px;
}

&_s {
@include sizeState(10px, 24px, 26px, 28px, var(--g-border-radius-s));
--_--height: 24px;
--_--border-radius: var(--g-border-radius-s);
--_--margin-inline: 10px;
--_--margin-addon-start: 28px;
--_--margin-addon-end: 26px;
}

&_m {
@include sizeState(12px, 28px, 32px, 32px, var(--g-border-radius-m));
--_--height: 28px;
--_--border-radius: var(--g-border-radius-m);
--_--margin-inline: 12px;
--_--margin-addon-start: 32px;
--_--margin-addon-end: 32px;
}
}

&_disabled {
opacity: $hover-opacity;
opacity: 0.7;
pointer-events: none;
}

&_is-interactive {
&_interactive {
cursor: pointer;
}

--_-bg-color: none;
--_-bg-hover-color: none;
--_-text-color: none;

&_theme {
&_normal {
--_-bg-color: var(--g-color-base-misc-light);
--_-bg-hover-color: var(--g-color-base-misc-light-hover);
--_-text-color: var(--g-color-text-misc-heavy);
--_--bg-color: var(--g-color-base-misc-light);
--_--bg-color-hover: var(--g-color-base-misc-light-hover);
--_--text-color: var(--g-color-text-misc-heavy);
}

&_success {
--_-bg-color: var(--g-color-base-positive-light);
--_-bg-hover-color: var(--g-color-base-positive-light-hover);
--_-text-color: var(--g-color-text-positive-heavy);
--_--bg-color: var(--g-color-base-positive-light);
--_--bg-color-hover: var(--g-color-base-positive-light-hover);
--_--text-color: var(--g-color-text-positive-heavy);
}

&_info {
--_-bg-color: var(--g-color-base-info-light);
--_-bg-hover-color: var(--g-color-base-info-light-hover);
--_-text-color: var(--g-color-text-info-heavy);
--_--bg-color: var(--g-color-base-info-light);
--_--bg-color-hover: var(--g-color-base-info-light-hover);
--_--text-color: var(--g-color-text-info-heavy);
}

&_warning {
--_-bg-color: var(--g-color-base-warning-light);
--_-bg-hover-color: var(--g-color-base-warning-light-hover);
--_-text-color: var(--g-color-text-warning-heavy);
--_--bg-color: var(--g-color-base-warning-light);
--_--bg-color-hover: var(--g-color-base-warning-light-hover);
--_--text-color: var(--g-color-text-warning-heavy);
}

&_danger {
--_-bg-color: var(--g-color-base-danger-light);
--_-bg-hover-color: var(--g-color-base-danger-light-hover);
--_-text-color: var(--g-color-text-danger-heavy);
--_--bg-color: var(--g-color-base-danger-light);
--_--bg-color-hover: var(--g-color-base-danger-light-hover);
--_--text-color: var(--g-color-text-danger-heavy);
}

&_utility {
--_-bg-color: var(--g-color-base-utility-light);
--_-bg-hover-color: var(--g-color-base-utility-light-hover);
--_-text-color: var(--g-color-text-utility-heavy);
--_--bg-color: var(--g-color-base-utility-light);
--_--bg-color-hover: var(--g-color-base-utility-light-hover);
--_--text-color: var(--g-color-text-utility-heavy);
}

&_unknown {
--_-bg-color: var(--g-color-base-neutral-light);
--_-bg-hover-color: var(--g-color-base-neutral-light-hover);
--_-text-color: var(--g-color-text-complementary);
--_--bg-color: var(--g-color-base-neutral-light);
--_--bg-color-hover: var(--g-color-base-neutral-light-hover);
--_--text-color: var(--g-color-text-complementary);
}

&_clear {
--_-bg-color: transparent;
--_-bg-hover-color: var(--g-color-base-simple-hover-solid);
--_-text-color: var(--g-color-text-complementary);
--_--bg-color: transparent;
--_--bg-color-hover: var(--g-color-base-simple-hover);
--_--text-color: var(--g-color-text-complementary);

--border-size: 1px;
border: var(--border-size) solid var(--g-color-line-generic);
box-shadow: inset 0 0 0 1px var(--g-color-line-generic);
}
}

color: var(--_-text-color);
background-color: var(--_-bg-color);

// hover on interactive label (excluding hover on addon)
&_is-interactive:hover:not(:has(#{$block}__addon_interactive:hover)) {
background-color: var(--_-bg-hover-color);
// Apply margins for addons
&:has(#{$block}__addon_side_start) &__text {
margin-inline-start: var(--_--margin-addon-start);
}
&:has(#{$block}__addon_side_end) &__text {
margin-inline-end: var(--_--margin-addon-end);
}

// hover on action button
&:not(#{$disabled}) #{$block}__addon_interactive {
--g-button-background-color-hover: var(--_-bg-hover-color);
// hover styles
&_interactive:hover:not(:has(#{$block}__addon_type_button:hover)),
&__addon_type_button:hover {
background-color: var(--_--bg-color-hover);
}

&:hover,
&:focus,
&:active {
color: var(--_-text-color);
}
// focus styles
&__main-button:focus-visible,
&__addon_type_button:focus-visible {
outline: 2px solid var(--g-color-line-focus);
}
}
Loading
Loading