Skip to content

[WC-3280] DG: Fix unwanted scrollbar for cleared grids #2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yordan-st wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −1
Draft

[WC-3280] DG: Fix unwanted scrollbar for cleared grids #2113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c099e0d
fix: keep custom content column headers visible when grid becomes empty
yordan-st Feb 24, 2026
431abdb
fix: revert old fix and implement new
yordan-st Feb 25, 2026
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
4 changes: 4 additions & 0 deletions packages/pluggableWidgets/datagrid-web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

### Fixed

- We fixed an issue where clearing a grid would cause wrong column grid calculation, causing unwanted scroll bars.

## [3.8.1] - 2026-02-19

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion packages/pluggableWidgets/datagrid-web/src/model/containers/Datagrid.container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ injected(DatasourceParamsController, CORE.setupService, DG.query, DG.combinedFil
injected(DatasourceService, CORE.setupService, DG.queryGate, DG.refreshInterval.optional);
injected(GridBasicData, CORE.mainGate);
injected(WidgetRootViewModel, CORE.mainGate, CORE.config, DG.exportProgressService, SA_TOKENS.selectionDialogVM);
injected(GridSizeStore, CORE.atoms.hasMoreItems, DG.paginationConfig, DG.setPageAction);
injected(GridSizeStore, CORE.atoms.hasMoreItems, CORE.atoms.itemCount, DG.paginationConfig, DG.setPageAction);

/** Pagination **/
injected(createSetPageAction, DG.query, DG.paginationConfig, DG.currentPage, DG.pageSize);
Expand Down
10 changes: 10 additions & 0 deletions packages/pluggableWidgets/datagrid-web/src/model/stores/GridSize.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export class GridSizeStore {

constructor(
private readonly hasMoreItemsAtom: ComputedAtom<boolean | undefined>,
private readonly itemCountAtom: ComputedAtom<number>,
private readonly paginationConfig: PaginationConfig,
private readonly setPageAction: SetPageAction
) {
Expand Down Expand Up @@ -75,6 +76,15 @@ export class GridSizeStore {
}

updateColumnSizes(sizes: number[]): void {
const itemCount = this.itemCountAtom.get();

// If grid is empty, always clear columnSizes to use natural CSS grid layout
// This ensures empty grids behave consistently whether freshly rendered or emptied
if (itemCount === 0) {
this.columnSizes = undefined;
return;
}

this.columnSizes = sizes;
}

Expand Down
Loading