Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/component/DataView.cy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ describe('DataView', () => {
}
/>
<DataViewTable aria-label='Repositories table' ouiaId={ouiaId} columns={columns} rows={rows} />
<DataViewToolbar ouiaId="DataViewFooter" pagination={<Pagination isCompact {...PAGINATION} />} />
<DataViewToolbar ouiaId="DataViewFooter" pagination={<Pagination isCompact variant="bottom" {...PAGINATION} />} />
</DataView>
);
cy.get('[data-ouia-component-id="DataViewToolbar-pagination"]').should('exist');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ const RepositoriesTable: FunctionComponent<RepositoriesTableProps> = ({ selected
ouiaId='LayoutExampleFooter'
pagination={
<Pagination
isCompact
isCompact
variant="bottom"
perPageOptions={perPageOptions}
itemCount={repositories.length}
{...pagination}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ const MyTable: React.FunctionComponent = () => {
ouiaId='LayoutExampleFooter'
pagination={
<Pagination
isCompact
isCompact
variant="bottom"
perPageOptions={perPageOptions}
itemCount={filteredData.length}
{...pagination}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const MyTable: React.FunctionComponent = () => {
<DataView>
<DataViewToolbar ouiaId='DataViewHeader' pagination={<Pagination perPageOptions={perPageOptions} itemCount={repositories.length} {...pagination} />} />
<DataViewTable aria-label='Repositories table' ouiaId={ouiaId} columns={columns} rows={pageRows} />
<DataViewToolbar ouiaId='DataViewFooter' pagination={<Pagination isCompact perPageOptions={perPageOptions} itemCount={repositories.length} {...pagination} />} />
<DataViewToolbar ouiaId='DataViewFooter' pagination={<Pagination isCompact variant="bottom" perPageOptions={perPageOptions} itemCount={repositories.length} {...pagination} />} />
</DataView>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ const MyTable: React.FunctionComponent = () => {
<DataViewToolbar
ouiaId="TreeFilterExampleFooter"
pagination={
<Pagination isCompact perPageOptions={perPageOptions} itemCount={filteredData.length} {...pagination} />
<Pagination isCompact variant="bottom" perPageOptions={perPageOptions} itemCount={filteredData.length} {...pagination} />
}
/>
</DataView>
Expand Down
19 changes: 17 additions & 2 deletions packages/module/src/DataViewToolbar/DataViewToolbar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FC, PropsWithChildren, useRef } from 'react';
import { Button, Toolbar, ToolbarContent, ToolbarItem, ToolbarItemVariant, ToolbarProps } from '@patternfly/react-core';
import { createUseStyles } from 'react-jss';

/** extends ToolbarProps */
export interface DataViewToolbarProps extends Omit<PropsWithChildren<ToolbarProps>, 'ref'> {
Expand All @@ -21,7 +22,19 @@ export interface DataViewToolbarProps extends Omit<PropsWithChildren<ToolbarProp
customLabelGroupContent?: React.ReactNode;
}

const useStyles = createUseStyles({
dataViewToolbarPagination: {
flexBasis: '100%',
width: '100%'
},
dataViewToolbarPaginationWrapper: {
flexBasis: '100%',
width: '100%'
}
});

export const DataViewToolbar: FC<DataViewToolbarProps> = ({ className, ouiaId = 'DataViewToolbar', bulkSelect, actions, toggleGroup, pagination, filters, customLabelGroupContent, clearAllFilters, children, ...props }: DataViewToolbarProps) => {
const classes = useStyles();
const defaultClearFilters = useRef(
<ToolbarItem>
<Button ouiaId={`${ouiaId}-clear-all-filters`} variant="link" onClick={clearAllFilters} isInline>
Expand Down Expand Up @@ -53,8 +66,10 @@ export const DataViewToolbar: FC<DataViewToolbarProps> = ({ className, ouiaId =
</ToolbarItem>
)}
{pagination && (
<ToolbarItem variant={ToolbarItemVariant.pagination} data-ouia-component-id={`${ouiaId}-pagination`}>
{pagination}
<ToolbarItem variant={ToolbarItemVariant.pagination} data-ouia-component-id={`${ouiaId}-pagination`} className={classes.dataViewToolbarPagination}>
<div className={classes.dataViewToolbarPaginationWrapper}>
{pagination}
</div>
</ToolbarItem>
)}
{children}
Expand Down
Loading
Loading