Skip to content

Commit f9f5295

Browse files
tlabajtlabaj
authored
Merge branch 'main' into renovate/patternfly-patternfly-4.x
2 parents 1046166 + 65f89d4 commit f9f5295

File tree

34 files changed

+1187
-434
lines changed

34 files changed

+1187
-434
lines changed

‎packages/react-catalog-view-extension/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
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+
## [4.12.52](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2021-08-20)
7+
8+
**Note:** Version bump only for package @patternfly/react-catalog-view-extension
9+
10+
11+
12+
13+
614
## [4.12.51](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2021-08-20)
715

816
**Note:** Version bump only for package @patternfly/react-catalog-view-extension

‎packages/react-catalog-view-extension/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-catalog-view-extension",
3-
"version": "4.12.51",
3+
"version": "4.12.52",
44
"description": "This library provides catalog view extensions for PatternFly 4 React.",
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",
@@ -36,7 +36,7 @@
3636
},
3737
"dependencies": {
3838
"@patternfly/patternfly": "4.132.2",
39-
"@patternfly/react-core": "^4.151.2",
39+
"@patternfly/react-core": "^4.152.0",
4040
"@patternfly/react-styles": "^4.11.12",
4141
"classnames": "^2.2.5"
4242
},

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

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
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+
## [4.3.38](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2021-08-20)
7+
8+
**Note:** Version bump only for package @patternfly/react-code-editor
9+
10+
11+
12+
13+
614
## [4.3.37](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2021-08-20)
715

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-code-editor",
3-
"version": "4.3.37",
3+
"version": "4.3.38",
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",
@@ -30,7 +30,7 @@
3030
"clean": "rimraf dist"
3131
},
3232
"dependencies": {
33-
"@patternfly/react-core": "^4.151.2",
33+
"@patternfly/react-core": "^4.152.0",
3434
"@patternfly/react-icons": "^4.11.12",
3535
"@patternfly/react-styles": "^4.11.12",
3636
"react-dropzone": "9.0.0",

‎packages/react-console/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
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+
## [4.11.20](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2021-08-20)
7+
8+
**Note:** Version bump only for package @patternfly/react-console
9+
10+
11+
12+
13+
614
## [4.11.19](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2021-08-20)
715

816
**Note:** Version bump only for package @patternfly/react-console

‎packages/react-console/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-console",
3-
"version": "4.11.19",
3+
"version": "4.11.20",
44
"description": "This package provides VncConsole, SerialConsole and DesktopViewer React components to be used alongside patternfly-react to access virtual machine or server consoles.",
55
"main": "dist/js/index.js",
66
"module": "dist/esm/index.js",
@@ -34,7 +34,7 @@
3434
"dependencies": {
3535
"@novnc/novnc": "^1.2.0",
3636
"@patternfly/patternfly": "4.132.2",
37-
"@patternfly/react-core": "^4.151.2",
37+
"@patternfly/react-core": "^4.152.0",
3838
"@spice-project/spice-html5": "^0.2.1",
3939
"@types/file-saver": "^2.0.1",
4040
"file-saver": "^1.3.8",

‎packages/react-core/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
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+
# [4.152.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2021-08-20)
7+
8+
9+
### Features
10+
11+
* **Menu:** add app-launcher mockup ([#6175](https://github.com/patternfly/patternfly-react/issues/6175)) ([9f2fdcc](https://github.com/patternfly/patternfly-react/commit/9f2fdcce55e087f39b7f5b3ce6f1f5939ac1e1c7))
12+
13+
14+
15+
16+
617
## [4.151.2](https://github.com/patternfly/patternfly-react/compare/@patternfly/[email protected]...@patternfly/[email protected]) (2021-08-20)
718

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

‎packages/react-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-core",
3-
"version": "4.151.2",
3+
"version": "4.152.0",
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/Menu/MenuItem.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export interface MenuItemProps extends Omit<React.HTMLProps<HTMLLIElement>, 'onC
3333
/** Callback for item click */
3434
onClick?: (event?: any) => void;
3535
/** Component used to render the menu item */
36-
component?: React.ReactNode;
36+
component?: React.ElementType<any> | React.ComponentType<any>;
3737
/** Render item as disabled option */
3838
isDisabled?: boolean;
3939
/** Render item with icon */
@@ -77,7 +77,7 @@ export const MenuItem: React.FunctionComponent<MenuItemProps> = ({
7777
direction,
7878
description = null as string,
7979
onClick = () => {},
80-
component,
80+
component = 'button',
8181
isDisabled = false,
8282
isExternalLink = false,
8383
isSelected = null,
@@ -102,7 +102,7 @@ export const MenuItem: React.FunctionComponent<MenuItemProps> = ({
102102
setFlyoutRef,
103103
disableHover
104104
} = React.useContext(MenuContext);
105-
const Component = component || to ? 'a' : 'button';
105+
const Component = (to ? 'a' : component) as any;
106106
const [flyoutTarget, setFlyoutTarget] = React.useState(null);
107107
const flyoutContext = React.useContext(FlyoutContext);
108108
const [flyoutXDirection, setFlyoutXDirection] = React.useState(flyoutContext.direction);

0 commit comments

Comments
 (0)