Skip to content

Commit 6f848e8

Browse files
authored
Merge pull request patternfly#80 from logonoff/patch
fix(CatalogItemHeader): use PF component over `h1`
2 parents e8eb0e1 + ffa0394 commit 6f848e8

File tree

6 files changed

+710
-452
lines changed

6 files changed

+710
-452
lines changed

packages/module/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-catalog-view-extension",
3-
"version": "6.0.0-prerelease.0",
3+
"version": "6.1.0-prerelease.0",
44
"description": "This library provides catalog view extensions for PatternFly 4 React.",
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",
@@ -40,18 +40,18 @@
4040
"patternfly"
4141
],
4242
"dependencies": {
43-
"@patternfly/react-core": "^6.0.0",
44-
"@patternfly/react-styles": "^6.0.0"
43+
"@patternfly/react-core": "^6.1.0",
44+
"@patternfly/react-styles": "^6.1.0"
4545
},
4646
"peerDependencies": {
4747
"react": "^17 || ^18",
4848
"react-dom": "^17 || ^18"
4949
},
5050
"devDependencies": {
51-
"@patternfly/patternfly": "^6.0.0",
52-
"@patternfly/documentation-framework": "6.0.0-alpha.120",
53-
"@patternfly/react-table": "^6.0.0",
54-
"@patternfly/react-code-editor": "^6.0.0",
51+
"@patternfly/patternfly": "^6.1.0",
52+
"@patternfly/documentation-framework": "6.5.14",
53+
"@patternfly/react-table": "^6.1.0",
54+
"@patternfly/react-code-editor": "^6.1.0",
5555
"@octokit/rest": "^18.0.0",
5656
"surge": "^0.23.1",
5757
"react-monaco-editor": "0.51.0",

packages/module/patternfly-docs/content/examples/catalogItemHeader.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
margin-inline-start: var(--pf-t--global--spacer--md);
1818
}
1919
.ws-react-e-catalog-item-header .catalog-item-header-pf-title {
20-
font-weight: var(--pf-t--global--font--weight--body);
2120
margin-block-end: 0;
2221
margin-block-start: 0;
2322
}

packages/module/sass/react-catalog-view-extension/_catalog-item.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
margin-left: 20px;
1414
}
1515

16-
.catalog-item-header-pf-title {
17-
font-weight: 400;
18-
margin-bottom: 0;
19-
margin-top: 0;
20-
}
21-
2216
.catalog-item-header-pf-subtitle {
2317
color: var(--pf-t--global--text--color--subtle);
2418
margin-bottom: 0;

packages/module/src/components/CatalogItemHeader/CatalogItemHeader.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as React from 'react';
2+
import { Content, Title } from '@patternfly/react-core';
23
import { css } from '@patternfly/react-styles';
34

45
export interface CatalogItemHeaderProps extends Omit<React.HTMLProps<HTMLElement>, 'title'> {
@@ -26,8 +27,8 @@ export const CatalogItemHeader: React.FunctionComponent<CatalogItemHeaderProps>
2627
{iconImg && <img className="catalog-item-header-pf-icon" src={iconImg} alt="" />}
2728
{!iconImg && iconClass && <span className={`catalog-item-header-pf-icon ${iconClass}`} />}
2829
<div className="catalog-item-header-pf-text">
29-
<h1 className="catalog-item-header-pf-title">{title}</h1>
30-
{vendor && <h5 className="catalog-item-header-pf-subtitle">{vendor}</h5>}
30+
<Title headingLevel="h1" className="catalog-item-header-pf-title">{title}</Title>
31+
{vendor && <Content component="p" className="catalog-item-header-pf-subtitle">{vendor}</Content>}
3132
</div>
3233
</header>
3334
);

packages/module/src/components/CatalogItemHeader/__snapshots__/CatalogItemHeader.test.tsx.snap

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,19 @@ exports[`simple catalog item header 1`] = `
99
class="catalog-item-header-pf-text"
1010
>
1111
<h1
12-
class="catalog-item-header-pf-title"
12+
class="pf-v6-c-title pf-m-h1 catalog-item-header-pf-title"
13+
data-ouia-component-id="OUIA-Generated-Title-1"
14+
data-ouia-component-type="PF6/Title"
15+
data-ouia-safe="true"
1316
>
1417
PatternFly
1518
</h1>
16-
<h5
17-
class="catalog-item-header-pf-subtitle"
19+
<p
20+
class="pf-v6-c-content--p catalog-item-header-pf-subtitle"
21+
data-ouia-component-id="OUIA-Generated-Content-1"
22+
data-ouia-component-type="PF6/Content"
23+
data-ouia-safe="true"
24+
data-pf-content="true"
1825
>
1926
<span>
2027
provided by
@@ -24,7 +31,7 @@ exports[`simple catalog item header 1`] = `
2431
Red Hat
2532
</a>
2633
</span>
27-
</h5>
34+
</p>
2835
</div>
2936
</header>
3037
</DocumentFragment>

0 commit comments

Comments
 (0)