From 8a765c25851dd975a9030302fd6d33c8ec044e16 Mon Sep 17 00:00:00 2001 From: Vincent Baaij Date: Sat, 11 Jan 2025 23:18:11 +0100 Subject: [PATCH 1/3] Fix #3151, #3152 --- examples/Demo/Shared/Pages/Lab/IssueTester.razor | 3 +-- src/Core/Components/DataGrid/FluentDataGrid.razor.cs | 4 ++-- src/Core/Components/DataGrid/FluentDataGridCell.razor.cs | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/Demo/Shared/Pages/Lab/IssueTester.razor b/examples/Demo/Shared/Pages/Lab/IssueTester.razor index 218995abff..e02abfc9b0 100644 --- a/examples/Demo/Shared/Pages/Lab/IssueTester.razor +++ b/examples/Demo/Shared/Pages/Lab/IssueTester.razor @@ -1,2 +1 @@ -@using FluentUI.Demo.Shared.Pages.DataGrid.Examples - + diff --git a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs index 5bd6992200..24b76180ad 100644 --- a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs +++ b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs @@ -809,8 +809,8 @@ private string AriaSortValue(ColumnBase column) { return new CssBuilder(Class) .AddClass(ColumnJustifyClass(column)) - .AddClass("col-sort-asc", _sortByAscending) - .AddClass("col-sort-desc", !_sortByAscending) + .AddClass("col-sort-asc", _sortByAscending && column.IsActiveSortColumn) + .AddClass("col-sort-desc", !_sortByAscending && column.IsActiveSortColumn) .Build(); } diff --git a/src/Core/Components/DataGrid/FluentDataGridCell.razor.cs b/src/Core/Components/DataGrid/FluentDataGridCell.razor.cs index f11c62dc1f..635a98bc1f 100644 --- a/src/Core/Components/DataGrid/FluentDataGridCell.razor.cs +++ b/src/Core/Components/DataGrid/FluentDataGridCell.razor.cs @@ -74,11 +74,12 @@ public partial class FluentDataGridCell : FluentComponentBase .AddStyle("padding-inline-start", "calc(((var(--design-unit)* 3) + var(--focus-stroke-width) - var(--stroke-width))* 1px)", Column is SelectColumn && Owner.RowType == DataGridRowType.Default) .AddStyle("padding-top", "calc(var(--design-unit) * 2.5px)", Column is SelectColumn && (Grid.RowSize == DataGridRowSize.Medium || Owner.RowType == DataGridRowType.Header)) .AddStyle("padding-top", "calc(var(--design-unit) * 1.5px)", Column is SelectColumn && Grid.RowSize == DataGridRowSize.Small && Owner.RowType == DataGridRowType.Default) - .AddStyle("height", $"{Grid.ItemSize:0}px", () => !Grid.EffectiveLoadingValue && Grid.Virtualize && 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", $"{(int)Grid.RowSize}px", () => !Grid.EffectiveLoadingValue && !Grid.Virtualize && Grid.Items is not null && !Grid.MultiLine) .AddStyle("height", "100%", InternalGridContext.TotalItemCount == 0 || (Grid.EffectiveLoadingValue && Grid.Items is null) || Grid.MultiLine) .AddStyle("min-height", "44px", Owner.RowType != DataGridRowType.Default) - .AddStyle("display", "flex", CellType == DataGridCellType.ColumnHeader && !Grid.HeaderCellAsButtonWithMenu && !Grid.ResizableColumns) + .AddStyle("display", "flex", CellType == DataGridCellType.ColumnHeader && !Grid.HeaderCellAsButtonWithMenu && !Grid.ResizableColumns && (Column is null || (Column!.Sortable.HasValue && !Column!.Sortable.Value))) .AddStyle(Owner.Style) .Build(); From 4ae006af57e351d80a21e469b74852a844fb2087 Mon Sep 17 00:00:00 2001 From: Vincent Baaij Date: Sun, 12 Jan 2025 22:10:21 +0100 Subject: [PATCH 2/3] Update WhatsNew Fix tests --- .editorconfig | 11 ++++++++++- WHATSNEW.md | 7 +++++++ examples/Demo/Shared/wwwroot/docs/WhatsNew.md | 7 +++++++ ...ts_SortByColumnIndex_Ascending.verified.razor.html | 4 ++-- ...s_SortByColumnIndex_Descending.verified.razor.html | 4 ++-- ...ts_SortByColumnTitle_Ascending.verified.razor.html | 4 ++-- ...s_SortByColumnTitle_Descending.verified.razor.html | 4 ++-- ...ltiSelect_Customized_Rendering.verified.razor.html | 4 ++-- ...umSelect_MultiSelect_Rendering.verified.razor.html | 4 ++-- ...mSelect_SingleSelect_Rendering.verified.razor.html | 4 ++-- ...idTests.FluentDataGrid_Default.verified.razor.html | 2 +- 11 files changed, 39 insertions(+), 16 deletions(-) diff --git a/.editorconfig b/.editorconfig index 137e9a8c06..b6e1784cea 100644 --- a/.editorconfig +++ b/.editorconfig @@ -26,6 +26,13 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true spelling_exclusion_path = spelling.dic +dotnet_style_operator_placement_when_wrapping = beginning_of_line +tab_width = 4 +indent_size = 4 +end_of_line = crlf +dotnet_style_coalesce_expression = true:warning +dotnet_style_null_propagation = true:warning +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion # C# files [*.cs] @@ -57,7 +64,7 @@ dotnet_style_parentheses_in_other_operators = never_if_unnecessary:error dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:error # Modifier preferences -dotnet_style_require_accessibility_modifiers = for_non_interface_members:error +dotnet_style_require_accessibility_modifiers = never:error # Require var all the time. csharp_style_var_for_built_in_types = true:suggestion @@ -296,6 +303,8 @@ dotnet_naming_style.begins_with_i.capitalization = pascal_case dotnet_analyzer_diagnostic.category-Usage.severity = none csharp_style_prefer_method_group_conversion = true:silent csharp_style_prefer_top_level_statements = true:silent +csharp_style_prefer_primary_constructors = true:suggestion +csharp_prefer_system_threading_lock = true:suggestion #### Tests Projects #### [/tests/**/*.cs] diff --git a/WHATSNEW.md b/WHATSNEW.md index 8fe47b07dd..45bd498eae 100644 --- a/WHATSNEW.md +++ b/WHATSNEW.md @@ -1,3 +1,10 @@ +## V4.11.2 + +### Components +- \[DataGrid\] Add SingleSticky selection mode ([#3150](https://github.com/microsoft/fluentui-blazor/pull/3150)) +- \[DataGrid\] Tweak `display: flex` and DataGridDisplayMode.Table ([#3156](https://github.com/microsoft/fluentui-blazor/pull/3156)) +- \[Tabs\] Remove 40px height compensation for some cases ([#3149](https://github.com/microsoft/fluentui-blazor/pull/3149)) + ## V4.11.1 ### Components diff --git a/examples/Demo/Shared/wwwroot/docs/WhatsNew.md b/examples/Demo/Shared/wwwroot/docs/WhatsNew.md index aac3c2288e..4201946504 100644 --- a/examples/Demo/Shared/wwwroot/docs/WhatsNew.md +++ b/examples/Demo/Shared/wwwroot/docs/WhatsNew.md @@ -1,3 +1,10 @@ +## V4.11.2 + +### Components +- \[DataGrid\] Add SingleSticky selection mode ([#3150](https://github.com/microsoft/fluentui-blazor/pull/3150)) +- \[DataGrid\] Tweak `display: flex` and DataGridDisplayMode.Table ([#3156](https://github.com/microsoft/fluentui-blazor/pull/3156)) +- \[Tabs\] Remove 40px height compensation for some cases ([#3149](https://github.com/microsoft/fluentui-blazor/pull/3149)) + ## V4.11.1 ### Components diff --git a/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnIndex_Ascending.verified.razor.html b/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnIndex_Ascending.verified.razor.html index 6e43a0f64c..8406eecce0 100644 --- a/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnIndex_Ascending.verified.razor.html +++ b/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnIndex_Ascending.verified.razor.html @@ -2,12 +2,12 @@ - -
+
Item1
 +
Item2
diff --git a/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnIndex_Descending.verified.razor.html b/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnIndex_Descending.verified.razor.html index b545e5ae90..b52279f375 100644 --- a/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnIndex_Descending.verified.razor.html +++ b/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnIndex_Descending.verified.razor.html @@ -2,12 +2,12 @@ - -
+
Item1
 +
Item2
diff --git a/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnTitle_Ascending.verified.razor.html b/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnTitle_Ascending.verified.razor.html index cb20e8f8a9..8406eecce0 100644 --- a/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnTitle_Ascending.verified.razor.html +++ b/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnTitle_Ascending.verified.razor.html @@ -2,12 +2,12 @@ - -
+
Item1
 +
Item2
diff --git a/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnTitle_Descending.verified.razor.html b/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnTitle_Descending.verified.razor.html index b545e5ae90..b52279f375 100644 --- a/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnTitle_Descending.verified.razor.html +++ b/tests/Core/DataGrid/DataGridSortByTests.DataGridSortByTests_SortByColumnTitle_Descending.verified.razor.html @@ -2,12 +2,12 @@ - -
+
Item1
 +
Item2
diff --git a/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_MultiSelect_Customized_Rendering.verified.razor.html b/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_MultiSelect_Customized_Rendering.verified.razor.html index 5ee1a229b0..b49c8263c9 100644 --- a/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_MultiSelect_Customized_Rendering.verified.razor.html +++ b/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_MultiSelect_Customized_Rendering.verified.razor.html @@ -2,10 +2,10 @@ - -
+
➖
 +
Name
diff --git a/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_MultiSelect_Rendering.verified.razor.html b/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_MultiSelect_Rendering.verified.razor.html index 28199e7293..0e58e97642 100644 --- a/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_MultiSelect_Rendering.verified.razor.html +++ b/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_MultiSelect_Rendering.verified.razor.html @@ -2,14 +2,14 @@ - -
+ +
Name
diff --git a/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_SingleSelect_Rendering.verified.razor.html b/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_SingleSelect_Rendering.verified.razor.html index 7fb49801d2..97283710fe 100644 --- a/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_SingleSelect_Rendering.verified.razor.html +++ b/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_SingleSelect_Rendering.verified.razor.html @@ -2,8 +2,8 @@ - - +
+
Name
diff --git a/tests/Core/DataGrid/FluentDataGridTests.FluentDataGrid_Default.verified.razor.html b/tests/Core/DataGrid/FluentDataGridTests.FluentDataGrid_Default.verified.razor.html index 1419c66654..6a5af28273 100644 --- a/tests/Core/DataGrid/FluentDataGridTests.FluentDataGrid_Default.verified.razor.html +++ b/tests/Core/DataGrid/FluentDataGridTests.FluentDataGrid_Default.verified.razor.html @@ -2,7 +2,7 @@ - + + + + + + + + + + + + + + + + + + + +
+
Name
From 93af80300d118e73438ebe2076229cef286073c1 Mon Sep 17 00:00:00 2001 From: Vincent Baaij Date: Sun, 12 Jan 2025 22:35:53 +0100 Subject: [PATCH 3/3] Fix test --- ...StickySelect_Rendering.verified.razor.html | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_SingleStickySelect_Rendering.verified.razor.html b/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_SingleStickySelect_Rendering.verified.razor.html index dcaef7249b..97283710fe 100644 --- a/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_SingleStickySelect_Rendering.verified.razor.html +++ b/tests/Core/DataGrid/FluentDataGridColumSelectTests.FluentDataGrid_ColumSelect_SingleStickySelect_Rendering.verified.razor.html @@ -1,42 +1,42 @@ - - - - - - - - - - - - - - - - - - - - -
-
-
Name
-
-
- - Jean Martin
- - Kenji Sato
- - Julie Smith
+
+
+
Name
+
+
+ + Jean Martin
+ + Kenji Sato
+ + Julie Smith
\ No newline at end of file