diff --git a/packages/module/patternfly-docs/content/examples/UsingComposableTableComponents.tsx b/packages/module/patternfly-docs/content/examples/UsingComposableTableComponents.tsx
deleted file mode 100644
index 15933a9..0000000
--- a/packages/module/patternfly-docs/content/examples/UsingComposableTableComponents.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React from 'react';
-
-import { CellMeasurerCache, CellMeasurer } from 'react-virtualized';
-import { AutoSizer, VirtualTableBody } from '@patternfly/react-virtualized-extension';
-import { Table, Thead, Tr, Th, Td, Caption, TableGridBreakpoint } from '@patternfly/react-table';
-
-export const ComposableTableVirtualized = () => {
-  const rows = [];
-  for (let i = 0; i < 100; i++) {
-    rows.push([`one-${i}`, `two-${i}`, `three-${i}`, `four-${i}`, `five-${i}`]);
-  }
-  const [selected, setSelected] = React.useState(rows.map((_row) => false));
-  const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];
-
-  const onSelect = (event, isSelected, rowId) => {
-    setSelected(selected.map((sel, index) => (index === rowId ? isSelected : sel)));
-  };
-
-  const measurementCache = new CellMeasurerCache({
-    fixedWidth: true,
-    minHeight: 44,
-    keyMapper: (rowIndex) => rowIndex
-  });
-
-  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => (
-    <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>
-      <Tr style={style}>
-        <Td
-          key={`${rowIndex}_0`}
-          select={{
-            rowIndex,
-            onSelect,
-            isSelected: selected[rowIndex]
-          }}
-        />
-        {columns.map((col, index) => (
-          <Td key={`${rowIndex}-${index + 1}`}>{rows[rowIndex][index]}</Td>
-        ))}
-      </Tr>
-    </CellMeasurer>
-  );
-
-  return (
-    <div aria-label="Scrollable Table" className="pf-v5-c-scrollablegrid">
-      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length}>
-        <Caption>Virtualized table with composable table components</Caption>
-        <Thead>
-          <Tr>
-            <Th className="pf-v5-c-table__check" />
-            {columns.map((col, index) => (
-              <Th key={++index}>{col}</Th>
-            ))}
-          </Tr>
-        </Thead>
-      </Table>
-      <AutoSizer disableHeight>
-        {({ width }) => (
-          <VirtualTableBody
-            className="pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller"
-            deferredMeasurementCache={measurementCache}
-            rowHeight={measurementCache.rowHeight}
-            height={400}
-            overscanRowCount={2}
-            columnCount={1}
-            rows={rows}
-            rowCount={rows.length}
-            rowRenderer={rowRenderer}
-            width={width}
-            role="grid"
-          />
-        )}
-      </AutoSizer>
-    </div>
-  );
-};
diff --git a/packages/module/patternfly-docs/content/examples/UsingComposableTableComponentsDemo.tsx b/packages/module/patternfly-docs/content/examples/UsingComposableTableComponentsDemo.tsx
deleted file mode 100644
index ea411ea..0000000
--- a/packages/module/patternfly-docs/content/examples/UsingComposableTableComponentsDemo.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import React from 'react';
-import { CellMeasurerCache, CellMeasurer } from 'react-virtualized';
-import { AutoSizer, VirtualTableBody, WindowScroller } from '@patternfly/react-virtualized-extension';
-import { Table, Thead, Tr, Th, Td, Caption, TableGridBreakpoint } from '@patternfly/react-table';
-
-export const ComposableTableWindowScroller = () => {
-  const [scrollableElement, setScrollableElement] = React.useState();
-  React.useEffect(() => {
-    const scrollableElement = document.getElementById('content-scrollable-2');
-    setScrollableElement(scrollableElement);
-  });
-  const rows = [];
-  for (let i = 0; i < 100000; i++) {
-    const cells = [];
-    const num = Math.floor(Math.random() * Math.floor(2)) + 1;
-    for (let j = 0; j < 5; j++) {
-      const cellValue = i.toString() + ' Arma virumque cano Troiae qui primus ab oris. '.repeat(num);
-      cells.push(cellValue);
-    }
-    rows.push(cells);
-  }
-  const [selected, setSelected] = React.useState(rows.map((_row) => false));
-  const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];
-  const scrollToIndex = -1; // can be used to programmatically set current index
-
-  const onSelect = (event, isSelected, rowId) => {
-    setSelected(selected.map((sel, index) => (index === rowId ? isSelected : sel)));
-  };
-
-  const measurementCache = new CellMeasurerCache({
-    fixedWidth: true,
-    minHeight: 44,
-    keyMapper: (rowIndex) => rowIndex
-  });
-
-  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => {
-    const text = rows[rowIndex][0];
-
-    return (
-      <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>
-        <Tr style={style}>
-          <Td
-            key={`${rowIndex}_0`}
-            select={{
-              rowIndex,
-              onSelect,
-              isSelected: selected[rowIndex]
-            }}
-          />
-          {columns.map((col, index) => (
-            <Td key={`${rowIndex}-${++index}`}>{text}</Td>
-          ))}
-        </Tr>
-      </CellMeasurer>
-    );
-  };
-
-  const scrollableContainerStyle = {
-    height: 500 /* important note: the scrollable container should have some sort of fixed height, or it should be wrapped in container that is smaller than ReactVirtualized__VirtualGrid container and has overflow visible if using the Window Scroller. See WindowScroller.example.css */,
-    overflowX: 'auto',
-    overflowY: 'scroll',
-    scrollBehavior: 'smooth',
-    WebkitOverflowScrolling: 'touch',
-    position: 'relative'
-  };
-
-  return (
-    <div
-      id="content-scrollable-2"
-      aria-label="Scrollable Table"
-      className="pf-v5-c-scrollablegrid"
-      style={scrollableContainerStyle}
-    >
-      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length}>
-        <Caption>Virtualized table with composable table components</Caption>
-        <Thead>
-          <Tr>
-            <Th className="pf-v5-c-table__check" />
-            {columns.map((col, index) => (
-              <Th key={++index}>{col}</Th>
-            ))}
-          </Tr>
-        </Thead>
-      </Table>
-      <WindowScroller scrollElement={scrollableElement}>
-        {({ height, isScrolling, registerChild, onChildScroll, scrollTop }) => (
-          <AutoSizer disableHeight>
-            {({ width }) => (
-              <div ref={registerChild}>
-                <VirtualTableBody
-                  autoHeight
-                  className={'pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller'}
-                  deferredMeasurementCache={measurementCache}
-                  rowHeight={measurementCache.rowHeight}
-                  height={height || 0}
-                  isScrolling={isScrolling}
-                  isScrollingOptOut={true}
-                  onScroll={onChildScroll}
-                  overscanRowCount={2}
-                  columnCount={1}
-                  rows={rows}
-                  rowCount={rows.length}
-                  rowRenderer={rowRenderer}
-                  scrollToIndex={scrollToIndex}
-                  scrollTop={scrollTop}
-                  width={width}
-                  role="grid"
-                />
-              </div>
-            )}
-          </AutoSizer>
-        )}
-      </WindowScroller>
-    </div>
-  );
-};
diff --git a/packages/module/patternfly-docs/content/examples/VirtualizedTable.md b/packages/module/patternfly-docs/content/examples/VirtualizedTable.md
index 9f40ff3..92cecd2 100644
--- a/packages/module/patternfly-docs/content/examples/VirtualizedTable.md
+++ b/packages/module/patternfly-docs/content/examples/VirtualizedTable.md
@@ -32,11 +32,6 @@ import './VirtualGrid.example.css';
 ```js file="./Basic.tsx"
 ```
 
-### Using composable table components
-
-```js file="./UsingComposableTableComponents.tsx"
-```
-
 ### Sortable
 
 ```js file="./Sortable.tsx"
diff --git a/packages/module/patternfly-docs/content/examples/WindowScroller.md b/packages/module/patternfly-docs/content/examples/WindowScroller.md
index dbfed96..8e47f9b 100644
--- a/packages/module/patternfly-docs/content/examples/WindowScroller.md
+++ b/packages/module/patternfly-docs/content/examples/WindowScroller.md
@@ -22,10 +22,5 @@ import './WindowScroller.example.css';
 
 ### Window scroller
 
-```js file="./WindowScroller.tsx"
-```
-
-### Using composable table components
-
-```js file="UsingComposableTableComponentsDemo.tsx"
+```js file="WindowScroller.tsx"
 ```
diff --git a/packages/module/patternfly-docs/content/examples/WindowScroller.tsx b/packages/module/patternfly-docs/content/examples/WindowScroller.tsx
index 6383e39..e872ab3 100644
--- a/packages/module/patternfly-docs/content/examples/WindowScroller.tsx
+++ b/packages/module/patternfly-docs/content/examples/WindowScroller.tsx
@@ -1,170 +1,120 @@
 import React from 'react';
-import { debounce } from '@patternfly/react-core';
-import { TableGridBreakpoint } from '@patternfly/react-table';
-import { Table as TableDeprecated, TableHeader as TableHeaderDeprecated } from '@patternfly/react-table/deprecated';
 import { CellMeasurerCache, CellMeasurer } from 'react-virtualized';
 import { AutoSizer, VirtualTableBody, WindowScroller } from '@patternfly/react-virtualized-extension';
+import { Table, Thead, Tr, Th, Td, Caption, TableGridBreakpoint } from '@patternfly/react-table';
 
-export class WindowScrollerExample extends React.Component {
-  constructor(props) {
-    super(props);
-    const rows = [];
-    for (let i = 0; i < 100000; i++) {
-      const cells = [];
-      const num = Math.floor(Math.random() * Math.floor(2)) + 1;
-      for (let j = 0; j < 5; j++) {
-        const cellValue = i.toString() + ' Arma virumque cano Troiae qui primus ab oris. '.repeat(num);
-        cells.push(cellValue);
-      }
-      rows.push({
-        id: `window-scroller-row-${i}`,
-        cells
-      });
+export const WindowScrollerExample = () => {
+  const [scrollableElement, setScrollableElement] = React.useState<HTMLElement>();
+  React.useEffect(() => {
+    const scrollableElement = document.getElementById('content-scrollable-2') as HTMLElement;
+    setScrollableElement(scrollableElement);
+  }, []);
 
-      this._cellMeasurementCache = new CellMeasurerCache({
-        fixedWidth: true,
-        minHeight: 44,
-        keyMapper: (rowIndex) => rowIndex
-      });
-    }
-
-    this.state = {
-      scrollToIndex: -1, // can be used to programmatically set current index
-      scrollableElement: null,
-      columns: [
-        {
-          title: 'Repositories',
-          props: { className: 'pf-m-6-col-on-sm pf-m-4-col-on-md pf-m-3-col-on-lg pf-m-2-col-on-xl' }
-        },
-        {
-          title: 'Branches',
-          props: { className: 'pf-m-6-col-on-sm pf-m-4-col-on-md pf-m-3-col-on-lg pf-m-2-col-on-xl' }
-        },
-        {
-          title: 'Pull requests',
-          props: { className: 'pf-m-4-col-on-md pf-m-4-col-on-lg pf-m-3-col-on-xl pf-m-hidden pf-m-visible-on-md' }
-        },
-        {
-          title: 'Workspaces',
-          props: { className: 'pf-m-2-col-on-lg pf-m-2-col-on-xl pf-m-hidden pf-m-visible-on-lg' }
-        },
-        { title: 'Last Commit', props: { className: 'pf-m-3-col-on-xl pf-m-hidden pf-m-visible-on-xl' } }
-      ],
-      rows
-    };
+  // this StringArray type is just needed because something in our documentation framework crashes when it encounters
+  // a string[][] type
+  type StringArray = string[];
+  const rows: StringArray[] = [];
 
-    this._handleResize = debounce(this._handleResize.bind(this), 100);
-    this._bindBodyRef = this._bindBodyRef.bind(this);
+  for (let i = 0; i < 100000; i++) {
+    const cells: string[] = [];
+    const num = Math.floor(Math.random() * Math.floor(2)) + 1;
+    for (let j = 0; j < 5; j++) {
+      const cellValue = i.toString() + ' Arma virumque cano Troiae qui primus ab oris. '.repeat(num);
+      cells.push(cellValue);
+    }
+    rows.push(cells);
   }
 
-  componentDidMount() {
-    // re-render after resize
-    window.addEventListener('resize', this._handleResize);
+  const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];
+  const scrollToIndex = -1; // can be used to programmatically set current index
 
-    this.setState({ scrollableElement: document.getElementById('content-scrollable-1') });
-  }
+  const measurementCache = new CellMeasurerCache({
+    fixedWidth: true,
+    minHeight: 44,
+    keyMapper: (rowIndex) => rowIndex
+  });
 
-  componentWillUnmount() {
-    window.removeEventListener('resize', this._handleResize);
-  }
+  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => {
+    const text = rows[rowIndex][0];
 
-  _handleResize() {
-    this._cellMeasurementCache.clearAll();
-    this._bodyRef.recomputeVirtualGridSize();
-  }
+    return (
+      <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>
+        <Tr style={style}>
+          {columns.map((col, index) => (
+            <Td key={`${rowIndex}-${++index}`}>{text}</Td>
+          ))}
+        </Tr>
+      </CellMeasurer>
+    );
+  };
 
-  _bindBodyRef(ref) {
-    this._bodyRef = ref;
+  interface ScrollableContainerStyle {
+    height: number;
+    overflowX: 'auto';
+    overflowY: 'scroll';
+    scrollBehavior: 'smooth';
+    WebkitOverflowScrolling: 'touch';
+    position: 'relative';
   }
 
-  render() {
-    const { scrollToIndex, columns, rows, scrollableElement } = this.state;
-
-    const rowRenderer = ({ index, _isScrolling, key, style, parent }) => {
-      const { rows, columns } = this.state;
-      const text = rows[index].cells[0];
-
-      return (
-        <CellMeasurer cache={this._cellMeasurementCache} columnIndex={0} key={key} parent={parent} rowIndex={index}>
-          <tr style={style} role="row">
-            <td className={columns[0].props.className} role="gridcell">
-              {text}
-            </td>
-            <td className={columns[1].props.className} role="gridcell">
-              {text}
-            </td>
-            <td className={columns[2].props.className} role="gridcell">
-              {text}
-            </td>
-            <td className={columns[3].props.className} role="gridcell">
-              {text}
-            </td>
-            <td className={columns[4].props.className} role="gridcell">
-              {text}
-            </td>
-          </tr>
-        </CellMeasurer>
-      );
-    };
+  const scrollableContainerStyle: ScrollableContainerStyle = {
+    height: 500 /* important note: the scrollable container should have some sort of fixed height, or it should be wrapped in container that is smaller than ReactVirtualized__VirtualGrid container and has overflow visible if using the Window Scroller. See WindowScroller.example.css */,
+    overflowX: 'auto',
+    overflowY: 'scroll',
+    scrollBehavior: 'smooth',
+    WebkitOverflowScrolling: 'touch',
+    position: 'relative'
+  };
 
-    return (
-      <div
-        id="content-scrollable-1"
-        aria-label="Scrollable Table"
-        className="pf-v5-c-scrollablegrid"
-        style={{
-          height: 500 /* important note: the scrollable container should have some sort of fixed height, or it should be wrapped in container that is smaller than ReactVirtualized__VirtualGrid container and has overflow visible if using the Window Scroller. See WindowScroller.example.css */,
-          overflowX: 'auto',
-          overflowY: 'scroll',
-          scrollBehavior: 'smooth',
-          WebkitOverflowScrolling: 'touch',
-          position: 'relative'
-        }}
-      >
-        <div style={{ padding: 15 }}>
-          <TableDeprecated
-            caption="WindowScoller allows scrolling of a parent container or the window instead of tbody. It also can be used to dynamically size the table to the size of the scroll element."
-            cells={columns}
-            rows={rows}
-            gridBreakPoint={TableGridBreakpoint.none}
-            aria-rowcount={rows.length}
-          >
-            <TableHeaderDeprecated />
-          </TableDeprecated>
-          {scrollableElement && (
-            <WindowScroller scrollElement={scrollableElement}>
-              {({ height, isScrolling, registerChild, onChildScroll, scrollTop }) => (
-                <AutoSizer disableHeight>
-                  {({ width }) => (
-                    <div ref={registerChild}>
-                      <VirtualTableBody
-                        ref={this._bindBodyRef}
-                        autoHeight
-                        className={'pf-v5-c-virtualized pf-v5-c-window-scroller'}
-                        deferredMeasurementCache={this._cellMeasurementCache}
-                        rowHeight={this._cellMeasurementCache.rowHeight}
-                        height={height || 0}
-                        isScrolling={isScrolling}
-                        isScrollingOptOut={true}
-                        onScroll={onChildScroll}
-                        overscanRowCount={2}
-                        columnCount={1}
-                        rows={rows}
-                        rowCount={rows.length}
-                        rowRenderer={rowRenderer}
-                        scrollToIndex={scrollToIndex}
-                        scrollTop={scrollTop}
-                        width={width}
-                        role="grid"
-                      />
-                    </div>
-                  )}
-                </AutoSizer>
-              )}
-            </WindowScroller>
-          )}
-        </div>
-      </div>
-    );
-  }
-}
+  return (
+    <div
+      id="content-scrollable-2"
+      aria-label="Scrollable Table"
+      className="pf-v5-c-scrollablegrid"
+      style={scrollableContainerStyle}
+    >
+      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length}>
+        <Caption>
+          WindowScroller allows scrolling of a parent container or the window instead of tbody. It also can be used to
+          dynamically size the table to the size of the scroll element.
+        </Caption>
+        <Thead>
+          <Tr>
+            {columns.map((col, index) => (
+              <Th key={++index}>{col}</Th>
+            ))}
+          </Tr>
+        </Thead>
+      </Table>
+      <WindowScroller scrollElement={scrollableElement}>
+        {({ height, isScrolling, registerChild, onChildScroll, scrollTop }) => (
+          <AutoSizer disableHeight>
+            {({ width }) => (
+              <div ref={registerChild as (element: HTMLDivElement | null) => void}>
+                <VirtualTableBody
+                  autoHeight
+                  className={'pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller'}
+                  deferredMeasurementCache={measurementCache}
+                  rowHeight={measurementCache.rowHeight}
+                  height={height || 0}
+                  isScrolling={isScrolling}
+                  isScrollingOptOut={true}
+                  onScroll={onChildScroll}
+                  overscanRowCount={2}
+                  columnCount={1}
+                  rows={rows}
+                  rowCount={rows.length}
+                  rowRenderer={rowRenderer}
+                  scrollToIndex={scrollToIndex}
+                  scrollTop={scrollTop}
+                  width={width}
+                  role="grid"
+                />
+              </div>
+            )}
+          </AutoSizer>
+        )}
+      </WindowScroller>
+    </div>
+  );
+};
diff --git a/packages/module/patternfly-docs/generated/extensions/virtual-scroll-table/react.js b/packages/module/patternfly-docs/generated/extensions/virtual-scroll-table/react.js
index 52a2924..56f4def 100644
--- a/packages/module/patternfly-docs/generated/extensions/virtual-scroll-table/react.js
+++ b/packages/module/patternfly-docs/generated/extensions/virtual-scroll-table/react.js
@@ -175,7 +175,6 @@ const pageData = {
   ],
   "examples": [
     "Basic",
-    "Using composable table components",
     "Sortable",
     "Selectable",
     "Actions",
@@ -207,17 +206,11 @@ pageData.liveContext = {
   SelectOptionDeprecated,
   SelectVariantDeprecated
 };
-pageData.relativeImports = {
-  
-};
+pageData.relativeImports = "import 'content/examples/./VirtualGrid.example.css';"
 pageData.examples = {
   'Basic': props => 
     <Example {...pageData} {...props} {...{"code":"import React from 'react';\nimport { Caption, Table, TableGridBreakpoint, Td, Th, Thead, Tr } from '@patternfly/react-table';\nimport { CellMeasurerCache, CellMeasurer } from 'react-virtualized';\nimport { AutoSizer, VirtualTableBody } from '@patternfly/react-virtualized-extension';\n\nexport const VirtualizedExample: React.FunctionComponent = () => {\n  // this StringArray type is just needed because something in our documentation framework crashes when it encounters\n  // a string[][] type\n  type StringArray = string[];\n  const rows: StringArray[] = [];\n  for (let i = 0; i < 100; i++) {\n    rows.push([`one-${i}`, `two-${i}`, `three-${i}`, `four-${i}`, `five-${i}`]);\n  }\n\n  const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];\n\n  const measurementCache = new CellMeasurerCache({\n    fixedWidth: true,\n    minHeight: 44,\n    keyMapper: (rowIndex) => rowIndex\n  });\n\n  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => (\n    <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>\n      <Tr style={style}>\n        {columns.map((col, index) => (\n          <Td key={`${rowIndex}-${index + 1}`}>{rows[rowIndex][index]}</Td>\n        ))}\n      </Tr>\n    </CellMeasurer>\n  );\n\n  return (\n    <div aria-label=\"Scrollable Table\" className=\"pf-v5-c-scrollablegrid\">\n      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length}>\n        <Caption>Simple Table</Caption>\n        <Thead>\n          <Tr>\n            {columns.map((col, index) => (\n              <Th key={++index}>{col}</Th>\n            ))}\n          </Tr>\n        </Thead>\n      </Table>\n      <AutoSizer disableHeight>\n        {({ width }) => (\n          <VirtualTableBody\n            className=\"pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller\"\n            deferredMeasurementCache={measurementCache}\n            rowHeight={measurementCache.rowHeight}\n            height={400}\n            overscanRowCount={2}\n            columnCount={1}\n            rows={rows}\n            rowCount={rows.length}\n            rowRenderer={rowRenderer}\n            width={width}\n            role=\"grid\"\n          />\n        )}\n      </AutoSizer>\n    </div>\n  );\n};\n","title":"Basic","lang":"js"}}>
       
-    </Example>,
-  'Using composable table components': props => 
-    <Example {...pageData} {...props} {...{"code":"import React from 'react';\n\nimport { CellMeasurerCache, CellMeasurer } from 'react-virtualized';\nimport { AutoSizer, VirtualTableBody } from '@patternfly/react-virtualized-extension';\nimport { Table, Thead, Tr, Th, Td, Caption, TableGridBreakpoint } from '@patternfly/react-table';\n\nexport const ComposableTableVirtualized = () => {\n  const rows = [];\n  for (let i = 0; i < 100; i++) {\n    rows.push([`one-${i}`, `two-${i}`, `three-${i}`, `four-${i}`, `five-${i}`]);\n  }\n  const [selected, setSelected] = React.useState(rows.map((_row) => false));\n  const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];\n\n  const onSelect = (event, isSelected, rowId) => {\n    setSelected(selected.map((sel, index) => (index === rowId ? isSelected : sel)));\n  };\n\n  const measurementCache = new CellMeasurerCache({\n    fixedWidth: true,\n    minHeight: 44,\n    keyMapper: (rowIndex) => rowIndex\n  });\n\n  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => (\n    <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>\n      <Tr style={style}>\n        <Td\n          key={`${rowIndex}_0`}\n          select={{\n            rowIndex,\n            onSelect,\n            isSelected: selected[rowIndex]\n          }}\n        />\n        {columns.map((col, index) => (\n          <Td key={`${rowIndex}-${index + 1}`}>{rows[rowIndex][index]}</Td>\n        ))}\n      </Tr>\n    </CellMeasurer>\n  );\n\n  return (\n    <div aria-label=\"Scrollable Table\" className=\"pf-v5-c-scrollablegrid\">\n      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length}>\n        <Caption>Virtualized table with composable table components</Caption>\n        <Thead>\n          <Tr>\n            <Th className=\"pf-v5-c-table__check\" />\n            {columns.map((col, index) => (\n              <Th key={++index}>{col}</Th>\n            ))}\n          </Tr>\n        </Thead>\n      </Table>\n      <AutoSizer disableHeight>\n        {({ width }) => (\n          <VirtualTableBody\n            className=\"pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller\"\n            deferredMeasurementCache={measurementCache}\n            rowHeight={measurementCache.rowHeight}\n            height={400}\n            overscanRowCount={2}\n            columnCount={1}\n            rows={rows}\n            rowCount={rows.length}\n            rowRenderer={rowRenderer}\n            width={width}\n            role=\"grid\"\n          />\n        )}\n      </AutoSizer>\n    </div>\n  );\n};\n","title":"Using composable table components","lang":"js"}}>
-      
     </Example>,
   'Sortable': props => 
     <Example {...pageData} {...props} {...{"code":"import React from 'react';\nimport { Caption, Table, Td, Th, Thead, ThProps, Tr } from '@patternfly/react-table';\nimport { CellMeasurerCache, CellMeasurer } from 'react-virtualized';\nimport { AutoSizer, VirtualTableBody } from '@patternfly/react-virtualized-extension';\n\nexport const SortableExample: React.FunctionComponent = () => {\n  const rows: { id: string; cells: string[] }[] = [];\n  for (let i = 0; i < 100; i++) {\n    rows.push({\n      id: `sortable-row-${i}`,\n      cells: [`one-${i}`, `two-${i}`, `three-${i}`, `four-${i}`, `five-${i}`]\n    });\n  }\n\n  const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];\n\n  const [activeSortIndex, setActiveSortIndex] = React.useState<number>(-1);\n\n  // Sort direction of the currently sorted column\n  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | undefined>();\n\n  const getRowIndex = (str: string) => Number(str?.split('-')[1]);\n\n  const getSortParams = (columnIndex: number): ThProps['sort'] => ({\n    sortBy: {\n      index: activeSortIndex,\n      direction: activeSortDirection\n    },\n    onSort: (_event, index, direction) => {\n      setActiveSortIndex(index);\n      setActiveSortDirection(direction as 'desc' | 'asc');\n    },\n    columnIndex\n  });\n\n  if (activeSortIndex !== null) {\n    rows.sort((a, b) => {\n      const aValue = a.cells[activeSortIndex];\n      const bValue = b.cells[activeSortIndex];\n\n      const aValueIndex = getRowIndex(aValue);\n      const bValueIndex = getRowIndex(bValue);\n\n      if (activeSortDirection === 'asc') {\n        return aValueIndex - bValueIndex;\n      }\n\n      return bValueIndex - aValueIndex;\n    });\n  }\n\n  const measurementCache = new CellMeasurerCache({\n    fixedWidth: true,\n    minHeight: 44,\n    keyMapper: (rowIndex) => rowIndex\n  });\n\n  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => (\n    <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>\n      <Tr style={style}>\n        {columns.map((col, index) => (\n          <Td key={`${rowIndex}-${index + 1}`}>{rows[rowIndex].cells[index]}</Td>\n        ))}\n      </Tr>\n    </CellMeasurer>\n  );\n  return (\n    <div aria-label=\"Scrollable Table\" className=\"pf-v5-c-scrollablegrid\">\n      <Table aria-label=\"Sortable table\" ouiaId=\"SortableTable\">\n        <Caption>Sortable Virtualized Table</Caption>\n        <Thead>\n          <Tr>\n            <Th sort={getSortParams(0)}>{columns[0]}</Th>\n            <Th>{columns[1]}</Th>\n            <Th sort={getSortParams(2)}>{columns[2]}</Th>\n            <Th>{columns[3]}</Th>\n            <Th>{columns[4]}</Th>\n          </Tr>\n        </Thead>\n      </Table>\n      <AutoSizer disableHeight>\n        {({ width }) => (\n          <VirtualTableBody\n            ref={(ref) => ref}\n            className=\"pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller\"\n            deferredMeasurementCache={measurementCache}\n            rowHeight={measurementCache.rowHeight}\n            height={400}\n            overscanRowCount={2}\n            columnCount={1}\n            rows={rows}\n            rowCount={rows.length}\n            rowRenderer={rowRenderer}\n            width={width}\n            role=\"grid\"\n          />\n        )}\n      </AutoSizer>\n    </div>\n  );\n};\n","title":"Sortable","lang":"js"}}>
@@ -252,7 +245,6 @@ const Component = () => (
       {`Examples`}
     </AutoLinkHeader>
     {React.createElement(pageData.examples["Basic"])}
-    {React.createElement(pageData.examples["Using composable table components"])}
     {React.createElement(pageData.examples["Sortable"])}
     {React.createElement(pageData.examples["Selectable"])}
     {React.createElement(pageData.examples["Actions"])}
diff --git a/packages/module/patternfly-docs/generated/extensions/virtual-scroll-window-scroller/react.js b/packages/module/patternfly-docs/generated/extensions/virtual-scroll-window-scroller/react.js
index 24607e3..f731118 100644
--- a/packages/module/patternfly-docs/generated/extensions/virtual-scroll-window-scroller/react.js
+++ b/packages/module/patternfly-docs/generated/extensions/virtual-scroll-window-scroller/react.js
@@ -163,8 +163,7 @@ const pageData = {
     }
   ],
   "examples": [
-    "Window scroller",
-    "Using composable table components"
+    "Window scroller"
   ]
 };
 pageData.liveContext = {
@@ -176,16 +175,10 @@ pageData.liveContext = {
   TableDeprecated,
   TableHeaderDeprecated
 };
-pageData.relativeImports = {
-  
-};
+pageData.relativeImports = "import 'content/examples/./VirtualGrid.example.css';,import 'content/examples/./WindowScroller.example.css';"
 pageData.examples = {
   'Window scroller': props => 
-    <Example {...pageData} {...props} {...{"code":"import React from 'react';\nimport { debounce } from '@patternfly/react-core';\nimport { TableGridBreakpoint } from '@patternfly/react-table';\nimport { Table as TableDeprecated, TableHeader as TableHeaderDeprecated } from '@patternfly/react-table/deprecated';\nimport { CellMeasurerCache, CellMeasurer } from 'react-virtualized';\nimport { AutoSizer, VirtualTableBody, WindowScroller } from '@patternfly/react-virtualized-extension';\n\nexport class WindowScrollerExample extends React.Component {\n  constructor(props) {\n    super(props);\n    const rows = [];\n    for (let i = 0; i < 100000; i++) {\n      const cells = [];\n      const num = Math.floor(Math.random() * Math.floor(2)) + 1;\n      for (let j = 0; j < 5; j++) {\n        const cellValue = i.toString() + ' Arma virumque cano Troiae qui primus ab oris. '.repeat(num);\n        cells.push(cellValue);\n      }\n      rows.push({\n        id: `window-scroller-row-${i}`,\n        cells\n      });\n\n      this._cellMeasurementCache = new CellMeasurerCache({\n        fixedWidth: true,\n        minHeight: 44,\n        keyMapper: (rowIndex) => rowIndex\n      });\n    }\n\n    this.state = {\n      scrollToIndex: -1, // can be used to programmatically set current index\n      scrollableElement: null,\n      columns: [\n        {\n          title: 'Repositories',\n          props: { className: 'pf-m-6-col-on-sm pf-m-4-col-on-md pf-m-3-col-on-lg pf-m-2-col-on-xl' }\n        },\n        {\n          title: 'Branches',\n          props: { className: 'pf-m-6-col-on-sm pf-m-4-col-on-md pf-m-3-col-on-lg pf-m-2-col-on-xl' }\n        },\n        {\n          title: 'Pull requests',\n          props: { className: 'pf-m-4-col-on-md pf-m-4-col-on-lg pf-m-3-col-on-xl pf-m-hidden pf-m-visible-on-md' }\n        },\n        {\n          title: 'Workspaces',\n          props: { className: 'pf-m-2-col-on-lg pf-m-2-col-on-xl pf-m-hidden pf-m-visible-on-lg' }\n        },\n        { title: 'Last Commit', props: { className: 'pf-m-3-col-on-xl pf-m-hidden pf-m-visible-on-xl' } }\n      ],\n      rows\n    };\n\n    this._handleResize = debounce(this._handleResize.bind(this), 100);\n    this._bindBodyRef = this._bindBodyRef.bind(this);\n  }\n\n  componentDidMount() {\n    // re-render after resize\n    window.addEventListener('resize', this._handleResize);\n\n    this.setState({ scrollableElement: document.getElementById('content-scrollable-1') });\n  }\n\n  componentWillUnmount() {\n    window.removeEventListener('resize', this._handleResize);\n  }\n\n  _handleResize() {\n    this._cellMeasurementCache.clearAll();\n    this._bodyRef.recomputeVirtualGridSize();\n  }\n\n  _bindBodyRef(ref) {\n    this._bodyRef = ref;\n  }\n\n  render() {\n    const { scrollToIndex, columns, rows, scrollableElement } = this.state;\n\n    const rowRenderer = ({ index, _isScrolling, key, style, parent }) => {\n      const { rows, columns } = this.state;\n      const text = rows[index].cells[0];\n\n      return (\n        <CellMeasurer cache={this._cellMeasurementCache} columnIndex={0} key={key} parent={parent} rowIndex={index}>\n          <tr style={style} role=\"row\">\n            <td className={columns[0].props.className} role=\"gridcell\">\n              {text}\n            </td>\n            <td className={columns[1].props.className} role=\"gridcell\">\n              {text}\n            </td>\n            <td className={columns[2].props.className} role=\"gridcell\">\n              {text}\n            </td>\n            <td className={columns[3].props.className} role=\"gridcell\">\n              {text}\n            </td>\n            <td className={columns[4].props.className} role=\"gridcell\">\n              {text}\n            </td>\n          </tr>\n        </CellMeasurer>\n      );\n    };\n\n    return (\n      <div\n        id=\"content-scrollable-1\"\n        aria-label=\"Scrollable Table\"\n        className=\"pf-v5-c-scrollablegrid\"\n        style={{\n          height: 500 /* important note: the scrollable container should have some sort of fixed height, or it should be wrapped in container that is smaller than ReactVirtualized__VirtualGrid container and has overflow visible if using the Window Scroller. See WindowScroller.example.css */,\n          overflowX: 'auto',\n          overflowY: 'scroll',\n          scrollBehavior: 'smooth',\n          WebkitOverflowScrolling: 'touch',\n          position: 'relative'\n        }}\n      >\n        <div style={{ padding: 15 }}>\n          <TableDeprecated\n            caption=\"WindowScoller allows scrolling of a parent container or the window instead of tbody. It also can be used to dynamically size the table to the size of the scroll element.\"\n            cells={columns}\n            rows={rows}\n            gridBreakPoint={TableGridBreakpoint.none}\n            aria-rowcount={rows.length}\n          >\n            <TableHeaderDeprecated />\n          </TableDeprecated>\n          {scrollableElement && (\n            <WindowScroller scrollElement={scrollableElement}>\n              {({ height, isScrolling, registerChild, onChildScroll, scrollTop }) => (\n                <AutoSizer disableHeight>\n                  {({ width }) => (\n                    <div ref={registerChild}>\n                      <VirtualTableBody\n                        ref={this._bindBodyRef}\n                        autoHeight\n                        className={'pf-v5-c-virtualized pf-v5-c-window-scroller'}\n                        deferredMeasurementCache={this._cellMeasurementCache}\n                        rowHeight={this._cellMeasurementCache.rowHeight}\n                        height={height || 0}\n                        isScrolling={isScrolling}\n                        isScrollingOptOut={true}\n                        onScroll={onChildScroll}\n                        overscanRowCount={2}\n                        columnCount={1}\n                        rows={rows}\n                        rowCount={rows.length}\n                        rowRenderer={rowRenderer}\n                        scrollToIndex={scrollToIndex}\n                        scrollTop={scrollTop}\n                        width={width}\n                        role=\"grid\"\n                      />\n                    </div>\n                  )}\n                </AutoSizer>\n              )}\n            </WindowScroller>\n          )}\n        </div>\n      </div>\n    );\n  }\n}\n","title":"Window scroller","lang":"js"}}>
-      
-    </Example>,
-  'Using composable table components': props => 
-    <Example {...pageData} {...props} {...{"code":"import React from 'react';\nimport { CellMeasurerCache, CellMeasurer } from 'react-virtualized';\nimport { AutoSizer, VirtualTableBody, WindowScroller } from '@patternfly/react-virtualized-extension';\nimport { Table, Thead, Tr, Th, Td, Caption, TableGridBreakpoint } from '@patternfly/react-table';\n\nexport const ComposableTableWindowScroller = () => {\n  const [scrollableElement, setScrollableElement] = React.useState();\n  React.useEffect(() => {\n    const scrollableElement = document.getElementById('content-scrollable-2');\n    setScrollableElement(scrollableElement);\n  });\n  const rows = [];\n  for (let i = 0; i < 100000; i++) {\n    const cells = [];\n    const num = Math.floor(Math.random() * Math.floor(2)) + 1;\n    for (let j = 0; j < 5; j++) {\n      const cellValue = i.toString() + ' Arma virumque cano Troiae qui primus ab oris. '.repeat(num);\n      cells.push(cellValue);\n    }\n    rows.push(cells);\n  }\n  const [selected, setSelected] = React.useState(rows.map((_row) => false));\n  const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];\n  const scrollToIndex = -1; // can be used to programmatically set current index\n\n  const onSelect = (event, isSelected, rowId) => {\n    setSelected(selected.map((sel, index) => (index === rowId ? isSelected : sel)));\n  };\n\n  const measurementCache = new CellMeasurerCache({\n    fixedWidth: true,\n    minHeight: 44,\n    keyMapper: (rowIndex) => rowIndex\n  });\n\n  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => {\n    const text = rows[rowIndex][0];\n\n    return (\n      <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>\n        <Tr style={style}>\n          <Td\n            key={`${rowIndex}_0`}\n            select={{\n              rowIndex,\n              onSelect,\n              isSelected: selected[rowIndex]\n            }}\n          />\n          {columns.map((col, index) => (\n            <Td key={`${rowIndex}-${++index}`}>{text}</Td>\n          ))}\n        </Tr>\n      </CellMeasurer>\n    );\n  };\n\n  const scrollableContainerStyle = {\n    height: 500 /* important note: the scrollable container should have some sort of fixed height, or it should be wrapped in container that is smaller than ReactVirtualized__VirtualGrid container and has overflow visible if using the Window Scroller. See WindowScroller.example.css */,\n    overflowX: 'auto',\n    overflowY: 'scroll',\n    scrollBehavior: 'smooth',\n    WebkitOverflowScrolling: 'touch',\n    position: 'relative'\n  };\n\n  return (\n    <div\n      id=\"content-scrollable-2\"\n      aria-label=\"Scrollable Table\"\n      className=\"pf-v5-c-scrollablegrid\"\n      style={scrollableContainerStyle}\n    >\n      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length}>\n        <Caption>Virtualized table with composable table components</Caption>\n        <Thead>\n          <Tr>\n            <Th className=\"pf-v5-c-table__check\" />\n            {columns.map((col, index) => (\n              <Th key={++index}>{col}</Th>\n            ))}\n          </Tr>\n        </Thead>\n      </Table>\n      <WindowScroller scrollElement={scrollableElement}>\n        {({ height, isScrolling, registerChild, onChildScroll, scrollTop }) => (\n          <AutoSizer disableHeight>\n            {({ width }) => (\n              <div ref={registerChild}>\n                <VirtualTableBody\n                  autoHeight\n                  className={'pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller'}\n                  deferredMeasurementCache={measurementCache}\n                  rowHeight={measurementCache.rowHeight}\n                  height={height || 0}\n                  isScrolling={isScrolling}\n                  isScrollingOptOut={true}\n                  onScroll={onChildScroll}\n                  overscanRowCount={2}\n                  columnCount={1}\n                  rows={rows}\n                  rowCount={rows.length}\n                  rowRenderer={rowRenderer}\n                  scrollToIndex={scrollToIndex}\n                  scrollTop={scrollTop}\n                  width={width}\n                  role=\"grid\"\n                />\n              </div>\n            )}\n          </AutoSizer>\n        )}\n      </WindowScroller>\n    </div>\n  );\n};\n","title":"Using composable table components","lang":"js"}}>
+    <Example {...pageData} {...props} {...{"code":"import React from 'react';\nimport { CellMeasurerCache, CellMeasurer } from 'react-virtualized';\nimport { AutoSizer, VirtualTableBody, WindowScroller } from '@patternfly/react-virtualized-extension';\nimport { Table, Thead, Tr, Th, Td, Caption, TableGridBreakpoint } from '@patternfly/react-table';\n\nexport const WindowScrollerExample = () => {\n  const [scrollableElement, setScrollableElement] = React.useState<HTMLElement>();\n  React.useEffect(() => {\n    const scrollableElement = document.getElementById('content-scrollable-2') as HTMLElement;\n    setScrollableElement(scrollableElement);\n  }, []);\n\n  // this StringArray type is just needed because something in our documentation framework crashes when it encounters\n  // a string[][] type\n  type StringArray = string[];\n  const rows: StringArray[] = [];\n\n  for (let i = 0; i < 100000; i++) {\n    const cells: string[] = [];\n    const num = Math.floor(Math.random() * Math.floor(2)) + 1;\n    for (let j = 0; j < 5; j++) {\n      const cellValue = i.toString() + ' Arma virumque cano Troiae qui primus ab oris. '.repeat(num);\n      cells.push(cellValue);\n    }\n    rows.push(cells);\n  }\n\n  const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];\n  const scrollToIndex = -1; // can be used to programmatically set current index\n\n  const measurementCache = new CellMeasurerCache({\n    fixedWidth: true,\n    minHeight: 44,\n    keyMapper: (rowIndex) => rowIndex\n  });\n\n  const rowRenderer = ({ index: rowIndex, _isScrolling, key, style, parent }) => {\n    const text = rows[rowIndex][0];\n\n    return (\n      <CellMeasurer cache={measurementCache} columnIndex={0} key={key} parent={parent} rowIndex={rowIndex}>\n        <Tr style={style}>\n          {columns.map((col, index) => (\n            <Td key={`${rowIndex}-${++index}`}>{text}</Td>\n          ))}\n        </Tr>\n      </CellMeasurer>\n    );\n  };\n\n  interface ScrollableContainerStyle {\n    height: number;\n    overflowX: 'auto';\n    overflowY: 'scroll';\n    scrollBehavior: 'smooth';\n    WebkitOverflowScrolling: 'touch';\n    position: 'relative';\n  }\n\n  const scrollableContainerStyle: ScrollableContainerStyle = {\n    height: 500 /* important note: the scrollable container should have some sort of fixed height, or it should be wrapped in container that is smaller than ReactVirtualized__VirtualGrid container and has overflow visible if using the Window Scroller. See WindowScroller.example.css */,\n    overflowX: 'auto',\n    overflowY: 'scroll',\n    scrollBehavior: 'smooth',\n    WebkitOverflowScrolling: 'touch',\n    position: 'relative'\n  };\n\n  return (\n    <div\n      id=\"content-scrollable-2\"\n      aria-label=\"Scrollable Table\"\n      className=\"pf-v5-c-scrollablegrid\"\n      style={scrollableContainerStyle}\n    >\n      <Table gridBreakPoint={TableGridBreakpoint.none} aria-rowcount={rows.length}>\n        <Caption>\n          WindowScroller allows scrolling of a parent container or the window instead of tbody. It also can be used to\n          dynamically size the table to the size of the scroll element.\n        </Caption>\n        <Thead>\n          <Tr>\n            {columns.map((col, index) => (\n              <Th key={++index}>{col}</Th>\n            ))}\n          </Tr>\n        </Thead>\n      </Table>\n      <WindowScroller scrollElement={scrollableElement}>\n        {({ height, isScrolling, registerChild, onChildScroll, scrollTop }) => (\n          <AutoSizer disableHeight>\n            {({ width }) => (\n              <div ref={registerChild as (element: HTMLDivElement | null) => void}>\n                <VirtualTableBody\n                  autoHeight\n                  className={'pf-v5-c-table pf-v5-c-virtualized pf-v5-c-window-scroller'}\n                  deferredMeasurementCache={measurementCache}\n                  rowHeight={measurementCache.rowHeight}\n                  height={height || 0}\n                  isScrolling={isScrolling}\n                  isScrollingOptOut={true}\n                  onScroll={onChildScroll}\n                  overscanRowCount={2}\n                  columnCount={1}\n                  rows={rows}\n                  rowCount={rows.length}\n                  rowRenderer={rowRenderer}\n                  scrollToIndex={scrollToIndex}\n                  scrollTop={scrollTop}\n                  width={width}\n                  role=\"grid\"\n                />\n              </div>\n            )}\n          </AutoSizer>\n        )}\n      </WindowScroller>\n    </div>\n  );\n};\n","title":"Window scroller","lang":"js"}}>
       
     </Example>
 };
@@ -214,7 +207,6 @@ This package is currently an extension. Extension components do not undergo the
       {`Examples`}
     </AutoLinkHeader>
     {React.createElement(pageData.examples["Window scroller"])}
-    {React.createElement(pageData.examples["Using composable table components"])}
   </React.Fragment>
 );
 Component.displayName = 'ExtensionsVirtualScrollWindowScrollerReactDocs';
diff --git a/packages/module/patternfly-docs/generated/index.js b/packages/module/patternfly-docs/generated/index.js
index c96b05f..37e5fe5 100644
--- a/packages/module/patternfly-docs/generated/index.js
+++ b/packages/module/patternfly-docs/generated/index.js
@@ -2,8 +2,8 @@ module.exports = {
   '/extensions/virtual-scroll-table/react': {
     id: "Virtual scroll table",
     title: "Virtual scroll table",
-    toc: [{"text":"Examples"},[{"text":"Basic"},{"text":"Using composable table components"},{"text":"Sortable"},{"text":"Selectable"},{"text":"Actions"},{"text":"Filterable with WindowScroller"}]],
-    examples: ["Basic","Using composable table components","Sortable","Selectable","Actions","Filterable with WindowScroller"],
+    toc: [{"text":"Examples"},[{"text":"Basic"},{"text":"Sortable"},{"text":"Selectable"},{"text":"Actions"},{"text":"Filterable with WindowScroller"}]],
+    examples: ["Basic","Sortable","Selectable","Actions","Filterable with WindowScroller"],
     section: "extensions",
     subsection: "",
     source: "react",
@@ -13,8 +13,8 @@ module.exports = {
   '/extensions/virtual-scroll-window-scroller/react': {
     id: "Virtual scroll window scroller",
     title: "Virtual scroll window scroller",
-    toc: [{"text":"Examples"},[{"text":"Window scroller"},{"text":"Using composable table components"}]],
-    examples: ["Window scroller","Using composable table components"],
+    toc: [{"text":"Examples"},[{"text":"Window scroller"}]],
+    examples: ["Window scroller"],
     section: "extensions",
     subsection: "",
     source: "react",
diff --git a/packages/module/src/components/Virtualized/VirtualGrid.ts b/packages/module/src/components/Virtualized/VirtualGrid.ts
index 0a0cc84..2c0bdbe 100644
--- a/packages/module/src/components/Virtualized/VirtualGrid.ts
+++ b/packages/module/src/components/Virtualized/VirtualGrid.ts
@@ -1006,7 +1006,7 @@ export class VirtualGrid extends React.Component<VirtualGridProps, VirtualGridSt
     let innerScrollContainer = null;
     if (childrenToDisplay.length > 0) {
       const innerScrollContainerProps = {
-        className: 'ReactVirtualized__VirtualGrid__innerScrollContainer',
+        className: 'ReactVirtualized__VirtualGrid__innerScrollContainer pf-v5-c-table__tbody',
         key: 'ReactVirtualized__VirtualGrid__innerScrollContainer',
         role: containerRole,
         style: {