Skip to content
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

Jump to bottom

Fix OnRowwFocus and sorting for DataGrid #1577

Merged
merged 4 commits into from
Feb 27, 2024
Merged

Fix OnRowwFocus and sorting for DataGrid #1577

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b1168e
Fix #1531 by using web components current-value instead of value.
vnbaaij Feb 26, 2024
ec9f19c
Fix #1540 by only invoking RowFocus/CellFocus for default rows/cells
vnbaaij Feb 26, 2024
f735c35
Merge branch 'dev' into vnbaaij/fix-issue-#1540
vnbaaij Feb 27, 2024
9879281
Merge branch 'dev' into vnbaaij/fix-issue-#1540
vnbaaij Feb 27, 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
5 changes: 4 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 @@ -523,7 +523,10 @@ private async Task HandleOnRowFocusAsync(DataGridRowFocusEventArgs args)
var rowId = args.RowId;
if (_internalGridContext.Rows.TryGetValue(rowId!, out var row))
{
await OnRowFocus.InvokeAsync(row);
if (row != null && row.RowType == DataGridRowType.Default)
{
await OnRowFocus.InvokeAsync(row);
}
}
}
}
5 changes: 4 additions & 1 deletion src/Core/Components/DataGrid/FluentDataGridRow.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ private async Task HandleOnCellFocusAsync(DataGridCellFocusEventArgs args)
var cellId = args.CellId;
if (cells.TryGetValue(cellId!, out var cell))
{
await Owner.Grid.OnCellFocus.InvokeAsync(cell);
if (cell != null && cell.CellType == DataGridCellType.Default)
{
await Owner.Grid.OnCellFocus.InvokeAsync(cell);
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Core/Components/NumberField/FluentNumberField.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@namespace Microsoft.FluentUI.AspNetCore.Components
@namespace Microsoft.FluentUI.AspNetCore.Components
@inherits FluentInputBase<TValue>
@typeparam TValue where TValue : new()
@using System.Globalization;
Expand All @@ -24,7 +24,7 @@
max="@(ReadOnly ? value : Max)"
min="@(ReadOnly ? value : Min)"
id=@Id
value="@value"
current-value="@value"
disabled="@Disabled"
vnbaaij marked this conversation as resolved.
Show resolved Hide resolved
name=@Name
required="@Required"
Expand Down
2 changes: 1 addition & 1 deletion ...re/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" additional-parameter-name="additional-parameter-value" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" additional-parameter-name="additional-parameter-value" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...e/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameters.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" additional-parameter1-name="additional-parameter1-value" additional-parameter2-name="additional-parameter2-value" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" additional-parameter1-name="additional-parameter1-value" additional-parameter2-name="additional-parameter2-value" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...erField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Filled.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="filled" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="filled" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...rField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Outline.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...ore/NumberField/FluentNumberFieldTests.FluentNumberField_AutoFocusParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field autofocus="" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field autofocus="" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ClassParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field class="additional-css-class" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field class="additional-css-class" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...Core/NumberField/FluentNumberFieldTests.FluentNumberField_DataListParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field list="datalist" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field list="datalist" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Default.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...Core/NumberField/FluentNumberFieldTests.FluentNumberField_DisabledParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" disabled="" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" disabled="" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...Core/NumberField/FluentNumberFieldTests.FluentNumberField_HideStepParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field hide-step="" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field hide-step="" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_IdParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Label.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

<label for="xxx" class="fluent-input-label" b-hum22yrq17="">My label
</label>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_LabelTemplate.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<label for="xxx" class="fluent-input-label" b-hum22yrq17="">
<h1>My label</h1>
</label>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...ore/NumberField/FluentNumberFieldTests.FluentNumberField_MaxLengthParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="10" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="10" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" max="2147483647" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" max="2147483647" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...ore/NumberField/FluentNumberFieldTests.FluentNumberField_MinLengthParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="3" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="3" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" min="-2147483648" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" min="-2147483648" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_NameParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" name="xxx" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" name="xxx" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...e/NumberField/FluentNumberFieldTests.FluentNumberField_PlaceholderParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field placeholder="placeholder-value" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field placeholder="placeholder-value" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...Core/NumberField/FluentNumberFieldTests.FluentNumberField_ReadOnlyParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field readonly="" maxlength="14" minlength="1" size="20" step="1" max="100" min="100" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field readonly="" maxlength="14" minlength="1" size="20" step="1" max="100" min="100" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion ...Core/NumberField/FluentNumberFieldTests.FluentNumberField_RequiredParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" required="" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" required="" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_SizeParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="3" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="3" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StepParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field maxlength="14" minlength="1" size="20" step="3" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field maxlength="14" minlength="1" size="20" step="3" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
2 changes: 1 addition & 1 deletion tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StyleParameter.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-number-field style="background-color: red;" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
<fluent-number-field style="background-color: red;" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
Loading