Rebase postv5

README.md

@@ -13,7 +13,7 @@ This project provides a set of React components for the [PatternFly project](htt
 3. [Contribution guidelines](#Contribution-guidelines)
 4. [License](#License)
 
-Using PatternFly 3?  Take a look at the [PatternFly 3 React component information](https://github.com/patternfly/patternfly-react/blob/patternfly-3/README.md).
+Using PatternFly 3? Take a look at the [PatternFly 3 React component information](https://github.com/patternfly/patternfly-react/blob/patternfly-3/README.md).
 
 ### PatternFly React packages
 

packages/react-charts/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 7.0.0-prerelease.12 (2023-07-20)
+
+**Note:** Version bump only for package @patternfly/react-charts
+
 # [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)
 
 **Note:** Version bump only for package @patternfly/react-charts

packages/react-charts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-charts",
-  "version": "7.0.0-prerelease.11",
+  "version": "7.0.0-prerelease.12",
   "description": "This library provides a set of React chart components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -29,8 +29,8 @@
   },
   "homepage": "https://github.com/patternfly/patternfly-react#readme",
   "dependencies": {
-    "@patternfly/react-styles": "^5.0.0-prerelease.6",
-    "@patternfly/react-tokens": "^5.0.0-prerelease.8",
+    "@patternfly/react-styles": "^5.0.0-prerelease.7",
+    "@patternfly/react-tokens": "^5.0.0-prerelease.9",
     "hoist-non-react-statics": "^3.3.0",
     "lodash": "^4.17.19",
     "tslib": "^2.5.0",

packages/react-code-editor/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
+
+### Bug Fixes
+
+- **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))
+
+# 5.0.0-prerelease.24 (2023-07-20)
+
+**Note:** Version bump only for package @patternfly/react-code-editor
+
 # [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)
 
 **Note:** Version bump only for package @patternfly/react-code-editor

packages/react-code-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-code-editor",
-  "version": "5.0.0-prerelease.23",
+  "version": "5.0.0-prerelease.25",
   "description": "This package provides a PatternFly wrapper for the Monaco code editor\n",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -30,9 +30,9 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@patternfly/react-core": "^5.0.0-prerelease.23",
-    "@patternfly/react-icons": "^5.0.0-prerelease.8",
-    "@patternfly/react-styles": "^5.0.0-prerelease.6",
+    "@patternfly/react-core": "^5.0.0-prerelease.25",
+    "@patternfly/react-icons": "^5.0.0-prerelease.9",
+    "@patternfly/react-styles": "^5.0.0-prerelease.7",
     "react-dropzone": "14.2.3",
     "tslib": "^2.5.0"
   },

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

@@ -645,7 +645,7 @@ export class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState
               {isUploadEnabled || providedEmptyState ? (
                 <div
                   {...getRootProps({
-                    onClick: (event) => event.preventDefault() // Prevents clicking TextArea from opening file dialog
+                    onClick: (event) => event.stopPropagation() // Prevents clicking TextArea from opening file dialog
                   })}
                   className={`pf-v5-c-file-upload ${isDragActive && 'pf-m-drag-hover'} ${isLoading && 'pf-m-loading'}`}
                 >

packages/react-core/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
+
+### Bug Fixes
+
+- **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))
+- **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))
+
+### Features
+
+- **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))
+
+# 5.0.0-prerelease.24 (2023-07-20)
+
+**Note:** Version bump only for package @patternfly/react-core
+
 # [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)
 
 **Note:** Version bump only for package @patternfly/react-core

packages/react-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "5.0.0-prerelease.23",
+  "version": "5.0.0-prerelease.25",
   "description": "This library provides a set of common React components for use with the PatternFly reference implementation.",
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
@@ -46,15 +46,15 @@
     "subpaths": "node ../../scripts/exportSubpaths.js --config subpaths.config.json"
   },
   "dependencies": {
-    "@patternfly/react-icons": "^5.0.0-prerelease.8",
-    "@patternfly/react-styles": "^5.0.0-prerelease.6",
-    "@patternfly/react-tokens": "^5.0.0-prerelease.8",
+    "@patternfly/react-icons": "^5.0.0-prerelease.9",
+    "@patternfly/react-styles": "^5.0.0-prerelease.7",
+    "@patternfly/react-tokens": "^5.0.0-prerelease.9",
     "focus-trap": "7.4.3",
     "react-dropzone": "^14.2.3",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@patternfly/patternfly": "5.0.0-prerelease.13",
+    "@patternfly/patternfly": "5.0.0-prerelease.16",
     "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "@rollup/plugin-replace": "^5.0.2",

packages/react-core/src/components/Card/__tests__/CardSelectableActions.test.tsx

@@ -0,0 +1,32 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { CardSelectableActions } from '../CardSelectableActions';
+
+test('Matches the snapshot', () => {
+  const { asFragment } = render(<CardSelectableActions>Test</CardSelectableActions>);
+  expect(asFragment()).toMatchSnapshot();
+});
+
+test('Renders without children', () => {
+  render(<CardSelectableActions data-testid="card-selectable-actions" />);
+
+  expect(screen.getByTestId('card-selectable-actions')).toBeVisible();
+});
+
+test('Renders children', () => {
+  render(<CardSelectableActions>Test</CardSelectableActions>);
+
+  expect(screen.getByText('Test')).toBeVisible();
+});
+
+test('Renders with class name pf-v5-c-card__selectable-actions', () => {
+  render(<CardSelectableActions>Test</CardSelectableActions>);
+
+  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-card__selectable-actions');
+});
+
+test('Renders with custom class names provided via prop', () => {
+  render(<CardSelectableActions className="test-class">Test</CardSelectableActions>);
+
+  expect(screen.getByText('Test')).toHaveClass('test-class');
+});

packages/react-core/src/components/Card/__tests__/__snapshots__/CardSelectableActions.test.tsx.snap

@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Matches the snapshot 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-v5-c-card__selectable-actions"
+  >
+    Test
+  </div>
+</DocumentFragment>
+`;

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { css } from '@patternfly/react-styles';
 import { MenuItemProps, MenuItem } from '../Menu';
+import { TooltipProps } from '../Tooltip';
 import { useOUIAProps, OUIAProps } from '../../helpers';
 
 /**
@@ -17,6 +18,8 @@ export interface DropdownItemProps extends Omit<MenuItemProps, 'ref'>, OUIAProps
   description?: React.ReactNode;
   /** Render item as disabled option */
   isDisabled?: boolean;
+  /** Render item as aria-disabled option */
+  isAriaDisabled?: boolean;
   /** Identifies the component in the dropdown onSelect callback */
   value?: any;
   /** Callback for item click */
@@ -25,18 +28,22 @@ export interface DropdownItemProps extends Omit<MenuItemProps, 'ref'>, OUIAProps
   ouiaId?: number | string;
   /** 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. */
   ouiaSafe?: boolean;
+  /** Props for adding a tooltip to a menu item */
+  tooltipProps?: TooltipProps;
 }
 
 const DropdownItemBase: React.FunctionComponent<DropdownItemProps> = ({
   children,
   className,
   description,
   isDisabled,
+  isAriaDisabled,
   value,
   onClick,
   ouiaId,
   ouiaSafe,
   innerRef,
+  tooltipProps,
   ...props
 }: DropdownItemProps) => {
   const ouiaProps = useOUIAProps(DropdownItem.displayName, ouiaId, ouiaSafe);
@@ -45,8 +52,10 @@ const DropdownItemBase: React.FunctionComponent<DropdownItemProps> = ({
       className={css(className)}
       description={description}
       isDisabled={isDisabled}
+      isAriaDisabled={isAriaDisabled}
       itemId={value}
       onClick={onClick}
+      tooltipProps={tooltipProps}
       ref={innerRef}
       {...ouiaProps}
       {...props}

packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx

@@ -22,7 +22,11 @@ test('renders dropdown', () => {
 });
 
 test('passes children', () => {
-  render(<Dropdown toggle={(toggleRef) => toggle(toggleRef)}>{dropdownChildren}</Dropdown>);
+  render(
+    <Dropdown isOpen toggle={(toggleRef) => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
 
   expect(screen.getByText('Dropdown children')).toBeVisible();
 });
@@ -112,7 +116,7 @@ test('passes zIndex to popper', () => {
 test('does not pass isOpen to popper by default', () => {
   render(<Dropdown toggle={(toggleRef) => toggle(toggleRef)}>{dropdownChildren}</Dropdown>);
 
-  expect(screen.getByText('isOpen: undefined')).toBeVisible();
+  expect(screen.getByText('isVisible: undefined')).toBeVisible();
 });
 
 test('passes isOpen to popper', () => {
@@ -122,7 +126,7 @@ test('passes isOpen to popper', () => {
     </Dropdown>
   );
 
-  expect(screen.getByText('isOpen: true')).toBeVisible();
+  expect(screen.getByText('isVisible: true')).toBeVisible();
 });
 
 /* no default tests for callback props
@@ -134,7 +138,7 @@ test('passes onSelect callback', async () => {
 
   const onSelect = jest.fn();
   render(
-    <Dropdown onSelect={onSelect} toggle={(toggleRef) => toggle(toggleRef)}>
+    <Dropdown isOpen onSelect={onSelect} toggle={(toggleRef) => toggle(toggleRef)}>
       {dropdownChildren}
     </Dropdown>
   );

packages/react-core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.test.tsx.snap

@@ -2,40 +2,62 @@
 
 exports[`match snapshot 1`] = `
 <DocumentFragment>
-  <div>
+  <div
+    data-testid="mock-wrapper"
+  >
     <div
-      class="customClass"
-      data-ouia-component-id="dropdown"
-      data-ouia-component-type="PF5/Dropdown"
-      data-ouia-safe="true"
-      data-testid="menu-mock"
+      data-testid="popper"
     >
-      <div>
+      <div
+        class="customClass"
+        data-ouia-component-id="dropdown"
+        data-ouia-component-type="PF5/Dropdown"
+        data-ouia-safe="true"
+        data-testid="menu-mock"
+      >
         <div>
-          Dropdown children
+          <div>
+            Dropdown children
+          </div>
         </div>
       </div>
+      <div>
+        Mock item
+      </div>
+      <p>
+        isPlain: true
+      </p>
+      <p>
+        isScrollable: true
+      </p>
+      <p>
+        minWidth: undefined
+      </p>
     </div>
-    <div>
-      Mock item
-    </div>
     <p>
-      isPlain: true
+      zIndex: 9999
+    </p>
+    <p>
+      isVisible: true
+    </p>
+    <p>
+      enableFlip: undefined
     </p>
     <p>
-      isScrollable: true
+      placement: undefined
+    </p>
+    <p>
+      appendTo: undefined
+    </p>
+    <p>
+      distance: undefined
+    </p>
+    <p>
+      flipBehavior: undefined
     </p>
     <p>
       minWidth: undefined
     </p>
-  </div>
-  <p>
-    zIndex: 9999
-  </p>
-  <p>
-    isOpen: true
-  </p>
-  <div>
     <button>
       Dropdown
     </button>

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

@@ -11,7 +11,8 @@ propComponents:
     'DropdownList',
     'MenuToggle',
     'DropdownToggleProps',
-    'DropdownPopperProps'
+    'DropdownPopperProps',
+    'TooltipProps'
   ]
 ---
 

packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx

@@ -46,11 +46,14 @@ export const DropdownBasic: React.FunctionComponent = () => {
         <DropdownItem value={3} isDisabled key="disabled link" to="#default-link4">
           Disabled Link
         </DropdownItem>
+        <DropdownItem value={4} isAriaDisabled key="aria-disabled link" to="#default-link5" tooltipProps={{content: "aria-disabled link", position: "top"}}>
+          Aria-disabled Link
+        </DropdownItem>
         <Divider component="li" key="separator" />
-        <DropdownItem value={4} key="separated action">
+        <DropdownItem value={5} key="separated action">
           Separated Action
         </DropdownItem>
-        <DropdownItem value={5} key="separated link" to="#default-link6" onClick={(ev) => ev.preventDefault()}>
+        <DropdownItem value={6} key="separated link" to="#default-link6" onClick={(ev) => ev.preventDefault()}>
           Separated Link
         </DropdownItem>
       </DropdownList>