Skip to content

Commit 608f18b

Browse files
committed
Fix chip variables
1 parent ef3e835 commit 608f18b

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

docs/data/joy/components/chip/ChipVariables.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ export default function ChipVariables() {
4343
gap: 1,
4444
}}
4545
>
46+
<Chip variant="soft" color="danger" sx={sx}>
47+
Some text
48+
</Chip>
4649
<Chip
4750
startDecorator={<Avatar src="/static/images/avatar/1.jpg" />}
4851
endDecorator={<ChipDelete />}

packages/mui-joy/src/Chip/Chip.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ const ChipRoot = styled('div', {
4242
'--Chip-radius': '1.5rem',
4343
// for controlling chip delete margin offset
4444
'--Chip-decorator-childOffset':
45-
'min(calc(var(--Chip-paddingInline) - (var(--Chip-minHeight) - 2 * var(--variant-borderWidth) - var(--Chip-decorator-childHeight)) / 2), var(--Chip-paddingInline))',
45+
'min(calc(var(--Chip-paddingInline) - (var(--_Chip-minHeight) - 2 * var(--variant-borderWidth) - var(--Chip-decorator-childHeight)) / 2), var(--Chip-paddingInline))',
4646
'--_Chip-paddingBlock':
47-
'max((var(--Chip-minHeight) - 2 * var(--variant-borderWidth) - var(--Chip-decorator-childHeight)) / 2, 0px)',
47+
'max((var(--_Chip-minHeight) - 2 * var(--variant-borderWidth) - var(--Chip-decorator-childHeight)) / 2, 0px)',
4848
'--Chip-decorator-childRadius':
4949
'max(var(--Chip-radius) - var(--_Chip-paddingBlock), min(var(--_Chip-paddingBlock) / 2, var(--Chip-radius) / 2))',
5050
'--Chip-delete-radius': 'var(--Chip-decorator-childRadius)',
@@ -57,28 +57,28 @@ const ChipRoot = styled('div', {
5757
'--Chip-gap': '0.25rem',
5858
'--Chip-paddingInline': '0.5rem',
5959
'--Chip-decorator-childHeight':
60-
'calc(min(1.125rem, var(--Chip-minHeight)) - 2 * var(--variant-borderWidth))',
61-
'--Icon-fontSize': 'calc(var(--Chip-minHeight, 1.5rem) / 1.714)', // 0.875rem by default
62-
'--Chip-minHeight': '1.5rem',
60+
'calc(min(1.125rem, var(--_Chip-minHeight)) - 2 * var(--variant-borderWidth))',
61+
'--Icon-fontSize': 'calc(var(--_Chip-minHeight) / 1.714)', // 0.875rem by default
62+
'--_Chip-minHeight': 'var(--Chip-minHeight, 1.5rem)',
6363
fontSize: theme.vars.fontSize.xs,
6464
}),
6565
...(ownerState.size === 'md' && {
6666
'--Chip-gap': '0.375rem',
6767
'--Chip-paddingInline': '0.75rem',
68-
'--Chip-decorator-childHeight': 'min(1.375rem, var(--Chip-minHeight))',
69-
'--Icon-fontSize': 'calc(var(--Chip-minHeight, 2rem) / 1.778)', // 1.125rem by default
70-
'--Chip-minHeight': '2rem',
68+
'--Chip-decorator-childHeight': 'min(1.375rem, var(--_Chip-minHeight))',
69+
'--Icon-fontSize': 'calc(var(--_Chip-minHeight) / 1.778)', // 1.125rem by default
70+
'--_Chip-minHeight': 'var(--Chip-minHeight, 2rem)',
7171
fontSize: theme.vars.fontSize.sm,
7272
}),
7373
...(ownerState.size === 'lg' && {
7474
'--Chip-gap': '0.5rem',
7575
'--Chip-paddingInline': '1rem',
76-
'--Chip-decorator-childHeight': 'min(1.75rem, var(--Chip-minHeight))',
77-
'--Icon-fontSize': 'calc(var(--Chip-minHeight, 2.5rem) / 2)', // 1.25rem by default
78-
'--Chip-minHeight': '2.5rem',
76+
'--Chip-decorator-childHeight': 'min(1.75rem, var(--_Chip-minHeight))',
77+
'--Icon-fontSize': 'calc(var(--_Chip-minHeight) / 2)', // 1.25rem by default
78+
'--_Chip-minHeight': 'var(--Chip-minHeight, 2.5rem)',
7979
fontSize: theme.vars.fontSize.md,
8080
}),
81-
minHeight: 'var(--Chip-minHeight)',
81+
minHeight: 'var(--_Chip-minHeight)',
8282
paddingInline: 'var(--Chip-paddingInline)',
8383
borderRadius: 'var(--Chip-radius)',
8484
position: 'relative',

0 commit comments

Comments
 (0)