Skip to content

[DataGrid] Fix resizing to initial column widths issue #2561

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

Merged
vnbaaij merged 3 commits into from
Aug 21, 2024
Merged

[DataGrid] Fix resizing to initial column widths issue #2561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90e7c69
Use dictionary for initialColumnsWidths
vnbaaij Aug 21, 2024
f5637b1
Add cleanup
vnbaaij Aug 21, 2024
8189cc6
Merge branch 'dev' into fix-issue-#2517
vnbaaij Aug 21, 2024
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
1 change: 1 addition & 0 deletions src/Core/Components/DataGrid/FluentDataGrid.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ColumnsCollectedNotifier TGridItem="TGridItem" />

<fluent-data-grid @ref=_gridReference
id="@Id"
no-tabbing=@NoTabbing
generate-header="none"
grid-template-columns=@_internalGridTemplateColumns
Expand Down
1 change: 1 addition & 0 deletions src/Core/Components/DataGrid/FluentDataGrid.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ public partial class FluentDataGrid<TGridItem> : FluentComponentBase, IHandleEve
[DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(DataGridRowFocusEventArgs))]
public FluentDataGrid()
{
Id = Identifier.NewId();
_columns = [];
_internalGridContext = new(this);
_currentPageItemsChanged = new(EventCallback.Factory.Create<PaginationState>(this, RefreshDataCoreAsync));
Expand Down
11 changes: 6 additions & 5 deletions src/Core/Components/DataGrid/FluentDataGrid.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var initialColumnsWidths = '';
let initialColumnsWidths = {};
var latestGridElement = null;

export function init(gridElement) {
Expand All @@ -7,7 +7,7 @@ export function init(gridElement) {
};

if (gridElement.querySelectorAll('.column-header.resizable').length > 0) {
initialColumnsWidths = gridElement.gridTemplateColumns;
initialColumnsWidths[gridElement.id] = gridElement.gridTemplateColumns ;
enableColumnResizing(gridElement);
}

Expand Down Expand Up @@ -63,6 +63,7 @@ export function init(gridElement) {
document.body.removeEventListener('click', bodyClickHandler);
document.body.removeEventListener('mousedown', bodyClickHandler);
document.body.removeEventListener('keydown', keyDownHandler);
delete initialColumnsWidths[gridElement.id];
}
};
}
Expand Down Expand Up @@ -158,8 +159,8 @@ export function enableColumnResizing(gridElement) {
}

export function resetColumnWidths(gridElement) {
gridElement.gridTemplateColumns = initialColumnsWidths;

gridElement.gridTemplateColumns = initialColumnsWidths[gridElement.id];
}

export function resizeColumnDiscrete(gridElement, column, change) {
Expand Down Expand Up @@ -231,7 +232,7 @@ export function autoFitGridColumns(gridElement, columnCount) {
gridElement.setAttribute("grid-template-columns", gridTemplateColumns);
gridElement.classList.remove("auto-fit");

initialColumnsWidths = gridTemplateColumns;
initialColumnsWidths[gridElement.id] = gridTemplateColumns;
}

export function resizeColumnExact(gridElement, column, width) {
Expand Down