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.

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

feat(Select): implement design tokens #1159

Merged
merged 1 commit into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/components/forms/Select/CreatableSelect.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,13 @@ export const AsyncSelect: StoryFn<CreatableSelectProps<false>> = () => {
AsyncSelect.parameters = {
screenshot: { skip: true },
};

export const DarkMode = CreatableSelectTemplate.bind({});
DarkMode.args = {
...Playground.args,
};
DarkMode.parameters = {
themes: {
themeOverride: 'Dark',
},
};
21 changes: 21 additions & 0 deletions src/components/forms/Select/Select.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -477,3 +477,24 @@ MultiSelectWithControlledValue.args = {
MultiSelectWithControlledValue.parameters = {
screenshot: { skip: true },
};

export const DarkMode: Story = (args) => <Select {...args} />;
DarkMode.args = {
...OptionsGroup.args,
isMenuPositionRelative: true,
isMulti: true,
defaultValue: [options[4]],
isClearable: true,
menuActions: [
{
label: 'Action A',
name: 'Action A',
onClick: action('click-action-a'),
},
],
};
DarkMode.parameters = {
themes: {
themeOverride: 'Dark',
},
};
220 changes: 102 additions & 118 deletions src/components/forms/Select/Select.styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,74 +31,69 @@ import { PaddingTypes } from '../../layout/Padbox/Padbox.enums';
import { Icon } from '../../Icon';
import { MenuActionArgs, Option as OptionType } from './Select.types';
import { getPaddingSpace } from '../../../utils/space';
import { getColor, getSpace, getToken, pxToRem } from '../../../utils';
import { pxToRem } from '../../../utils';
import { SpaceSizes } from '../../../theme';
import { Spinner } from '../../Spinner';
import PillWrapper from '../../Pill/PillWrapper';
import PillLabel from '../../Pill/PillLabel';
import PillRemoveButton from '../../Pill/PillRemoveButton';

export const reactSelectTheme: (DSTheme: DefaultTheme) => ThemeConfig =
() => (selectTheme) => ({
...selectTheme,
colors: {
primary: 'var(--sscds-primary-400)',
primary75: 'var(--sscds-primary-400)',
primary50: 'var(--sscds-primary-200)',
primary25: 'var(--sscds-primary-50)',
danger: 'var(--sscds-error-500)',
dangerLight: 'var(--sscds-error-50)',
neutral0: 'var(--sscds-neutral-0)',
neutral5: 'var(--sscds-neutral-100)',
neutral10: 'var(--sscds-neutral-200)',
neutral20: 'var(--sscds-neutral-300)',
neutral30: 'var(--sscds-neutral-400)',
neutral40: 'var(--sscds-neutral-500)',
neutral50: 'var(--sscds-neutral-600)',
neutral60: 'var(--sscds-neutral-700)',
neutral70: 'var(--sscds-neutral-800)',
neutral80: 'var(--sscds-neutral-900)',
neutral90: 'var(--sscds-neutral-1000)',
},
spacing: { ...selectTheme.spacing },
});
export const reactSelectTheme: () => ThemeConfig = () => (selectTheme) => ({
...selectTheme,
colors: {
primary: 'var(--sscds-color-primary-8)',
primary75: 'var(--sscds-color-primary-8)',
primary50: 'var(--sscds-color-primary-6)',
primary25: 'var(--sscds-color-primary-3)',
danger: 'var(--sscds-color-danger-800)',
dangerLight: 'var(--sscds-color-danger-050)',
neutral0: 'var(--sscds-color-neutral-0)',
neutral5: 'var(--sscds-color-neutral-2)',
neutral10: 'var(--sscds-color-neutral-3)',
neutral20: 'var(--sscds-color-neutral-4)',
neutral30: 'var(--sscds-color-neutral-7)',
neutral40: 'var(--sscds-color-neutral-8)',
neutral50: 'var(--sscds-color-neutral-9)',
neutral60: 'var(--sscds-color-neutral-10)',
neutral70: 'var(--sscds-color-neutral-11)',
neutral80: 'var(--sscds-color-neutral-12)',
neutral90: 'var(--sscds-color-neutral-13)',
},
spacing: { ...selectTheme.spacing },
});

const stateStyles = (color, width) => ({
const stateStyles = (
color: `var(--sscds-${string})`,
width: `${string}px`,
) => ({
boxShadow: `inset 0 0 0 ${width} ${color}`,
});

const invalidStyles = (DSTheme) => ({
...stateStyles(
DSTheme.forms.invalidBorderColor,
DSTheme.forms.statefulBorderWidth,
),
});
const invalidStyles = {
...stateStyles('var(--sscds-color-border-input-error)', '2px'),
};

const focusStyles = (DSTheme) => ({
...stateStyles(
DSTheme.forms.focusBorderColor,
DSTheme.forms.statefulBorderWidth,
),
});
const focusStyles = {
...stateStyles('var(--sscds-color-border-input-focused)', '2px'),
};

const disabledStyles = (DSTheme) => ({
...stateStyles(DSTheme.forms.disabledBorderColor, DSTheme.forms.borderWidth),
background: DSTheme.forms.disabledBgColor,
});
const disabledStyles = {
...stateStyles('var(--sscds-color-border-input-disabled)', '1px'),
background: 'var(--sscds-color-background-input-disabled)',
};

const indicatorStyles = (DSTheme) => ({
const indicatorStyles = {
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
color: DSTheme.forms.indicatorColor,
color: 'var(--sscds-color-icon-subtle)',
cursor: 'pointer',
padding: `0rem ${pxToRem(18)}`,
height: pxToRem(34),
margin: pxToRem(1, 0),
width: '2rem',
height: '1.75rem',
':hover': {
color: DSTheme.forms.hoverIndicatorColor,
color: 'var(--sscds-color-icon-default)',
},
});
};

export const selectStyles: (
DSTheme: DefaultTheme,
Expand All @@ -121,32 +116,31 @@ export const selectStyles: (
alignItems: 'center',
width: '100%',
minHeight: DSTheme.forms.fieldHeight,
background: DSTheme.forms.bgColor,
boxShadow: `inset 0 0 0 ${DSTheme.forms.borderWidth} ${DSTheme.forms.borderColor}`,
borderRadius: DSTheme.radii.default,
color: DSTheme.forms.color,
fontSize: DSTheme.typography.size.md,
lineHeight: DSTheme.forms.fieldLineHeight,
background: 'var(--sscds-color-background-input-default)',
boxShadow: `inset 0 0 0 1px var(--sscds-color-border-input-default)`,
borderRadius: 'var(--sscds-radii-input)',
color: 'var(--sscds-color-text-default)',
fontSize: 'var(--sscds-font-size-body-md)',
lineHeight: 'var(--sscds-font-lineheight-body-md)',
outline: 'none',

...(isInvalid && invalidStyles(DSTheme)),
...((isFocused || includes('focus', className)) &&
focusStyles(DSTheme)),
...(isDisabled && disabledStyles(DSTheme)),
...(isInvalid && invalidStyles),
...((isFocused || includes('focus', className)) && focusStyles),
...(isDisabled && disabledStyles),
};
},
valueContainer: (styles, { selectProps: { isMulti, value } }) => {
return {
...styles,
display: 'flex',
alignItems: 'center',
fontSize: DSTheme.typography.size.md,
lineHeight: DSTheme.typography.lineHeight.md,
padding: pxToRem(DSTheme.space.xs),
fontSize: 'var(--sscds-font-size-body-md)',
lineHeight: 'var(--sscds-font-lineheight-body-md)',
padding: 'var(--sscds-space-1x)',
paddingLeft:
isMulti && isNotNilOrEmpty(value)
? undefined
: pxToRem(DSTheme.space.md),
: 'var(--sscds-space-4x)',
};
},
singleValue: assoc('margin', 0),
Expand All @@ -163,53 +157,56 @@ export const selectStyles: (
display: 'flex',
alignItems: 'center',
'> div > input': {
fontFamily: DSTheme.typography.family.base,
lineHeight: DSTheme.forms.fieldLineHeight,
fontFamily: 'var(--sscds-font-family-body)',
lineHeight: 'var(--sscds-font-lineheight-body-md)',
},
}),
placeholder: (_, { children }) => ({
color: DSTheme.forms.placeholderColor,
fontSize: DSTheme.typography.size.md,
lineHeight: DSTheme.typography.lineHeight.md,
color: 'var(--sscds-color-text-subtle)',
fontSize: 'var(--sscds-font-size-body-md)',
lineHeight: 'var(--sscds-font-lineheight-body-md)',
display: isEmptyString(children) ? 'none' : 'block',
position: 'absolute',
}),
indicatorsContainer: (styles) => ({
...styles,
alignItems: 'flex-start',
padding: 'var(--sscds-space-1x)',
paddingLeft: 0,
}),
indicatorSeparator: (
styles,
{ hasValue, selectProps: { isClearable, isProcessing } },
) => ({
...styles,
display: (isClearable && hasValue) || isProcessing ? 'block' : 'none',
backgroundColor: DSTheme.colors.neutral[500],
margin: pxToRem(DSTheme.space.xs, 0),
}),
dropdownIndicator: () => ({
...indicatorStyles(DSTheme),
backgroundColor: 'var(--sscds-color-border-default)',
height: 'calc(100% - var(--sscds-space-2x))',
margin: 'var(--sscds-space-1x) 0',
}),
dropdownIndicator: () => indicatorStyles,
clearIndicator: (_, { selectProps: { isProcessing } }) => ({
...indicatorStyles(DSTheme),
...indicatorStyles,
display: isProcessing ? 'none' : 'flex',
':hover': {
color: DSTheme.colors.error[500],
color: 'var(--sscds-color-text-danger)',
backgroundColor: 'transparent',
},
':focus': {
color: DSTheme.colors.error[500],
color: 'var(--sscds-color-text-danger)',
},
}),
menu: (styles, { selectProps: { isMenuPositionRelative } }) => ({
...styles,
...(isMenuPositionRelative ? { position: 'relative' } : {}),
border: `1px solid ${DSTheme.colors.neutral[300]}`,
boxShadow: `0px 1px 4px var(--sscds-slateA-slateA6)`,
marginBottom: pxToRem(DSTheme.space.xs),
marginTop: pxToRem(DSTheme.space.xs),
paddingTop: pxToRem(DSTheme.space.sm),
paddingBottom: pxToRem(DSTheme.space.sm),
backgroundColor: 'var(--sscds-color-background-surface-default)',
border: `1px solid var(--sscds-color-border-surface-default)`,
borderRadius: 'var(--sscds-radii-surface-md)',
boxShadow: 'var(--sscds-shadow-1x)',
marginBottom: 'var(--sscds-space-1x)',
marginTop: 'var(--sscds-space-1x)',
paddingTop: 'var(--sscds-space-2x)',
paddingBottom: 'var(--sscds-space-2x)',
}),
menuList: (styles) => ({
...styles,
Expand All @@ -218,43 +215,42 @@ export const selectStyles: (
option: (styles, { isDisabled, isSelected, isFocused }) => ({
...styles,
backgroundColor: isSelected
? DSTheme.colors.neutral[300]
? 'var(--sscds-color-background-selectable-active)'
: isFocused
? DSTheme.colors.primary[50]
? 'var(--sscds-color-background-selectable-hover)'
: 'transparent',
color: isDisabled ? DSTheme.colors.neutral[600] : DSTheme.forms.color,
fontSize: DSTheme.typography.size.md,
lineHeight: DSTheme.typography.lineHeight.md,
color: isDisabled
? 'var(--sscds-color-text-disabled)'
: 'var(--sscds-color-text-default)',
fontSize: 'var(--sscds-font-size-body-md)',
lineHeight: 'var(--sscds-font-lineheight-body-md)',
padding: menuItemPadding,
':active': {
...styles[':active'],
backgroundColor: DSTheme.colors.primary[200],
backgroundColor: 'var(--sscds-color-background-selectable-active)',
},
}),
group: (styles, { isMulti }) => ({
group: (styles) => ({
...styles,
padding: 0,
marginTop: pxToRem(DSTheme.space.sm),
'[class$="-option"]': {
paddingLeft: !isMulti && pxToRem(DSTheme.space.mdPlus),
},
marginTop: 'var(--sscds-space-2x)',
}),
groupHeading: (styles) => ({
...styles,
fontWeight: DSTheme.typography.weight.bold,
color: DSTheme.colors.neutral[900],
fontSize: DSTheme.typography.size.md,
lineHeight: DSTheme.typography.lineHeight.md,
fontWeight: 'var(--sscds-font-weight-body-strong)',
color: 'var(--sscds-color-text-default)',
fontSize: 'var(--sscds-font-size-body-md)',
lineHeight: 'var(--sscds-font-lineheight-body-md)',
textTransform: 'none',
margin: 0,
padding: menuItemPadding,
}),
noOptionsMessage: (styles) => ({
...styles,
padding: menuItemPadding,
fontSize: DSTheme.typography.size.md,
lineHeight: DSTheme.typography.lineHeight.md,
color: DSTheme.forms.disabledActiveColor,
fontSize: 'var(--sscds-font-size-body-md)',
lineHeight: 'var(--sscds-font-lineheight-body-md)',
color: 'var(--sscds-color-text-subtle)',
textAlign: 'left',
}),
};
Expand Down Expand Up @@ -321,9 +317,9 @@ export const MultiValueRemove: ComponentType<{
);

const ActionsMenu = styled.div`
margin-top: ${getSpace(SpaceSizes.sm)};
border-top: 1px solid ${getColor('neutral.300')};
padding-top: ${getSpace(SpaceSizes.sm)};
margin-top: var(--sscds-space-2x);
border-top: 1px solid var(--sscds-color-border-surface-default);
padding-top: var(--sscds-space-2x);
`;

const SelectActionButton = styled(Button)`
Expand Down Expand Up @@ -418,21 +414,9 @@ export const ValueContainer = (props) => {
return <components.ValueContainer {...props} />;
};

const CreateNewOption = styled.div.attrs<{ variant: 'text'; color: 'primary' }>(
() => ({
variant: 'text',
color: 'primary',
}),
)`
const CreateNewOption = styled.div`
cursor: pointer;
color: ${getToken('color-action-primary')};

&:hover {
color: ${getToken('color-action-primary-hover')};
}
&:active {
color: ${getToken('color-action-primary-active')};
}
color: var(--sscds-color-text-action);
`;

const StyledCheckbox = styled(Checkbox)`
Expand Down Expand Up @@ -502,7 +486,7 @@ export const IndicatorsContainer: ComponentType<
borderWidth={2}
height={16}
horizontalMargin={16}
verticalMargin={10}
verticalMargin={6}
width={16}
dark
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/forms/Select/useSelectProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const useSelectProps = <IsMulti extends boolean>({
options: sortedOptions,
placeholder,
styles: selectStyles(DSTheme),
theme: reactSelectTheme(DSTheme),
theme: reactSelectTheme(),
classNamePrefix: 'ssc',
maxVisibleItem,
maxPillLabelLength,
Expand Down
Loading
Loading