Update JSInProcessObjectReference.cs (#48287)

* Update JSInProcessObjectReference.cs

Fix for bug #48280

* Add JSObjectReferences dispose tests

---------

Co-authored-by: Mackinnon Buck <[email protected]>

Author: LostBeard

src/Components/Web.JS/dist/Release/blazor.server.js

@@ -91,6 +91,7 @@ public void CanInvokeDotNetMethods()
             ["invokeAsyncThrowsSerializingCircularStructure"] = "Success",
             ["invokeAsyncThrowsUndefinedJSObjectReference"] = "Success",
             ["invokeAsyncThrowsNullJSObjectReference"] = "Success",
+            ["disposeJSObjectReferenceAsync"] = "Success",
         };
 
         var expectedSyncValues = new Dictionary<string, string>
@@ -143,6 +144,7 @@ public void CanInvokeDotNetMethods()
             ["genericInstanceMethod"] = @"""Updated value 2""",
             ["requestDotNetStreamReference"] = @"""Success""",
             ["requestDotNetStreamWrapperReference"] = @"""Success""",
+            ["disposeJSInProcessObjectReference"] = "Success",
         };
 
         // Include the sync assertions only when running under WebAssembly

src/Components/Web.JS/dist/Release/blazor.web.js

@@ -221,6 +221,16 @@
             JSObjectReferenceInvokeNonFunctionException = e;
         }
 
+        try
+        {
+            await jsObjectReference.DisposeAsync();
+            ReturnValues["disposeJSObjectReferenceAsync"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["disposeJSObjectReferenceAsync"] = $"Failure: {ex.Message}";
+        }
+
         var module = await JSRuntime.InvokeAsync<IJSObjectReference>("import", "./js/testmodule.js");
         ReturnValues["jsObjectReferenceModule"] = await module.InvokeAsync<string>("identity", "Returned from module!");
 
@@ -408,6 +418,15 @@
             NumberField = 41,
         }).ToString();
 
+        try
+        {
+            jsInProcObjectReference.Dispose();
+            ReturnValues["disposeJSInProcessObjectReference"] = "Success";
+        }
+        catch (Exception ex)
+        {
+            ReturnValues["disposeJSInProcessObjectReference"] = $"Failure: {ex.Message}";
+        }
 
         var unmarshalledRuntime = (IJSUnmarshalledRuntime)JSRuntime;
         var jsUnmarshalledReference = unmarshalledRuntime.InvokeUnmarshalled<IJSUnmarshalledObjectReference>("returnJSObjectReference");

src/Components/Web.JS/dist/Release/blazor.webview.js

@@ -555,7 +555,7 @@ export module DotNet {
       throw new Error(`JS object instance with ID ${targetInstanceId} does not exist (has it been disposed?).`);
   }
 
-  function disposeJSObjectReferenceById(id: number) {
+  export function disposeJSObjectReferenceById(id: number) {
       delete cachedJSObjectsById[id];
   }
 

src/Components/test/E2ETest/Tests/InteropTest.cs

@@ -44,6 +44,6 @@ public void Dispose()
         }
     }
 
-    [JSImport("DotNet.jsCallDispatcher.disposeJSObjectReferenceById", "blazor-internal")]
+    [JSImport("globalThis.DotNet.disposeJSObjectReferenceById")]
     private static partial void DisposeJSObjectReferenceById([JSMarshalAs<JSType.Number>] long id);
 }

src/Components/test/testassets/BasicTestApp/InteropComponent.razor

@@ -21,7 +21,7 @@ public class JSObjectReference : IJSObjectReference
     protected internal long Id { get; }
 
     /// <summary>
-    /// Inititializes a new <see cref="JSObjectReference"/> instance.
+    /// Initializes a new <see cref="JSObjectReference"/> instance.
     /// </summary>
     /// <param name="jsRuntime">The <see cref="JSRuntime"/> used for invoking JS interop calls.</param>
     /// <param name="id">The unique identifier.</param>
@@ -55,7 +55,7 @@ public async ValueTask DisposeAsync()
         {
             Disposed = true;
 
-            await _jsRuntime.InvokeVoidAsync("DotNet.jsCallDispatcher.disposeJSObjectReferenceById", Id);
+            await _jsRuntime.InvokeVoidAsync("DotNet.disposeJSObjectReferenceById", Id);
         }
     }
 

src/JSInterop/Microsoft.JSInterop.JS/src/src/Microsoft.JSInterop.ts

@@ -14,7 +14,7 @@ public sealed class JSStreamReference : JSObjectReference, IJSStreamReference
     public long Length { get; }
 
     /// <summary>
-    /// Inititializes a new <see cref="JSStreamReference"/> instance.
+    /// Initializes a new <see cref="JSStreamReference"/> instance.
     /// </summary>
     /// <param name="jsRuntime">The <see cref="JSRuntime"/> used for invoking JS interop calls.</param>
     /// <param name="id">The unique identifier.</param>