Skip to content

Commit 0dac6b8

Browse files
authored
fix(generate tokens): prefix tokens with a t_ (#11002)
* fix(generate tokens): prefix tokens with a t_ * fix lint issues * update tokens in codebase * fix unit test * fix demos
1 parent a3efcdb commit 0dac6b8

File tree

21 files changed

+236
-157
lines changed

21 files changed

+236
-157
lines changed

packages/react-charts/src/components/ChartBar/examples/ChartBar.md

Lines changed: 170 additions & 92 deletions
Large diffs are not rendered by default.

packages/react-charts/src/components/ChartTheme/styles/box-plot-tooltip-styles.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable camelcase */
2-
import global_font_weight_heading_bold from '@patternfly/react-tokens/dist/esm/global_font_weight_heading_bold';
2+
import t_global_font_weight_heading_bold from '@patternfly/react-tokens/dist/esm/t_global_font_weight_heading_bold';
33
import chart_voronoi_labels_Fill from '@patternfly/react-tokens/dist/esm/chart_voronoi_labels_Fill';
44

55
/**
@@ -12,6 +12,6 @@ export const BoxPlotTooltipStyles = {
1212
},
1313
label: {
1414
fill: chart_voronoi_labels_Fill.var,
15-
fontWeight: global_font_weight_heading_bold.value
15+
fontWeight: t_global_font_weight_heading_bold.value
1616
} as any
1717
};

packages/react-charts/src/components/ChartTheme/styles/legend-tooltip-styles.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable camelcase */
2-
import global_font_weight_heading_bold from '@patternfly/react-tokens/dist/esm/global_font_weight_heading_bold';
2+
import t_global_font_weight_heading_bold from '@patternfly/react-tokens/dist/esm/t_global_font_weight_heading_bold';
33
import chart_voronoi_labels_Fill from '@patternfly/react-tokens/dist/esm/chart_voronoi_labels_Fill';
44

55
/**
@@ -12,6 +12,6 @@ export const LegendTooltipStyles = {
1212
},
1313
label: {
1414
fill: chart_voronoi_labels_Fill.var,
15-
fontWeight: global_font_weight_heading_bold.value
15+
fontWeight: t_global_font_weight_heading_bold.value
1616
} as any
1717
};

packages/react-core/src/components/Page/Page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import styles from '@patternfly/react-styles/css/components/Page/page';
33
import { css } from '@patternfly/react-styles';
4-
import globalBreakpointXl from '@patternfly/react-tokens/dist/esm/global_breakpoint_xl';
4+
import globalBreakpointXl from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_xl';
55
import { debounce, canUseDOM } from '../../helpers/util';
66
import { Drawer, DrawerContent, DrawerContentBody, DrawerPanelContent } from '../Drawer';
77
import { PageBreadcrumb, PageBreadcrumbProps } from './PageBreadcrumb';

packages/react-core/src/components/Skeleton/examples/Skeleton.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ cssPrefix: pf-v5-c-skeleton
55
propComponents: ['Skeleton']
66
---
77

8-
import global_font_size_4xl from '@patternfly/react-tokens/dist/esm/global_font_size_4xl';
9-
import global_font_size_3xl from '@patternfly/react-tokens/dist/esm/global_font_size_3xl';
10-
import global_font_size_2xl from '@patternfly/react-tokens/dist/esm/global_font_size_2xl';
11-
import global_font_size_xl from '@patternfly/react-tokens/dist/esm/global_font_size_xl';
12-
import global_font_size_lg from '@patternfly/react-tokens/dist/esm/global_font_size_lg';
13-
import global_font_size_md from '@patternfly/react-tokens/dist/esm/global_font_size_md';
14-
import global_font_size_sm from '@patternfly/react-tokens/dist/esm/global_font_size_sm';
8+
import t_global_font_size_4xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_4xl';
9+
import t_global_font_size_3xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_3xl';
10+
import t_global_font_size_2xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_2xl';
11+
import t_global_font_size_xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_xl';
12+
import t_global_font_size_lg from '@patternfly/react-tokens/dist/esm/t_global_font_size_lg';
13+
import t_global_font_size_md from '@patternfly/react-tokens/dist/esm/t_global_font_size_md';
14+
import t_global_font_size_sm from '@patternfly/react-tokens/dist/esm/t_global_font_size_sm';
1515

1616
## Examples
1717

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
import React from 'react';
22
import { Skeleton } from '@patternfly/react-core';
33
/* eslint-disable camelcase */
4-
import global_font_size_4xl from '@patternfly/react-tokens/dist/esm/global_font_size_4xl';
5-
import global_font_size_3xl from '@patternfly/react-tokens/dist/esm/global_font_size_3xl';
6-
import global_font_size_2xl from '@patternfly/react-tokens/dist/esm/global_font_size_2xl';
7-
import global_font_size_xl from '@patternfly/react-tokens/dist/esm/global_font_size_xl';
8-
import global_font_size_lg from '@patternfly/react-tokens/dist/esm/global_font_size_lg';
9-
import global_font_size_md from '@patternfly/react-tokens/dist/esm/global_font_size_md';
10-
import global_font_size_sm from '@patternfly/react-tokens/dist/esm/global_font_size_sm';
4+
import t_global_font_size_4xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_4xl';
5+
import t_global_font_size_3xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_3xl';
6+
import t_global_font_size_2xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_2xl';
7+
import t_global_font_size_xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_xl';
8+
import t_global_font_size_lg from '@patternfly/react-tokens/dist/esm/t_global_font_size_lg';
9+
import t_global_font_size_md from '@patternfly/react-tokens/dist/esm/t_global_font_size_md';
10+
import t_global_font_size_sm from '@patternfly/react-tokens/dist/esm/t_global_font_size_sm';
1111

1212
export const SkeletonText: React.FunctionComponent = () => (
1313
<React.Fragment>
14-
{global_font_size_4xl.name}
14+
{t_global_font_size_4xl.name}
1515
<Skeleton fontSize="4xl" screenreaderText="Loading font size 4xl" />
1616
<br />
17-
{global_font_size_3xl.name}
17+
{t_global_font_size_3xl.name}
1818
<Skeleton fontSize="3xl" screenreaderText="Loading font size 3xl" />
1919
<br />
20-
{global_font_size_2xl.name}
20+
{t_global_font_size_2xl.name}
2121
<Skeleton fontSize="2xl" screenreaderText="Loading font size 2xl" />
2222
<br />
23-
{global_font_size_xl.name}
23+
{t_global_font_size_xl.name}
2424
<Skeleton fontSize="xl" screenreaderText="Loading font size xl" />
2525
<br />
26-
{global_font_size_lg.name}
26+
{t_global_font_size_lg.name}
2727
<Skeleton fontSize="lg" screenreaderText="Loading font size lg" />
2828
<br />
29-
{global_font_size_md.name}
29+
{t_global_font_size_md.name}
3030
<Skeleton fontSize="md" screenreaderText="Loading font size md" />
3131
<br />
32-
{global_font_size_sm.name}
32+
{t_global_font_size_sm.name}
3333
<Skeleton fontSize="sm" screenreaderText="Loading font size sm" />
3434
</React.Fragment>
3535
);

packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { css } from '@patternfly/react-styles';
55
import { ToolbarGroupProps } from './ToolbarGroup';
66
import { ToolbarContext, ToolbarContentContext } from './ToolbarUtils';
77
import { Button } from '../Button';
8-
import globalBreakpointLg from '@patternfly/react-tokens/dist/esm/global_breakpoint_lg';
8+
import globalBreakpointLg from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_lg';
99
import { formatBreakpointMods, toCamel, canUseDOM } from '../../helpers/util';
1010
import { PageContext } from '../Page/PageContext';
1111
import { ToolbarExpandableContent } from './ToolbarExpandableContent';

packages/react-core/src/components/Toolbar/ToolbarUtils.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as React from 'react';
22
import { RefObject } from 'react';
3-
import globalBreakpointMd from '@patternfly/react-tokens/dist/esm/global_breakpoint_md';
4-
import globalBreakpointLg from '@patternfly/react-tokens/dist/esm/global_breakpoint_lg';
5-
import globalBreakpointXl from '@patternfly/react-tokens/dist/esm/global_breakpoint_xl';
6-
import globalBreakpoint2xl from '@patternfly/react-tokens/dist/esm/global_breakpoint_2xl';
3+
import globalBreakpointMd from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_md';
4+
import globalBreakpointLg from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_lg';
5+
import globalBreakpointXl from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_xl';
6+
import globalBreakpoint2xl from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_2xl';
77

88
export interface ToolbarContextProps {
99
isExpanded: boolean;

packages/react-core/src/demos/CardDemos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import chart_color_yellow_300 from '@patternfly/react-tokens/dist/esm/chart_colo
1515
import chart_color_orange_300 from '@patternfly/react-tokens/dist/esm/chart_color_orange_300';
1616
import chart_color_red_orange_400 from '@patternfly/react-tokens/dist/esm/chart_color_red_orange_400';
1717
import l_gallery_GridTemplateColumns_min from '@patternfly/react-tokens/dist/esm/l_gallery_GridTemplateColumns_min';
18-
import global_text_color_subtle from '@patternfly/react-tokens/dist/esm/global_text_color_subtle';
18+
import t_global_text_color_subtle from '@patternfly/react-tokens/dist/esm/t_global_text_color_subtle';
1919
import flex from '@patternfly/react-styles/css/utilities/Flex/flex';
2020
import text from '@patternfly/react-styles/css/utilities/Text/text';
2121
import sizing from '@patternfly/react-styles/css/utilities/Sizing/sizing';

packages/react-core/src/demos/examples/Card/CardStatus.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import BellIcon from '@patternfly/react-icons/dist/js/icons/bell-icon';
2727
import CheckCircleIcon from '@patternfly/react-icons/dist/js/icons/check-circle-icon';
2828
import ExclamationCircleIcon from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon';
2929
import ExclamationTriangleIcon from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
30-
import global_text_color_subtle from '@patternfly/react-tokens/dist/esm/global_text_color_subtle';
30+
import t_global_text_color_subtle from '@patternfly/react-tokens/dist/esm/t_global_text_color_subtle';
3131

3232
export const CardStatus: React.FunctionComponent = () => {
3333
const [drawerExpanded, setDrawerExpanded] = React.useState(false);
@@ -176,7 +176,7 @@ export const CardStatus: React.FunctionComponent = () => {
176176
<a href="#">Operators</a>
177177
</FlexItem>
178178
<FlexItem>
179-
<span style={{ color: global_text_color_subtle.var }}>1 degraded</span>
179+
<span style={{ color: t_global_text_color_subtle.var }}>1 degraded</span>
180180
</FlexItem>
181181
</Flex>
182182
</Flex>
@@ -193,7 +193,7 @@ export const CardStatus: React.FunctionComponent = () => {
193193
<a href="#">Image Vulnerabilities</a>
194194
</FlexItem>
195195
<FlexItem>
196-
<span style={{ color: global_text_color_subtle.var }}>0 vulnerabilities</span>
196+
<span style={{ color: t_global_text_color_subtle.var }}>0 vulnerabilities</span>
197197
</FlexItem>
198198
</Flex>
199199
</Flex>

0 commit comments

Comments
 (0)