Clean Up JSInvoke

Author: enkodellc

src/MatBlazor.Demo/Demo/DemoMatNavMenu.razor

@@ -29,10 +29,10 @@
                     <MatNavItem Disabled="true" Href="#">Item 6.A</MatNavItem>
                     <MatNavItem>Item 6.B</MatNavItem>
                     <MatNavItem>Item 6.C</MatNavItem>
-                    
+
                 </MatNavSubMenuList>
             </MatNavSubMenu>
-            <MatNavItem Href="https://blazorboilerplate.com/">Blazor Boilerplate - Href</MatNavItem>
+            <MatNavItem Href="https://blazorboilerplate.com/" >Blazor Boilerplate - Href</MatNavItem>
             <MatNavItem Href="https://www.matblazor.com/">MatBlazor - Href</MatNavItem>
         </MatNavMenu>
 
@@ -312,4 +312,4 @@
         }
     ")></BlazorFiddle>
     </SourceContent>
-</DemoContainer>    
+</DemoContainer>

src/MatBlazor/Components/MatButton/BaseMatButton.cs

@@ -2,7 +2,6 @@
 using System.Windows.Input;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.JSInterop;
 
 namespace MatBlazor
 {
@@ -15,9 +14,6 @@ public class BaseMatButton : BaseMatDomComponent
         [Inject]
         public Microsoft.AspNetCore.Components.NavigationManager UriHelper { get; set; }
 
-        [Inject]
-        public IJSRuntime JSRuntime { get; set; }
-
         protected async override Task OnFirstAfterRenderAsync()
         {
             await base.OnFirstAfterRenderAsync();
@@ -190,13 +186,13 @@ public string Label
         [Parameter]
         public RenderFragment ChildContent { get; set; }
 
-        protected void OnClickHandler(MouseEventArgs ev)
+        protected async void OnClickHandler(MouseEventArgs ev)
         {
             if (Link != null)
             {
                 if (!string.IsNullOrEmpty(Target))
                 {
-                    JSRuntime.InvokeAsync<object>("open", Link, Target);
+                    await JsInvokeAsync<object>("open", Link, Target);
                 }
                 else
                 {
@@ -205,7 +201,7 @@ protected void OnClickHandler(MouseEventArgs ev)
             }
             else
             {
-                OnClick.InvokeAsync(ev);
+               await OnClick.InvokeAsync(ev);
                 if (Command?.CanExecute(CommandParameter) ?? false)
                 {
                     Command.Execute(CommandParameter);

src/MatBlazor/Components/MatIconButton/BaseMatIconButton.cs

@@ -2,7 +2,6 @@
 using System.Windows.Input;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.JSInterop;
 
 namespace MatBlazor
 {
@@ -14,9 +13,6 @@ public class BaseMatIconButton : BaseMatDomComponent
         [Inject]
         public Microsoft.AspNetCore.Components.NavigationManager UriHelper { get; set; }
 
-        [Inject]
-        public IJSRuntime JSRuntime { get; set; }
-
         private bool _disabled;
         private bool _toggled = false;
 
@@ -117,7 +113,7 @@ protected async Task OnClickHandler(MouseEventArgs ev)
             {
                 if (!string.IsNullOrEmpty(Target))
                 {
-                    JSRuntime.InvokeAsync<object>("open", Link, Target);
+                    await JsInvokeAsync<object>("open", Link, Target);
                 }
                 else
                 {
@@ -126,7 +122,7 @@ protected async Task OnClickHandler(MouseEventArgs ev)
             }
             else
             {
-                OnClick.InvokeAsync(ev);
+                await OnClick.InvokeAsync(ev);
                 if (Command?.CanExecute(CommandParameter) ?? false)
                 {
                     Command.Execute(CommandParameter);

src/MatBlazor/Components/MatNavMenu/BaseMatNavItem.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.JSInterop;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
@@ -15,9 +14,6 @@ public class BaseMatNavItem : BaseMatListItem
         [Inject]
         public NavigationManager UriHelper { get; set; }
 
-        [Inject]
-        public IJSRuntime JSRuntime { get; set; }
-
         [CascadingParameter]
         public BaseMatNavMenu MatNavMenu { get; set; }
 
@@ -95,14 +91,14 @@ protected async void OnClickHandler(MouseEventArgs e)
 
             if (Href != null)
             {
-                //if (!string.IsNullOrEmpty(Target))
-                //{
-                //   await JSRuntime.InvokeAsync<object>("open", Href, Target);
-                //}
-                //else
-                //{
+                if (!string.IsNullOrEmpty(Target))
+                {
+                   await JsInvokeAsync<object>("open", Href, Target);
+                }
+                else
+                {
                     UriHelper.NavigateTo(Href);
-                //}
+                }
             }
             else
             {