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

feat: improve focus outline styles for text/select inputs #1318

Merged
merged 7 commits into from
Mar 21, 2024
Merged

feat: improve focus outline styles for text/select inputs #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d45d1f
feat: using outline styles for textarea textinput
Feb 7, 2024
885caa0
feat: using outline styles for select
Feb 7, 2024
3b40c57
fix: change css variables names
Feb 8, 2024
5f9df1f
feat: outline on error
Mar 4, 2024
50171b1
fix: using public / private pair of css variables
Mar 14, 2024
c922fcf
fix: use raw :focus-visible pseudoselector
Mar 21, 2024
c566f26
docs: additional clarification
Mar 21, 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
6 changes: 6 additions & 0 deletions src/components/Select/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,3 +1123,9 @@ LANDING_BLOCK-->
| errorMessage | Error text | `string` | |
| errorPlacement | Error placement | `outside` `inside` | `outside` |
| validationState | Validation state | `"invalid"` | |

## CSS API

| Name | Description |
| :------------------------------- | :-------------------------------------------------- |
| `--g-select-focus-outline-color` | Outline color if focused (by default not presented) |
8 changes: 8 additions & 0 deletions src/components/Select/components/SelectControl/SelectControl.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ $blockButton: '.#{variables.$ns}select-control__button';
}

#{$block} {
--_--focus-outline-color: var(--g-select-focus-outline-color);
@include mixins.button-reset();

position: relative;
Expand Down Expand Up @@ -167,6 +168,8 @@ $blockButton: '.#{variables.$ns}select-control__button';
}

&_error::before {
--_--focus-outline-color: var(--g-color-line-danger);

border-color: var(--g-color-line-danger);
}

Expand Down Expand Up @@ -195,6 +198,11 @@ $blockButton: '.#{variables.$ns}select-control__button';
&:not(&_error):not(&_view_clear):focus-visible::before {
border-color: var(--g-color-line-generic-active);
}

&:focus-visible::before {
outline: 2px solid var(--g-select-focus-outline-color, var(--_--focus-outline-color));
outline-offset: -1px;
}
}

&:not(&_disabled):not(&_no-active):active {
Expand Down
21 changes: 11 additions & 10 deletions src/components/controls/TextArea/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,14 @@ LANDING_BLOCK-->

## CSS API

| Name | Description |
| :---------------------------------- | :---------------------- |
| `--g-text-area-text-color` | Text color |
| `--g-text-area-placeholder-color` | Placeholder color |
| `--g-text-area-background-color` | Background color |
| `--g-text-area-border-radius` | Border radius |
| `--g-text-area-border-width` | Border width |
| `--g-text-area-border-color` | Border color |
| `--g-text-area-border-color-hover` | Border color if hovered |
| `--g-text-area-border-color-active` | Border color if active |
| Name | Description |
| :---------------------------------- | :-------------------------------------------------- |
| `--g-text-area-text-color` | Text color |
| `--g-text-area-placeholder-color` | Placeholder color |
| `--g-text-area-background-color` | Background color |
| `--g-text-area-border-radius` | Border radius |
| `--g-text-area-border-width` | Border width |
| `--g-text-area-border-color` | Border color |
| `--g-text-area-border-color-hover` | Border color if hovered |
| `--g-text-area-border-color-active` | Border color if active |
| `--g-text-area-focus-outline-color` | Outline color if focused (by default not presented) |
11 changes: 11 additions & 0 deletions src/components/controls/TextArea/TextArea.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ $block: '.#{variables.$ns}text-area';
--_--clear-offset: calc(
var(--g-text-area-border-width, #{control-variables.$border-width}) + 1px
);
--_--focus-outline-color: var(--g-text-area-focus-outline-color);

display: inline-block;
width: 100%;
Expand All @@ -34,6 +35,8 @@ $block: '.#{variables.$ns}text-area';

&:focus-within {
border-color: var(--g-text-area-border-color-active, var(--_--border-color-active));
outline: 2px solid var(--g-text-area-focus-outline-color, var(--_--focus-outline-color));
outline-offset: -1px;
}
}

Expand Down Expand Up @@ -187,6 +190,10 @@ $block: '.#{variables.$ns}text-area';
&:focus-within {
border-color: var(--g-color-line-danger);
}

&:focus-within {
--_--focus-outline-color: var(--g-color-line-danger);
}
}
}

Expand All @@ -197,6 +204,10 @@ $block: '.#{variables.$ns}text-area';
&:focus-within {
border-block-end: 1px solid var(--g-color-line-danger);
}

&:focus-within {
--_--focus-outline-color: var(--g-color-line-danger);
}
}
}
}
Expand Down
23 changes: 12 additions & 11 deletions src/components/controls/TextInput/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,15 @@ LANDING_BLOCK-->

## CSS API

| Name | Description |
| :----------------------------------- | :---------------------- |
| `--g-text-input-text-color` | Text color |
| `--g-text-input-label-color` | Label color |
| `--g-text-input-placeholder-color` | Placeholder color |
| `--g-text-input-background-color` | Background color |
| `--g-text-input-border-radius` | Border radius |
| `--g-text-input-border-width` | Border width |
| `--g-text-input-border-color` | Border color |
| `--g-text-input-border-color-hover` | Border color if hovered |
| `--g-text-input-border-color-active` | Border color if active |
| Name | Description |
| :----------------------------------- | :-------------------------------------------------- |
| `--g-text-input-text-color` | Text color |
| `--g-text-input-label-color` | Label color |
| `--g-text-input-placeholder-color` | Placeholder color |
| `--g-text-input-background-color` | Background color |
| `--g-text-input-border-radius` | Border radius |
| `--g-text-input-border-width` | Border width |
| `--g-text-input-border-color` | Border color |
| `--g-text-input-border-color-hover` | Border color if hovered |
| `--g-text-input-border-color-active` | Border color if active |
| `--g-text-input-focus-outline-color` | Outline color if focused (by default not presented) |
12 changes: 12 additions & 0 deletions src/components/controls/TextInput/TextInput.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ $block: '.#{variables.$ns}text-input';
--_--placeholder-color: var(--g-color-text-hint);
--_--background-color: transparent;
--_--border-width: #{control-variables.$border-width};
--_--focus-outline-color: var(--g-text-input-focus-outline-color);

display: inline-block;
width: 100%;
Expand All @@ -118,6 +119,9 @@ $block: '.#{variables.$ns}text-input';

&:focus-within {
border-color: var(--g-text-input-border-color-active, var(--_--border-color-active));
outline: 2px solid
var(--g-text-input-focus-outline-color, var(--_--focus-outline-color));
outline-offset: -1px;
}
}

Expand Down Expand Up @@ -380,6 +384,10 @@ $block: '.#{variables.$ns}text-input';
&:focus-within {
border-color: var(--g-color-line-danger);
}

&:focus-within {
--_--focus-outline-color: var(--g-color-line-danger);
}
}
}

Expand All @@ -390,6 +398,10 @@ $block: '.#{variables.$ns}text-input';
&:focus-within {
border-block-end: 1px solid var(--g-color-line-danger);
}

&:focus-within {
--_--focus-outline-color: var(--g-color-line-danger);
}
}
}
}
Expand Down
Loading