Autocomplete: fix multi selection when ReadData is used (#6303)

Author: stsrki

Source/Extensions/Blazorise.Components/Autocomplete.razor.cs

@@ -775,20 +775,26 @@ private async Task RemoveMultipleText( string text )
         if ( SelectedTexts is null )
             return;
 
-        SelectedTexts.Remove( text );
-        await SelectedTextsChanged.InvokeAsync( SelectedTexts );
+        var removed = SelectedTexts.Remove( text );
 
-        if ( SelectionMode == AutocompleteSelectionMode.Multiple )
-            DirtyFilter();
+        if ( removed )
+        {
+            await SelectedTextsChanged.InvokeAsync( SelectedTexts );
+
+            if ( SelectionMode == AutocompleteSelectionMode.Multiple )
+                DirtyFilter();
+        }
     }
 
     private async Task RemoveMultipleValue( TValue value )
     {
         if ( SelectedValues is null )
             return;
 
-        SelectedValues.Remove( value );
-        await SelectedValuesChanged.InvokeAsync( SelectedValues );
+        var removed = SelectedValues.Remove( value );
+
+        if ( removed )
+            await SelectedValuesChanged.InvokeAsync( SelectedValues );
     }
 
     /// <summary>
@@ -814,8 +820,10 @@ public async Task RemoveMultipleTextAndValue( string text )
         if ( Disabled )
             return;
 
+        var selectedValue = GetValueByText( text );
+
         await RemoveMultipleText( text );
-        await RemoveMultipleValue( GetValueByText( text ) );
+        await RemoveMultipleValue( selectedValue );
 
         if ( ( validationRef.ParentValidations?.Mode ?? ValidationMode.Auto ) == ValidationMode.Auto )
             await validationRef.ValidateAsync();
@@ -830,7 +838,17 @@ public async Task RemoveMultipleTextAndValue( string text )
     /// <returns></returns>
     public async Task RemoveMultipleTextAndValue( TValue value )
     {
-        await RemoveMultipleText( GetItemText( value ) );
+        var text = GetItemText( value );
+
+        if ( string.IsNullOrEmpty( text ) && SelectedValues is not null && SelectedTexts is not null )
+        {
+            var selectedValueIndex = SelectedValues.IndexOf( value );
+
+            if ( selectedValueIndex > -1 && selectedValueIndex < SelectedTexts.Count )
+                text = SelectedTexts[selectedValueIndex];
+        }
+
+        await RemoveMultipleText( text );
         await RemoveMultipleValue( value );
 
         if ( ( validationRef.ParentValidations?.Mode ?? ValidationMode.Auto ) == ValidationMode.Auto )
@@ -1190,9 +1208,21 @@ public IEnumerable<TItem> GetItemsByText( string text )
     /// <param name="text"></param>
     /// <returns></returns>
     private TValue GetValueByText( string text )
-        => SelectedValues is not null
-        ? SelectedValues.FirstOrDefault( x => GetItemText( x ) == text )
-        : default;
+    {
+        if ( SelectedValues is not null && SelectedTexts is not null )
+        {
+            var selectedValueIndex = SelectedTexts.IndexOf( text );
+
+            if ( selectedValueIndex > -1 && selectedValueIndex < SelectedValues.Count )
+                return SelectedValues[selectedValueIndex];
+        }
+
+        var item = GetItemByText( text );
+
+        return item is null
+            ? default
+            : GetItemValue( item );
+    }
 
     private Color GetMultipleBadgeColor() => Disabled
         ? MultipleDisabledBadgeColor

Tests/Blazorise.Tests/Components/AutocompleteMultipleReadDataComponentTest.cs

@@ -1,5 +1,7 @@
 #region Using directives
+using System.Linq;
 using System.Threading.Tasks;
+using Bunit;
 using Xunit;
 #endregion
 
@@ -54,4 +56,35 @@ public Task RemoveValues_ShouldRemove( string[] startTexts, string[] removeTexts
     {
         return TestRemoveValues<AutocompleteMultipleReadDataComponent>( startTexts, removeTexts, expectedTexts );
     }
+
+    [Fact]
+    public async Task RemovePreviousSelection_WhenLastReadDataDoesNotContainIt_ShouldKeepRemainingSelection()
+    {
+        var comp = RenderComponent<AutocompleteMultipleReadDataComponent>( parameters =>
+            parameters.Add( p => p.MinLength, 0 ) );
+
+        var autoComplete = comp.Find( ".b-is-autocomplete input" );
+
+        await autoComplete.FocusAsync( new() );
+        await autoComplete.InputAsync( "Antarctica" );
+        AutocompleteBaseComponentTest.WaitAndClickfirstOption( comp, "Antarctica", true );
+
+        await autoComplete.FocusAsync( new() );
+        await autoComplete.InputAsync( "Zambia" );
+        AutocompleteBaseComponentTest.WaitAndClickfirstOption( comp, "Zambia", true );
+
+        var badges = comp.FindAll( ".b-is-autocomplete .badge" );
+        var badgeToRemove = badges.Single( x => x.TextContent.Replace( "×", "" ) == "Antarctica" );
+        var removeButton = badgeToRemove.GetElementsByTagName( "span" )[0];
+        await removeButton.ClickAsync( new() );
+
+        comp.WaitForAssertion( () =>
+        {
+            badges.Refresh();
+            Assert.Single( badges );
+            Assert.Equal( "Zambia", badges[0].TextContent.Replace( "×", "" ) );
+            Assert.Equal( new[] { "Zambia" }, comp.Instance.SelectedTexts );
+            Assert.Equal( new[] { "ZM" }, comp.Instance.SelectedValues );
+        }, TestExtensions.WaitTime );
+    }
 }