Skip to content

Commit db444ac

Browse files
committed
fix: fix layout issues
1 parent 7eb5086 commit db444ac

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,11 @@ $root: ".widget-datagrid";
569569
padding: var(--spacing-small) 0;
570570
}
571571

572+
:where(#{$root}-pb-middle) {
573+
display: flex;
574+
justify-content: center;
575+
}
576+
572577
:where(#{$root}-pb-start, #{$root}-tb-start) {
573578
padding-inline: var(--spacing-medium);
574579
display: flex;
@@ -583,6 +588,7 @@ $root: ".widget-datagrid";
583588
padding: 0.3em 0.5em;
584589
border-radius: 6px;
585590
display: inline-block;
591+
white-space: nowrap;
586592

587593
&:hover,
588594
&:focus-visible {

packages/pluggableWidgets/datagrid-web/src/components/WidgetFooter.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ export const WidgetFooter = observer(function WidgetFooter(props: WidgetFooterPr
2020
return (
2121
<div {...rest} className="widget-datagrid-footer table-footer">
2222
<div className="widget-datagrid-paging-bottom">
23-
<If condition={selectionCounterVM.isBottomCounterVisible}>
24-
<div className="widget-datagrid-pb-start">
23+
<div className="widget-datagrid-pb-start">
24+
<If condition={selectionCounterVM.isBottomCounterVisible}>
2525
<SelectionCounter />
26-
</div>
27-
</If>
28-
<div className="widget-datagrid-pb-end">
29-
{pagination}
30-
{hasMoreItems && paginationType === "loadMore" && (
26+
</If>
27+
</div>
28+
{hasMoreItems && paginationType === "loadMore" && (
29+
<div className="widget-datagrid-pb-middle">
3130
<button
3231
className="btn btn-primary widget-datagrid-load-more"
3332
onClick={() => setPage && setPage(prev => prev + 1)}
3433
tabIndex={0}
3534
>
3635
{loadMoreButtonCaption}
3736
</button>
38-
)}
39-
</div>
37+
</div>
38+
)}
39+
<div className="widget-datagrid-pb-end">{pagination}</div>
4040
</div>
4141
</div>
4242
);

packages/pluggableWidgets/datagrid-web/src/components/WidgetTopBar.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ export const WidgetTopBar = observer(function WidgetTopBar(props: WidgetTopBarPr
1515
return (
1616
<div {...rest} className="widget-datagrid-top-bar table-header">
1717
<div className="widget-datagrid-padding-top">
18-
<If condition={selectionCounter.isTopCounterVisible}>
19-
<div className="widget-datagrid-tb-start">
18+
<div className="widget-datagrid-tb-start">
19+
<If condition={selectionCounter.isTopCounterVisible}>
2020
<SelectionCounter />
21-
</div>
22-
</If>
23-
<If condition={!!pagination}>
24-
<div className="widget-datagrid-tb-end">{pagination}</div>
25-
</If>
21+
</If>
22+
</div>
23+
<div className="widget-datagrid-tb-end">
24+
<If condition={!!pagination}>{pagination}</If>
25+
</div>
2626
</div>
2727
</div>
2828
);

0 commit comments

Comments
 (0)