diff --git a/src/Core/Components/List/FluentCombobox.razor b/src/Core/Components/List/FluentCombobox.razor index 6496707926..c72f6522de 100644 --- a/src/Core/Components/List/FluentCombobox.razor +++ b/src/Core/Components/List/FluentCombobox.razor @@ -14,7 +14,7 @@ style="@StyleValue" autocomplete="@Autocomplete.ToAttributeValue()" open=@Open - current-value=@Value + current-value=@GetComboboxContent() placeholder=@Placeholder position=@Position.ToAttributeValue() disabled=@Disabled diff --git a/src/Core/Components/List/FluentCombobox.razor.cs b/src/Core/Components/List/FluentCombobox.razor.cs index 1cae063c18..332311a206 100644 --- a/src/Core/Components/List/FluentCombobox.razor.cs +++ b/src/Core/Components/List/FluentCombobox.razor.cs @@ -163,11 +163,11 @@ protected override async Task ChangeHandlerAsync(ChangeEventArgs e) } } - protected override string? GetOptionValue(TOption? item) + private string? GetComboboxContent() { - if (item != null) + if (SelectedOption != null) { - return OptionText.Invoke(item) ?? OptionValue.Invoke(item) ?? item.ToString(); + return OptionText.Invoke(SelectedOption) ?? OptionValue.Invoke(SelectedOption) ?? SelectedOption.ToString(); } else { diff --git a/tests/Core/List/FluentComboboxTests.FluentCombobox_ClearSelection.verified.html b/tests/Core/List/FluentComboboxTests.FluentCombobox_ClearSelection.verified.html index 27b79c65bf..d26baf656f 100644 --- a/tests/Core/List/FluentComboboxTests.FluentCombobox_ClearSelection.verified.html +++ b/tests/Core/List/FluentComboboxTests.FluentCombobox_ClearSelection.verified.html @@ -1,5 +1,5 @@ - + Contoso