From 2b74b94c530555938eff49824cb76e4998ebfbf6 Mon Sep 17 00:00:00 2001 From: Irina Aristova <38761239+Irinaristova@users.noreply.github.com> Date: Tue, 27 Apr 2021 12:27:51 +0300 Subject: [PATCH] [FRNT-477] Implement danger variant (#95) --- src/lib/box-styles.tsx | 31 +++++++----- src/ui/atoms/heading/index.tsx | 11 ++--- src/ui/atoms/input/usage.mdx | 5 +- src/ui/atoms/label/index.tsx | 10 ++-- src/ui/atoms/text-area/index.tsx | 2 +- src/ui/atoms/text-area/usage.mdx | 11 +++++ src/ui/atoms/text/index.tsx | 12 ++--- .../elements/quarks/input-container/index.tsx | 7 ++- src/ui/molecules/field/usage.mdx | 49 ++++++++++++++++--- src/ui/molecules/input-password/usage.mdx | 4 +- src/ui/molecules/switch/usage.mdx | 12 +++++ 11 files changed, 105 insertions(+), 49 deletions(-) diff --git a/src/lib/box-styles.tsx b/src/lib/box-styles.tsx index 64f0c675..52716796 100644 --- a/src/lib/box-styles.tsx +++ b/src/lib/box-styles.tsx @@ -26,6 +26,7 @@ export const Global = styled.div` --woly-neutral: var(--palette-snow-500); --woly-focus: var(--palette-lavender-500); --woly-background: var(--palette-snow-0); + --woly-danger: var(--palette-dawn-300); [data-variant='primary'] { --woly-shape-default: var(--palette-lavender-300); @@ -68,18 +69,26 @@ export const Global = styled.div` --woly-text-disabled: #e4e4e4; --woly-fill-disabled: #e4e4e4; } - [data-variant='error'] { - --woly-border-width: 1.5px; + [data-variant='danger'] { + --woly-shape-default: var(--woly-danger); + --woly-shape-disabled: var(--palette-snow-300); + --woly-shape-hover: var(--woly-danger); + --woly-shape-active: var(--woly-danger); - --woly-background: #ffffff; - --woly-border: #eb5656; - --woly-color: #eb5656; - --woly-label-color: #eb5656; - --woly-canvas: #eb5656; - - --woly-border-focus: #eb5656; - --woly-error-text: #eb5656; - --woly-hint-color: #ff9097; + --woly-shape-text-default: var(--palette-snow-0); + --woly-shape-text-disabled: var(--palette-snow-0); + --woly-shape-text-hover: var(--palette-snow-0); + --woly-shape-text-active: var(--palette-snow-0); + + --woly-canvas-default: transparent; + --woly-canvas-disabled: var(--palette-snow-100); + --woly-canvas-hover: var(--woly-danger); + --woly-canvas-active: var(--woly-danger); + + --woly-canvas-text-default: var(--woly-danger); + --woly-canvas-text-disabled: var(--palette-snow-500); + --woly-canvas-text-hover: var(--woly-danger); + --woly-canvas-text-active: var(--woly-danger); } `; diff --git a/src/ui/atoms/heading/index.tsx b/src/ui/atoms/heading/index.tsx index d66ba67a..04fa7e90 100644 --- a/src/ui/atoms/heading/index.tsx +++ b/src/ui/atoms/heading/index.tsx @@ -1,13 +1,6 @@ import * as React from 'react'; import styled, { StyledComponent } from 'styled-components'; import { Variant } from 'lib/types'; - -/** - * --woly-font-size - * --woly-label-color - * --woly-line-height - */ - interface HeadingProps extends React.LabelHTMLAttributes { children: React.ReactNode; size?: 1 | 2 | 3; @@ -21,7 +14,9 @@ const map = (properties: HeadingProps & Variant) => ({ }); export const Heading = styled.span.attrs(map)` - color: var(--woly-color, #000000); + --local-color: var(--woly-canvas-text-default); + + color: var(--local-color); font-size: 24px; line-height: 30px; font-weight: 500; diff --git a/src/ui/atoms/input/usage.mdx b/src/ui/atoms/input/usage.mdx index bb94cee3..ca4c7249 100644 --- a/src/ui/atoms/input/usage.mdx +++ b/src/ui/atoms/input/usage.mdx @@ -188,8 +188,6 @@ Primary and secondary variants are should be used to focus user attention. Error variant can be used to focus user attention on error. - - } @@ -197,8 +195,7 @@ Error variant can be used to focus user attention on error. onChange={(event) => console.info('On input change')} placeholder="Error input" type="text" - value="Error" - variant="Error" + variant="danger" /> diff --git a/src/ui/atoms/label/index.tsx b/src/ui/atoms/label/index.tsx index cf524d0f..9d31703c 100644 --- a/src/ui/atoms/label/index.tsx +++ b/src/ui/atoms/label/index.tsx @@ -10,12 +10,14 @@ const map = (properties: LabelProps & Variant) => ({ }); export const Label = styled.label.attrs(map)` - --vertical: calc(1px * var(--woly-component-level) * var(--woly-main-level)); - --horizontal: calc(var(--woly-const-m) + (1px * var(--woly-main-level)) + var(--vertical)); + --local-vertical: calc(1px * var(--woly-component-level) * var(--woly-main-level)); + --local-horizontal: calc(var(--woly-const-m) + (1px * var(--woly-main-level)) + var(--local-vertical)); - padding: var(--woly-vertical, 6px) var(--woly-horizontal, 6px); + --local-color: var(--woly-canvas-text-default); - color: var(--woly-label-color, #000000); + padding: var(--local-vertical) var(--local-horizontal); + + color: var(--local-color); font-size: var(--woly-font-size, 15px); line-height: var(--woly-line-height, 24px); ` as StyledComponent<'label', Record, LabelProps & Variant>; diff --git a/src/ui/atoms/text-area/index.tsx b/src/ui/atoms/text-area/index.tsx index 428f5d44..2f4c13f8 100644 --- a/src/ui/atoms/text-area/index.tsx +++ b/src/ui/atoms/text-area/index.tsx @@ -104,7 +104,7 @@ export const TextArea = styled(TextAreaBase)` var(--woly-const-m) + (1px * var(--woly-main-level)) + var(--local-vertical) ); - --local-border-color: var(--woly-neutral); + --local-border-color: var(--woly-canvas-text-hover); --local-background-color: var(--woly-canvas-default); --local-value-color: var(--woly-canvas-text-default); diff --git a/src/ui/atoms/text-area/usage.mdx b/src/ui/atoms/text-area/usage.mdx index 3eaa44f0..1a50512b 100644 --- a/src/ui/atoms/text-area/usage.mdx +++ b/src/ui/atoms/text-area/usage.mdx @@ -41,6 +41,17 @@ Primary and danger variants are should be used to focus user attention. /> +Error variant focus user attention on error. + + +