Skip to content

fix(colorpickers): ColorSwatch focus styling #1726

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

Merged
merged 2 commits into from
Feb 28, 2024
Merged

fix(colorpickers): ColorSwatch focus styling #1726

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
3cbb066
fix(colorpickers): `ColorSwatch` focus styling
jzempel Feb 28, 2024
1309479
Fix cell content positioning
jzempel Feb 28, 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
1 change: 1 addition & 0 deletions packages/colorpickers/src/styled/ColorSwatch/StyledColorSwatchInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const StyledColorSwatchInput = styled.input.attrs({
opacity: 0;
z-index: 1;
margin: 0;
cursor: pointer;
width: 100%;
height: 100%;

Expand Down
10 changes: 4 additions & 6 deletions packages/colorpickers/src/styled/ColorSwatch/StyledColorSwatchLabel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import styled, { DefaultTheme, ThemeProps } from 'styled-components';
import { parseToRgb, readableColor } from 'polished';
import { DEFAULT_THEME, getColor, retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { DEFAULT_THEME, focusStyles, retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { StyledButtonPreview } from '../ColorPickerDialog/StyledButtonPreview';
import { IRGBColor } from '../../types';

Expand All @@ -18,7 +18,6 @@ interface IStyledColorSwatchLabelProps extends ThemeProps<DefaultTheme> {
}

const colorStyles = (props: IStyledColorSwatchLabelProps) => {
const boxShadow = props.theme.shadows.md(getColor('primaryHue', 600, props.theme, 0.35)!);
const { alpha } = parseToRgb(props.backgroundColor) as IRGBColor;
let foregroundColor;

Expand All @@ -34,9 +33,6 @@ const colorStyles = (props: IStyledColorSwatchLabelProps) => {

return `
color: ${foregroundColor};

&[data-garden-focus-visible] {
box-shadow: ${boxShadow};
`;
};

Expand All @@ -46,11 +42,13 @@ export const StyledColorSwatchLabel = styled(StyledButtonPreview).attrs({
'data-garden-version': PACKAGE_VERSION
})`
position: relative;
top: 0;
border-radius: ${props => props.theme.borderRadii.md};
cursor: pointer;

${colorStyles};

${props => focusStyles({ theme: props.theme, selector: '&:has(:focus-visible)' })}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
`;

Expand Down