Skip to content

Commit 3e57d67

Browse files
committed
fix: reference to updated scss variable
1 parent 2318f04 commit 3e57d67

File tree

5 files changed

+175
-66
lines changed

5 files changed

+175
-66
lines changed

packages/modules/data-widgets/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
### Changed
10+
11+
- We enhanced datagrid selection UI with responsive container queries and improved layout styling for header and footer components.
12+
913
## [3.6.1] DataWidgets - 2025-10-14
1014

1115
### [3.6.1] Datagrid

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

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ $root: ".widget-datagrid";
311311
justify-content: flex-end;
312312
white-space: nowrap;
313313
align-items: baseline;
314-
margin: 16px;
314+
margin: 0 16px;
315315
color: $pagination-caption-color;
316316

317317
.paging-status {
@@ -397,6 +397,10 @@ $root: ".widget-datagrid";
397397
}
398398
}
399399

400+
&-top-bar {
401+
container: widget-datagrid-header / inline-size;
402+
}
403+
400404
&-content {
401405
overflow-x: auto;
402406
}
@@ -409,6 +413,10 @@ $root: ".widget-datagrid";
409413
display: contents;
410414
}
411415

416+
&-footer {
417+
container: widget-datagrid-footer / inline-size;
418+
}
419+
412420
&.widget-datagrid-selection-method-click {
413421
.tr.tr-selected .td {
414422
background-color: $grid-selected-row-background;
@@ -517,7 +525,7 @@ $root: ".widget-datagrid";
517525

518526
.widget-datagrid .widget-datagrid-load-more {
519527
display: block !important;
520-
margin: 0 auto;
528+
margin: 0;
521529
}
522530

523531
.infinite-loading.widget-datagrid-grid-body {
@@ -540,21 +548,30 @@ $root: ".widget-datagrid";
540548
grid-column: 1 / -1;
541549
}
542550

543-
:where(#{$root}-paging-bottom) {
551+
:where(#{$root}-paging-bottom, #{$root}-padding-top) {
544552
display: flex;
545553
flex-flow: row nowrap;
546554
align-items: center;
547555
}
548556

549-
:where(#{$root}-pb-start, #{$root}-pb-end, #{$root}-pb-middle) {
557+
:where(#{$root}-pb-end, #{$root}-tb-end) {
558+
display: flex;
559+
justify-content: flex-end;
560+
align-items: center;
561+
}
562+
563+
:where(#{$root}-pb-start, #{$root}-tb-start, #{$root}-pb-end, #{$root}-tb-end, #{$root}-pb-middle) {
550564
flex-grow: 1;
551565
flex-basis: 33.33%;
552566
min-height: 20px;
567+
height: 54px;
568+
padding: var(--spacing-small) 0;
553569
}
554570

555-
:where(#{$root}-pb-start) {
556-
margin-block: var(--spacing-medium);
571+
:where(#{$root}-pb-start, #{$root}-tb-start) {
557572
padding-inline: var(--spacing-medium);
573+
display: flex;
574+
align-items: center;
558575
}
559576

560577
#{$root}-clear-selection {
@@ -578,3 +595,23 @@ $root: ".widget-datagrid";
578595
transform: rotate(1turn);
579596
}
580597
}
598+
599+
@container widget-datagrid-footer (width < 500px) {
600+
#{$root}-paging-bottom {
601+
flex-direction: column;
602+
:where(#{$root}-pb-start, #{$root}-pb-end, #{$root}-pb-middle) {
603+
width: 100%;
604+
justify-content: center;
605+
}
606+
}
607+
}
608+
609+
@container widget-datagrid-header (width < 500px) {
610+
#{$root}-padding-top {
611+
flex-direction: column-reverse;
612+
:where(#{$root}-tb-start, #{$root}-tb-end) {
613+
width: 100%;
614+
justify-content: center;
615+
}
616+
}
617+
}

packages/pluggableWidgets/datagrid-web/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88

99
### Added
1010

11+
- We added configurable selection count visibility and clear selection button label template for improved row selection management.
12+
1113
- We fixed an issue where missing consistency checks for the captions were causing runtime errors instead of in Studio Pro
1214

1315
## [3.6.1] - 2025-10-14

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99
LoadingTypeEnum,
1010
PaginationEnum,
1111
PagingPositionEnum,
12-
ShowPagingButtonsEnum,
13-
SelectionCountVisibilityEnum
12+
SelectionCountVisibilityEnum,
13+
ShowPagingButtonsEnum
1414
} from "../../typings/DatagridProps";
1515
import { SelectActionHelper } from "../helpers/SelectActionHelper";
1616
import { useDatagridRootScope } from "../helpers/root-context";
@@ -136,10 +136,11 @@ const Main = observer(<C extends GridColumn>(props: WidgetProps<C>): ReactElemen
136136
visibleColumns
137137
} = props;
138138

139-
const { basicData } = useDatagridRootScope();
139+
const { basicData, selectionCountStore } = useDatagridRootScope();
140140

141141
const showHeader = !!headerContent;
142142
const showTopBar = paging && (pagingPosition === "top" || pagingPosition === "both");
143+
const showFooter = paging && (pagingPosition === "bottom" || pagingPosition === "both");
143144

144145
const pagination = paging ? (
145146
<Pagination
@@ -165,14 +166,14 @@ const Main = observer(<C extends GridColumn>(props: WidgetProps<C>): ReactElemen
165166

166167
return (
167168
<Fragment>
168-
{showTopBar && (
169-
<WidgetTopBar
170-
selectionCountVisibility={selectionCountVisibility}
171-
clearSelectionButtonLabel={clearSelectionButtonLabel}
172-
>
173-
{pagination}
174-
</WidgetTopBar>
175-
)}
169+
<WidgetTopBar
170+
selectedCount={selectionCountStore.selectedCount}
171+
showTopBar={showTopBar}
172+
selectionCountVisibility={selectionCountVisibility}
173+
clearSelectionButtonLabel={clearSelectionButtonLabel}
174+
>
175+
{pagination}
176+
</WidgetTopBar>
176177
{showHeader && <WidgetHeader headerTitle={headerTitle}>{headerContent}</WidgetHeader>}
177178
<WidgetContent>
178179
<Grid
@@ -243,8 +244,9 @@ const Main = observer(<C extends GridColumn>(props: WidgetProps<C>): ReactElemen
243244
</Grid>
244245
</WidgetContent>
245246
<WidgetFooter
247+
selectedCount={selectionCountStore.selectedCount}
248+
showFooter={showFooter}
246249
pagination={pagination}
247-
pagingPosition={pagingPosition}
248250
paginationType={paginationType}
249251
loadMoreButtonCaption={loadMoreButtonCaption}
250252
clearSelectionButtonLabel={clearSelectionButtonLabel}

0 commit comments

Comments
 (0)