Skip to content

FIG-33207: updating focus outlines for components and elements #131

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

Open
antalutrazvan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

FIG-33207: updating focus outlines for components and elements #131

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions packages/ui/button/iconButton/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

&:focus,
&:hover {
outline-offset: -2px;
background: var(--color-iconButton-primary-background_hover);
fill: var(--color-iconButton-primary-icon_hover);
}
Expand All @@ -40,6 +41,7 @@
}

.primaryAlt {
outline-offset: -2px;
background: var(--color-iconButton-primaryAlt-background);
fill: var(--color-iconButton-primaryAlt-icon);

Expand All @@ -66,6 +68,7 @@

&:focus,
&:hover {
outline-offset: -2px;
background: var(--color-iconButton-secondary-background_hover);
fill: var(--color-iconButton-secondary-icon_hover);
}
Expand All @@ -87,6 +90,7 @@

&:focus,
&:hover {
outline-offset: -2px;
background: var(--color-iconButton-secondaryAlt-background_hover);
fill: var(--color-iconButton-secondaryAlt-icon_hover);
}
Expand All @@ -108,6 +112,7 @@

&:focus,
&:hover {
outline-offset: -2px;
background: var(--color-iconButton-tertiary-background_hover);
fill: var(--color-iconButton-tertiary-icon_hover);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/input/checkbox/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
flex-basis: calc(5 * var(--gridSize));
}

.checkbox svg {
width: 100%;
height: 100%;
}

.checkbox::before {
position: absolute;

Expand Down Expand Up @@ -68,4 +73,5 @@

.switch .input {
border-radius: calc(2.5 * var(--gridSize));
outline-offset: 0;
}
13 changes: 1 addition & 12 deletions packages/ui/input/date/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,24 +259,13 @@
background-color: var(--color-layout-primary-background);
}

:global(.react-datepicker__input-container) input:focus,
:global(.react-datepicker__input-container) input:focus-visible {
padding: calc(var(--gridSize) - 1px) calc(2 * var(--gridSize) - 1px);

border: 2px solid var(--color-border-active);
outline: none;
background-color: var(--color-layout-primary-background);

box-shadow: none;
}

.error input {
border-color: var(--color-border-error);
}

.error input:focus,
.error input:focus-visible {
border-color: var(--color-border-error);
outline-color: var(--color-border-error);
}

.disabled input,
Expand Down
135 changes: 73 additions & 62 deletions packages/ui/input/search/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,68 @@
/* stylelint-disable a11y/no-outline-none */
.container {
position: relative;

display: flex;
flex-direction: row;

width: calc(60 * var(--gridSize));
height: calc(6 * var(--gridSize));
justify-content: space-between;
align-items: center;
}

width: calc(60 * var(--gridSize));
.input {
overflow: hidden;

width: calc(100% - 12 * var(--gridSize));

white-space: nowrap;
text-overflow: ellipsis;

border: transparent;
border-radius: calc(0.5 * var(--gridSize));

&:active,
&:focus {
border-color: none;
outline: none;
box-shadow: none;
}

&::placeholder {
color: var(--color-typography-tertiary);
}

&[aria-disabled] {
color: var(--color-typography-disabled);
background-color: var(--color-layout-tertiary-background);

&:focus,
&:active {
border: none;
box-shadow: none;
}

&::placeholder {
color: var(--color-typography-disabled);
}
}

&[data-size="S"] {
font-size: var(--typography-M-fontSize);

height: calc(4 * var(--gridSize));

margin: var(--gridSize) calc(2 * var(--gridSize));
}

&[data-size="L"] {
font-size: var(--typography-XL-fontSize);

height: calc(6 * var(--gridSize));

margin: calc(1.5 * var(--gridSize)) calc(2 * var(--gridSize));
}
}

.defaultContainer {
Expand All @@ -16,8 +72,11 @@
border-radius: calc(0.5 * var(--gridSize));

&:active,
&:focus {
border: 2px solid var(--color-border-active);
&:focus,
&:focus-within {
outline: 2px solid var(--color-border-active);
outline-width: 2px;
outline-offset: -2px;
}
}

Expand All @@ -36,91 +95,43 @@
&:active,
&:focus {
border-bottom: 2px solid var(--color-border-active);
outline: none;
}
}

.isDisabled {
background-color: var(--color-layout-tertiary-background);
}

.defaultContainer:focus-within,
.defaultContainer.isFocused {
border: 2px solid var(--color-border-active);
}

.defaultContainer.error:focus-within,
.defaultContainer.isFocused.error {
border: 2px solid var(--color-border-error);
outline-color: var(--color-border-error);
}

.underlineContainer:focus-within,
.underlineContainer.isFocused {
border-bottom: 2px solid var(--color-border-active);
outline: none;
}

.underlineContainer.error:focus-within,
.underlineContainer.isFocused.error {
border-bottom: 2px solid var(--color-border-error);
outline: none;
}

.error {
border-color: var(--color-border-error);
.underlineContainer:focus-within .input,
.underlineContainer.isFocused .input {
padding-bottom: 0;

&:active,
&:focus {
border-color: var(--color-border-error);
}
outline: none;
}

.input {
overflow: hidden;

width: calc(100% - 12 * var(--gridSize));

white-space: nowrap;
text-overflow: ellipsis;

border: transparent;
border-radius: calc(0.5 * var(--gridSize));
.error {
border-color: var(--color-border-error);

&:active,
&:focus {
border-color: none;
box-shadow: none;
}

&::placeholder {
color: var(--color-typography-tertiary);
}

&[aria-disabled] {
color: var(--color-typography-disabled);
background-color: var(--color-layout-tertiary-background);

&:focus,
&:active {
border: none;
box-shadow: none;
}

&::placeholder {
color: var(--color-typography-disabled);
}
}

&[data-size="S"] {
font-size: var(--typography-M-fontSize);

height: calc(4 * var(--gridSize));

margin: var(--gridSize) calc(2 * var(--gridSize));
}

&[data-size="L"] {
font-size: var(--typography-XL-fontSize);

height: calc(6 * var(--gridSize));

margin: calc(1.5 * var(--gridSize)) calc(2 * var(--gridSize));
border-color: var(--color-border-error);
}
}
31 changes: 17 additions & 14 deletions packages/ui/input/text/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable a11y/no-outline-none */
.container {
position: relative;

Expand Down Expand Up @@ -26,10 +27,6 @@
padding: 0 calc(2 * var(--gridSize));
}

.container.isFocused > button:last-child {
padding-right: calc(2 * var(--gridSize) - 1px);
}

.underlineTheme {
composes: container;

Expand Down Expand Up @@ -61,9 +58,8 @@

&:active,
&:focus {
padding: calc(var(--gridSize) - 1px) calc(2 * var(--gridSize) - 1px);

border-color: none;
outline: none;
box-shadow: none;
}

Expand All @@ -78,6 +74,7 @@
&:focus,
&:active {
border: none;
outline: none;
box-shadow: none;
}

Expand All @@ -101,30 +98,36 @@

.defaultTheme:focus-within,
.defaultTheme.isFocused {
border: 2px solid var(--color-border-active);
}

.defaultTheme:focus-within > .input,
.defaultTheme.isFocused > .input {
padding: calc(var(--gridSize) - 1px) calc(2 * var(--gridSize) - 1px);
outline: 2px solid var(--color-border-active);
outline-width: 2px;
outline-offset: -2px;
}

.defaultTheme.error:focus-within,
.defaultTheme.isFocused.error {
border: 2px solid var(--color-border-error);
outline-color: var(--color-border-error);
}

.defaultTheme:focus-within,
.defaultTheme:focus-within > .input,
.defaultTheme.isFocused > .input {
outline: none;
}

.underlineTheme:focus-within,
.underlineTheme.isFocused {
border-bottom: 2px solid var(--color-border-active);
outline: none;
}

.underlineTheme:focus-within > .input,
.underlineTheme.isFocused > .input {
padding-bottom: calc(var(--gridSize) - 2px);

outline: none;
}

.underlineTheme.error:focus-within,
.underlineTheme.isFocused.error {
border-bottom: 2px solid var(--color-border-error);
outline: none;
}
9 changes: 7 additions & 2 deletions packages/ui/styles/generic/normalize.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ svg {

&:focus {
border-radius: calc(0.5 * var(--gridSize));
outline: none;
box-shadow: 0 0 0 2px var(--color-border-focus), 0 0 4px 2px var(--color-border-focusShadow);
outline: 2px solid var(--color-border-active);
outline-width: 2px;
outline-offset: -2px;
}
}

Expand All @@ -33,6 +34,8 @@ button {
text-decoration: none;

color: var(--color-button-tertiary-label_hover);

outline-offset: 0;
background: var(--color-button-tertiary-background_hover);
}

Expand All @@ -47,6 +50,8 @@ button {
text-decoration: none;

color: var(--color-button-tertiary-label_click);

outline-offset: 0;
background: var(--color-button-tertiary-background_click);
}

Expand Down
4 changes: 4 additions & 0 deletions packages/ui/textEditor/Lexical/editor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@

.container:focus-within {
--border-color: var(--color-border-active);

outline: 2px solid var(--border-color);
outline-offset: -2px;
}

.container:focus-within::before {
Expand Down Expand Up @@ -91,6 +94,7 @@
}

.input:focus {
outline: none;
box-shadow: none;
}

Expand Down
Loading