Skip to content

Commit 568ff76

Browse files
committed
Revert "Use Text component"
This reverts commit 1e43dfc.
1 parent 1e43dfc commit 568ff76

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎packages/admin-ui/src/breadcrumbs/index.tsx‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
*/
44
import { Link } from '@wordpress/route';
55
import { __ } from '@wordpress/i18n';
6-
import { Text } from '@wordpress/ui';
7-
import { __experimentalHStack as HStack } from '@wordpress/components';
6+
import {
7+
__experimentalHeading as Heading,
8+
__experimentalHStack as HStack,
9+
} from '@wordpress/components';
810

911
/**
1012
* Internal dependencies
@@ -22,23 +24,16 @@ const BreadcrumbItem = ( {
2224
if ( ! to ) {
2325
return (
2426
<li>
25-
<Text
26-
className="admin-ui-page__header-title"
27-
// eslint-disable-next-line jsx-a11y/heading-has-content -- content provided via render prop
28-
render={ <h1 /> }
29-
variant="heading-lg"
30-
>
27+
<Heading level={ 1 } truncate>
3128
{ label }
32-
</Text>
29+
</Heading>
3330
</li>
3431
);
3532
}
3633

3734
return (
3835
<li>
39-
<Link to={ to }>
40-
<Text variant="heading-lg">{ label }</Text>
41-
</Link>
36+
<Link to={ to }>{ label }</Link>
4237
</li>
4338
);
4439
};

‎packages/admin-ui/src/breadcrumbs/style.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
margin: 0;
77
// gap prop don't seem to be working properly.
88
gap: 0;
9+
font-family: var(--wpds-font-family-heading);
10+
font-size: var(--wpds-font-size-lg);
11+
font-weight: var(--wpds-font-weight-medium);
12+
line-height: var(--wpds-font-line-height-lg);
913
min-height: 32px;
1014

1115
li:not(:last-child)::after {

‎packages/admin-ui/src/page/header.tsx‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* WordPress dependencies
33
*/
4-
import { Stack, Text } from '@wordpress/ui';
4+
import { Stack } from '@wordpress/ui';
55

66
/**
77
* Internal dependencies
@@ -38,14 +38,9 @@ export default function Header( {
3838
/>
3939
) }
4040
{ title && (
41-
<Text
42-
className="admin-ui-page__header-title"
43-
// eslint-disable-next-line jsx-a11y/heading-has-content -- content provided via render prop
44-
render={ <h2 /> }
45-
variant="heading-lg"
46-
>
41+
<h2 className="admin-ui-page__header-title">
4742
{ title }
48-
</Text>
43+
</h2>
4944
) }
5045
{ breadcrumbs }
5146
{ badges }

‎packages/admin-ui/src/page/style.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@
1919
}
2020

2121
.admin-ui-page__header-title {
22+
font-family: var(--wpds-font-family-heading);
23+
font-size: var(--wpds-font-size-lg);
24+
font-weight: var(--wpds-font-weight-medium);
25+
line-height: var(--wpds-font-line-height-lg);
2226
margin: 0;
2327
overflow: hidden;
28+
text-overflow: ellipsis;
29+
white-space: nowrap;
2430
}
2531

2632
.admin-ui-page__sidebar-toggle-slot:empty {

0 commit comments

Comments
 (0)