Skip to content

Commit 518afce

Browse files
authored
Merge pull request #275 from aali309/GITOPS-10908
horizontally align top and bottom pagination widgets
2 parents 08f4d34 + 1481e39 commit 518afce

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Keep top/bottom pagination aligned horizontally. PatternFly's bottom
2+
// variant adds spacer--sm inline padding that the top (toolbar) pager does not.
3+
.gitops-data-view-table {
4+
.pf-v6-c-toolbar__item.pf-m-pagination .pf-v6-c-pagination.pf-m-bottom {
5+
padding-inline-start: 0;
6+
padding-inline-end: 0;
7+
}
8+
}

src/gitops/components/shared/DataView/GitOpsDataViewTable.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import {
1919
paginateItems,
2020
} from './gitOpsDataViewPagination';
2121

22+
import './GitOpsDataViewTable.scss';
23+
2224
let gitOpsPaginationInstanceCounter = 0;
2325

2426
const useGitOpsPaginationWidgetIdBase = (): string => {
@@ -149,7 +151,7 @@ export const GitOpsDataViewTable: React.FC<GitOpsDataViewTableProps> = ({
149151
const showPagination = !!pagination && paginationItemCount > 0 && !isError && !isLoading;
150152

151153
return (
152-
<DataView activeState={resolvedActiveState}>
154+
<DataView activeState={resolvedActiveState} className="gitops-data-view-table">
153155
{showPagination && pagination && (
154156
<DataViewToolbar
155157
pagination={
@@ -171,6 +173,7 @@ export const GitOpsDataViewTable: React.FC<GitOpsDataViewTableProps> = ({
171173
pagination={pagination}
172174
variant={PaginationVariant.bottom}
173175
widgetId={`${paginationWidgetIdBase}-bottom`}
176+
isStatic
174177
/>
175178
}
176179
/>
@@ -184,7 +187,8 @@ const GitOpsPagination: React.FC<{
184187
pagination: GitOpsDataViewPagination;
185188
variant: PaginationVariant;
186189
widgetId: string;
187-
}> = ({ itemCount, pagination, variant, widgetId }) => {
190+
isStatic?: boolean;
191+
}> = ({ itemCount, pagination, variant, widgetId, isStatic }) => {
188192
const { t } = useGitOpsTranslation();
189193

190194
return (
@@ -193,6 +197,7 @@ const GitOpsPagination: React.FC<{
193197
perPageOptions={GITOPS_PER_PAGE_OPTIONS}
194198
variant={variant}
195199
widgetId={widgetId}
200+
isStatic={isStatic}
196201
titles={{
197202
paginationAriaLabel: t('Pagination'),
198203
toFirstPageAriaLabel: t('Go to first page'),

0 commit comments

Comments
 (0)