Skip to content

Commit c1406fb

Browse files
wise-king-sullymanwise-king-sullyman
committed
Merge branch 'main' into update-close-icons-to-rh-microns
2 parents 7e43c3b + e8f083e commit c1406fb

File tree

152 files changed

+2709
-2545
lines changed

Some content is hidden

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

152 files changed

+2709
-2545
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@testing-library/user-event": "^14.6.1",
4444
"@types/jest": "29.5.14",
4545
"@types/node": "^22.16.5",
46-
"@types/react": "^18.3.27",
46+
"@types/react": "^18.3.28",
4747
"@types/react-dom": "^18.3.7",
4848
"babel-jest": "^29.7.0",
4949
"concurrently": "^9.2.1",
@@ -65,9 +65,9 @@
6565
"lerna": "^8.2.4",
6666
"lint-staged": "^15.5.2",
6767
"mutation-observer": "^1.0.3",
68-
"plop": "^4.0.4",
68+
"plop": "^4.0.5",
6969
"prettier": "^3.8.1",
70-
"publint": "^0.3.16",
70+
"publint": "^0.3.18",
7171
"react": "^18.3.1",
7272
"react-dom": "^18.3.1",
7373
"rimraf": "^6.1.2",

‎packages/react-charts/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [8.5.0-prerelease.17](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-charts@8.5.0-prerelease.16...@patternfly/react-charts@8.5.0-prerelease.17) (2026-03-27)
7+
8+
**Note:** Version bump only for package @patternfly/react-charts
9+
610
# [8.5.0-prerelease.16](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-charts@8.5.0-prerelease.15...@patternfly/react-charts@8.5.0-prerelease.16) (2026-03-19)
711

812
**Note:** Version bump only for package @patternfly/react-charts

‎packages/react-charts/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-charts",
3-
"version": "8.5.0-prerelease.16",
3+
"version": "8.5.0-prerelease.17",
44
"description": "This library provides a set of React chart components for use with the PatternFly reference implementation.",
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",
@@ -46,7 +46,7 @@
4646
"tslib": "^2.8.1"
4747
},
4848
"devDependencies": {
49-
"@types/lodash": "^4.17.21",
49+
"@types/lodash": "^4.17.24",
5050
"fs-extra": "^11.3.3",
5151
"jest-canvas-mock": "^2.5.2"
5252
},

‎packages/react-code-editor/CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [6.5.0-prerelease.45](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@6.5.0-prerelease.44...@patternfly/react-code-editor@6.5.0-prerelease.45) (2026-03-27)
7+
8+
**Note:** Version bump only for package @patternfly/react-code-editor
9+
10+
# [6.5.0-prerelease.44](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@6.5.0-prerelease.43...@patternfly/react-code-editor@6.5.0-prerelease.44) (2026-03-25)
11+
12+
**Note:** Version bump only for package @patternfly/react-code-editor
13+
14+
# [6.5.0-prerelease.43](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@6.5.0-prerelease.42...@patternfly/react-code-editor@6.5.0-prerelease.43) (2026-03-25)
15+
16+
**Note:** Version bump only for package @patternfly/react-code-editor
17+
618
# [6.5.0-prerelease.42](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@6.5.0-prerelease.41...@patternfly/react-code-editor@6.5.0-prerelease.42) (2026-03-19)
719

820
**Note:** Version bump only for package @patternfly/react-code-editor

‎packages/react-code-editor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-code-editor",
3-
"version": "6.5.0-prerelease.42",
3+
"version": "6.5.0-prerelease.45",
44
"description": "This package provides a PatternFly wrapper for the Monaco code editor\n",
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",

‎packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
2525
<button
2626
aria-label="Copy code to clipboard"
2727
class="pf-v6-c-button pf-m-plain"
28-
data-ouia-component-id="OUIA-Generated-Button-plain-1"
28+
data-ouia-component-id="OUIA-Generated-Button-plain-:r1:"
2929
data-ouia-component-type="PF6/Button"
3030
data-ouia-safe="true"
3131
type="button"
@@ -67,7 +67,7 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
6767
<button
6868
aria-label="Upload code"
6969
class="pf-v6-c-button pf-m-plain"
70-
data-ouia-component-id="OUIA-Generated-Button-plain-2"
70+
data-ouia-component-id="OUIA-Generated-Button-plain-:r3:"
7171
data-ouia-component-type="PF6/Button"
7272
data-ouia-safe="true"
7373
type="button"
@@ -109,7 +109,7 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
109109
<button
110110
aria-label="Download code"
111111
class="pf-v6-c-button pf-m-plain"
112-
data-ouia-component-id="OUIA-Generated-Button-plain-3"
112+
data-ouia-component-id="OUIA-Generated-Button-plain-:r5:"
113113
data-ouia-component-type="PF6/Button"
114114
data-ouia-safe="true"
115115
type="button"

‎packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditorControl.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exports[`Matches snapshot 1`] = `
77
>
88
<button
99
class="pf-v6-c-button pf-m-plain"
10-
data-ouia-component-id="OUIA-Generated-Button-plain-1"
10+
data-ouia-component-id="OUIA-Generated-Button-plain-:r1:"
1111
data-ouia-component-type="PF6/Button"
1212
data-ouia-safe="true"
1313
type="button"

‎packages/react-core/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [6.5.0-prerelease.42](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.5.0-prerelease.41...@patternfly/react-core@6.5.0-prerelease.42) (2026-03-27)
7+
8+
### Features
9+
10+
- **card:** add isGlass prop ([#12290](https://github.com/patternfly/patternfly-react/issues/12290)) ([f854fa6](https://github.com/patternfly/patternfly-react/commit/f854fa632902f79ec45da6aad1702699f8623e3d))
11+
12+
# [6.5.0-prerelease.41](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.5.0-prerelease.40...@patternfly/react-core@6.5.0-prerelease.41) (2026-03-25)
13+
14+
### Features
15+
16+
- **NotificationBadge:** add support for plain variant ([#12139](https://github.com/patternfly/patternfly-react/issues/12139)) ([43322f3](https://github.com/patternfly/patternfly-react/commit/43322f3e77e225639566aea2bdb9af0f455637d6))
17+
18+
# [6.5.0-prerelease.40](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.5.0-prerelease.39...@patternfly/react-core@6.5.0-prerelease.40) (2026-03-25)
19+
20+
**Note:** Version bump only for package @patternfly/react-core
21+
622
# [6.5.0-prerelease.39](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.5.0-prerelease.38...@patternfly/react-core@6.5.0-prerelease.39) (2026-03-19)
723

824
### Bug Fixes

‎packages/react-core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-core",
3-
"version": "6.5.0-prerelease.39",
3+
"version": "6.5.0-prerelease.42",
44
"description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",

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

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { AboutModalBoxBrand } from './AboutModalBoxBrand';
66
import { AboutModalBoxCloseButton } from './AboutModalBoxCloseButton';
77
import { AboutModalBox } from './AboutModalBox';
88
import { Modal, ModalVariant } from '../Modal';
9-
import { GenerateId } from '../../helpers/GenerateId/GenerateId';
9+
import { useSSRSafeId } from '../../helpers';
1010

1111
export interface AboutModalProps extends React.HTMLProps<HTMLDivElement> {
1212
/** Content rendered inside the about modal */
@@ -56,6 +56,8 @@ export const AboutModal: React.FunctionComponent<AboutModalProps> = ({
5656
disableFocusTrap,
5757
...props
5858
}: AboutModalProps) => {
59+
const ariaLabelledBy = useSSRSafeId('pf-about-modal-title-');
60+
5961
if (brandImageSrc && !brandImageAlt) {
6062
// eslint-disable-next-line no-console
6163
console.error(
@@ -73,35 +75,29 @@ export const AboutModal: React.FunctionComponent<AboutModalProps> = ({
7375
return null;
7476
}
7577
return (
76-
<GenerateId prefix="pf-about-modal-title-">
77-
{(ariaLabelledBy) => (
78-
<Modal
79-
isOpen={isOpen}
80-
variant={ModalVariant.large}
81-
{...(productName && { 'aria-labelledby': ariaLabelledBy })}
82-
aria-label={ariaLabel}
83-
onEscapePress={onClose}
84-
appendTo={appendTo}
85-
disableFocusTrap={disableFocusTrap}
86-
>
87-
<AboutModalBox
88-
style={
89-
backgroundImageSrc
90-
? ({ [backgroundImage.name]: `url(${backgroundImageSrc})` } as React.CSSProperties)
91-
: {}
92-
}
93-
className={css(className)}
94-
>
95-
<AboutModalBoxBrand src={brandImageSrc} alt={brandImageAlt} />
96-
<AboutModalBoxCloseButton aria-label={closeButtonAriaLabel} onClose={onClose} />
97-
{productName && <AboutModalBoxHeader id={ariaLabelledBy} productName={productName} />}
98-
<AboutModalBoxContent trademark={trademark} hasNoContentContainer={hasNoContentContainer} {...props}>
99-
{children}
100-
</AboutModalBoxContent>
101-
</AboutModalBox>
102-
</Modal>
103-
)}
104-
</GenerateId>
78+
<Modal
79+
isOpen={isOpen}
80+
variant={ModalVariant.large}
81+
{...(productName && { 'aria-labelledby': ariaLabelledBy })}
82+
aria-label={ariaLabel}
83+
onEscapePress={onClose}
84+
appendTo={appendTo}
85+
disableFocusTrap={disableFocusTrap}
86+
>
87+
<AboutModalBox
88+
style={
89+
backgroundImageSrc ? ({ [backgroundImage.name]: `url(${backgroundImageSrc})` } as React.CSSProperties) : {}
90+
}
91+
className={css(className)}
92+
>
93+
<AboutModalBoxBrand src={brandImageSrc} alt={brandImageAlt} />
94+
<AboutModalBoxCloseButton aria-label={closeButtonAriaLabel} onClose={onClose} />
95+
{productName && <AboutModalBoxHeader id={ariaLabelledBy} productName={productName} />}
96+
<AboutModalBoxContent trademark={trademark} hasNoContentContainer={hasNoContentContainer} {...props}>
97+
{children}
98+
</AboutModalBoxContent>
99+
</AboutModalBox>
100+
</Modal>
105101
);
106102
};
107103
AboutModal.displayName = 'AboutModal';

0 commit comments

Comments
 (0)