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

plasma(sdds-cs): Add view negative to combobox and autocomplite #1523

Merged
merged 2 commits into from
Nov 6, 2024
Merged

plasma(sdds-cs): Add view negative to combobox and autocomplite #1523

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
436b956
feat(sdds-cs): add view negative to combobox and autocomplite
iljs Oct 30, 2024
e8d35ac
feat(sdds-cs): update docs for combobox and autocomplite
iljs Oct 31, 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
6 changes: 4 additions & 2 deletions packages/sdds-cs/api/sdds-cs.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ icon?: ReactNode;
export const Autocomplete: FunctionComponent<PropsType< {
view: {
default: PolymorphicClassName;
negative: PolymorphicClassName;
};
size: {
s: PolymorphicClassName;
Expand Down Expand Up @@ -951,6 +952,7 @@ export { ColSizeProps }
export const Combobox: <T extends ItemOption>(props: Omit<ComboboxProps<T>, "view" | "size" | "disabled" | "readOnly" | "labelPlacement"> & Pick<PropsType< {
view: {
default: PolymorphicClassName;
negative: PolymorphicClassName;
};
size: {
s: PolymorphicClassName;
Expand Down Expand Up @@ -3364,7 +3366,7 @@ true: PolymorphicClassName;
chipView?: string | undefined;
} & Omit<React_2.ButtonHTMLAttributes<HTMLButtonElement>, "onChange" | "nonce" | "onResize" | "onResizeCapture" | "value"> & React_2.RefAttributes<HTMLButtonElement>) | ({
target?: "button-like" | undefined;
view?: "default" | "accent" | "clear" | "negative" | "secondary" | "positive" | "warning" | "dark" | "black" | "white" | undefined;
view?: "default" | "accent" | "negative" | "clear" | "secondary" | "positive" | "warning" | "dark" | "black" | "white" | undefined;
contentLeft?: undefined;
labelPlacement?: undefined;
placeholder?: undefined;
Expand Down Expand Up @@ -3402,7 +3404,7 @@ true: PolymorphicClassName;
chipView?: string | undefined;
} & Omit<React_2.ButtonHTMLAttributes<HTMLButtonElement>, "onChange" | "nonce" | "onResize" | "onResizeCapture" | "value"> & React_2.RefAttributes<HTMLButtonElement>) | ({
target?: "button-like" | undefined;
view?: "default" | "accent" | "clear" | "negative" | "secondary" | "positive" | "warning" | "dark" | "black" | "white" | undefined;
view?: "default" | "accent" | "negative" | "clear" | "secondary" | "positive" | "warning" | "dark" | "black" | "white" | undefined;
contentLeft?: undefined;
labelPlacement?: undefined;
placeholder?: undefined;
Expand Down
43 changes: 43 additions & 0 deletions packages/sdds-cs/src/components/Autocomplete/Autocomplete.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,49 @@ export const config = {

${tokens.infiniteLoaderSpinnerColor}: var(--text-primary);

${tokens.dropdownBorderColor}: var(--surface-solid-primary);
`,
negative: css`
${tokens.textFieldColor}: var(--text-primary);
${tokens.textFieldClearColor}: var(--text-primary);

${tokens.textFieldPlaceholderColor}: var(--text-secondary);
${tokens.textFieldPlaceholderColorFocus}: var(--text-tertiary);
${tokens.textFieldClearPlaceholderColor}: var(--text-secondary);
${tokens.textFieldClearPlaceholderColorFocus}: var(--text-tertiary);

${tokens.textFieldBackgroundColor}: var(--surface-solid-card);
${tokens.textFieldBackgroundColorFocus}: var(--surface-solid-card);
${tokens.textFieldCaretColor}: var(--text-accent);
${tokens.textFieldTextBeforeColor}: var(--text-secondary);
${tokens.textFieldTextAfterColor}: var(--text-secondary);
${tokens.textFieldLabelColor}: var(--text-primary);
${tokens.textFieldLeftHelperColor}: var(--text-negative);
${tokens.textFieldFocusColor}: var(--text-accent);

${tokens.textFieldContentSlotColor}: var(--text-secondary);
${tokens.textFieldContentSlotColorHover}: var(--text-secondary-hover);
${tokens.textFieldContentSlotColorActive}: var(--text-secondary-active);
${tokens.textFieldContentSlotRightColor}: var(--text-accent);
${tokens.textFieldContentSlotRightColorHover}: var(--text-accent-hover);
${tokens.textFieldContentSlotRightColorActive}: var(--text-accent-active);

${tokens.focusColor}: var(--surface-accent);
${tokens.textFieldIndicatorColor}: var(--surface-negative);
${tokens.textFieldOptionalColor}: var(--text-tertiary);

${tokens.textFieldBorderColor}: var(--outline-negative);
${tokens.textFieldBorderColorHover}: var(--outline-negative-hover);
${tokens.textFieldBorderColorFocus}: var(--outline-accent);

${tokens.background}: var(--surface-solid-card);
${tokens.boxShadow}: 0px 4px 14px -4px rgba(8, 8, 8, 0.08), 0px 1px 4px -1px rgba(0, 0, 0, 0.04);
${tokens.itemBackground}: var(--plasma-colors-transparent);
${tokens.itemBackgroundHover}: var(--surface-transparent-accent);
${tokens.itemColor}: var(--text-primary);

${tokens.infiniteLoaderSpinnerColor}: var(--text-primary);

${tokens.dropdownBorderColor}: var(--surface-solid-primary);
`,
},
Expand Down
18 changes: 1 addition & 17 deletions packages/sdds-cs/src/components/Autocomplete/Autocomplete.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import { IconPlasma } from '@salutejs/plasma-icons';

import { Autocomplete } from './Autocomplete';

const sizes = ['s'];
const views = ['default'];
const labelPlacements = ['outer'];
const views = ['default', 'negative'];

const suggestions = [
{ label: 'Алексей Смирнов' },
Expand Down Expand Up @@ -79,18 +77,6 @@ const meta: Meta<StoryProps> = {
type: 'select',
},
},
size: {
options: sizes,
control: {
type: 'inline-radio',
},
},
labelPlacement: {
options: labelPlacements,
control: {
type: 'inline-radio',
},
},
requiredPlacement: {
options: ['left', 'right'],
control: {
Expand All @@ -113,8 +99,6 @@ const meta: Meta<StoryProps> = {
},
args: {
view: 'default',
size: 's',
labelPlacement: 'outer',
disabled: false,
readOnly: false,
label: 'Label',
Expand Down
55 changes: 53 additions & 2 deletions packages/sdds-cs/src/components/Combobox/Combobox.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ export const config = {
${tokens.textFieldLeftHelperColor}: var(--text-secondary);
${tokens.textFieldFocusColor}: var(--text-accent);

${tokens.textFieldBorderColor}: var(--outline-solid-primary);
${tokens.textFieldBorderColorHover}: var(--outline-solid-primary-hover);
${tokens.textFieldBorderColorFocus}: var(--outline-accent);

${tokens.textFieldContentSlotColor}: var(--text-secondary);
${tokens.textFieldContentSlotColorHover}: var(--text-secondary-hover);
${tokens.textFieldContentSlotColorActive}: var(--text-secondary-active);
Expand All @@ -36,10 +40,56 @@ export const config = {
${tokens.textFieldIndicatorColor}: var(--surface-negative);
${tokens.textFieldOptionalColor}: var(--text-tertiary);

${tokens.textFieldBorderColor}: var(--outline-solid-primary);
${tokens.textFieldBorderColorHover}: var(--outline-solid-primary-hover);
${tokens.textFieldChipCloseIconColor}: var(--text-secondary);
${tokens.textFieldChipColor}: var(--text-primary);
${tokens.textFieldChipBackground}: var(--surface-transparent-secondary);
${tokens.textFieldChipColorHover}: var(--text-primary);
${tokens.textFieldChipBackgroundHover}: var(--surface-transparent-secondary-hover);
${tokens.textFieldChipColorActive}: var(--text-primary);
${tokens.textFieldChipBackgroundActive}: var(--surface-transparent-secondary-active);
${tokens.textFieldChipBackgroundReadOnly}: var(--surface-transparent-secondary);
${tokens.textFieldChipColorReadOnly}: var(--text-primary);
${tokens.textFieldChipBackgroundReadOnlyHover}: var(--surface-transparent-secondary);
${tokens.textFieldChipColorReadOnlyHover}: var(--text-primary);
${tokens.textFieldChipOpacityReadonly}: 0.72;
${tokens.dropdownBorderColor}: var(--surface-solid-primary);

${tokens.disclosureIconColor}: var(--text-accent);
${tokens.disclosureIconColorHover}: var(--text-accent-hover);
${tokens.itemBackgroundHover}: var(--surface-transparent-accent);
`,
negative: css`
${tokens.textFieldColor}: var(--text-primary);
${tokens.textFieldClearColor}: var(--text-primary);

${tokens.textFieldPlaceholderColor}: var(--text-secondary);
${tokens.textFieldPlaceholderColorFocus}: var(--text-tertiary);
${tokens.textFieldClearPlaceholderColor}: var(--text-secondary);
${tokens.textFieldClearPlaceholderColorFocus}: var(--text-tertiary);

${tokens.textFieldBackgroundColor}: var(--surface-solid-card);
${tokens.textFieldBackgroundColorFocus}: var(--surface-solid-card);
${tokens.textFieldCaretColor}: var(--text-accent);
${tokens.textFieldTextBeforeColor}: var(--text-secondary);
${tokens.textFieldTextAfterColor}: var(--text-secondary);
${tokens.textFieldLabelColor}: var(--text-primary);
${tokens.textFieldLeftHelperColor}: var(--text-negative);
${tokens.textFieldFocusColor}: var(--text-accent);

${tokens.textFieldBorderColor}: var(--outline-negative);
${tokens.textFieldBorderColorHover}: var(--outline-negative-hover);
${tokens.textFieldBorderColorFocus}: var(--outline-accent);

${tokens.textFieldContentSlotColor}: var(--text-secondary);
${tokens.textFieldContentSlotColorHover}: var(--text-secondary-hover);
${tokens.textFieldContentSlotColorActive}: var(--text-secondary-active);
${tokens.textFieldContentSlotRightColor}: var(--text-accent);
${tokens.textFieldContentSlotRightColorHover}: var(--text-accent-hover);
${tokens.textFieldContentSlotRightColorActive}: var(--text-accent-active);

${tokens.textFieldIndicatorColor}: var(--surface-negative);
${tokens.textFieldOptionalColor}: var(--text-tertiary);

${tokens.textFieldChipCloseIconColor}: var(--text-secondary);
${tokens.textFieldChipColor}: var(--text-primary);
${tokens.textFieldChipBackground}: var(--surface-transparent-secondary);
Expand All @@ -53,6 +103,7 @@ export const config = {
${tokens.textFieldChipColorReadOnlyHover}: var(--text-primary);
${tokens.textFieldChipOpacityReadonly}: 0.72;
${tokens.dropdownBorderColor}: var(--surface-solid-primary);

${tokens.disclosureIconColor}: var(--text-accent);
${tokens.disclosureIconColorHover}: var(--text-accent-hover);
${tokens.itemBackgroundHover}: var(--surface-transparent-accent);
Expand Down
18 changes: 1 addition & 17 deletions packages/sdds-cs/src/components/Combobox/Combobox.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ type StorySelectProps = ComponentProps<typeof Combobox> & {
enableContentLeft?: boolean;
};

const view = ['default'];
const size = ['s'];
const labelPlacement = ['outer'];
const view = ['default', 'negative'];
const chip = ['default', 'secondary', 'accent'];
const variant = ['normal', 'tight'];

Expand All @@ -21,24 +19,12 @@ const meta: Meta<StorySelectProps> = {
decorators: [InSpacingDecorator],
component: Combobox,
argTypes: {
size: {
options: size,
control: {
type: 'select',
},
},
view: {
options: view,
control: {
type: 'select',
},
},
labelPlacement: {
options: labelPlacement,
control: {
type: 'select',
},
},
chipView: {
options: chip,
control: {
Expand Down Expand Up @@ -99,10 +85,8 @@ const meta: Meta<StorySelectProps> = {
},
args: {
label: 'Label',
labelPlacement: 'outer',
placeholder: 'Placeholder',
helperText: 'Helper text',
size: 's',
view: 'default',
chipView: 'default',
enableContentLeft: false,
Expand Down
Loading