Skip to content

Commit 0d5ec4f

Browse files
tlabajTitanipatternfly-buildmcokergitdallas
authored
Rebase postv5 (#9393)
* chore(deps): bump docs framework (#9370) * chore(docs): Updated screenshots (#9337) * chore(docs): Updated screenshots * updated screenshots after logo update --------- Co-authored-by: Titani <tlabaj@redaht.com> * chore(release): releasing packages [ci skip] - @patternfly/react-docs@6.0.0-prerelease.26 * chore(deps): bump to latest chore version (#9389) * chore(deps): bump to latest chore version * bump to 16 * chore(release): releasing packages [ci skip] - @patternfly/react-charts@7.0.0-prerelease.12 - @patternfly/react-code-editor@5.0.0-prerelease.24 - @patternfly/react-core@5.0.0-prerelease.24 - @patternfly/react-docs@6.0.0-prerelease.27 - @patternfly/react-icons@5.0.0-prerelease.9 - demo-app-ts@5.0.0-prerelease.22 - @patternfly/react-styles@5.0.0-prerelease.7 - @patternfly/react-table@5.0.0-prerelease.24 - @patternfly/react-tokens@5.0.0-prerelease.9 * fix(fileupload): use default readonly text input instead of plain (#9387) * fix(fileupload): use default readonly text input instead of plain * chore(build): snaps * fix(CodeEditor): prevent clicks in textarea from opening fileupload (#9385) * fix(toolbar): added chip container class to toolbar content (#9379) * feat(Menu): added support for tooltips to menu (#9382) * fix(whitespace): Update readme to trigger release * chore(release): releasing packages [ci skip] - @patternfly/react-code-editor@5.0.0-prerelease.25 - @patternfly/react-core@5.0.0-prerelease.25 - @patternfly/react-docs@6.0.0-prerelease.28 - demo-app-ts@5.0.0-prerelease.23 - @patternfly/react-table@5.0.0-prerelease.25 * fix(Toolbar): resolved typeerror on full page demo (#9355) * chore(TreeView): converted examples to TS (#9286) * fix(ExpandableSection): added ARIA attributes (#9303) * fix(ExpandableSection): added ARIA attributes * Updated failing snapshots due to mismatching generated ID * chore(Tooltip): updated unit tests (#9295) * chore(Tooltip): updated unit tests * Updated mock and tests * Updated based on Austin feedback * Updated integration tests * Removed unused imports * Updated remaining tests using Popper mock * Removed extraenous snapshot test * Removed test * Split out onTooltipHidden test * chore(Card): added tests for new clickable/selectable (#9262) * chore(Card): added tests for new clickable/selectable * Added tests for clickable cards * Updated card with actions test * fix(Slider): reverted taborder (#9293) * fix(chore): Fix deprecated wizard integration tests (#9312) * fix(chore): Fix deprecated wizard integration tests * updated non deprecated test as well --------- Co-authored-by: Titani <tlabaj@redaht.com> --------- Co-authored-by: Titani <tlabaj@redaht.com> Co-authored-by: patternfly-build <patternfly-build@redhat.com> Co-authored-by: Michael Coker <35148959+mcoker@users.noreply.github.com> Co-authored-by: Dallas <dallas.nicol@gmail.com> Co-authored-by: Dana Gutride <dgutride@gmail.com> Co-authored-by: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com>
1 parent 77369cd commit 0d5ec4f

File tree

100 files changed

+218
-91
lines changed

Some content is hidden

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

100 files changed

+218
-91
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This project provides a set of React components for the [PatternFly project](htt
1313
3. [Contribution guidelines](#Contribution-guidelines)
1414
4. [License](#License)
1515

16-
Using PatternFly 3? Take a look at the [PatternFly 3 React component information](https://github.com/patternfly/patternfly-react/blob/patternfly-3/README.md).
16+
Using PatternFly 3? Take a look at the [PatternFly 3 React component information](https://github.com/patternfly/patternfly-react/blob/patternfly-3/README.md).
1717

1818
### PatternFly React packages
1919

‎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+
# 7.0.0-prerelease.12 (2023-07-20)
7+
8+
**Note:** Version bump only for package @patternfly/react-charts
9+
610
# [7.0.0-prerelease.11](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-charts@7.0.0-prerelease.10...@patternfly/react-charts@7.0.0-prerelease.11) (2023-07-14)
711

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

‎packages/react-charts/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-charts",
3-
"version": "7.0.0-prerelease.11",
3+
"version": "7.0.0-prerelease.12",
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",
@@ -29,8 +29,8 @@
2929
},
3030
"homepage": "https://github.com/patternfly/patternfly-react#readme",
3131
"dependencies": {
32-
"@patternfly/react-styles": "^5.0.0-prerelease.6",
33-
"@patternfly/react-tokens": "^5.0.0-prerelease.8",
32+
"@patternfly/react-styles": "^5.0.0-prerelease.7",
33+
"@patternfly/react-tokens": "^5.0.0-prerelease.9",
3434
"hoist-non-react-statics": "^3.3.0",
3535
"lodash": "^4.17.19",
3636
"tslib": "^2.5.0",

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
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+
# [5.0.0-prerelease.25](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@5.0.0-prerelease.24...@patternfly/react-code-editor@5.0.0-prerelease.25) (2023-07-20)
7+
8+
### Bug Fixes
9+
10+
- **CodeEditor:** prevent clicks in textarea from opening fileupload ([#9385](https://github.com/patternfly/patternfly-react/issues/9385)) ([959bc7e](https://github.com/patternfly/patternfly-react/commit/959bc7ef2723bc3ef57db906ded7b1854b577eee))
11+
12+
# 5.0.0-prerelease.24 (2023-07-20)
13+
14+
**Note:** Version bump only for package @patternfly/react-code-editor
15+
616
# [5.0.0-prerelease.23](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-code-editor@5.0.0-prerelease.22...@patternfly/react-code-editor@5.0.0-prerelease.23) (2023-07-14)
717

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-code-editor",
3-
"version": "5.0.0-prerelease.23",
3+
"version": "5.0.0-prerelease.25",
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,9 +30,9 @@
3030
"clean": "rimraf dist"
3131
},
3232
"dependencies": {
33-
"@patternfly/react-core": "^5.0.0-prerelease.23",
34-
"@patternfly/react-icons": "^5.0.0-prerelease.8",
35-
"@patternfly/react-styles": "^5.0.0-prerelease.6",
33+
"@patternfly/react-core": "^5.0.0-prerelease.25",
34+
"@patternfly/react-icons": "^5.0.0-prerelease.9",
35+
"@patternfly/react-styles": "^5.0.0-prerelease.7",
3636
"react-dropzone": "14.2.3",
3737
"tslib": "^2.5.0"
3838
},

‎packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ export class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState
645645
{isUploadEnabled || providedEmptyState ? (
646646
<div
647647
{...getRootProps({
648-
onClick: (event) => event.preventDefault() // Prevents clicking TextArea from opening file dialog
648+
onClick: (event) => event.stopPropagation() // Prevents clicking TextArea from opening file dialog
649649
})}
650650
className={`pf-v5-c-file-upload ${isDragActive && 'pf-m-drag-hover'} ${isLoading && 'pf-m-loading'}`}
651651
>

‎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+
# [5.0.0-prerelease.25](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@5.0.0-prerelease.24...@patternfly/react-core@5.0.0-prerelease.25) (2023-07-20)
7+
8+
### Bug Fixes
9+
10+
- **fileupload:** use default readonly text input instead of plain ([#9387](https://github.com/patternfly/patternfly-react/issues/9387)) ([cc8f777](https://github.com/patternfly/patternfly-react/commit/cc8f777364e65dfc883e653d36931e885b56e804))
11+
- **toolbar:** added chip container class to toolbar content ([#9379](https://github.com/patternfly/patternfly-react/issues/9379)) ([df21278](https://github.com/patternfly/patternfly-react/commit/df2127881a00299e8bf73dab14dfc7482598a14b))
12+
13+
### Features
14+
15+
- **Menu:** added support for tooltips to menu ([#9382](https://github.com/patternfly/patternfly-react/issues/9382)) ([8579096](https://github.com/patternfly/patternfly-react/commit/8579096dbc4ff48217e5e3e71923a589f60cda7f))
16+
17+
# 5.0.0-prerelease.24 (2023-07-20)
18+
19+
**Note:** Version bump only for package @patternfly/react-core
20+
621
# [5.0.0-prerelease.23](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@5.0.0-prerelease.22...@patternfly/react-core@5.0.0-prerelease.23) (2023-07-14)
722

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

‎packages/react-core/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@patternfly/react-core",
3-
"version": "5.0.0-prerelease.23",
3+
"version": "5.0.0-prerelease.25",
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",
@@ -46,15 +46,15 @@
4646
"subpaths": "node ../../scripts/exportSubpaths.js --config subpaths.config.json"
4747
},
4848
"dependencies": {
49-
"@patternfly/react-icons": "^5.0.0-prerelease.8",
50-
"@patternfly/react-styles": "^5.0.0-prerelease.6",
51-
"@patternfly/react-tokens": "^5.0.0-prerelease.8",
49+
"@patternfly/react-icons": "^5.0.0-prerelease.9",
50+
"@patternfly/react-styles": "^5.0.0-prerelease.7",
51+
"@patternfly/react-tokens": "^5.0.0-prerelease.9",
5252
"focus-trap": "7.4.3",
5353
"react-dropzone": "^14.2.3",
5454
"tslib": "^2.5.0"
5555
},
5656
"devDependencies": {
57-
"@patternfly/patternfly": "5.0.0-prerelease.13",
57+
"@patternfly/patternfly": "5.0.0-prerelease.16",
5858
"@rollup/plugin-commonjs": "^25.0.0",
5959
"@rollup/plugin-node-resolve": "^15.0.2",
6060
"@rollup/plugin-replace": "^5.0.2",

‎packages/react-core/src/components/Dropdown/DropdownItem.tsx‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import { css } from '@patternfly/react-styles';
33
import { MenuItemProps, MenuItem } from '../Menu';
4+
import { TooltipProps } from '../Tooltip';
45
import { useOUIAProps, OUIAProps } from '../../helpers';
56

67
/**
@@ -17,6 +18,8 @@ export interface DropdownItemProps extends Omit<MenuItemProps, 'ref'>, OUIAProps
1718
description?: React.ReactNode;
1819
/** Render item as disabled option */
1920
isDisabled?: boolean;
21+
/** Render item as aria-disabled option */
22+
isAriaDisabled?: boolean;
2023
/** Identifies the component in the dropdown onSelect callback */
2124
value?: any;
2225
/** Callback for item click */
@@ -25,18 +28,22 @@ export interface DropdownItemProps extends Omit<MenuItemProps, 'ref'>, OUIAProps
2528
ouiaId?: number | string;
2629
/** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
2730
ouiaSafe?: boolean;
31+
/** Props for adding a tooltip to a menu item */
32+
tooltipProps?: TooltipProps;
2833
}
2934

3035
const DropdownItemBase: React.FunctionComponent<DropdownItemProps> = ({
3136
children,
3237
className,
3338
description,
3439
isDisabled,
40+
isAriaDisabled,
3541
value,
3642
onClick,
3743
ouiaId,
3844
ouiaSafe,
3945
innerRef,
46+
tooltipProps,
4047
...props
4148
}: DropdownItemProps) => {
4249
const ouiaProps = useOUIAProps(DropdownItem.displayName, ouiaId, ouiaSafe);
@@ -45,8 +52,10 @@ const DropdownItemBase: React.FunctionComponent<DropdownItemProps> = ({
4552
className={css(className)}
4653
description={description}
4754
isDisabled={isDisabled}
55+
isAriaDisabled={isAriaDisabled}
4856
itemId={value}
4957
onClick={onClick}
58+
tooltipProps={tooltipProps}
5059
ref={innerRef}
5160
{...ouiaProps}
5261
{...props}

‎packages/react-core/src/components/Dropdown/examples/Dropdown.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ propComponents:
1111
'DropdownList',
1212
'MenuToggle',
1313
'DropdownToggleProps',
14-
'DropdownPopperProps'
14+
'DropdownPopperProps',
15+
'TooltipProps'
1516
]
1617
---
1718

0 commit comments

Comments
 (0)