Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
93f6cf9
- Add enums
vnbaaij Jun 12, 2025
b255f69
- Add DataGrid component
vnbaaij Jun 12, 2025
96e40df
Add DataGridGeneratedHeaderType
vnbaaij Jun 12, 2025
f6d0fb1
Merge branch 'users/vnbaaij/dev-v5/datagrid-part1' into users/vnbaaij…
vnbaaij Jun 12, 2025
1059dbe
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/datagrid-part1
dvoituron Jun 12, 2025
595ff78
Fix analyzer errors
vnbaaij Jun 12, 2025
b1cf680
- Add Typical demo and flags
vnbaaij Jun 12, 2025
8393e35
Work on review comments
vnbaaij Jun 12, 2025
8cd48c6
Merge branch 'users/vnbaaij/dev-v5/datagrid-part1' of https://github.…
vnbaaij Jun 12, 2025
202c10a
Process review comments
vnbaaij Jun 12, 2025
5aa2c65
Add language resources
vnbaaij Jun 12, 2025
777e854
Add Unit Tests for Paginator
vnbaaij Jun 12, 2025
448c89e
More review comments
vnbaaij Jun 13, 2025
3146aeb
Update tests. Now 100% lc
vnbaaij Jun 13, 2025
69ffae6
- Add Typical demo and flags
vnbaaij Jun 13, 2025
35e0334
Replace tokens (WIP)
vnbaaij Jun 13, 2025
b92c83c
Remove flags. These will be added to sample data project in separate PR
vnbaaij Jun 17, 2025
430abd5
Remove DI abstractions package. Not needed
vnbaaij Jun 17, 2025
d0c1052
Merge dev-v5
vnbaaij Jun 17, 2025
33af462
Add IsFixed parameter
vnbaaij Jun 17, 2025
689fe43
merge dev-v5
vnbaaij Jun 17, 2025
44f7d0d
MAke example grid mor functional and look better
vnbaaij Jun 17, 2025
6fc0809
Add initial tests. They are not passing yet
vnbaaij Jun 18, 2025
5bcb9fa
Add surpression atribute, fix other analyzer warnings
vnbaaij Jun 18, 2025
a30dabf
Use localized strings
vnbaaij Jun 18, 2025
aadf080
Merg dev-v5
vnbaaij Jun 18, 2025
70c342b
Fix tests
vnbaaij Jun 18, 2025
b826128
Add Tests
vnbaaij Jun 19, 2025
d0979ea
Add tests for PaginatinState and TotalItemCountChangedEventArgs
vnbaaij Jun 19, 2025
a6aa6fc
Merge branch 'users/vnbaaij/dev-v5/pagination-tests' into users/vnbaa…
vnbaaij Jun 19, 2025
613cbd0
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/pagination-tests
vnbaaij Jun 19, 2025
af4f1e8
Add Row tests
vnbaaij Jun 19, 2025
89038a7
process review comments
vnbaaij Jun 19, 2025
bcdffd9
Merge branch 'users/vnbaaij/dev-v5/pagination-tests' into users/vnbaa…
vnbaaij Jun 19, 2025
ba9c0fb
More tests
vnbaaij Jun 19, 2025
924df75
More tests
vnbaaij Jun 19, 2025
726cf24
Merge branch 'users/vnbaaij/dev-v5/datagrid-part2' of https://github.…
vnbaaij Jun 20, 2025
8fe02c0
- Add typical demo
vnbaaij Jun 23, 2025
abb696c
More tests
vnbaaij Jun 29, 2025
4aae12f
- More tests
vnbaaij Jun 29, 2025
39dc140
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/datagrid-part2
vnbaaij Jul 1, 2025
f4b691a
Update file headers
vnbaaij Jul 1, 2025
1f50f07
Convert DataGrid JS to TS
vnbaaij Jul 1, 2025
097db2f
Implement fix for #3963
vnbaaij Jul 1, 2025
713d96b
Bring in changes made in v4 with #3949
vnbaaij Jul 1, 2025
2698837
- Update file headers
vnbaaij Jul 1, 2025
460a82f
Merge branch 'users/vnbaaij/dev-v5/datagrid-part2' into users/vnbaaij…
vnbaaij Jul 1, 2025
f9ce111
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/datagrid-part3
vnbaaij Jul 2, 2025
ab02f1c
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/datagrid-part2
vnbaaij Jul 2, 2025
088dd55
Process review comments:
vnbaaij Jul 2, 2025
ede49e6
Forgot to change the docs
vnbaaij Jul 2, 2025
87cb81a
Merge branch 'users/vnbaaij/dev-v5/datagrid-part2' into users/vnbaaij…
vnbaaij Jul 2, 2025
d47fc5e
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/datagrid-part2
vnbaaij Jul 2, 2025
f921191
- Use auto-generated constant
vnbaaij Jul 2, 2025
25e046e
Merge branch 'users/vnbaaij/dev-v5/datagrid-part2' of https://github.…
vnbaaij Jul 2, 2025
e6ec4a3
DataGrid docs and examples
vnbaaij Jul 2, 2025
07365bd
Merge branch 'users/vnbaaij/dev-v5/datagrid-part3' into users/vnbaaij…
vnbaaij Jul 2, 2025
5af4579
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/datagrid-part4
vnbaaij Jul 2, 2025
66af301
Merge branch 'users/vnbaaij/dev-v5/datagrid-part2' into users/vnbaaij…
vnbaaij Jul 3, 2025
9e89b82
Merge branch 'users/vnbaaij/dev-v5/datagrid-part3' into users/vnbaaij…
vnbaaij Jul 3, 2025
855fe34
Merge branch 'users/vnbaaij/dev-v5/datagrid-part4' of https://github.…
vnbaaij Jul 3, 2025
e3c942f
Process review comments
vnbaaij Jul 3, 2025
f6d458b
More review comments
vnbaaij Jul 3, 2025
64cf5bb
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/datagrid-part2
vnbaaij Jul 3, 2025
85154bf
- Undo make internal GridItemsProvider*
vnbaaij Jul 3, 2025
ed02449
Update test verified files
vnbaaij Jul 3, 2025
770c533
merge part 2
vnbaaij Jul 3, 2025
c6a2f1b
Merge branch 'users/vnbaaij/dev-v5/datagrid-part3' into users/vnbaaij…
vnbaaij Jul 3, 2025
d0246dd
Merge dev-v5
vnbaaij Jul 3, 2025
36dc27b
- Fix when to show header menu
vnbaaij Jul 3, 2025
150c1fd
- Rename getting started
vnbaaij Jul 3, 2025
567729b
WIP
vnbaaij Jul 18, 2025
61deb6a
Update samples and structure
vnbaaij Jul 21, 2025
e1932a6
Make all DataGrid samples work
vnbaaij Jul 21, 2025
62753d4
Merge branch 'dev-v5' into users/vnbaaij/dev-v5/datagrid-part4
vnbaaij Jul 21, 2025
7c4f77b
Update DataGrid verified tests files
vnbaaij Jul 21, 2025
998b8c9
Merge branch 'users/vnbaaij/dev-v5/datagrid-part4' of https://github.…
vnbaaij Jul 21, 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
3 changes: 2 additions & 1 deletion examples/Demo/FluentUI.Demo/MyLocalizer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// ------------------------------------------------------------------------

using Microsoft.FluentUI.AspNetCore.Components;
using Microsoft.FluentUI.AspNetCore.Components.Localization;
using System.Globalization;

namespace FluentUI.Demo;
Expand Down Expand Up @@ -34,7 +35,7 @@ internal class MyLocalizer : IFluentLocalizer
// Provide custom translations based on the key
return key switch
{
"DataGrid_ResizeDiscrete" => "Width (+/- 10px)",
LanguageResource.DataGrid_ResizeDiscrete => "Width (+/- 10px)",

// Fallback to the Default/English if no translation is found
_ => IFluentLocalizer.GetDefault(key, arguments),
Expand Down
3 changes: 3 additions & 0 deletions src/Core/Localization/LanguageResource.resx
Original file line number Diff line number Diff line change
Expand Up @@ -276,4 +276,7 @@
<data name="DataGrid_ResizeSubmit" xml:space="preserve">
<value>Set column widths</value>
</data>
<data name="MessageBar_Dismiss" xml:space="preserve">
<value>Hide this message</value>
</data>
</root>
75 changes: 23 additions & 52 deletions tests/Core/Components/DataGrid/FluentDataGridCellTests.razor
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@
public async Task FluentDataGridCell_HandleOnCellClickAsync_InvokesCallbacks()
{
// Arrange
var cellClickInvoked = false;

var cut = Render<FluentDataGrid<object>>(
@<FluentDataGrid TGridItem="object" OnCellClick="HandleCellClick">
@<FluentDataGrid TGridItem="object" OnCellClick="@(e => cellClickInvoked = true )">
<FluentDataGridRow>
<FluentDataGridCell />
</FluentDataGridRow>
Expand All @@ -57,15 +59,16 @@
await cell.Instance.HandleOnCellClickAsync();

// Assert
Assert.True(OnCellClickInvoked);
Assert.True(cellClickInvoked);
}

[Fact]
public async Task FluentDataGridCell_HandleOnCellFocusAsync_InvokesCallbacks()
{
// Arrange
var cellFocusInvoked = false;
var cut = Render<FluentDataGrid<object>>(
@<FluentDataGrid TGridItem="object" OnCellFocus="HandleCellFocus">
@<FluentDataGrid TGridItem="object" OnCellFocus="@(e => cellFocusInvoked = true)">
<FluentDataGridRow>
<FluentDataGridCell />
</FluentDataGridRow>
Expand All @@ -75,22 +78,23 @@
var cell = cut.FindComponent<FluentDataGridCell<object>>();
await cell.Instance.HandleOnCellFocusAsync();
// Assert
Assert.True(OnCellFocusInvoked);
Assert.True(cellFocusInvoked);
}

[Fact]
public async Task FluentDataGridCell_HandleOnCellKeyDownAsync_HandlesKeyEnter()
{
// Arrange
var items = new List<Person>(People).AsQueryable();
var cellKeyDownInvoked = false;

var cut = Render<FluentDataGrid<Person>>(
@<FluentDataGrid TGridItem="Person" Items="@People" GenerateHeader="DataGridGeneratedHeaderType.None">
<SelectColumn TGridItem="Person"
SelectMode="DataGridSelectMode.Multiple"
Selectable="@(x => x.PersonId > 0)"
SelectFromEntireRow="false"
OnSelect="HandleCellKeyDown" />
OnSelect="@(e => cellKeyDownInvoked = e.Selected)" />
<PropertyColumn Property="@(x => x)" Title="Value" />
</FluentDataGrid>);

Expand All @@ -100,47 +104,50 @@
await cell.Instance.HandleOnCellKeyDownAsync(keyboardEvent);

// Assert
Assert.True(OnCellKeyDownInvoked);
Assert.True(cellKeyDownInvoked);
}

[Fact]
public async Task FluentDataGridCell_HandleOnCellKeyDownAsync_HandlesKeyEnter_EntireRow()
{
// Arrange
var items = new List<Person>(People).AsQueryable();
var cellKeyDownInvoked = false;

var cut = Render<FluentDataGrid<Person>>(
@<FluentDataGrid TGridItem="Person" Items="@People" GenerateHeader="DataGridGeneratedHeaderType.None">
<SelectColumn TGridItem="Person"
SelectMode="DataGridSelectMode.Multiple"
Selectable="@(x => x.PersonId > 0)"
SelectFromEntireRow="true"
OnSelect="HandleCellKeyDown" />
<PropertyColumn Property="@(x => x)" Title="Value" />
</FluentDataGrid>);
<SelectColumn TGridItem="Person"
SelectMode="DataGridSelectMode.Multiple"
Selectable="@(x => x.PersonId > 0)"
SelectFromEntireRow="true"
OnSelect="@(e => cellKeyDownInvoked = e.Selected)" /> />
<PropertyColumn Property="@(x => x)" Title="Value" />
</FluentDataGrid>
);

// Act
var keyboardEvent = new KeyboardEventArgs { Code = "Enter" };
var cell = cut.FindComponent<FluentDataGridCell<Person>>();
await cell.Instance.HandleOnCellKeyDownAsync(keyboardEvent);

// Assert
Assert.False(OnCellKeyDownInvoked);
Assert.False(cellKeyDownInvoked);
}

[Fact]
public async Task FluentDataGridCell_HandleOnCellKeyDownAsync_HandlesKeyOther()
{
// Arrange
var items = new List<Person>(People).AsQueryable();
var cellKeyDownInvoked = false;

var cut = Render<FluentDataGrid<Person>>(
@<FluentDataGrid TGridItem="Person" Items="@People" GenerateHeader="DataGridGeneratedHeaderType.None">
<SelectColumn TGridItem="Person"
SelectMode="DataGridSelectMode.Multiple"
Selectable="@(x => x.PersonId > 1)"
SelectFromEntireRow="false"
OnSelect="HandleCellKeyDown" />
OnSelect="@(e => cellKeyDownInvoked = e.Selected)" />
<PropertyColumn Property="@(x => x)" Title="Value" />
</FluentDataGrid>);

Expand All @@ -150,7 +157,7 @@
await cell.Instance.HandleOnCellKeyDownAsync(keyboardEvent);

// Assert
Assert.False(OnCellKeyDownInvoked);
Assert.False(cellKeyDownInvoked);
}

[Fact]
Expand All @@ -174,40 +181,4 @@
Assert.True(cell.IsDisposed);

}

public bool OnCellClickInvoked { get; set; }
public bool OnCellFocusInvoked { get; set; }
public bool OnCellKeyDownInvoked { get; set; }


private void HandleCellClick()
{
// This method simulates the callback that would be invoked on cell click
// In a real scenario, this would be defined in the FluentDataGrid component
// and passed to the FluentDataGridCell.
OnCellClickInvoked = true;
}

private void HandleCellFocus()
{
// This method simulates the callback that would be invoked on cell focus
// In a real scenario, this would be defined in the FluentDataGrid component
// and passed to the FluentDataGridCell.
OnCellFocusInvoked = true;
}

private void HandleCellKeyDown((Person person, bool selected) e)
{
// This method simulates the callback that would be invoked on cell key down
// In a real scenario, this would be defined in the FluentDataGrid component
// and passed to the FluentDataGridCell.
if (e.selected )
{
OnCellKeyDownInvoked = true;
}
else
{
OnCellKeyDownInvoked = false;
}
}
}
Loading