@patternfly/react-core 5.2.0-prerelease.30 → 5.2.0-prerelease.31

package/helpers/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"5.2.0-prerelease.29","private":true}
+{"name":"@patternfly/react-core-helpers","main":"../dist/js/helpers/index.js","module":"../dist/esm/helpers/index.js","typings":"../dist/esm/helpers/index.d.ts","version":"5.2.0-prerelease.30","private":true}

package/layouts/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"5.2.0-prerelease.29","private":true}
+{"name":"@patternfly/react-core-layouts","main":"../dist/js/layouts/index.js","module":"../dist/esm/layouts/index.js","typings":"../dist/esm/layouts/index.d.ts","version":"5.2.0-prerelease.30","private":true}

package/next/package.json

@@ -1 +1 @@
-{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"5.2.0-prerelease.29","private":true}
+{"name":"@patternfly/react-core-next","main":"../dist/js/next/index.js","module":"../dist/esm/next/index.js","typings":"../dist/esm/next/index.d.ts","version":"5.2.0-prerelease.30","private":true}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/react-core",
-  "version": "5.2.0-prerelease.30",
+  "version": "5.2.0-prerelease.31",
   "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",
@@ -71,5 +71,5 @@
     "react": "^17 || ^18",
     "react-dom": "^17 || ^18"
   },
-  "gitHead": "e112034cf060e8917e5ba47079af4850a4f12d1a"
+  "gitHead": "3fa692ce5af87f73509c3131c53dd9669d504794"
 }

package/src/components/Toolbar/ToolbarToggleGroup.tsx

@@ -149,7 +149,7 @@ class ToolbarToggleGroup extends React.Component<ToolbarToggleGroupProps> {
                           aria-label="Show Filters"
                           {...(_isExpanded && { 'aria-expanded': true })}
                           aria-haspopup={_isExpanded && this.isContentPopup()}
-                          aria-controls={expandableContentId}
+                          aria-controls={_isExpanded ? expandableContentId : undefined}
                           ref={this.toggleRef}
                         >
                           {toggleIcon}

package/src/components/Toolbar/__tests__/__snapshots__/Toolbar.test.tsx.snap

@@ -69,7 +69,6 @@ exports[`Toolbar should render with custom chip content 1`] = `
             class="pf-v5-c-toolbar__toggle"
           >
             <button
-              aria-controls="toolbar-with-filter-expandable-content-3"
               aria-disabled="false"
               aria-haspopup="false"
               aria-label="Show Filters"

package/src/components/TreeView/TreeViewListItem.tsx

@@ -198,7 +198,7 @@ const TreeViewListItemBase: React.FunctionComponent<TreeViewListItemProps> = ({
     <li
       id={id}
       className={css(styles.treeViewListItem, internalIsExpanded && styles.modifiers.expanded)}
-      {...(internalIsExpanded && { 'aria-expanded': 'true' })}
+      aria-expanded={internalIsExpanded}
       role="treeitem"
       tabIndex={-1}
     >

package/src/components/TreeView/__tests__/TreeView.test.tsx

@@ -1,242 +1,316 @@
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { TreeView } from '../TreeView';
-import { Button } from '@patternfly/react-core';
-import FolderIcon from '@patternfly/react-icons/dist/esm/icons/folder-icon';
-import FolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
-import { TreeViewSearch } from '../TreeViewSearch';
-
-const options = [
-  {
-    name: 'ApplicationLauncher',
-    id: 'AppLaunch',
-    children: [
-      {
-        name: 'Application 1',
-        id: 'App1',
-        children: [
-          { name: 'Settings', id: 'App1Settings' },
-          { name: 'Current', id: 'App1Current' }
-        ]
-      },
-      {
-        name: 'Application 2',
-        id: 'App2',
-        children: [
-          { name: 'Settings', id: 'App2Settings' },
-          {
-            name: 'Loader',
-            id: 'App2Loader',
-            children: [
-              { name: 'Loading App 1', id: 'LoadApp1' },
-              { name: 'Loading App 2', id: 'LoadApp2' },
-              { name: 'Loading App 3', id: 'LoadApp3' }
-            ]
-          }
-        ]
-      }
-    ],
-    defaultExpanded: true
-  },
-  {
-    name: 'Cost Management',
-    id: 'Cost',
-    children: [
-      {
-        name: 'Application 3',
-        id: 'App3',
-        children: [
-          { name: 'Settings', id: 'App3Settings' },
-          { name: 'Current', id: 'App3Current' }
-        ]
-      }
-    ]
-  },
-  {
-    name: 'Sources',
-    id: 'Sources',
-    children: [{ name: 'Application 4', id: 'App4', children: [{ name: 'Settings', id: 'App4Settings' }] }]
-  },
-  {
-    name: 'Really really really long folder name that overflows the container it is in',
-    id: 'Long',
-    children: [{ name: 'Application 5', id: 'App5' }]
-  }
-];
-
-const flagOptions = [
-  {
-    name: 'ApplicationLauncher',
-    id: 'AppLaunch',
-    hasCheckbox: true,
-    icon: <FolderIcon />,
-    expandedIcon: <FolderOpenIcon />,
-    children: [
-      {
-        name: 'Application 1',
-        id: 'App1',
-        children: [
-          { name: 'Settings', id: 'App1Settings' },
-          { name: 'Current', id: 'App1Current' }
-        ]
-      },
-      {
-        name: 'Application 2',
-        id: 'App2',
-        hasBadge: true,
-        children: [
-          { name: 'Settings', id: 'App2Settings', hasCheckbox: true },
-          {
-            name: 'Loader',
-            id: 'App2Loader',
-            children: [
-              { name: 'Loading App 1', id: 'LoadApp1' },
-              { name: 'Loading App 2', id: 'LoadApp2' },
-              { name: 'Loading App 3', id: 'LoadApp3' }
-            ]
-          }
-        ]
-      }
-    ],
-    defaultExpanded: true
-  },
-  {
-    name: 'Cost Management',
-    id: 'Cost',
-    hasBadge: true,
-    action: (
-      <Button variant="plain" aria-label="Folder action">
-        <FolderIcon />
-      </Button>
-    ),
-    children: [
-      {
-        name: 'Application 3',
-        id: 'App3',
-        children: [
-          { name: 'Settings', id: 'App3Settings' },
-          { name: 'Current', id: 'App3Current' }
-        ]
-      }
-    ]
-  },
-  {
-    name: 'Sources',
-    id: 'Sources',
-    children: [{ name: 'Application 4', id: 'App4', children: [{ name: 'Settings', id: 'App4Settings' }] }]
-  },
-  {
-    name: 'Really really really long folder name that overflows the container it is in',
-    id: 'Long',
-    children: [{ name: 'Application 5', id: 'App5' }]
-  }
-];
-
-const active = [
-  {
-    name: 'Application 1',
-    id: 'App1',
-    children: [
-      { name: 'Settings', id: 'App1Settings' },
-      { name: 'Current', id: 'App1Current' }
-    ]
-  }
-];
-
-describe('tree view', () => {
-  test('renders basic successfully', () => {
-    const { asFragment } = render(<TreeView data={options} onSelect={jest.fn()} />);
-    expect(asFragment()).toMatchSnapshot();
-  });
 
-  test('calls onExpand and onCollapse appropriately', () => {
-    const onExpand = jest.fn();
-    const onCollapse = jest.fn();
-    render(<TreeView data={options} onSelect={jest.fn()} onExpand={onExpand} onCollapse={onCollapse} />);
-    expect(onExpand).not.toHaveBeenCalled();
-    expect(onCollapse).not.toHaveBeenCalled();
-    expect(screen.queryByText('Application 3')).toBeNull();
-    expect(screen.getByText('Cost Management')).toBeInTheDocument();
-    fireEvent(
-      screen.getByText('Cost Management'),
-      new MouseEvent('click', {
-        bubbles: true,
-        cancelable: true
-      })
-    );
-    expect(onExpand).toHaveBeenCalled();
-    expect(onCollapse).not.toHaveBeenCalled();
-    expect(screen.getByText('Application 3')).toBeInTheDocument();
-    fireEvent(
-      screen.getByText('Cost Management'),
-      new MouseEvent('click', {
-        bubbles: true,
-        cancelable: true
-      })
-    );
-    expect(onCollapse).toHaveBeenCalled();
-    expect(screen.queryByText('Application 3')).toBeNull();
-  });
+jest.mock('../TreeViewList', () => ({
+  TreeViewList: ({ children, isNested, toolbar }) => (
+    <div data-testid="TreeViewList-mock">
+      <p>{`TreeViewList isNested: ${isNested}`}</p>
+      <p>{`TreeViewList toolbar: ${toolbar}`}</p>
+      <div data-testid="TreeViewList-children">{children}</div>
+    </div>
+  )
+}));
+jest.mock('../TreeViewListItem', () => ({
+  TreeViewListItem: ({
+    action,
+    activeItems,
+    badgeProps,
+    checkProps,
+    children,
+    compareItems,
+    customBadgeContent,
+    defaultExpanded,
+    expandedIcon,
+    hasBadge,
+    hasCheckbox,
+    icon,
+    id,
+    isCompact,
+    isExpanded,
+    isSelectable,
+    itemData,
+    name,
+    onCheck,
+    onSelect,
+    onExpand,
+    onCollapse,
+    parentItem,
+    title,
+    useMemo
+  }) => (
+    <div data-testid="TreeViewListItem-mock">
+      <p>{`TreeViewListItem action: ${action}`}</p>
+      <div data-testid="TreeViewListItem-activeItems">{activeItems && activeItems[0].name}</div>
+      <p>{`TreeViewListItem badgeProps: ${badgeProps?.id}`}</p>
+      <p>{`TreeViewListItem checkProps: ${checkProps?.checked}`}</p>
+      <p>{`TreeViewListItem customBadgeContent: ${customBadgeContent}`}</p>
+      <p>{`TreeViewListItem defaultExpanded: ${defaultExpanded}`}</p>
+      <p>{`TreeViewListItem expandedIcon: ${expandedIcon}`}</p>
+      <p>{`TreeViewListItem hasBadge: ${hasBadge}`}</p>
+      <p>{`TreeViewListItem hasCheckbox: ${hasCheckbox}`}</p>
+      <p>{`TreeViewListItem icon: ${icon}`}</p>
+      <p>{`TreeViewListItem id: ${id}`}</p>
+      <p>{`TreeViewListItem isCompact: ${isCompact}`}</p>
+      <p>{`TreeViewListItem isExpanded: ${isExpanded}`}</p>
+      <p>{`TreeViewListItem isSelectable: ${isSelectable}`}</p>
+      <p>{`TreeViewListItem itemData: ${itemData.name}`}</p>
+      <p>{`TreeViewListItem name: ${name}`}</p>
+      <p>{`TreeViewListItem parentItem: ${parentItem?.name}`}</p>
+      <p>{`TreeViewListItem title: ${title}`}</p>
+      <p>{`TreeViewListItem useMemo: ${useMemo}`}</p>
+      <button onClick={compareItems}>compareItems clicker</button>
+      <button onClick={onCheck}>onCheck clicker</button>
+      <button onClick={onSelect}>onSelect clicker</button>
+      <button onClick={onExpand}>onExpand clicker</button>
+      <button onClick={onCollapse}>onCollapse clicker</button>
+      <div data-testid="TreeViewListItem-children">{children}</div>
+    </div>
+  )
+}));
+jest.mock('../TreeViewRoot', () => ({
+  TreeViewRoot: ({ children, hasCheckboxes, hasGuides, hasSelectableNodes, variant, className }) => (
+    <div data-testid="TreeViewRoot-mock">
+      <p>{`TreeViewRoot hasCheckboxes: ${hasCheckboxes}`}</p>
+      <p>{`TreeViewRoot hasGuides: ${hasGuides}`}</p>
+      <p>{`TreeViewRoot hasSelectableNodes: ${hasSelectableNodes}`}</p>
+      <p>{`TreeViewRoot variant: ${variant}`}</p>
+      <p>{`TreeViewRoot className: ${className}`}</p>
+      <div data-testid="TreeViewRoot-children">{children}</div>
+    </div>
+  )
+}));
 
-  test('renders active successfully', () => {
-    const { asFragment } = render(<TreeView data={options} activeItems={active} onSelect={jest.fn()} />);
-    expect(asFragment()).toMatchSnapshot();
-  });
+const basicData = {
+  name: 'Basic data name'
+};
 
-  test('renders search successfully', () => {
-    const { asFragment } = render(
-      <TreeViewSearch onSearch={jest.fn()} id="input-search" name="search-input" aria-label="Search input example" />
-    );
-    expect(asFragment()).toMatchSnapshot();
-  });
+test('Passes hasSelectableNodes to TreeViewRoot', () => {
+  render(<TreeView hasSelectableNodes data={[basicData]} />);
+
+  expect(screen.getByText('TreeViewRoot hasSelectableNodes: true')).toBeVisible();
+});
+test('Passes hasCheckboxes to TreeViewRoot', () => {
+  render(<TreeView hasCheckboxes data={[basicData]} />);
+
+  expect(screen.getByText('TreeViewRoot hasCheckboxes: true')).toBeVisible();
+});
+test('Passes hasGuides to TreeViewRoot', () => {
+  render(<TreeView hasGuides data={[basicData]} />);
+
+  expect(screen.getByText('TreeViewRoot hasGuides: true')).toBeVisible();
+});
+test('Passes variant to TreeViewRoot', () => {
+  render(<TreeView variant="compact" data={[basicData]} />);
+
+  expect(screen.getByText('TreeViewRoot variant: compact')).toBeVisible();
+});
+test('Passes className to TreeViewRoot', () => {
+  render(<TreeView className="test-class" data={[basicData]} />);
+
+  expect(screen.getByText('TreeViewRoot className: test-class')).toBeVisible();
+});
+test('Passes data as children TreeViewRoot', () => {
+  render(<TreeView data={[basicData]} />);
+
+  expect(screen.getByTestId('TreeViewRoot-children')).toContainHTML('TreeViewListItem name: Basic data name');
+});
+test('Does not render TreeViewRoot when parentItem is passed', () => {
+  render(<TreeView data={[basicData]} parentItem={{ name: 'Parent name' }} />);
+
+  expect(screen.queryByTestId('TreeViewRoot-mock')).not.toBeInTheDocument();
+});
+
+test('Passes isNested to TreeViewList', () => {
+  render(<TreeView isNested data={[basicData]} />);
+
+  expect(screen.getByText('TreeViewList isNested: true')).toBeVisible();
+});
+test('Passes toolbar to TreeViewList', () => {
+  render(<TreeView toolbar="Toolbar content" data={[basicData]} />);
+
+  expect(screen.getByText('TreeViewList toolbar: Toolbar content')).toBeVisible();
+});
+test('Passes data as children TreeViewList', () => {
+  render(<TreeView data={[basicData]} />);
 
-  test('renders toolbar successfully', () => {
-    const { asFragment } = render(
-      <TreeView data={options} activeItems={active} onSelect={jest.fn()} toolbar={<div>test</div>} />
-    );
-    expect(asFragment()).toMatchSnapshot();
+  expect(screen.getByTestId('TreeViewList-children')).toContainHTML('TreeViewListItem name: Basic data name');
+});
+
+test('Passes data action to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, action: 'Item action' }]} />);
+
+  expect(screen.getByText('TreeViewListItem action: Item action')).toBeVisible();
+});
+test('Passes activeItems to TreeViewListItem', () => {
+  render(<TreeView data={[basicData]} activeItems={[{ name: 'Active item name' }]} />);
+
+  expect(screen.getByTestId('TreeViewListItem-activeItems')).toHaveTextContent('Active item name');
+});
+test('Passes data badgeProps to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, badgeProps: { id: 'test-id' } }]} />);
+
+  expect(screen.getByText('TreeViewListItem badgeProps: test-id')).toBeVisible();
+});
+test('Passes data checkProps to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, checkProps: { checked: true } }]} />);
+
+  expect(screen.getByText('TreeViewListItem checkProps: true')).toBeVisible();
+});
+test('Passes data customBadgeContent to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, customBadgeContent: 'Custom badge' }]} />);
+
+  expect(screen.getByText('TreeViewListItem customBadgeContent: Custom badge')).toBeVisible();
+});
+test('Passes data defaultExpanded to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, defaultExpanded: true }]} />);
+
+  expect(screen.getByText('TreeViewListItem defaultExpanded: true')).toBeVisible();
+});
+test('Passes defaultAllExpanded to TreeViewListItem', () => {
+  render(<TreeView data={[basicData]} defaultAllExpanded />);
+
+  expect(screen.getByText('TreeViewListItem defaultExpanded: true')).toBeVisible();
+});
+test('Passes data expandedIcon to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, expandedIcon: 'Expanded icon' }]} />);
+
+  expect(screen.getByText('TreeViewListItem expandedIcon: Expanded icon')).toBeVisible();
+});
+test('Passes expandedIcon to TreeViewListItem', () => {
+  render(<TreeView data={[basicData]} expandedIcon="Expanded icon" />);
+
+  expect(screen.getByText('TreeViewListItem expandedIcon: Expanded icon')).toBeVisible();
+});
+test('Passes data hasBadge to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, hasBadge: true }]} />);
+
+  expect(screen.getByText('TreeViewListItem hasBadge: true')).toBeVisible();
+});
+test('Passes hasBadges to TreeViewListItem', () => {
+  render(<TreeView data={[basicData]} hasBadges={true} />);
+
+  expect(screen.getByText('TreeViewListItem hasBadge: true')).toBeVisible();
+});
+test('Passes data hasCheckbox to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, hasCheckbox: true }]} />);
+
+  expect(screen.getByText('TreeViewListItem hasCheckbox: true')).toBeVisible();
+});
+test('Passes hasCheckboxes to TreeViewListItem', () => {
+  render(<TreeView data={[basicData]} hasCheckboxes={true} />);
+
+  expect(screen.getByText('TreeViewListItem hasCheckbox: true')).toBeVisible();
+});
+test('Passes data icon to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, icon: 'Icon content' }]} />);
+
+  expect(screen.getByText('TreeViewListItem icon: Icon content')).toBeVisible();
+});
+test('Passes icon to TreeViewListItem', () => {
+  render(<TreeView data={[basicData]} icon="Icon content" />);
+
+  expect(screen.getByText('TreeViewListItem icon: Icon content')).toBeVisible();
+});
+test('Passes data id to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, id: 'test-id' }]} />);
+
+  expect(screen.getByText('TreeViewListItem id: test-id')).toBeVisible();
+});
+
+['default', 'compact', 'compactNoBackground'].forEach((variant) => {
+  test(`Passes isCompact to TreeViewListItem when variant=${variant}`, () => {
+    render(<TreeView data={[basicData]} variant={variant as 'default' | 'compact' | 'compactNoBackground'} />);
+
+    expect(screen.getByText(`TreeViewListItem isCompact: ${variant === 'default' ? 'false' : 'true'}`)).toBeVisible();
   });
+});
+
+test('Passes allExpanded to TreeViewListItem isExpanded prop', () => {
+  render(<TreeView data={[basicData]} allExpanded />);
+
+  expect(screen.getByText('TreeViewListItem isExpanded: true')).toBeVisible();
+});
+test('Passes hasSelectableNodes to TreeViewListItem isSelectable prop', () => {
+  render(<TreeView data={[basicData]} hasSelectableNodes />);
+
+  expect(screen.getByText('TreeViewListItem isSelectable: true')).toBeVisible();
+});
+test('Passes data to TreeViewListItem itemData prop', () => {
+  render(<TreeView data={[{ name: 'itemData name' }]} />);
+
+  expect(screen.getByText('TreeViewListItem itemData: itemData name')).toBeVisible();
+});
+test('Passes data.name to TreeViewListItem name prop', () => {
+  render(<TreeView data={[basicData]} />);
 
-  test('renders checkboxes successfully', () => {
-    const { asFragment } = render(<TreeView data={options} activeItems={active} onSelect={jest.fn()} hasCheckboxes />);
-    expect(asFragment()).toMatchSnapshot();
+  expect(screen.getByText('TreeViewListItem name: Basic data name')).toBeVisible();
+});
+test('Passes parentItem to TreeViewListItem', () => {
+  render(<TreeView data={[basicData]} parentItem={{ name: 'Parent name' }} />);
+
+  expect(screen.getByText('TreeViewListItem parentItem: Parent name')).toBeVisible();
+});
+test('Passes data.title to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, title: 'Basic data title' }]} />);
+
+  expect(screen.getByText('TreeViewListItem title: Basic data title')).toBeVisible();
+});
+test('Passes useMemo to TreeViewListItem', () => {
+  render(<TreeView data={[basicData]} useMemo={true} />);
+
+  expect(screen.getByText('TreeViewListItem useMemo: true')).toBeVisible();
+});
+test('Passes data.children to TreeViewListItem', () => {
+  render(<TreeView data={[{ ...basicData, children: [{ name: 'Child 1' }] }]} />);
+
+  expect(screen.getByText('TreeViewListItem name: Child 1')).toBeVisible();
+});
+
+describe('Passes callback props to TreeViewListItem', () => {
+  const user = userEvent.setup();
+  const callbackMock = jest.fn();
+
+  test('Passes compareItems', async () => {
+    render(<TreeView data={[basicData]} compareItems={callbackMock} />);
+
+    await user.click(screen.getByRole('button', { name: 'compareItems clicker' }));
+
+    expect(callbackMock).toHaveBeenCalledTimes(1);
   });
+  test('Passes onCheck', async () => {
+    render(<TreeView data={[basicData]} onCheck={callbackMock} />);
+
+    await user.click(screen.getByRole('button', { name: 'onCheck clicker' }));
 
-  test('renders icons successfully', () => {
-    const { asFragment } = render(
-      <TreeView
-        data={options}
-        activeItems={active}
-        onSelect={jest.fn()}
-        icon={<FolderIcon />}
-        expandedIcon={<FolderOpenIcon />}
-      />
-    );
-    expect(asFragment()).toMatchSnapshot();
+    expect(callbackMock).toHaveBeenCalledTimes(1);
   });
+  test('Passes onSelect', async () => {
+    render(<TreeView data={[basicData]} onSelect={callbackMock} />);
 
-  test('renders badges successfully', () => {
-    const { asFragment } = render(<TreeView data={options} activeItems={active} onSelect={jest.fn()} hasBadges />);
-    expect(asFragment()).toMatchSnapshot();
+    await user.click(screen.getByRole('button', { name: 'onSelect clicker' }));
+
+    expect(callbackMock).toHaveBeenCalledTimes(1);
   });
+  test('Passes onExpand', async () => {
+    render(<TreeView data={[basicData]} onExpand={callbackMock} />);
+
+    await user.click(screen.getByRole('button', { name: 'onExpand clicker' }));
 
-  test('renders individual flag options successfully', () => {
-    const { asFragment } = render(<TreeView data={flagOptions} activeItems={active} onSelect={jest.fn()} />);
-    expect(asFragment()).toMatchSnapshot();
+    expect(callbackMock).toHaveBeenCalledTimes(1);
   });
-});
+  test('Passes onCollapse', async () => {
+    render(<TreeView data={[basicData]} onCollapse={callbackMock} />);
 
-test('renders guides successfully', () => {
-  const { asFragment } = render(<TreeView data={options} onSelect={jest.fn()} hasGuides={true} />);
-  expect(asFragment()).toMatchSnapshot();
-});
+    await user.click(screen.getByRole('button', { name: 'onCollapse clicker' }));
 
-test('renders compact successfully', () => {
-  const { asFragment } = render(<TreeView data={options} onSelect={jest.fn()} variant="compact" />);
-  expect(asFragment()).toMatchSnapshot();
+    expect(callbackMock).toHaveBeenCalledTimes(1);
+  });
 });
 
-test('renders compact no background successfully', () => {
-  const { asFragment } = render(<TreeView data={options} onSelect={jest.fn()} variant="compactNoBackground" />);
+test('Matches snapshot', () => {
+  const { asFragment } = render(<TreeView data={[basicData]} />);
+
   expect(asFragment()).toMatchSnapshot();
 });

package/src/components/TreeView/__tests__/TreeViewList.test.tsx

@@ -0,0 +1,52 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { TreeViewList } from '../TreeViewList';
+import styles from '@patternfly/react-styles/css/components/TreeView/tree-view';
+
+test(`Renders with class ${styles.treeView}__list by default`, () => {
+  render(<TreeViewList>Content</TreeViewList>);
+
+  expect(screen.getByRole('tree')).toHaveClass(`${styles.treeView}__list`, { exact: true });
+});
+
+test(`Renders with role="tree" by default`, () => {
+  render(<TreeViewList>Content</TreeViewList>);
+
+  expect(screen.getByRole('tree')).toHaveTextContent('Content');
+});
+
+test(`Renders with role="group" when isNested is true`, () => {
+  render(<TreeViewList isNested>Content</TreeViewList>);
+
+  expect(screen.getByRole('group')).toHaveTextContent('Content');
+});
+
+test(`Spreads additional props`, () => {
+  render(<TreeViewList id="test-id">Content</TreeViewList>);
+
+  expect(screen.getByRole('tree')).toHaveAttribute('id', 'test-id');
+});
+
+test(`Renders toolbar content when toolbar prop is passed`, () => {
+  render(<TreeViewList toolbar="Toolbar content">Content</TreeViewList>);
+
+  expect(screen.getByText('Toolbar content')).toBeInTheDocument();
+});
+
+test(`Does not render toolbar content when toolbar prop is not passed`, () => {
+  render(<TreeViewList>Content</TreeViewList>);
+
+  expect(screen.queryByRole('separator')).not.toBeInTheDocument();
+});
+
+test('Matches snapshot by default', () => {
+  const { asFragment } = render(<TreeViewList>Content</TreeViewList>);
+
+  expect(asFragment()).toMatchSnapshot();
+});
+
+test('Matches snapshot when toolbar is passed', () => {
+  const { asFragment } = render(<TreeViewList toolbar={<div>Toolbar content</div>}>Content</TreeViewList>);
+
+  expect(asFragment()).toMatchSnapshot();
+});