Skip to content

fix(react,Chips): collapse algorithm improvements #444

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

Open
feerzlay wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(react,Chips): collapse algorithm improvements #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/react/src/components/Chips/Chips.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const chips = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
export const Demo: Story = {
render: (args, context) => {
return (
<Chips key={args.maxLines} style={{ maxWidth: '600px' }} {...args}>
<Chips key={args.maxLines} {...args}>
{chips.map((chip) => (
<Chip {...args} key={chip}>
{context.globals.locale === 'ru' ? 'Иванов Иван' : 'John Doe'} {chip}
Expand Down
71 changes: 36 additions & 35 deletions packages/react/src/components/Chips/Chips.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,44 +44,45 @@ export const Chips = (inProps: ChipsProps) => {
return;
}

let lineCount = 1;
let totalWidth = 0;
let hiddenCount = 0;

const chips = ref.current.querySelectorAll('.es-chip');
chips.forEach((chip) => (chip as HTMLElement).style.removeProperty('display'));

if (!open) {
let lineCount = 1;
let hiddenCount = 0;
let totalWidth = 0;

const containerWidth = ref.current.getBoundingClientRect().width;
const columnGap = parseInt(window.getComputedStyle(ref.current).columnGap);

const button = ref.current.querySelector('.es-chips__button') as HTMLButtonElement;
const buttonWidth = button.getBoundingClientRect().width;

setCollapsed(false);

chips.forEach((chip) => {
const chipWidth = chip.getBoundingClientRect().width;

if (
totalWidth + columnGap + chipWidth + (lineCount >= maxLines ? columnGap + buttonWidth : 0) >=
containerWidth
) {
lineCount += 1;
totalWidth = chipWidth;
} else {
totalWidth += chipWidth + columnGap;
}

if (lineCount > maxLines) {
setCollapsed(true);
(chip as HTMLElement).style.display = 'none';
hiddenCount += 1;
}
});

setHiddenCount(hiddenCount);
}
const containerWidth = ref.current.getBoundingClientRect().width;
const columnGap = parseInt(window.getComputedStyle(ref.current).columnGap);

const button = ref.current.querySelector('.es-chips__button') as HTMLButtonElement;
const buttonWidth = button.getBoundingClientRect().width;
button.style.display = 'flex';

chips.forEach((chip, index) => {
const chipWidth = chip.getBoundingClientRect().width;

if (
totalWidth +
columnGap +
chipWidth +
(!open && index < chips.length - 1 && lineCount >= maxLines ? columnGap + buttonWidth : 0) >=
containerWidth
) {
lineCount += 1;
totalWidth = chipWidth;
} else {
totalWidth += columnGap + chipWidth;
}

if (!open && lineCount > maxLines) {
(chip as HTMLElement).style.display = 'none';
hiddenCount += 1;
}
});

setHiddenCount(hiddenCount);
setCollapsed(lineCount > maxLines);
button.style.display = lineCount > maxLines ? 'flex' : 'none';
};

useResizeObserver(ref, onResize);
Expand Down
2 changes: 2 additions & 0 deletions packages/theme/lib/components/_chips.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

.es-button-base__wrapper {
@include typography.level('caption');

font-variant-numeric: tabular-nums;
}
}
}
Expand Down
Loading