ComponentDisposer : Get _disposables Field instead (#4182)

* ComponentDisposer : Get _disposables Field instead | Remove WASM Check | Add retried flag (Need this for WASM) * Rename vars Co-authored-by: Mladen Macanovic <[email protected]>
Megabit · Oct 7, 2022 · 7fe0674 · 7fe0674
1 parent 402d2b8
commit 7fe0674
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 27 deletions.
diff --git a/Source/Blazorise/ComponentDisposer.cs b/Source/Blazorise/ComponentDisposer.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using Blazorise.Extensions;
 using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
 #endregion
 
 namespace Blazorise
@@ -25,13 +24,13 @@ internal class ComponentDisposer : IComponentDisposer
     {
         #region Members
 
-        private readonly IJSRuntime jsRuntime;
-
         private bool disposePossible;
 
-        private readonly IList<object> disposables;
+        private bool retried;
+
+        private IList<object> disposables;
 
-        private const string PROPERTY_DISPOSABLES = "Disposables";
+        private const string FIELD_DISPOSABLES = "_disposables";
 
         private static Func<object, IList<object>> disposablesGetter;
 
@@ -42,12 +41,9 @@ internal class ComponentDisposer : IComponentDisposer
         /// <summary>
         /// Default constructor.
         /// </summary>
-        /// <param name="jsRuntime">Instance of a JavaScript runtime to which calls may be dispatched.</param>
         /// <param name="serviceProvider">Service provider used to retrieve registered components.</param>
-        public ComponentDisposer( IJSRuntime jsRuntime, IServiceProvider serviceProvider )
+        public ComponentDisposer( IServiceProvider serviceProvider )
         {
-            this.jsRuntime = jsRuntime;
-
             ServiceProvider = serviceProvider;
             disposables = LoadServiceProviderDisposableList();
         }
@@ -58,6 +54,12 @@ public ComponentDisposer( IJSRuntime jsRuntime, IServiceProvider serviceProvider
 
         public void Dispose<TComponent>( TComponent component ) where TComponent : IComponent
         {
+            if ( !disposePossible && !retried )
+            {
+                disposables = LoadServiceProviderDisposableList();
+                retried = true;
+            }
+
             if ( !disposePossible )
                 return;
 
@@ -74,15 +76,8 @@ public void Dispose<TComponent>( TComponent component ) where TComponent : IComp
         /// <returns>List of object references the ServiceProvider uses to track disposables</returns>
         private IList<object> LoadServiceProviderDisposableList()
         {
-            if ( IsWebAssembly )
-            {
-                disposePossible = false;
-
-                return new List<object>();
-            }
-
             if ( disposablesGetter is null )
-                disposablesGetter = ExpressionCompiler.CreatePropertyGetter<IList<object>>( ServiceProvider, PROPERTY_DISPOSABLES );
+                disposablesGetter = ExpressionCompiler.CreateFieldGetter<IList<object>>( ServiceProvider, FIELD_DISPOSABLES );
 
             var disposables = disposablesGetter( ServiceProvider );
 
@@ -95,11 +90,6 @@ private IList<object> LoadServiceProviderDisposableList()
 
         #region Properties
 
-        /// <summary>
-        /// Indicates if the current app is running in webassembly mode.
-        /// </summary>
-        protected bool IsWebAssembly => jsRuntime is IJSInProcessRuntime;
-
         /// <summary>
         /// Gets the reference to the <see cref="IServiceProvider"/>.
         /// </summary>

diff --git a/Source/Blazorise/Utilities/ExpressionCompiler.cs b/Source/Blazorise/Utilities/ExpressionCompiler.cs
@@ -1,10 +1,6 @@
 #region Using directives
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Reflection;
-using Microsoft.AspNetCore.Components.Forms;
 #endregion
 
 namespace Blazorise
@@ -22,7 +18,7 @@ public static class ExpressionCompiler
         /// <param name="propertyName"></param>
         /// <returns></returns>
         public static T GetProperty<T>( object instance, string propertyName )
-            => CreatePropertyGetter<T>( instance, propertyName )(instance);
+            => CreatePropertyGetter<T>( instance, propertyName )( instance );
 
         /// <summary>
         /// Generates a function getter for a property in an unknown instance.
@@ -39,5 +35,31 @@ public static Func<object, T> CreatePropertyGetter<T>( object instance, string p
 
             return Expression.Lambda<Func<object, T>>( Expression.Convert( property, typeof( T ) ), parameterExp ).Compile();
         }
+
+        /// <summary>
+        /// Gets a field in an unknown instance.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="instance"></param>
+        /// <param name="fieldName"></param>
+        /// <returns></returns>
+        public static T GetField<T>( object instance, string fieldName )
+            => CreateFieldGetter<T>( instance, fieldName )( instance );
+
+        /// <summary>
+        /// Generates a function getter for a field in an unknown instance.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="instance"></param>
+        /// <param name="fieldName"></param>
+        /// <returns></returns>
+        public static Func<object, T> CreateFieldGetter<T>( object instance, string fieldName )
+        {
+            var parameterExp = Expression.Parameter( typeof( object ), "instance" );
+            var castExp = Expression.TypeAs( parameterExp, instance.GetType() );
+            var field = Expression.Field( castExp, fieldName );
+
+            return Expression.Lambda<Func<object, T>>( Expression.Convert( field, typeof( T ) ), parameterExp ).Compile();
+        }
     }
 }