diff --git a/playwright/core/expectScreenshotFixture.ts b/playwright/core/expectScreenshotFixture.ts index 1192527440..2f9e790304 100644 --- a/playwright/core/expectScreenshotFixture.ts +++ b/playwright/core/expectScreenshotFixture.ts @@ -13,9 +13,9 @@ export const expectScreenshotFixture: PlaywrightFixture ...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); diff --git a/playwright/playwright/index.html b/playwright/playwright/index.html index 6572a36e5f..e8ad4b82fa 100644 --- a/playwright/playwright/index.html +++ b/playwright/playwright/index.html @@ -1,12 +1,12 @@ - + Test component page - -
+ +
diff --git a/src/components/Button/Button.scss b/src/components/Button/Button.scss index 5172c7344d..3aab110735 100644 --- a/src/components/Button/Button.scss +++ b/src/components/Button/Button.scss @@ -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; @@ -77,7 +77,7 @@ $block: '.#{variables.$ns}button'; &:active { transition: none; - transform: scale(0.96); + transform: variables.$button-shrink-transform; } &:active::after { diff --git a/src/components/Label/Label.scss b/src/components/Label/Label.scss index 1ae880daf6..deec1e89d0 100644 --- a/src/components/Label/Label.scss +++ b/src/components/Label/Label.scss @@ -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; @@ -61,7 +44,7 @@ $hover-opacity: 0.7; &__value { display: flex; - opacity: $hover-opacity; + opacity: 0.7; overflow: hidden; } @@ -69,149 +52,164 @@ $hover-opacity: 0.7; 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); } } diff --git a/src/components/Label/Label.tsx b/src/components/Label/Label.tsx index 9bbb955373..f6b8816d09 100644 --- a/src/components/Label/Label.tsx +++ b/src/components/Label/Label.tsx @@ -2,8 +2,6 @@ import React from 'react'; import {Xmark} from '@gravity-ui/icons'; -import {Button} from '../Button'; -import type {ButtonProps, ButtonSize} from '../Button'; import {ClipboardIcon} from '../ClipboardIcon'; import {CopyToClipboard} from '../CopyToClipboard'; import type {CopyToClipboardStatus} from '../CopyToClipboard'; @@ -15,24 +13,16 @@ import './Label.scss'; const b = block('label'); -type SizeMapType = {copyIconSize: number; closeIconSize: number; buttonSize: ButtonSize}; +type SizeMapType = {copyIconSize: number; closeIconSize: number}; const sizeMap: Record = { - xs: {copyIconSize: 12, closeIconSize: 12, buttonSize: 'xs'}, - s: {copyIconSize: 14, closeIconSize: 14, buttonSize: 's'}, - m: {copyIconSize: 16, closeIconSize: 16, buttonSize: 'm'}, -}; - -const commonActionButtonProps: ButtonProps = { - pin: 'brick-round', - className: b('addon', { - side: 'right', - interactive: true, - }), + xs: {copyIconSize: 12, closeIconSize: 12}, + s: {copyIconSize: 14, closeIconSize: 14}, + m: {copyIconSize: 16, closeIconSize: 16}, }; export interface LabelProps extends QAProps { - /** Label icon (at left) */ + /** Label icon (at start) */ icon?: React.ReactNode; /** Disabled state */ disabled?: boolean; @@ -94,10 +84,12 @@ export const Label = React.forwardRef(function Label( const hasOnClick = typeof onClick === 'function'; const hasCopy = Boolean(typeCopy && copyText); const isInteractive = (hasOnClick || hasCopy || interactive) && !disabled; - const {copyIconSize, closeIconSize, buttonSize} = sizeMap[size]; + const {copyIconSize, closeIconSize} = sizeMap[size]; - const leftIcon = icon && ( -
{icon}
+ const startIcon = icon && ( +
+ {icon} +
); const content = hasContent && (
@@ -116,29 +108,33 @@ export const Label = React.forwardRef(function Label( if (typeCopy) { actionButton = ( - + + ); } else if (typeClose) { actionButton = ( - + ); } @@ -149,23 +145,20 @@ export const Label = React.forwardRef(function Label( { theme, size, - type, - 'is-interactive': isInteractive, - 'has-right-addon': Boolean(actionButton), - 'has-left-addon': Boolean(leftIcon), + interactive: isInteractive, disabled, }, className, )} data-qa={qa} > - {leftIcon} + {startIcon} {hasOnClick ? ( diff --git a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-dark-chromium-linux.png b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-dark-chromium-linux.png index 7a86984bd3..3280efe254 100644 Binary files a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-dark-chromium-linux.png and b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-dark-chromium-linux.png differ diff --git a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-dark-webkit-linux.png b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-dark-webkit-linux.png index 678463c5a0..2a9a7f0257 100644 Binary files a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-dark-webkit-linux.png and b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-dark-webkit-linux.png differ diff --git a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-light-chromium-linux.png b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-light-chromium-linux.png index 60f96b62b4..ea47fb49db 100644 Binary files a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-light-chromium-linux.png and b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-light-chromium-linux.png differ diff --git a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-light-webkit-linux.png b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-light-webkit-linux.png index fe0780fd56..1a38c3a13e 100644 Binary files a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-light-webkit-linux.png and b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-ShowcaseStory-light-webkit-linux.png differ diff --git a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-dark-chromium-linux.png b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-dark-chromium-linux.png index 5b6865899c..75a6093929 100644 Binary files a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-dark-chromium-linux.png and b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-dark-chromium-linux.png differ diff --git a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-dark-webkit-linux.png b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-dark-webkit-linux.png index 827a5559ac..1047d43b24 100644 Binary files a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-dark-webkit-linux.png and b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-dark-webkit-linux.png differ diff --git a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-light-chromium-linux.png b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-light-chromium-linux.png index ab4e129afb..8cf0e216ed 100644 Binary files a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-light-chromium-linux.png and b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-light-chromium-linux.png differ diff --git a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-light-webkit-linux.png b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-light-webkit-linux.png index 66e4c037e7..79337072b5 100644 Binary files a/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-light-webkit-linux.png and b/src/components/Label/__snapshots__/Label.visual.test.tsx-snapshots/Label-render-story-Theme-light-webkit-linux.png differ diff --git a/src/components/variables.scss b/src/components/variables.scss index 8ebea2ebdb..e7fd20e983 100644 --- a/src/components/variables.scss +++ b/src/components/variables.scss @@ -6,4 +6,7 @@ $m-height: 28px; $l-height: 36px; $xl-height: 44px; +$button-shrink-transition: transform 0.1s ease-out; +$button-shrink-transform: scale(0.96); + $modal-default-margin: 20px;