Skip to content

Commit f067b7c

Browse files
adamviktoratlabajwise-king-sullyman
authored
feat(misc): Replace Text, TextContent, TextList and TextListItem with Content - PART 2 (#10643)
* feat(Text): move to Content folder * refactor(Text examples): update names to Content * docs(Text): fix link * feat(Text): rename component to Content * feat(misc): replace Text, TextContent, TextList, TextListItem with Content * test(Content): update test * feat(misc): delete TextContent, TextList, TextListItem * test(Content): update snapshot * docs(Text): prop components update * fix rebase issue * additional updates to replace text with content * fixes from pr reviews * fix lint errors * update example * docs(Content): get rid of TextContent occurences * chore(docs): temporarily pin react-core version of react-docs Needed so that we can avoid temporary build problems caused by a chicken and egg situation between this repo and org. * chore(docs): Temporarily disable docs build from release CI * chore(docs): Undo changes to icons.js --------- Co-authored-by: Titani <tlabaj@redhat.com> Co-authored-by: Austin Sullivan <ausulliv@redhat.com>
1 parent 8e89786 commit f067b7c

91 files changed

Lines changed: 829 additions & 1108 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ jobs:
1111
name: CI
1212
uses: ./.github/workflows/main.yml
1313

14-
docs:
15-
name: Documentation
16-
uses: ./.github/workflows/documentation.yml
17-
secrets: inherit
14+
# docs:
15+
# name: Documentation
16+
# uses: ./.github/workflows/documentation.yml
17+
# secrets: inherit
1818

1919
deploy:
2020
name: Deploy release
2121
runs-on: ubuntu-latest
22-
needs: [ci, docs]
22+
# needs: [ci, docs]
23+
needs: [ci]
2324
steps:
2425
- name: Check out project
2526
uses: actions/checkout@v4

‎packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { AboutModal, Button, TextContent, TextList, TextListItem } from '@patternfly/react-core';
2+
import { AboutModal, Button, Content } from '@patternfly/react-core';
33
import brandImg from '../../assets/PF-IconLogo.svg';
44

55
export const AboutModalBasic: React.FunctionComponent = () => {
@@ -23,24 +23,24 @@ export const AboutModalBasic: React.FunctionComponent = () => {
2323
backgroundImageSrc="/assets/images/pf-background.svg"
2424
productName="name"
2525
>
26-
<TextContent>
27-
<TextList component="dl">
28-
<TextListItem component="dt">CFME version</TextListItem>
29-
<TextListItem component="dd">5.5.3.4.20102789036450</TextListItem>
30-
<TextListItem component="dt">Cloudforms Version</TextListItem>
31-
<TextListItem component="dd">4.1</TextListItem>
32-
<TextListItem component="dt">Server name</TextListItem>
33-
<TextListItem component="dd">40DemoMaster</TextListItem>
34-
<TextListItem component="dt">User name</TextListItem>
35-
<TextListItem component="dd">Administrator</TextListItem>
36-
<TextListItem component="dt">User role</TextListItem>
37-
<TextListItem component="dd">EvmRole-super_administrator</TextListItem>
38-
<TextListItem component="dt">Browser version</TextListItem>
39-
<TextListItem component="dd">601.2</TextListItem>
40-
<TextListItem component="dt">Browser OS</TextListItem>
41-
<TextListItem component="dd">Mac</TextListItem>
42-
</TextList>
43-
</TextContent>
26+
<Content>
27+
<dl>
28+
<dt>CFME version</dt>
29+
<dd>5.5.3.4.20102789036450</dd>
30+
<dt>Cloudforms Version</dt>
31+
<dd>4.1</dd>
32+
<dt>Server name</dt>
33+
<dd>40DemoMaster</dd>
34+
<dt>User name</dt>
35+
<dd>Administrator</dd>
36+
<dt>User role</dt>
37+
<dd>EvmRole-super_administrator</dd>
38+
<dt>Browser version</dt>
39+
<dd>601.2</dd>
40+
<dt>Browser OS</dt>
41+
<dd>Mac</dd>
42+
</dl>
43+
</Content>
4444
</AboutModal>
4545
</React.Fragment>
4646
);

‎packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { AboutModal, Alert, Button, TextContent, TextList, TextListItem } from '@patternfly/react-core';
2+
import { AboutModal, Alert, Button, Content } from '@patternfly/react-core';
33
import brandImg from '../../assets/PF-IconLogo.svg';
44
import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
55

@@ -25,29 +25,29 @@ export const AboutModalComplexUserPositionedContent: React.FunctionComponent = (
2525
hasNoContentContainer={true}
2626
productName="Product name"
2727
>
28-
<TextContent id="test1" className={spacing.pyXl}>
28+
<Content id="test1" className={spacing.pyXl}>
2929
<h4>About</h4>
3030
<p>Content here</p>
31-
</TextContent>
31+
</Content>
3232
<Alert variant="info" title="Updates available" />
33-
<TextContent id="test2" className={spacing.pyXl}>
34-
<TextList component="dl">
35-
<TextListItem component="dt">CFME version</TextListItem>
36-
<TextListItem component="dd">5.5.3.4.20102789036450</TextListItem>
37-
<TextListItem component="dt">Cloudforms version</TextListItem>
38-
<TextListItem component="dd">4.1</TextListItem>
39-
<TextListItem component="dt">Server name</TextListItem>
40-
<TextListItem component="dd">40DemoMaster</TextListItem>
41-
<TextListItem component="dt">User name</TextListItem>
42-
<TextListItem component="dd">Administrator</TextListItem>
43-
<TextListItem component="dt">User role</TextListItem>
44-
<TextListItem component="dd">EvmRole-super_administrator</TextListItem>
45-
<TextListItem component="dt">Browser version</TextListItem>
46-
<TextListItem component="dd">601.2</TextListItem>
47-
<TextListItem component="dt">Browser OS</TextListItem>
48-
<TextListItem component="dd">Mac</TextListItem>
49-
</TextList>
50-
</TextContent>
33+
<Content id="test2" className={spacing.pyXl}>
34+
<dl>
35+
<dt>CFME version</dt>
36+
<dd>5.5.3.4.20102789036450</dd>
37+
<dt>Cloudforms version</dt>
38+
<dd>4.1</dd>
39+
<dt>Server name</dt>
40+
<dd>40DemoMaster</dd>
41+
<dt>User name</dt>
42+
<dd>Administrator</dd>
43+
<dt>User role</dt>
44+
<dd>EvmRole-super_administrator</dd>
45+
<dt>Browser version</dt>
46+
<dd>601.2</dd>
47+
<dt>Browser OS</dt>
48+
<dd>Mac</dd>
49+
</dl>
50+
</Content>
5151
</AboutModal>
5252
</React.Fragment>
5353
);

‎packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { AboutModal, Button, TextContent, TextList, TextListItem } from '@patternfly/react-core';
2+
import { AboutModal, Button, Content } from '@patternfly/react-core';
33
import brandImg from '../../assets/PF-IconLogo.svg';
44

55
export const AboutModalWithoutProductName: React.FunctionComponent = () => {
@@ -23,24 +23,24 @@ export const AboutModalWithoutProductName: React.FunctionComponent = () => {
2323
backgroundImageSrc="/assets/images/pf-background.svg"
2424
aria-label="No product name about modal"
2525
>
26-
<TextContent>
27-
<TextList component="dl">
28-
<TextListItem component="dt">CFME version</TextListItem>
29-
<TextListItem component="dd">5.5.3.4.20102789036450</TextListItem>
30-
<TextListItem component="dt">Cloudforms version</TextListItem>
31-
<TextListItem component="dd">4.1</TextListItem>
32-
<TextListItem component="dt">Server name</TextListItem>
33-
<TextListItem component="dd">40DemoMaster</TextListItem>
34-
<TextListItem component="dt">User name</TextListItem>
35-
<TextListItem component="dd">Administrator</TextListItem>
36-
<TextListItem component="dt">User role</TextListItem>
37-
<TextListItem component="dd">EvmRole-super_administrator</TextListItem>
38-
<TextListItem component="dt">Browser version</TextListItem>
39-
<TextListItem component="dd">601.2</TextListItem>
40-
<TextListItem component="dt">Browser OS</TextListItem>
41-
<TextListItem component="dd">Mac</TextListItem>
42-
</TextList>
43-
</TextContent>
26+
<Content>
27+
<dl>
28+
<dt>CFME version</dt>
29+
<dd>5.5.3.4.20102789036450</dd>
30+
<dt>Cloudforms version</dt>
31+
<dd>4.1</dd>
32+
<dt>Server name</dt>
33+
<dd>40DemoMaster</dd>
34+
<dt>User name</dt>
35+
<dd>Administrator</dd>
36+
<dt>User role</dt>
37+
<dd>EvmRole-super_administrator</dd>
38+
<dt>Browser version</dt>
39+
<dd>601.2</dd>
40+
<dt>Browser OS</dt>
41+
<dd>Mac</dd>
42+
</dl>
43+
</Content>
4444
</AboutModal>
4545
</React.Fragment>
4646
);

‎packages/react-core/src/components/Content/Content.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { css } from '@patternfly/react-styles';
33
import styles from '@patternfly/react-styles/css/components/Content/content';
44
import { useOUIAProps, OUIAProps } from '../../helpers';
55

6-
export enum TextVariants {
6+
export enum ContentVariants {
77
h1 = 'h1',
88
h2 = 'h2',
99
h3 = 'h3',
@@ -24,7 +24,7 @@ export enum TextVariants {
2424
dd = 'dd'
2525
}
2626

27-
export interface TextProps extends React.HTMLProps<HTMLElement>, OUIAProps {
27+
export interface ContentProps extends React.HTMLProps<HTMLElement>, OUIAProps {
2828
/** The content component. If none provided, it will be a 'div' and styling will be applied to all its child components. */
2929
component?:
3030
| 'h1'
@@ -81,7 +81,7 @@ const componentStyles = {
8181
dd: styles.contentDd
8282
};
8383

84-
export const Text: React.FunctionComponent<TextProps> = ({
84+
export const Content: React.FunctionComponent<ContentProps> = ({
8585
children,
8686
className = '',
8787
component,
@@ -90,10 +90,10 @@ export const Text: React.FunctionComponent<TextProps> = ({
9090
ouiaId,
9191
ouiaSafe = true,
9292
...props
93-
}: TextProps) => {
93+
}: ContentProps) => {
9494
const wrappingComponent = component ?? 'div';
9595
const Component: any = wrappingComponent;
96-
const ouiaProps = useOUIAProps(Text.displayName, ouiaId, ouiaSafe);
96+
const ouiaProps = useOUIAProps(Content.displayName, ouiaId, ouiaSafe);
9797

9898
const isList = ['ul', 'ol', 'dl'].includes(wrappingComponent);
9999

@@ -113,4 +113,4 @@ export const Text: React.FunctionComponent<TextProps> = ({
113113
</Component>
114114
);
115115
};
116-
Text.displayName = 'Text';
116+
Content.displayName = 'Content';

‎packages/react-core/src/components/Content/TextContent.tsx‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎packages/react-core/src/components/Content/TextList.tsx‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎packages/react-core/src/components/Content/TextListItem.tsx‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)