From 46f69b99c67ea14f134693df51b495be4e1b12a4 Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Mon, 18 Apr 2022 16:11:52 -0400
Subject: [PATCH 01/12] full screen demo for bulk-select example

---
 packages/react-table/src/demos/Table.md | 67 ++++++++++++++-----------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md
index 341692f5dd5..d5b39e49997 100644
--- a/packages/react-table/src/demos/Table.md
+++ b/packages/react-table/src/demos/Table.md
@@ -3,7 +3,7 @@ id: Table
 section: components
 ---
 
-import { Checkbox, ToolbarExpandIconWrapper, ToolbarContent } from '@patternfly/react-core';
+import { Checkbox, PageSection, ToolbarExpandIconWrapper, ToolbarContent } from '@patternfly/react-core';
 import CodeIcon from '@patternfly/react-icons/dist/esm/icons/code-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
@@ -21,10 +21,11 @@ import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-ico
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import AttentionBellIcon from '@patternfly/react-icons/dist/esm/icons/attention-bell-icon';
+import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 ### Bulk select
 
-```js
+```js isFullscreen
 import React from 'react';
 import {
   Dropdown,
@@ -32,13 +33,16 @@ import {
   DropdownPosition,
   DropdownToggle,
   DropdownToggleCheckbox,
+  PageSection,
   Pagination,
   Title,
   Toolbar,
+  ToolbarContent,
   ToolbarGroup,
   ToolbarItem
 } from '@patternfly/react-core';
 import { Table, TableHeader, TableBody } from '@patternfly/react-table';
+import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 class BulkSelectTableDemo extends React.Component {
   constructor(props) {
@@ -218,10 +222,12 @@ class BulkSelectTableDemo extends React.Component {
     return (
       <React.Fragment>
         <Toolbar>
-          <ToolbarGroup>
-            <ToolbarItem variant="bulk-select">{this.buildSelectDropdown()}</ToolbarItem>
+          <ToolbarContent>
+            <ToolbarGroup>
+              <ToolbarItem variant="bulk-select">{this.buildSelectDropdown()}</ToolbarItem>
+            </ToolbarGroup>
             <ToolbarItem variant="pagination">{this.renderPagination('top')}</ToolbarItem>
-          </ToolbarGroup>
+          </ToolbarContent>
         </Toolbar>
       </React.Fragment>
     );
@@ -235,29 +241,32 @@ class BulkSelectTableDemo extends React.Component {
     }));
 
     return (
-      <React.Fragment>
-        {this.renderToolbar()}
-        {!loading && (
-          <Table
-            aria-label="Bulk Select Table Demo"
-            cells={['Title', 'Body']}
-            rows={rows}
-            onSelect={this.onSelect}
-            canSelectAll={false}
-          >
-            <TableHeader />
-            <TableBody />
-          </Table>
-        )}
-        {loading && (
-          <div className="pf-l-bullseye">
-            <Title headingLevel="h2" size="3xl">
-              Please wait while loading data
-            </Title>
-          </div>
-        )}
-        {this.renderPagination('bottom')}
-      </React.Fragment>
+      <DashboardWrapper hasPageTemplateTitle>
+        <PageSection isWidthLimited>
+          {this.renderToolbar()}
+          {!loading && (
+            <Table
+              aria-label="Bulk Select Table Demo"
+              cells={['Title', 'Body']}
+              rows={rows}
+              onSelect={this.onSelect}
+              canSelectAll={false}
+            >
+              <TableHeader />
+              <TableBody />
+            </Table>
+          )}
+
+          {loading && (
+            <div className="pf-l-bullseye">
+              <Title headingLevel="h2" size="3xl">
+                Please wait while loading data
+              </Title>
+            </div>
+          )}
+          {this.renderPagination('bottom')}
+        </PageSection>
+      </DashboardWrapper>
     );
   }
 }
@@ -3034,7 +3043,7 @@ class LoadingStateDemo extends React.Component {
             props: { colSpan: 8 },
             title: (
               <Bullseye>
-                <Spinner size="xl" aria-labelledby="loading-table-demo"/>
+                <Spinner size="xl" aria-labelledby="loading-table-demo" />
               </Bullseye>
             )
           }

From 958df9c40e1e34f84196214e5d5864b24a49bfca Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Tue, 19 Apr 2022 11:09:09 -0400
Subject: [PATCH 02/12] format

---
 packages/react-table/src/demos/Table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md
index d5b39e49997..a485aad52e1 100644
--- a/packages/react-table/src/demos/Table.md
+++ b/packages/react-table/src/demos/Table.md
@@ -3043,7 +3043,7 @@ class LoadingStateDemo extends React.Component {
             props: { colSpan: 8 },
             title: (
               <Bullseye>
-                <Spinner size="xl" aria-labelledby="loading-table-demo" />
+                <Spinner size="xl" aria-labelledby="loading-table-demo"/>
               </Bullseye>
             )
           }

From bde79905ea740d309d4da5295f7097bffa8efd9d Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 20 Apr 2022 13:25:47 -0400
Subject: [PATCH 03/12] convert to full page demo

---
 .../demos/table-demos/ExpandCollapseAll.jsx   | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
index 8880743b512..9f50b635430 100644
--- a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
+++ b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { Table, TableHeader, TableBody, expandable } from '@patternfly/react-table';
+import { PageSection, Table, TableHeader, TableBody, expandable } from '@patternfly/react-table';
+import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 class ExpandCollapseAllTableDemo extends React.Component {
@@ -120,19 +121,23 @@ class ExpandCollapseAllTableDemo extends React.Component {
 
     return (
       <React.Fragment>
-        <Table
-          aria-label="Collapsible table"
-          onSelect={this.onSelect}
-          onCollapse={this.onCollapse}
-          rows={rows}
-          cells={columns}
-          canSelectAll={true}
-          canCollapseAll={true}
-          collapseAllAriaLabel={collapseAllAriaLabel}
-        >
-          <TableHeader />
-          <TableBody />
-        </Table>
+        <DashboardWrapper hasPageTemplateTitle>
+          <PageSection isWidthLimited>
+            <Table
+              aria-label="Collapsible table"
+              onSelect={this.onSelect}
+              onCollapse={this.onCollapse}
+              rows={rows}
+              cells={columns}
+              canSelectAll={true}
+              canCollapseAll={true}
+              collapseAllAriaLabel={collapseAllAriaLabel}
+            >
+              <TableHeader />
+              <TableBody />
+            </Table>
+          </PageSection>
+        </DashboardWrapper>
       </React.Fragment>
     );
   }

From 911f4e906e8bb19ace62fc9ae8c5e3e8343f869a Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 20 Apr 2022 13:27:18 -0400
Subject: [PATCH 04/12] rename column

---
 .../react-table/src/demos/table-demos/ExpandCollapseAll.jsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
index 9f50b635430..6242bea4ec5 100644
--- a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
+++ b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
@@ -14,7 +14,7 @@ class ExpandCollapseAllTableDemo extends React.Component {
       collapseAllAriaLabel: 'Expand all',
       columns: [
         {
-          title: 'Header cell1',
+          title: 'Repositories',
           cellFormatters: [expandable]
         },
         'Branches',

From aa2f1d1ae9d2aa7200bd1039c4937a0649221f61 Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 20 Apr 2022 13:44:26 -0400
Subject: [PATCH 05/12] revert bulk selct

---
 packages/react-table/src/demos/Table.md | 64 +++++++++++--------------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md
index a485aad52e1..7274d5ac8a0 100644
--- a/packages/react-table/src/demos/Table.md
+++ b/packages/react-table/src/demos/Table.md
@@ -25,7 +25,7 @@ import DashboardWrapper from '@patternfly/react-core/src/demos/examples/Dashboar
 
 ### Bulk select
 
-```js isFullscreen
+```js
 import React from 'react';
 import {
   Dropdown,
@@ -33,16 +33,13 @@ import {
   DropdownPosition,
   DropdownToggle,
   DropdownToggleCheckbox,
-  PageSection,
   Pagination,
   Title,
   Toolbar,
-  ToolbarContent,
   ToolbarGroup,
   ToolbarItem
 } from '@patternfly/react-core';
 import { Table, TableHeader, TableBody } from '@patternfly/react-table';
-import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 class BulkSelectTableDemo extends React.Component {
   constructor(props) {
@@ -222,12 +219,10 @@ class BulkSelectTableDemo extends React.Component {
     return (
       <React.Fragment>
         <Toolbar>
-          <ToolbarContent>
-            <ToolbarGroup>
-              <ToolbarItem variant="bulk-select">{this.buildSelectDropdown()}</ToolbarItem>
-            </ToolbarGroup>
+          <ToolbarGroup>
+            <ToolbarItem variant="bulk-select">{this.buildSelectDropdown()}</ToolbarItem>
             <ToolbarItem variant="pagination">{this.renderPagination('top')}</ToolbarItem>
-          </ToolbarContent>
+          </ToolbarGroup>
         </Toolbar>
       </React.Fragment>
     );
@@ -241,32 +236,29 @@ class BulkSelectTableDemo extends React.Component {
     }));
 
     return (
-      <DashboardWrapper hasPageTemplateTitle>
-        <PageSection isWidthLimited>
-          {this.renderToolbar()}
-          {!loading && (
-            <Table
-              aria-label="Bulk Select Table Demo"
-              cells={['Title', 'Body']}
-              rows={rows}
-              onSelect={this.onSelect}
-              canSelectAll={false}
-            >
-              <TableHeader />
-              <TableBody />
-            </Table>
-          )}
-
-          {loading && (
-            <div className="pf-l-bullseye">
-              <Title headingLevel="h2" size="3xl">
-                Please wait while loading data
-              </Title>
-            </div>
-          )}
-          {this.renderPagination('bottom')}
-        </PageSection>
-      </DashboardWrapper>
+      <React.Fragment>
+        {this.renderToolbar()}
+        {!loading && (
+          <Table
+            aria-label="Bulk Select Table Demo"
+            cells={['Title', 'Body']}
+            rows={rows}
+            onSelect={this.onSelect}
+            canSelectAll={false}
+          >
+            <TableHeader />
+            <TableBody />
+          </Table>
+        )}
+        {loading && (
+          <div className="pf-l-bullseye">
+            <Title headingLevel="h2" size="3xl">
+              Please wait while loading data
+            </Title>
+          </div>
+        )}
+        {this.renderPagination('bottom')}
+      </React.Fragment>
     );
   }
 }
@@ -3043,7 +3035,7 @@ class LoadingStateDemo extends React.Component {
             props: { colSpan: 8 },
             title: (
               <Bullseye>
-                <Spinner size="xl" aria-labelledby="loading-table-demo"/>
+                <Spinner size="xl" aria-labelledby="loading-table-demo" />
               </Bullseye>
             )
           }

From 9b3db89ceaf7f7fa83380e05711d1702302796ec Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 20 Apr 2022 13:45:37 -0400
Subject: [PATCH 06/12] revert imports

---
 packages/react-table/src/demos/Table.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md
index 7274d5ac8a0..fd9a66991ea 100644
--- a/packages/react-table/src/demos/Table.md
+++ b/packages/react-table/src/demos/Table.md
@@ -3,7 +3,7 @@ id: Table
 section: components
 ---
 
-import { Checkbox, PageSection, ToolbarExpandIconWrapper, ToolbarContent } from '@patternfly/react-core';
+import { Checkbox, ToolbarExpandIconWrapper, ToolbarContent } from '@patternfly/react-core';
 import CodeIcon from '@patternfly/react-icons/dist/esm/icons/code-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
@@ -21,7 +21,6 @@ import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-ico
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import AttentionBellIcon from '@patternfly/react-icons/dist/esm/icons/attention-bell-icon';
-import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 ### Bulk select
 

From 3f35601505ba44df080740bea8e79a56d3e94a80 Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 20 Apr 2022 13:46:20 -0400
Subject: [PATCH 07/12] format

---
 packages/react-table/src/demos/Table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md
index fd9a66991ea..341692f5dd5 100644
--- a/packages/react-table/src/demos/Table.md
+++ b/packages/react-table/src/demos/Table.md
@@ -3034,7 +3034,7 @@ class LoadingStateDemo extends React.Component {
             props: { colSpan: 8 },
             title: (
               <Bullseye>
-                <Spinner size="xl" aria-labelledby="loading-table-demo" />
+                <Spinner size="xl" aria-labelledby="loading-table-demo"/>
               </Bullseye>
             )
           }

From ae9551613642fb25ad609440089abb14854dca9e Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 20 Apr 2022 14:33:55 -0400
Subject: [PATCH 08/12] add imports

---
 packages/react-table/src/demos/Table.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md
index 341692f5dd5..7274d5ac8a0 100644
--- a/packages/react-table/src/demos/Table.md
+++ b/packages/react-table/src/demos/Table.md
@@ -3,7 +3,7 @@ id: Table
 section: components
 ---
 
-import { Checkbox, ToolbarExpandIconWrapper, ToolbarContent } from '@patternfly/react-core';
+import { Checkbox, PageSection, ToolbarExpandIconWrapper, ToolbarContent } from '@patternfly/react-core';
 import CodeIcon from '@patternfly/react-icons/dist/esm/icons/code-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
@@ -21,6 +21,7 @@ import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-ico
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import AttentionBellIcon from '@patternfly/react-icons/dist/esm/icons/attention-bell-icon';
+import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 ### Bulk select
 
@@ -3034,7 +3035,7 @@ class LoadingStateDemo extends React.Component {
             props: { colSpan: 8 },
             title: (
               <Bullseye>
-                <Spinner size="xl" aria-labelledby="loading-table-demo"/>
+                <Spinner size="xl" aria-labelledby="loading-table-demo" />
               </Bullseye>
             )
           }

From 1eab3856e4ec144be695856fd9322de5b42689c8 Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 4 May 2022 13:39:42 -0400
Subject: [PATCH 09/12] add isFullscreen flag

---
 packages/react-table/src/demos/Table.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md
index 7274d5ac8a0..a8abdc31075 100644
--- a/packages/react-table/src/demos/Table.md
+++ b/packages/react-table/src/demos/Table.md
@@ -266,7 +266,7 @@ class BulkSelectTableDemo extends React.Component {
 
 ### Expand/collapse all
 
-```js file="table-demos/ExpandCollapseAll.jsx"
+```js isFullscreen file="table-demos/ExpandCollapseAll.jsx"
 ```
 
 ### Column management

From e86b677020f65273973cd79c1ad70077f2d936ff Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Mon, 9 May 2022 16:01:46 -0400
Subject: [PATCH 10/12] remove select all

---
 .../demos/table-demos/ExpandCollapseAll.jsx   | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
index 6242bea4ec5..5dfe33abda2 100644
--- a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
+++ b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
@@ -1,5 +1,15 @@
 import React from 'react';
-import { PageSection, Table, TableHeader, TableBody, expandable } from '@patternfly/react-table';
+import {
+  PageSection,
+  Pagination,
+  Table,
+  TableHeader,
+  TableBody,
+  Toolbar,
+  ToolbarContent,
+  ToolbarItem,
+  expandable
+} from '@patternfly/react-table';
 import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -116,26 +126,51 @@ class ExpandCollapseAllTableDemo extends React.Component {
     });
   }
 
+  renderPagination(variant, isCompact) {
+    return (
+      <Pagination
+        isCompact={isCompact}
+        itemCount={36}
+        page={1}
+        perPage={10}
+        variant={variant}
+        titles={{
+          paginationTitle: `${variant} pagination`
+        }}
+      />
+    );
+  }
+
   render() {
     const { columns, rows, collapseAllAriaLabel } = this.state;
 
+    const tableToolbar = (
+      <Toolbar id="compact-toolbar">
+        <ToolbarContent>
+          <ToolbarItem variant="pagination">{this.renderPagination('top', true)}</ToolbarItem>
+        </ToolbarContent>
+      </Toolbar>
+    );
+
     return (
       <React.Fragment>
         <DashboardWrapper hasPageTemplateTitle>
           <PageSection isWidthLimited>
+            {tableToolbar}
             <Table
               aria-label="Collapsible table"
               onSelect={this.onSelect}
               onCollapse={this.onCollapse}
               rows={rows}
               cells={columns}
-              canSelectAll={true}
+              canSelectAll={false}
               canCollapseAll={true}
               collapseAllAriaLabel={collapseAllAriaLabel}
             >
               <TableHeader />
               <TableBody />
             </Table>
+            {this.renderPagination('bottom', false)}
           </PageSection>
         </DashboardWrapper>
       </React.Fragment>

From 7a05da7dcc350c1458af7c2e93feefc858de8e4f Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 11 May 2022 14:49:07 -0400
Subject: [PATCH 11/12] PR feedback from Matt

---
 .../demos/table-demos/ExpandCollapseAll.jsx   | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
index 5dfe33abda2..d470c4835af 100644
--- a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
+++ b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {
+  Card,
   PageSection,
   Pagination,
   Table,
@@ -155,22 +156,29 @@ class ExpandCollapseAllTableDemo extends React.Component {
     return (
       <React.Fragment>
         <DashboardWrapper hasPageTemplateTitle>
-          <PageSection isWidthLimited>
-            {tableToolbar}
-            <Table
-              aria-label="Collapsible table"
-              onSelect={this.onSelect}
-              onCollapse={this.onCollapse}
-              rows={rows}
-              cells={columns}
-              canSelectAll={false}
-              canCollapseAll={true}
-              collapseAllAriaLabel={collapseAllAriaLabel}
-            >
-              <TableHeader />
-              <TableBody />
-            </Table>
-            {this.renderPagination('bottom', false)}
+          <PageSection
+            padding={{
+              default: 'noPadding',
+              xl: 'padding'
+            }}
+          >
+            <Card component="div">
+              {tableToolbar}
+              <Table
+                aria-label="Collapsible table"
+                onSelect={this.onSelect}
+                onCollapse={this.onCollapse}
+                rows={rows}
+                cells={columns}
+                canSelectAll={false}
+                canCollapseAll={true}
+                collapseAllAriaLabel={collapseAllAriaLabel}
+              >
+                <TableHeader />
+                <TableBody />
+              </Table>
+              {this.renderPagination('bottom', false)}
+            </Card>
           </PageSection>
         </DashboardWrapper>
       </React.Fragment>

From e52746d250d8c614ace62400782579b412e8c536 Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel@redhat.com>
Date: Wed, 11 May 2022 14:51:14 -0400
Subject: [PATCH 12/12] remove toolbar

---
 .../demos/table-demos/ExpandCollapseAll.jsx   | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
index d470c4835af..acb93f677e9 100644
--- a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
+++ b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
@@ -1,16 +1,5 @@
 import React from 'react';
-import {
-  Card,
-  PageSection,
-  Pagination,
-  Table,
-  TableHeader,
-  TableBody,
-  Toolbar,
-  ToolbarContent,
-  ToolbarItem,
-  expandable
-} from '@patternfly/react-table';
+import { Card, PageSection, Table, TableHeader, TableBody, expandable } from '@patternfly/react-table';
 import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -127,32 +116,9 @@ class ExpandCollapseAllTableDemo extends React.Component {
     });
   }
 
-  renderPagination(variant, isCompact) {
-    return (
-      <Pagination
-        isCompact={isCompact}
-        itemCount={36}
-        page={1}
-        perPage={10}
-        variant={variant}
-        titles={{
-          paginationTitle: `${variant} pagination`
-        }}
-      />
-    );
-  }
-
   render() {
     const { columns, rows, collapseAllAriaLabel } = this.state;
 
-    const tableToolbar = (
-      <Toolbar id="compact-toolbar">
-        <ToolbarContent>
-          <ToolbarItem variant="pagination">{this.renderPagination('top', true)}</ToolbarItem>
-        </ToolbarContent>
-      </Toolbar>
-    );
-
     return (
       <React.Fragment>
         <DashboardWrapper hasPageTemplateTitle>
@@ -163,7 +129,6 @@ class ExpandCollapseAllTableDemo extends React.Component {
             }}
           >
             <Card component="div">
-              {tableToolbar}
               <Table
                 aria-label="Collapsible table"
                 onSelect={this.onSelect}
@@ -177,7 +142,6 @@ class ExpandCollapseAllTableDemo extends React.Component {
                 <TableHeader />
                 <TableBody />
               </Table>
-              {this.renderPagination('bottom', false)}
             </Card>
           </PageSection>
         </DashboardWrapper>