Skip to content

[DataGrid] Fix cell height issue and make header really sticky #3173

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 5 commits into from
Jan 14, 2025
Merged

[DataGrid] Fix cell height issue and make header really sticky #3173

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
661fd32
Fix #3168
vnbaaij Jan 14, 2025
5137c61
Fix #3171
vnbaaij Jan 14, 2025
f452fdb
Merge branch 'dev' into users/vnbaaij/more-datagrid-issues
vnbaaij Jan 14, 2025
0a3a06d
- Update Whatsnew
vnbaaij Jan 14, 2025
909c233
Update global.json
vnbaaij Jan 14, 2025
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
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Pages/DataGrid/Examples/DataGridTypical.razor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Ensure all the flags are the same size, and centered */
.flag {
height: 1rem;
margin-top: 7px;
margin-top: 4px;
border: 1px solid var(--neutral-layer-3);
}
.search-box {
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Pages/Home/Home.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<br />
<p>
The demo and documentation sites for previous version is available:<br />
<a href="https://aka.ms/fluentui-blazor-v3/" target="_blank">Version 3.7.9</a><br />
<a href="https://aka.ms/fluentui-blazor-v3/" target="_blank">Version 3.8.0</a><br />
Please be aware that this version is no longer supported as both .NET 6 and .NET 7 are out of support now.
</p>
</div>
Expand Down
65 changes: 64 additions & 1 deletion examples/Demo/Shared/Pages/Lab/IssueTester.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,64 @@

@page "/test"

<style>
.column-header {
border-right: 2px solid;
}
</style>


<div style="height: 200px; overflow-y: scroll;">
<FluentDataGrid DisplayMode="DataGridDisplayMode.Table" TGridItem="Testt" Items="testList.AsQueryable()" GenerateHeader="GenerateHeaderOption.Sticky">
<TemplateColumn Sortable="true" Title="First Column Header" Align="Align.Center" Width="200px">
@context.a
</TemplateColumn>
<TemplateColumn Sortable="true" Title="Second Column Header" Align="Align.Center" Width="200px">
@context.b
</TemplateColumn>
<TemplateColumn Sortable="true" Title="Third Column Header" Align="Align.Center" Width="200px">
@context.c
</TemplateColumn>
</FluentDataGrid>
</div>


@code {
class Testt
{
public string a = "a";
public string b = "b";
public string c = "c";
}

private List<Testt> testList = new()
{
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new(),
};
}
4 changes: 3 additions & 1 deletion src/Core/Components/DataGrid/FluentDataGrid.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,9 +802,11 @@ private string AriaSortValue(ColumnBase<TGridItem> column)
: "none";

private string? StyleValue => new StyleBuilder(Style)
.AddStyle("grid-template-columns", _internalGridTemplateColumns, !string.IsNullOrWhiteSpace(_internalGridTemplateColumns))
.AddStyle("grid-template-columns", _internalGridTemplateColumns, !string.IsNullOrWhiteSpace(_internalGridTemplateColumns) && DisplayMode == DataGridDisplayMode.Grid)
.AddStyle("grid-template-rows", "auto 1fr", _internalGridContext.Items.Count == 0 || Items is null)
.AddStyle("height", $"calc(100% - {(int)RowSize}px)", _internalGridContext.TotalItemCount == 0 || EffectiveLoadingValue)
.AddStyle("border-collapse", "separate", GenerateHeader == GenerateHeaderOption.Sticky)
.AddStyle("border-spacing", "0", GenerateHeader == GenerateHeaderOption.Sticky)
.Build();

private string? ColumnHeaderClass(ColumnBase<TGridItem> column)
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Components/DataGrid/FluentDataGridCell.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public partial class FluentDataGridCell<TGridItem> : FluentComponentBase
.AddStyle("padding-top", "calc(var(--design-unit) * 2.5px)", Column is SelectColumn<TGridItem> && (Grid.RowSize == DataGridRowSize.Medium || Owner.RowType == DataGridRowType.Header))
.AddStyle("padding-top", "calc(var(--design-unit) * 1.5px)", Column is SelectColumn<TGridItem> && Grid.RowSize == DataGridRowSize.Small && Owner.RowType == DataGridRowType.Default)
.AddStyle("width", Column?.Width, !string.IsNullOrEmpty(Column?.Width) && Grid.DisplayMode == DataGridDisplayMode.Table)
.AddStyle("height", $"{Grid.ItemSize:0}px", () => !Grid.EffectiveLoadingValue && Grid.Virtualize && Owner.RowType == DataGridRowType.Default && CellType == DataGridCellType.ColumnHeader)
.AddStyle("height", $"{Grid.ItemSize:0}px", () => !Grid.EffectiveLoadingValue && Grid.Virtualize && Owner.RowType == DataGridRowType.Default)
.AddStyle("height", $"{(int)Grid.RowSize}px", () => !Grid.EffectiveLoadingValue && !Grid.Virtualize && Grid.Items is not null && !Grid.MultiLine)
.AddStyle("height", "100%", Grid.MultiLine)
.AddStyle("min-height", "44px", Owner.RowType != DataGridRowType.Default)
Expand Down
Loading