This repository was archived by the owner on Mar 4, 2020. It is now read-only.
fix(radio buttons): Update radio button styles #830
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import { RadioGroupItemVariables } from 'src/themes/teams/components/RadioGroup/radioGroupItemVariables' | ||
|
|
||
| export default (siteVars: any): Partial<RadioGroupItemVariables> => ({ | ||
| textColorDefault: siteVars.gray02, | ||
| textColorDefaultHoverFocus: siteVars.colors.white, | ||
| textColorChecked: siteVars.colors.white, | ||
|
|
||
| iconBorderColorDefaultHover: siteVars.colors.white, | ||
| iconBorderColorChecked: siteVars.brand06, | ||
|
|
||
| iconBackgroundColorChecked: siteVars.brand06, | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { RadioGroupItemVariables } from 'src/themes/teams/components/RadioGroup/radioGroupItemVariables' | ||
|
|
||
| export default (siteVars: any): Partial<RadioGroupItemVariables> => ({ | ||
| colorDisabled: siteVars.accessibleGreen, | ||
|
|
||
| textColorDefault: siteVars.white, | ||
| textColorDefaultHoverFocus: siteVars.white, | ||
| textColorChecked: siteVars.white, | ||
|
|
||
| iconBorderColorDefaultHover: siteVars.accessibleCyan, | ||
| iconBorderColorChecked: siteVars.accessibleCyan, | ||
|
|
||
| iconBackgroundColorChecked: siteVars.accessibleCyan, | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,36 +4,95 @@ import { | |
| RadioGroupItemState, | ||
| } from '../../../../components/RadioGroup/RadioGroupItem' | ||
| import { RadioGroupItemVariables } from './radioGroupItemVariables' | ||
| import Icon from '../../../../components/Icon/Icon' | ||
| import { pxToRem } from '../../../../lib' | ||
|
|
||
| const restHoverFocusTextColor = textColor => ({ | ||
| color: textColor, | ||
|
|
||
| ':hover': { | ||
| color: textColor, | ||
| }, | ||
|
|
||
| ':focus': { | ||
| color: textColor, | ||
| }, | ||
| }) | ||
|
|
||
| const radioStyles: ComponentSlotStylesInput< | ||
| RadioGroupItemProps & RadioGroupItemState, | ||
| RadioGroupItemVariables | ||
| > = { | ||
| root: ({ props: p, variables: v }): ICSSInJSStyle => ({ | ||
| // can remove this after global style for border-box goes in | ||
| boxSizing: 'border-box', | ||
|
|
||
| alignItems: 'center', | ||
| borderStyle: 'solid', | ||
| borderWidth: `${pxToRem(1)}`, | ||
| borderColor: 'transparent', | ||
| borderRadius: `${pxToRem(2)}`, | ||
| color: v.textColorDefault, | ||
| cursor: 'pointer', | ||
| display: p.vertical ? 'flex' : 'inline-flex', | ||
| fontSize: v.textFontSize, | ||
| padding: v.padding, | ||
| outline: 0, | ||
|
|
||
| ':hover': { | ||
| color: v.textColorDefaultHoverFocus, | ||
|
|
||
| [`& .${Icon.className}`]: { | ||
| color: v.iconBorderColorDefaultHover, | ||
| }, | ||
| }, | ||
|
|
||
| ':focus': { | ||
| color: v.textColorDefaultHoverFocus, | ||
| }, | ||
|
|
||
| ...(p.checked && { | ||
| ...restHoverFocusTextColor(v.textColorChecked), | ||
| }), | ||
|
|
||
| ...(p.disabled && { | ||
| ...restHoverFocusTextColor(v.colorDisabled), | ||
| }), | ||
|
|
||
| ...(p.isFromKeyboard && { | ||
| borderColor: v.focusInnerBorderColor, | ||
| boxShadow: `0 0 0 ${pxToRem(1)} ${v.focusOuterBorderColor}`, | ||
| }), | ||
| }), | ||
|
|
||
| icon: ({ props: p, variables: v }): ICSSInJSStyle => ({ | ||
| // overrides from icon styles | ||
| backgroundColor: 'transparent', | ||
| boxShadow: 'none', | ||
|
|
||
| // can remove this after global style for border-box goes in | ||
|
There was a problem hiding this comment. todo: remove after #1057 gets checked in |
||
| boxSizing: 'border-box', | ||
|
|
||
| borderStyle: 'solid', | ||
| borderWidth: `${pxToRem(1)}`, | ||
| borderColor: 'currentColor', | ||
| margin: `0 ${pxToRem(12)} 0 0`, | ||
| height: `${pxToRem(12)}`, | ||
| width: `${pxToRem(12)}`, | ||
|
|
||
| ...(p.checked && { | ||
| backgroundColor: v.iconBackgroundColorChecked, | ||
| borderColor: v.iconBorderColorChecked, | ||
| }), | ||
|
|
||
| ...(p.disabled && { | ||
| borderColor: v.colorDisabled, | ||
| }), | ||
|
|
||
| ...(p.checked && | ||
| p.disabled && { | ||
| backgroundColor: v.colorDisabled, | ||
| }), | ||
| }), | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,41 @@ | ||
| import { pxToRem } from '../../../../lib' | ||
|
|
||
| export type RadioGroupItemVariables = { | ||
codepretty marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| colorDisabled: string | ||
|
|
||
| // can these be global colors so we don't have to define for every component? | ||
|
There was a problem hiding this comment. Any suggestions? Almost every component will need There was a problem hiding this comment. After the color scheme this will be aligned with the color scheme used per theme. Let's restrain for making some changes at this moment. There was a problem hiding this comment. We can define the |
||
| focusInnerBorderColor: string | ||
| focusOuterBorderColor: string | ||
|
|
||
| textFontSize: string | ||
|
|
||
| textColorDefault: string | ||
| textColorDefaultHoverFocus: string | ||
| textColorChecked: string | ||
|
|
||
| iconBorderColorDefaultHover: string | ||
| iconBorderColorChecked: string | ||
|
|
||
| iconBackgroundColorChecked: string | ||
|
|
||
| padding: string | ||
| } | ||
|
|
||
| export default (siteVars: any): RadioGroupItemVariables => ({ | ||
| colorDisabled: siteVars.gray06, | ||
| focusInnerBorderColor: siteVars.colors.white, | ||
| focusOuterBorderColor: siteVars.colors.black, | ||
|
|
||
| textFontSize: siteVars.fontSizes.medium, | ||
|
|
||
| textColorDefault: siteVars.gray02, | ||
| textColorDefaultHoverFocus: siteVars.colors.grey[900], | ||
| textColorChecked: siteVars.colors.grey[900], | ||
|
|
||
| iconBorderColorDefaultHover: siteVars.colors.grey[900], | ||
| iconBorderColorChecked: siteVars.colors.primary[500], | ||
|
|
||
| iconBackgroundColorChecked: siteVars.colors.primary[500], | ||
|
|
||
| padding: `0 ${pxToRem(4)}`, | ||
| }) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
todo: remove after #1057 gets checked in