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

Jump to bottom

fix(radio): fix style imbalance caused by decimal width #242

Merged
merged 2 commits into from May 28, 2020
Merged

fix(radio): fix style imbalance caused by decimal width #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9936a15
fix(radio): fix style imbalance caused by decimal width
unix May 28, 2020
9bae10d
test: update snapshots
unix May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 17 additions & 17 deletions components/radio/__tests__/__snapshots__/group.test.tsx.snap
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ exports[`Radio Group should render correctly 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -82,7 +82,7 @@ exports[`Radio Group should render correctly 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -136,9 +136,9 @@ exports[`Radio Group should render correctly 1`] = `
}

.radio-group :global(.radio) {
margin-top: calc(1rem * 1);
margin-top: calc(16px * 1);
margin-left: 0;
--radio-size: 1rem;
--radio-size: 16px;
}

.radio-group :global(.radio:first-of-type) {
Expand All @@ -161,7 +161,7 @@ exports[`Radio Group should render correctly 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -225,7 +225,7 @@ exports[`Radio Group should render correctly 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -280,8 +280,8 @@ exports[`Radio Group should render correctly 1`] = `

.radio-group :global(.radio) {
margin-top: 0;
margin-left: calc(1rem * 1);
--radio-size: 1rem;
margin-left: calc(16px * 1);
--radio-size: 16px;
}

.radio-group :global(.radio:first-of-type) {
Expand All @@ -308,7 +308,7 @@ exports[`Radio Group should work correctly with different sizes 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -362,9 +362,9 @@ exports[`Radio Group should work correctly with different sizes 1`] = `
}

.radio-group :global(.radio) {
margin-top: calc(.75rem * 1);
margin-top: calc(12px * 1);
margin-left: 0;
--radio-size: .75rem;
--radio-size: 12px;
}

.radio-group :global(.radio:first-of-type) {
Expand All @@ -387,7 +387,7 @@ exports[`Radio Group should work correctly with different sizes 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -441,9 +441,9 @@ exports[`Radio Group should work correctly with different sizes 1`] = `
}

.radio-group :global(.radio) {
margin-top: calc(.875rem * 1);
margin-top: calc(14px * 1);
margin-left: 0;
--radio-size: .875rem;
--radio-size: 14px;
}

.radio-group :global(.radio:first-of-type) {
Expand All @@ -466,7 +466,7 @@ exports[`Radio Group should work correctly with different sizes 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -520,9 +520,9 @@ exports[`Radio Group should work correctly with different sizes 1`] = `
}

.radio-group :global(.radio) {
margin-top: calc(1.125rem * 1);
margin-top: calc(18px * 1);
margin-left: 0;
--radio-size: 1.125rem;
--radio-size: 18px;
}

.radio-group :global(.radio:first-of-type) {
Expand Down
16 changes: 8 additions & 8 deletions components/radio/__tests__/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ exports[`Radio should render correctly 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -86,7 +86,7 @@ exports[`Radio should support react-node in description 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -156,7 +156,7 @@ exports[`Radio should support react-node in description 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -226,7 +226,7 @@ exports[`Radio should support react-node in description 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -294,7 +294,7 @@ exports[`Radio should work correctly with different sizes 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: .75rem;
--radio-size: 12px;
}

label {
Expand Down Expand Up @@ -358,7 +358,7 @@ exports[`Radio should work correctly with different sizes 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: .875rem;
--radio-size: 14px;
}

label {
Expand Down Expand Up @@ -422,7 +422,7 @@ exports[`Radio should work correctly with different sizes 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1rem;
--radio-size: 16px;
}

label {
Expand Down Expand Up @@ -486,7 +486,7 @@ exports[`Radio should work correctly with different sizes 1`] = `
width: initial;
align-items: flex-start;
position: relative;
--radio-size: 1.125rem;
--radio-size: 18px;
}

label {
Expand Down
8 changes: 4 additions & 4 deletions components/radio/radio-group.tsx
View file
Open in desktop
Expand Up @@ -25,10 +25,10 @@ export type RadioGroupProps = Props & typeof defaultProps & NativeAttrs

export const getRadioSize = (size: NormalSizes): string => {
const sizes: { [key in NormalSizes]: string } = {
mini: '.75rem',
small: '.875rem',
medium: '1rem',
large: '1.125rem',
mini: '12px',
small: '14px',
medium: '16px',
large: '18px',
}
return sizes[size]
}
Expand Down