🐛 fix(MTextfield): OnClearClick should be invoked after value updated (…

…#451)
masastack · May 10, 2022 · 96e938f · 96e938f
1 parent 9aa104d
commit 96e938f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/Masa.Blazor/Components/FileInput/MFileInput.cs b/src/Masa.Blazor/Components/FileInput/MFileInput.cs
@@ -261,6 +261,11 @@ public override async Task HandleOnClearClickAsync(MouseEventArgs args)
             {
                 await SetInternalValueAsync(default);
             }
+
+            if (OnClearClick.HasDelegate)
+            {
+                await OnClearClick.InvokeAsync(args);
+            }
         }
     }
 }
diff --git a/src/Masa.Blazor/Components/Select/MSelect.cs b/src/Masa.Blazor/Components/Select/MSelect.cs
@@ -445,11 +445,6 @@ public override Task HandleOnBlurAsync(FocusEventArgs args)
 
         public override async Task HandleOnClearClickAsync(MouseEventArgs args)
         {
-            if (OnClearClick.HasDelegate)
-            {
-                await OnClearClick.InvokeAsync(args);
-            }
-
             if (Multiple)
             {
                 IList<TItemValue> values = new List<TItemValue>();
@@ -460,6 +455,11 @@ public override async Task HandleOnClearClickAsync(MouseEventArgs args)
                 await SetInternalValueAsync(default);
             }
 
+            if (OnClearClick.HasDelegate)
+            {
+                await OnClearClick.InvokeAsync(args);
+            }
+
             // TODO: setMenuIndex(-1)
 
             // whether to need NextTick?

diff --git a/src/Masa.Blazor/Components/TextField/MTextField.cs b/src/Masa.Blazor/Components/TextField/MTextField.cs
@@ -787,14 +787,13 @@ public virtual async Task HandleOnKeyDownAsync(KeyboardEventArgs args)
 
         public virtual async Task HandleOnClearClickAsync(MouseEventArgs args)
         {
+            await SetInternalValueAsync(default);
+
             if (OnClearClick.HasDelegate)
             {
                 await OnClearClick.InvokeAsync(args);
             }
 
-            // whether to need NextTick?
-            await SetInternalValueAsync(default);
-
             await InputElement.FocusAsync();
         }
     }