Skip to content

fix: tag collapse calculation for removable tags #8758

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
LFDanLu merged 4 commits into from
Sep 3, 2025
Merged

fix: tag collapse calculation for removable tags #8758

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3aff08e
fix: tag collapse calculation for removable tags
snowystinger Aug 21, 2025
1ac96cd
simplify
snowystinger Aug 24, 2025
7af4211
Merge branch 'main' into fix-removable-tag-size-calculation
snowystinger Aug 24, 2025
6f35000
Merge branch 'main' into fix-removable-tag-size-calculation
snowystinger Aug 27, 2025
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
110 changes: 74 additions & 36 deletions packages/@react-spectrum/s2/src/TagGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,45 @@ function TagGroupInner<T>({
style={item.props.UNSAFE_style}
key={item.key}
className={item.props.className({size, allowsRemoving: Boolean(onRemove)})}>
{item.props.children({size, allowsRemoving: Boolean(onRemove), isInCtx: true})}
<div
className={style({
display: 'flex',
minWidth: 0,
alignItems: 'center',
gap: 'text-to-visual',
forcedColorAdjust: 'none',
backgroundColor: 'transparent'
})}>
<Provider
values={[
[TextContext, {styles: style({order: 1, truncate: true})}],
[IconContext, {
render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
styles: style({size: fontRelative(20), marginStart: '--iconMargin', flexShrink: 0})
}],
[AvatarContext, {
size: avatarSize[size],
styles: style({order: 0})
}],
[ImageContext, {
styles: style({
size: fontRelative(20),
flexShrink: 0,
order: 0,
aspectRatio: 'square',
objectFit: 'contain',
borderRadius: 'sm'
})
}]
]}>
{item.props.children({size, allowsRemoving: Boolean(onRemove), isInCtx: true})}
</Provider>
</div>
{Boolean(onRemove) && (
<ClearButton
slot="remove"
size={size} />
)}
</div>
);
})}
Expand Down Expand Up @@ -516,41 +554,41 @@ function TagWrapper({children, isDisabled, allowsRemoving, isInRealDOM, isEmphas
return (
<>
{isInRealDOM && (
<div
className={style({
display: 'flex',
minWidth: 0,
alignItems: 'center',
gap: 'text-to-visual',
forcedColorAdjust: 'none',
backgroundColor: 'transparent'
})}>
<Provider
values={[
[TextContext, {styles: style({order: 1, truncate: true})}],
[IconContext, {
render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
styles: style({size: fontRelative(20), marginStart: '--iconMargin', flexShrink: 0})
}],
[AvatarContext, {
size: avatarSize[size],
styles: style({order: 0})
}],
[ImageContext, {
styles: style({
size: fontRelative(20),
flexShrink: 0,
order: 0,
aspectRatio: 'square',
objectFit: 'contain',
borderRadius: 'sm'
})
}]
]}>
{children}
</Provider>
</div>
)}
<div
className={style({
display: 'flex',
minWidth: 0,
alignItems: 'center',
gap: 'text-to-visual',
forcedColorAdjust: 'none',
backgroundColor: 'transparent'
})}>
<Provider
values={[
[TextContext, {styles: style({order: 1, truncate: true})}],
[IconContext, {
render: centerBaseline({slot: 'icon', styles: style({order: 0})}),
styles: style({size: fontRelative(20), marginStart: '--iconMargin', flexShrink: 0})
}],
[AvatarContext, {
size: avatarSize[size],
styles: style({order: 0})
}],
[ImageContext, {
styles: style({
size: fontRelative(20),
flexShrink: 0,
order: 0,
aspectRatio: 'square',
objectFit: 'contain',
borderRadius: 'sm'
})
}]
]}>
{children}
</Provider>
</div>
)}
{!isInRealDOM && children}
{allowsRemoving && isInRealDOM && (
<ClearButton
Expand Down