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

[Bug] Radio checked + focus state fixes #2314

Merged
merged 3 commits into from
Nov 17, 2022
Merged

[Bug] Radio checked + focus state fixes #2314

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
0cc23c8
use border instead of pseudo element
langermank Nov 17, 2022
5a25333
Stylelint auto-fixes
actions-user Nov 17, 2022
6084b91
Create rude-ears-tie.md
langermank Nov 17, 2022
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 .changeset/rude-ears-tie.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/css": patch
---

[Bug] Radio checked + focus state fixes
72 changes: 31 additions & 41 deletions src/forms/FormControl.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
}

// default focus state
&:focus-visible {
&:not([type='checkbox']):not([type='radio']):focus-visible {
@include focusBoxShadowInset;
}
}
Expand Down Expand Up @@ -520,8 +520,7 @@

// these selectors are temporary to override base.scss
// once Field styles are widely adopted, we can adjust this and the global base styles
input[type='checkbox'].FormControl-checkbox,
input[type='radio'].FormControl-radio {
input[type='checkbox'].FormControl-checkbox {
@include Field;

position: relative;
Expand Down Expand Up @@ -604,9 +603,8 @@ input[type='radio'].FormControl-radio {
// stylelint-enable primer/colors
}

&:focus,
&:focus-visible {
outline-offset: 2px;
@include focusOutline(2px);
}

&:indeterminate {
Expand All @@ -618,31 +616,43 @@ input[type='radio'].FormControl-radio {
}

input[type='radio'].FormControl-radio {
border-radius: var(--primer-borderRadius-full, 100vh);
@include Field;

&::before {
clip-path: circle(0%);
mask-image: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAiIGhlaWdodD0iMTAiIHZpZXdCb3g9IjAgMCAxMCAxMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUgOS4zNzVDNy40MTYyMiA5LjM3NSA5LjM3NSA3LjQxNjIyIDkuMzc1IDVDOS4zNzUgMi41ODM3NiA3LjQxNjIyIDAuNjI1IDUgMC42MjVDMi41ODM3NiAwLjYyNSAwLjYyNSAyLjU4Mzc2IDAuNjI1IDVDMC42MjUgNy40MTYyMiAyLjU4Mzc2IDkuMzc1IDUgOS4zNzVaIiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K'); // checked circle image
mask-size: 65%;
position: relative;
width: var(--base-size-16, 16px);
height: var(--base-size-16, 16px);
margin: 0;
margin-top: 0.125rem; // 2px to center align with label (20px line-height)
cursor: pointer;
border-radius: var(--primer-borderRadius-full, 100vh);
transition: background-color, border-color 80ms cubic-bezier(0.33, 1, 0.68, 1); // checked -> unchecked - add 120ms delay to fully see animation-out
appearance: none;

@media screen and (prefers-reduced-motion: no-preference) {
animation: radioOut 80ms cubic-bezier(0.65, 0, 0.35, 1) forwards; // slightly snappier animation out
}
&::after {
@include minTouchTarget(var(--primer-control-medium-size, 32px), var(--primer-control-medium-size, 32px));
}

&:checked {
&::before {
@media screen and (prefers-reduced-motion: no-preference) {
animation: radioIn 80ms cubic-bezier(0.65, 0, 0.35, 1) forwards 80ms;
}
border-color: var(--color-accent-fg);
border-width: var(--base-size-4, 4px);

&:disabled {
cursor: not-allowed;
border-color: var(--color-primer-fg-disabled);
}
}

&:indeterminate {
&::before {
visibility: hidden;
}
&:focus-visible {
@include focusOutline(2px);
}

// Windows High Contrast mode
// stylelint-disable primer/colors
@media (forced-colors: active) {
background-color: CanvasText;
border-color: CanvasText;
}
// stylelint-enable primer/colors
}

@keyframes checkmarkIn {
Expand All @@ -664,23 +674,3 @@ input[type='radio'].FormControl-radio {
clip-path: inset(var(--base-size-16, 16px) 0 0 0);
}
}

@keyframes radioIn {
from {
clip-path: circle(0%);
}

to {
clip-path: circle(100%);
}
}

@keyframes radioOut {
from {
clip-path: circle(100%);
}

to {
clip-path: circle(0%);
}
}