Merge branch 'v5' into v5

packages/react-code-editor/package.json

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

packages/react-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "5.0.0-alpha.5",
+  "version": "5.0.0-alpha.6",
   "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",

packages/react-core/src/components/Menu/__mocks__/Menu.tsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import { MenuProps } from '../Menu';
+
+export const Menu = ({ className, isPlain, isScrollable, style, onSelect, ...props }: MenuProps) => (
+  <>
+    <div className={className} data-testid="menu-mock" {...props}></div>
+    <div onClick={onSelect}>{'Mock item'}</div>
+    <p>{`isPlain: ${isPlain}`}</p>
+    <p>{`isScrollable: ${isScrollable}`}</p>
+    <p>{`minWidth: ${style?.['--pf-c-menu--MinWidth']}`}</p>
+  </>
+);

packages/react-core/src/components/Menu/__mocks__/MenuContent.tsx

@@ -0,0 +1,3 @@
+import React from 'react';
+
+export const MenuContent = ({ children }) => <div>{children}</div>;

packages/react-core/src/components/Menu/__mocks__/MenuGroup.tsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import { MenuGroupProps } from '../MenuGroup';
+
+export const MenuGroup = ({ className, children, label, labelHeadingLevel }: MenuGroupProps) => (
+  <>
+    <div className={className} data-testid="menu-group-mock">
+      {children}
+    </div>
+    <p>{`label: ${label}`}</p>
+    <p>{`labelHeadingLevel: ${labelHeadingLevel}`}</p>
+  </>
+);

packages/react-core/src/components/Menu/__mocks__/MenuItem.tsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import { MenuItemProps } from '../MenuItem';
+
+export const MenuItem = ({ className, children, description, itemId }: MenuItemProps) => (
+  <>
+    <div className={className} data-testid="menu-item-mock">
+      {children}
+    </div>
+    <p>{`description: ${description}`}</p>
+    <p>{`itemId: ${itemId}`}</p>
+  </>
+);

packages/react-core/src/components/Menu/__mocks__/MenuList.tsx

@@ -0,0 +1,10 @@
+import React from 'react';
+import { MenuListProps } from '../MenuList';
+
+export const MenuList = ({ className, children }: MenuListProps) => (
+  <>
+    <div className={className} data-testid="menu-list-mock">
+      {children}
+    </div>
+  </>
+);

packages/react-core/src/components/Menu/__mocks__/index.ts

@@ -0,0 +1,5 @@
+export * from './Menu';
+export * from './MenuContent';
+export * from './MenuGroup';
+export * from './MenuItem';
+export * from './MenuList';

packages/react-core/src/helpers/Popper/__mocks__/Popper.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { PopperProps } from '../Popper';
+
+export const Popper = ({ popper, zIndex, isVisible, trigger }: PopperProps) => (
+  <>
+    <div>{popper}</div>
+    <p>{`zIndex: ${zIndex}`}</p>
+    <p>{`isOpen: ${isVisible}`}</p>
+    <div>{trigger}</div>
+  </>
+);

packages/react-core/src/helpers/Popper/__mocks__/index.ts

@@ -0,0 +1 @@
+export * from './Popper';

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

@@ -0,0 +1,236 @@
+import React from 'react';
+import { Dropdown } from '../../Dropdown';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+jest.mock('../../../../components/Menu');
+
+jest.mock('../../../../helpers/Popper/Popper');
+
+const toggle = (ref: React.RefObject<any>) => <button ref={ref}>Dropdown</button>;
+
+const dropdownChildren = <div>Dropdown children</div>;
+
+test('renders dropdown', () => {
+  render(
+    <div data-testid="dropdown">
+      <Dropdown toggle={toggleRef => toggle(toggleRef)}>{dropdownChildren}</Dropdown>
+    </div>
+  );
+
+  expect(screen.getByTestId('dropdown').children[0]).toBeVisible();
+});
+
+test('passes children', () => {
+  render(<Dropdown toggle={toggleRef => toggle(toggleRef)}>{dropdownChildren}</Dropdown>);
+
+  expect(screen.getByText('Dropdown children')).toBeVisible();
+});
+
+test('renders passed toggle element', () => {
+  render(<Dropdown toggle={toggleRef => toggle(toggleRef)}>{dropdownChildren}</Dropdown>);
+
+  expect(screen.getByRole('button', { name: 'Dropdown' })).toBeVisible();
+});
+
+test('passes no class name by default', () => {
+  render(
+    <Dropdown isOpen={true} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByTestId('menu-mock')).not.toHaveClass();
+});
+
+test('passes custom class name', () => {
+  render(
+    <Dropdown className="custom-class" isOpen={true} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByTestId('menu-mock')).toHaveClass('custom-class');
+});
+
+test('does not pass isPlain to Menu by default', () => {
+  render(
+    <Dropdown isOpen={true} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByText('isPlain: undefined')).toBeVisible();
+});
+
+test('passes isPlain to Menu', () => {
+  render(
+    <Dropdown isPlain isOpen={true} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByText('isPlain: true')).toBeVisible();
+});
+
+test('does not pass isScrollable to Menu by default', () => {
+  render(
+    <Dropdown isOpen={true} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByText('isScrollable: undefined')).toBeVisible();
+});
+
+test('passes isScrollable to Menu', () => {
+  render(
+    <Dropdown isScrollable isOpen={true} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByText('isScrollable: true')).toBeVisible();
+});
+
+test('does not pass minWidth to Menu by default', () => {
+  render(
+    <Dropdown isOpen={true} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByText('minWidth: undefined')).toBeVisible();
+});
+
+test('passes minWidth to Menu', () => {
+  render(
+    <Dropdown minWidth="100px" isOpen={true} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByText('minWidth: 100px')).toBeVisible();
+});
+
+test('passes default zIndex to popper', () => {
+  render(<Dropdown toggle={toggleRef => toggle(toggleRef)}>{dropdownChildren}</Dropdown>);
+
+  expect(screen.getByText('zIndex: 9999')).toBeVisible();
+});
+
+test('passes zIndex to popper', () => {
+  render(
+    <Dropdown zIndex={100} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByText('zIndex: 100')).toBeVisible();
+});
+
+test('does not pass isOpen to popper by default', () => {
+  render(<Dropdown toggle={toggleRef => toggle(toggleRef)}>{dropdownChildren}</Dropdown>);
+
+  expect(screen.getByText('isOpen: undefined')).toBeVisible();
+});
+
+test('passes isOpen to popper', () => {
+  render(
+    <Dropdown isOpen toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(screen.getByText('isOpen: true')).toBeVisible();
+});
+
+/* no default tests for callback props
+since there is no way to test that the 
+function doesn`t get passed */
+
+test('passes onSelect callback', async () => {
+  const user = userEvent.setup();
+
+  const onSelect = jest.fn();
+  render(
+    <Dropdown onSelect={onSelect} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  const trigger = await screen.findByText('Mock item');
+  await user.click(trigger);
+
+  expect(onSelect).toBeCalledTimes(1);
+});
+
+test('onOpenChange is called when passed and user clicks outside of dropdown', async () => {
+  const user = userEvent.setup();
+  const onOpenChange = jest.fn();
+
+  render(
+    <Dropdown isOpen={true} onOpenChange={onOpenChange} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  const dropdown = screen.getByRole('button', { name: 'Dropdown' });
+  await user.click(dropdown);
+  await user.click(document.body);
+
+  expect(onOpenChange).toBeCalledTimes(1);
+});
+
+test('onOpenChange is called when passed and user presses tab key', async () => {
+  const user = userEvent.setup();
+  const onOpenChange = jest.fn();
+
+  render(
+    <Dropdown isOpen={true} onOpenChange={onOpenChange} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  //focus dropdown
+  const dropdown = screen.getByRole('button', { name: 'Dropdown' });
+  await user.click(dropdown);
+  await user.keyboard('{Tab}');
+
+  expect(onOpenChange).toBeCalledTimes(1);
+});
+
+test('onOpenChange is called when passed and user presses esc key', async () => {
+  const user = userEvent.setup();
+  const onOpenChange = jest.fn();
+
+  render(
+    <Dropdown isOpen={true} onOpenChange={onOpenChange} toggle={toggleRef => toggle(toggleRef)}>
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  //focus dropdown
+  const dropdown = screen.getByRole('button', { name: 'Dropdown' });
+  await user.click(dropdown);
+  await user.keyboard('{Escape}');
+
+  expect(onOpenChange).toBeCalledTimes(1);
+});
+
+test('match snapshot', () => {
+  const { asFragment } = render(
+    <Dropdown
+      ouiaId={'dropdown'}
+      isOpen
+      isScrollable
+      isPlain
+      className={'customClass'}
+      toggle={toggleRef => toggle(toggleRef)}
+    >
+      {dropdownChildren}
+    </Dropdown>
+  );
+
+  expect(asFragment()).toMatchSnapshot();
+});