Skip to content

fix(LayoutHeader): inner layout #1217

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
tenphi merged 1 commit into from
Jun 19, 2026
Merged

fix(LayoutHeader): inner layout #1217

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
5 changes: 5 additions & 0 deletions .changeset/nine-frogs-kneel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cube-dev/ui-kit": patch
---

Fix LayoutHeader inner layout.
6 changes: 5 additions & 1 deletion src/components/actions/Button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ export const Button = forwardRef(function Button(
tooltip = true,
defaultTooltipPlacement = 'top',
onPress: userOnPress,
tokens,
...props
} = allProps;

Expand Down Expand Up @@ -599,7 +600,10 @@ export const Button = forwardRef(function Button(
data-size={size}
data-popover-dismiss=""
styles={styles}
tokens={sizeTokenValue ? { $size: sizeTokenValue } : undefined}
tokens={{
...tokens,
...(sizeTokenValue ? { $size: sizeTokenValue } : {}),
}}
>
<DisplayTransition
isShown={hasLeftIcon}
Expand Down
6 changes: 5 additions & 1 deletion src/components/content/Item/Item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,7 @@ const Item = <T extends HTMLElement = HTMLDivElement>(
highlightStyles,
insideWrapper = false,
showActions = false,
tokens,
...rest
} = props;

Expand Down Expand Up @@ -949,7 +950,10 @@ const Item = <T extends HTMLElement = HTMLDivElement>(
aria-selected={isSelected}
mods={finalMods}
styles={styles}
tokens={sizeTokenValue ? { $size: sizeTokenValue } : undefined}
tokens={{
...tokens,
...(sizeTokenValue ? { $size: sizeTokenValue } : {}),
}}
type={htmlType as any}
{...mergeProps(rest, tooltipTriggerProps || {})}
style={style}
Expand Down
25 changes: 14 additions & 11 deletions src/components/content/Layout/LayoutHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,22 @@ const HeaderElement = tasty(LayoutContent, {
border: 'bottom',
flexShrink: 0,
flexGrow: 0,
height: 'min 6x',

Inner: {
$: '>',
display: 'grid',
gridTemplate: `
"breadcrumbs breadcrumbs breadcrumbs breadcrumbs" auto
"back title suffix extra" 1fr
"breadcrumbs breadcrumbs breadcrumbs extra" auto
"back title suffix extra" max-content
".. subtitle subtitle extra" auto
/ auto max-content 1fr minmax(0, auto)
`,
gap: 0,
placeContent: 'stretch',
placeContent: 'center stretch',
placeItems: 'center stretch',
padding: '0 ($content-padding, 1x)',
placeSelf: 'center stretch',
},

Back: {
Expand All @@ -64,13 +67,13 @@ const HeaderElement = tasty(LayoutContent, {
$: '> Inner >',
gridArea: 'title',
preset: {
'': 'h3',
'level=1': 'h1',
'level=2': 'h2',
'level=3': 'h3',
'level=4': 'h4',
'level=5': 'h5',
'level=6': 'h6',
'': 'h3 / tight',
'level=1': 'h1 / tight',
'level=2': 'h2 / tight',
'level=3': 'h3 / tight',
'level=4': 'h4 / tight',
'level=5': 'h5 / tight',
'level=6': 'h6 / tight',
},
color: '#dark',
margin: 0,
Expand All @@ -91,7 +94,7 @@ const HeaderElement = tasty(LayoutContent, {
gridArea: 'extra',
display: 'flex',
placeItems: 'center',
placeSelf: 'end',
placeSelf: 'center',
gap: '1x',
width: 'max 100%',
},
Expand Down
Loading