Skip to content

Commit b3383e4

Browse files
authored
Merge pull request #460 from mashmatrix/support-slds-2-text
Update `Text` for SLDS2
2 parents c85f24a + 746cd92 commit b3383e4

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/scripts/Text.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import classnames from 'classnames';
77
export type TextProps = {
88
tag?: keyof ReactHTML;
99
category?: 'body' | 'heading' | 'title';
10-
type?: 'small' | 'regular' | 'medium' | 'large' | 'caps' | 'label';
10+
type?: 'small' | 'regular' | 'medium' | 'large' | 'caps';
1111
align?: 'left' | 'center' | 'right';
1212
truncate?: boolean;
1313
section?: boolean;
@@ -29,7 +29,7 @@ export const Text: FC<TextProps> = ({
2929
}) => {
3030
const textClassNames = classnames(
3131
type && category ? `slds-text-${category}_${type}` : undefined,
32-
category && !type ? `slds-text-${category}` : undefined,
32+
category === 'title' && !type ? `slds-text-${category}` : undefined,
3333
align ? `slds-text-align_${align}` : undefined,
3434
{
3535
'slds-truncate': truncate,

stories/PageHeader.stories.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,12 @@ export const RecordHome: ComponentStoryObj<typeof PageHeader> = {
9797
</PageHeaderDetailItem>
9898
<PageHeaderDetailItem>
9999
<PageHeaderDetailLabel>
100-
<Text tag='div' category='heading' type='label'>
101-
FIELD 2 (3)
102-
<DropdownButton type='icon-bare' iconSize='small' icon='down'>
103-
<MenuItem>Menu Item #1</MenuItem>
104-
<MenuItem>Menu Item #2</MenuItem>
105-
<MenuItem>Menu Item #3</MenuItem>
106-
</DropdownButton>
107-
</Text>
100+
FIELD 2 (3)
101+
<DropdownButton type='icon-bare' iconSize='small' icon='down'>
102+
<MenuItem>Menu Item #1</MenuItem>
103+
<MenuItem>Menu Item #2</MenuItem>
104+
<MenuItem>Menu Item #3</MenuItem>
105+
</DropdownButton>
108106
</PageHeaderDetailLabel>
109107
<PageHeaderDetailBody>
110108
<Text category='body' type='regular' title='Multiple Values'>

0 commit comments

Comments
 (0)