Merge pull request SamProf#546 from sandrohanea/master

Fixed SamProf#545 Can't select item in MatAutocompleteList
sandrohanea · May 15, 2020 · eb20a3b · eb20a3b
2 parents 32b14b6 + d297ad4
commit eb20a3b
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/MatBlazor/Components/MatAutocompleteList/BaseMatAutocompleteList.cs b/src/MatBlazor/Components/MatAutocompleteList/BaseMatAutocompleteList.cs
@@ -90,13 +90,18 @@ public TItem Value
             get { return _value; }
             set
             {
+                var newerStringValue = EqualValues(value, default) ? string.Empty : ComputeStringValue(value);
+                if (newerStringValue != StringValue)
+                {
+                    StringValue = newerStringValue;
+                }
+
                 if (EqualValues(value, _value))
                 {
                     return;
                 }
 
                 _value = value;
-                StringValue = EqualValues(Value, default(TItem)) ? string.Empty : ComputeStringValue(Value);
                 ValueChanged.InvokeAsync(_value);
             }
         }
@@ -167,6 +172,10 @@ protected void OpenPopup()
 
         protected void ClosePopup()
         {
+            if (StringValue != ComputeStringValue(Value))
+            {
+                _value = default;
+            }
             IsOpened = false;
         }
 
@@ -217,11 +226,5 @@ private string ComputeStringValue(TItem obj)
         {
             return CustomStringSelector?.Invoke(obj) ?? obj?.ToString();
         }
-
-//        protected async override Task OnFirstAfterRenderAsync()
-//        {
-//            await base.OnFirstAfterRenderAsync();
-//            await JsInvokeAsync<object>("matBlazor.matAutocomplete.init", Ref);
-//        }
     }
 }