Skip to content

Commit c758eaa

Browse files
fallmofallmo
authored
Merge branch 'patternfly:main' into main
2 parents 5f4c037 + d5053dd commit c758eaa

File tree

54 files changed

+610
-625
lines changed

Some content is hidden

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

54 files changed

+610
-625
lines changed

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
"@rollup/plugin-node-resolve": "^15.3.1",
3838
"@rollup/plugin-replace": "^5.0.7",
3939
"@rollup/plugin-terser": "^0.4.4",
40-
"@testing-library/dom": "^10.4.0",
41-
"@testing-library/jest-dom": "^6.6.3",
42-
"@testing-library/react": "^16.2.0",
40+
"@testing-library/dom": "^10.4.1",
41+
"@testing-library/jest-dom": "^6.9.1",
42+
"@testing-library/react": "^16.3.0",
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.23",
46+
"@types/react": "^18.3.27",
4747
"@types/react-dom": "^18.3.7",
4848
"babel-jest": "^29.7.0",
4949
"concurrently": "^9.1.2",
@@ -62,12 +62,12 @@
6262
"jest": "^29.7.0",
6363
"jest-environment-jsdom": "^29.7.0",
6464
"jest-transform-stub": "^2.0.0",
65-
"lerna": "^8.2.1",
65+
"lerna": "^8.2.4",
6666
"lint-staged": "^15.5.0",
6767
"mutation-observer": "^1.0.3",
68-
"plop": "^4.0.1",
68+
"plop": "^4.0.4",
6969
"prettier": "^3.5.3",
70-
"publint": "^0.3.9",
70+
"publint": "^0.3.16",
7171
"react": "^18.3.1",
7272
"react-dom": "^18.3.1",
7373
"rimraf": "^6.0.1",

‎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.22](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@6.5.0-prerelease.21...@patternfly/react-code-editor@6.5.0-prerelease.22) (2025-12-03)
7+
8+
**Note:** Version bump only for package @patternfly/react-code-editor
9+
10+
# [6.5.0-prerelease.21](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@6.5.0-prerelease.20...@patternfly/react-code-editor@6.5.0-prerelease.21) (2025-12-03)
11+
12+
**Note:** Version bump only for package @patternfly/react-code-editor
13+
14+
# [6.5.0-prerelease.20](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@6.5.0-prerelease.19...@patternfly/react-code-editor@6.5.0-prerelease.20) (2025-12-01)
15+
16+
**Note:** Version bump only for package @patternfly/react-code-editor
17+
618
# [6.5.0-prerelease.19](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@6.5.0-prerelease.18...@patternfly/react-code-editor@6.5.0-prerelease.19) (2025-11-21)
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.19",
3+
"version": "6.5.0-prerelease.22",
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-core/CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,21 @@
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.21](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.5.0-prerelease.20...@patternfly/react-core@6.5.0-prerelease.21) (2025-12-03)
7+
8+
**Note:** Version bump only for package @patternfly/react-core
9+
10+
# [6.5.0-prerelease.20](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.5.0-prerelease.19...@patternfly/react-core@6.5.0-prerelease.20) (2025-12-03)
11+
12+
**Note:** Version bump only for package @patternfly/react-core
13+
14+
# [6.5.0-prerelease.19](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.5.0-prerelease.18...@patternfly/react-core@6.5.0-prerelease.19) (2025-12-01)
15+
16+
### Features
17+
18+
- **Dropdown:** Add optional container with ouiaId ([#12022](https://github.com/patternfly/patternfly-react/issues/12022)) ([0811452](https://github.com/patternfly/patternfly-react/commit/0811452f2720872e19d08a3781d4399368745dc8))
19+
- **ExpandableSection:** Allow more control over toggle icon ([#12051](https://github.com/patternfly/patternfly-react/issues/12051)) ([07c2bbf](https://github.com/patternfly/patternfly-react/commit/07c2bbfb32491c8f69dfa4261c9e1edb9136d487))
20+
621
# [6.5.0-prerelease.18](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.5.0-prerelease.17...@patternfly/react-core@6.5.0-prerelease.18) (2025-11-21)
722

823
**Note:** Version bump only for package @patternfly/react-core

‎packages/react-core/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-core",
3-
"version": "6.5.0-prerelease.18",
3+
"version": "6.5.0-prerelease.21",
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",
@@ -49,7 +49,7 @@
4949
"@patternfly/react-icons": "workspace:^",
5050
"@patternfly/react-styles": "workspace:^",
5151
"@patternfly/react-tokens": "workspace:^",
52-
"focus-trap": "7.6.4",
52+
"focus-trap": "7.6.6",
5353
"react-dropzone": "^14.3.5",
5454
"tslib": "^2.8.1"
5555
},

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import compassBackgroundImageLight from '@patternfly/react-tokens/dist/esm/c_com
66
import compassBackgroundImageDark from '@patternfly/react-tokens/dist/esm/c_compass_BackgroundImage_dark';
77

88
export interface CompassProps extends React.HTMLProps<HTMLDivElement> {
9-
/** Additional classes added to the compass. */
9+
/** Additional classes added to the Compass. */
1010
className?: string;
1111
/** Content placed at the top of the layout */
1212
header?: React.ReactNode;
@@ -30,9 +30,9 @@ export interface CompassProps extends React.HTMLProps<HTMLDivElement> {
3030
drawerContent?: React.ReactNode;
3131
/** Additional props passed to the drawer */
3232
drawerProps?: DrawerProps;
33-
/** Light theme background image path of the compass */
33+
/** Light theme background image path of the Compass */
3434
backgroundSrcLight?: string;
35-
/** Dark theme background image path of the compass */
35+
/** Dark theme background image path of the Compass */
3636
backgroundSrcDark?: string;
3737
}
3838

@@ -95,7 +95,7 @@ export const Compass: React.FunctionComponent<CompassProps> = ({
9595

9696
if (hasDrawer) {
9797
return (
98-
<Drawer {...drawerProps}>
98+
<Drawer isPill {...drawerProps}>
9999
<DrawerContent panelContent={drawerContent}>
100100
<DrawerContentBody>{compassContent}</DrawerContentBody>
101101
</DrawerContent>

‎packages/react-core/src/components/Compass/CompassContent.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import styles from '@patternfly/react-styles/css/components/Compass/compass';
33
import { css } from '@patternfly/react-styles';
44

55
export interface CompassContentProps extends React.HTMLProps<HTMLDivElement> {
6-
/** Content of the main compass area. Typically one or more CompassPanel components. */
6+
/** Content of the main Compass area. Typically one or more CompassPanel components. */
77
children: React.ReactNode;
88
/** Additional classes added to the CompassContent */
99
className?: string;
@@ -30,7 +30,7 @@ export const CompassContent: React.FunctionComponent<CompassContentProps> = ({
3030

3131
if (hasDrawer) {
3232
return (
33-
<Drawer {...drawerProps}>
33+
<Drawer isPill {...drawerProps}>
3434
<DrawerContent panelContent={drawerContent}>{compassContent}</DrawerContent>
3535
</Drawer>
3636
);

‎packages/react-core/src/components/Compass/CompassMainHeader.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { CompassMainHeaderToolbar } from './CompassMainHeaderToolbar';
55
import styles from '@patternfly/react-styles/css/components/Compass/compass';
66
import { css } from '@patternfly/react-styles';
77

8-
/** The wrapper component for header content in the main compass area. When building out a custom implementation,
9-
* you should ensure any content within the main header is rendered inside a compass panel and main header content wrappers.
8+
/** The wrapper component for header content in the main Compass area. When building out a custom implementation,
9+
* you should ensure any content within the main header is rendered inside a Compass panel and main header content wrappers.
1010
*/
1111

1212
export interface CompassMainHeaderProps extends Omit<React.HTMLProps<HTMLDivElement>, 'title'> {
@@ -18,8 +18,8 @@ export interface CompassMainHeaderProps extends Omit<React.HTMLProps<HTMLDivElem
1818
title?: React.ReactNode;
1919
/** Styled toolbar. If title or toolbar is provided, the children will be ignored. */
2020
toolbar?: React.ReactNode;
21-
/** Additional props passed to the compass panel that wraps the main header content when using the title or toolbar props. When using the
22-
* children prop, you should pass your own compass panel.
21+
/** Additional props passed to the Compass panel that wraps the main header content when using the title or toolbar props. When using the
22+
* children prop, you should pass your own Compass panel.
2323
*/
2424
compassPanelProps?: Omit<CompassPanelProps, 'children'>;
2525
}

‎packages/react-core/src/components/Compass/CompassMainHeaderContent.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import styles from '@patternfly/react-styles/css/components/Compass/compass';
22
import { css } from '@patternfly/react-styles';
33

4-
/** A wrapper component to be passed as custom content for the compass main header. This should also be wrapped
5-
* in a compass panel component.
4+
/** A wrapper component to be passed as custom content for the Compass main header. This should also be wrapped
5+
* in a Compass panel component.
66
*/
77

88
export interface CompassMainHeaderContentProps extends React.HTMLProps<HTMLDivElement> {

‎packages/react-core/src/components/Compass/CompassMainHeaderTitle.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import styles from '@patternfly/react-styles/css/components/Compass/compass';
22
import { css } from '@patternfly/react-styles';
33

4-
/** A wrapper component for custom title content to be passed into a compass main header. This should also be wrapped
5-
* by a compass main header content component.
4+
/** A wrapper component for custom title content to be passed into a Compass main header. This should also be wrapped
5+
* by a Compass main header content component.
66
*/
77

88
export interface CompassMainHeaderTitleProps extends React.HTMLProps<HTMLDivElement> {

0 commit comments

Comments
 (0)