Skip to content

[UIK-3372][Tag] update styles #2073

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

Merged
merged 18 commits into from
Apr 17, 2025
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.
6 changes: 6 additions & 0 deletions semcore/tag/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ CHANGELOG.md standards are inspired by [keepachangelog.com](https://keepachangel

- `Tag.Close` component. Use `TagContainer.Close`.

## [5.55.0] - 2025-04-11

### Changed

- Margins and paddings for addons and text, sizes of `Circle` addons for different tag sizes.

## [5.54.0] - 2025-04-11

### Changed
Expand Down
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.
Binary file not shown.
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.
55 changes: 19 additions & 36 deletions semcore/tag/src/style/tag.shadow.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,16 @@ SCircle {
justify-content: center;
overflow: hidden;
border-radius: 50%;
margin: 0 var(--intergalactic-spacing-1x, 4px);

&:first-child {
margin-left: 0;
}

&:last-child {
margin-right: 0;
}
}

SCircle[size="m"] {
width: 16px;
height: 16px;
width: 12px;
height: 12px;
}

SCircle[size="l"] {
width: 20px;
height: 20px;
width: 16px;
height: 16px;
}

SCircle[size="xl"] {
Expand All @@ -35,9 +26,11 @@ SAddon {
flex-shrink: 0;
align-items: center;
justify-content: center;
padding-left: var(--intergalactic-spacing-1x, 4px);
padding-right: var(--intergalactic-spacing-1x, 4px);
position: relative;

&:last-child {
padding-right: 0;
}
}

STagContainer SAddon {
Expand Down Expand Up @@ -111,16 +104,12 @@ STag[interactiveView] {

STag[size="m"],
STagContainerClose[size="m"],
STagContainer[size="m"] SAddon {
STagContainer[size="m"] {
height: 20px;
min-width: 20px;

& SCircle:first-child {
margin-left: calc(-1 * var(--intergalactic-spacing-05x, 2px));
}

& SCircle:last-child {
margin-right: calc(-1 * var(--intergalactic-spacing-05x, 2px));
& SAddon:first-child {
padding-left: 0;
}

& SText {
Expand All @@ -131,7 +120,7 @@ STagContainer[size="m"] SAddon {

STag[size="l"],
STagContainerClose[size="l"],
STagContainer[size="l"] SAddon {
STagContainer[size="l"] {
height: 28px;
min-width: 28px;

Expand Down Expand Up @@ -238,17 +227,12 @@ SText {
position: relative;
}

SText:not(:only-child):first-child {
padding-right: 0;
}

SText:not(:first-child):not(:last-child) {
padding-left: 0;
padding-right: 0;
}

SText:not(:only-child):last-child {
padding-left: 0;
SText:focus-visible {
box-shadow: var(
--intergalactic-keyboard-focus,
0px 0px 0px 3px rgba(0, 143, 248, 0.5)
);
z-index: 1;
}

SClose {
Expand All @@ -257,7 +241,7 @@ SClose {
flex-shrink: 0;
align-items: center;
justify-content: center;
padding: var(--intergalactic-spacing-1x, 4px);
padding: var(--intergalactic-spacing-1x, 4px) 0;
position: relative;

& path {
Expand Down Expand Up @@ -301,7 +285,6 @@ STagContainer {
&:not(:first-child) {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
padding-left: var(--intergalactic-spacing-05x, 2px);

&::before,
&::after {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const data = [
];

const Demo = () => {
const [sort, setSort] = React.useState<DataTableSort<keyof typeof data[0]>>(['kd', 'desc']);
const [sort, setSort] = React.useState<DataTableSort<keyof typeof data[0]>>(['keyword/kd/cpc/vol','desc']);
const sortedData = React.useMemo(
() =>
[...data].sort((aRow, bRow) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const data = [
];

const Demo = () => {
const [sort, setSort] = React.useState<DataTableSort<keyof typeof data[0]>>(['kd', 'desc']);
const [sort, setSort] = React.useState<DataTableSort<keyof typeof data[0]>>(['keyword/kd/cpc/vol', 'desc']);
const sortedData = React.useMemo(
() =>
[...data].sort((aRow, bRow) => {
Expand Down
11 changes: 10 additions & 1 deletion stories/components/tag/advanced/Tag.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import type { Meta, StoryObj } from '@storybook/react';
import Tag from '@semcore/tag';

import TagAddonSizesPositionsExample from './examples/tag_with_addon_all_sizes_positions';
import TagCircleAddonSizesExample from './examples/tag_with_circle_addon_all_sizes_positions';
import TagContainerAddonExample from './examples/tag_container_addon';

import TagTextCloseExample from './examples/tag_text_close';
const meta: Meta<typeof Tag> = {
title: 'Components/Tag/Advanced',
component: Tag,
Expand All @@ -16,6 +17,14 @@ export const TagWithAddonSizesAndPositions: Story = {
render: TagAddonSizesPositionsExample,
};

export const TagWithCircleAddonSizesAndPositions: Story = {
render: TagCircleAddonSizesExample,
};

export const TagContainerAddon: Story = {
render: TagContainerAddonExample,
};

export const TagTextClose: Story = {
render: TagTextCloseExample,
};
67 changes: 67 additions & 0 deletions stories/components/tag/advanced/examples/tag_container_addon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,42 @@ const Demo = () => {

return (
<Box>
{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='xl' data-id={idx} key={idx} mr={1} interactive>
<TagContainer.Tag>
<TagContainer.Tag.Text>{tag}</TagContainer.Tag.Text>
</TagContainer.Tag>
<TagContainer.Close onClick={handleEditTag} />
</TagContainer>
))}
{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='l' data-id={idx} key={idx} mr={1} interactive>
<TagContainer.Tag>
<TagContainer.Tag.Text>{tag}</TagContainer.Tag.Text>
</TagContainer.Tag>
<TagContainer.Close onClick={handleEditTag} />
</TagContainer>
))}
{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='m' data-id={idx} key={idx} mr={1} interactive>
<TagContainer.Tag>
<TagContainer.Tag.Text>{tag}</TagContainer.Tag.Text>
</TagContainer.Tag>
<TagContainer.Close onClick={handleEditTag} />
</TagContainer>
))}

{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='xl' data-id={idx} key={idx} mr={1} interactive>
<TagContainer.Tag>
<TagContainer.Addon>
<Edit />
</TagContainer.Addon>
<TagContainer.Tag.Text>{tag}</TagContainer.Tag.Text>
</TagContainer.Tag>
<TagContainer.Close onClick={handleEditTag} />
</TagContainer>
))}
{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='l' data-id={idx} key={idx} mr={1} interactive>
<TagContainer.Tag>
Expand All @@ -27,6 +63,37 @@ const Demo = () => {
</TagContainer.Tag>
<TagContainer.Close onClick={handleEditTag} />
</TagContainer>
))}
{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='m' data-id={idx} key={idx} mr={1} interactive>
<TagContainer.Tag>
<TagContainer.Addon>
<Edit />
</TagContainer.Addon>
<TagContainer.Tag.Text>{tag}</TagContainer.Tag.Text>
</TagContainer.Tag>
<TagContainer.Close onClick={handleEditTag} />
</TagContainer>
))}
{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='xl' data-id={idx} key={idx} mr={1} interactive>
<TagContainer.Tag>
<TagContainer.Addon>
<Edit />
</TagContainer.Addon>
<TagContainer.Tag.Text>{tag}</TagContainer.Tag.Text>
</TagContainer.Tag>
</TagContainer>
))}
{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='l' data-id={idx} key={idx} mr={1} interactive>
<TagContainer.Tag>
<TagContainer.Addon>
<Edit />
</TagContainer.Addon>
<TagContainer.Tag.Text>{tag}</TagContainer.Tag.Text>
</TagContainer.Tag>
</TagContainer>
))}
{tags.map((tag, idx) => (
<TagContainer theme='secondary' size='m' data-id={idx} key={idx} mr={1} interactive>
Expand Down
Loading
Loading