Feedback

Author: dariatiurina

src/Components/Web.JS/src/Rendering/ElementReferenceCapture.ts

@@ -16,16 +16,6 @@ function getCaptureIdAttributeName(referenceCaptureId: string) {
   return `_bl_${referenceCaptureId}`;
 }
 
-function getCaptureIdFromElement(element: Element): string | null {
-  for (let i = 0; i < element.attributes.length; i++) {
-    const attr = element.attributes[i];
-    if (attr.name.startsWith('_bl_')) {
-      return attr.name.substring(4);
-    }
-  }
-  return null;
-}
-
 // Support receiving ElementRef instances as args in interop calls
 const elementRefKey = '__internalId'; // Keep in sync with ElementRef.cs
 DotNet.attachReviver((key, value) => {
@@ -34,15 +24,4 @@ DotNet.attachReviver((key, value) => {
   } else {
     return value;
   }
-});
-
-// Support return of the ElementRef from JS to .NET
-DotNet.attachReplacer((key, value) => {
-  if (value instanceof Element) {
-    const captureId = getCaptureIdFromElement(value);
-    if (captureId) {
-      return { [elementRefKey]: captureId };
-    }
-  }
-  return value;
 });

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

@@ -6,11 +6,10 @@
 export module DotNet {
   export type JsonReviver = ((key: any, value: any) => any);
   const jsonRevivers: JsonReviver[] = [];
-  export type JsonReplacer = ((key: any, value: any) => any);
-  const jsonReplacers: JsonReplacer[] = [];
 
   const jsObjectIdKey = "__jsObjectId";
   const dotNetObjectRefKey = "__dotNetObject";
+  const dotNetElementRefKey = "__internalId";
   const byteArrayRefKey = "__byte[]";
   const dotNetStreamRefKey = "__dotNetStream";
   const jsStreamReferenceLengthKey = "__jsStreamReferenceLength";
@@ -120,14 +119,6 @@ export module DotNet {
       jsonRevivers.push(reviver);
   }
 
-  /**
-   * Adds a JSON replacer callback that will be used when serializing arguments sent to .NET.
-   * @param replacer The replacer to add.
-   */
-  export function attachReplacer(replacer: JsonReplacer) {
-    jsonReplacers.push(replacer);
-}
-
   /**
    * Invokes the specified .NET public method synchronously. Not all hosting scenarios support
    * synchronous invocation, so if possible use invokeMethodAsync instead.
@@ -817,22 +808,30 @@ export module DotNet {
       return result;
   }
 
+  function getCaptureIdFromElement(element: Element): string | null {
+    for (let i = 0; i < element.attributes.length; i++) {
+      const attr = element.attributes[i];
+      if (attr.name.startsWith('_bl_')) {
+        return attr.name.substring(4);
+      }
+    }
+    return null;
+}
+
   function argReplacer(key: string, value: any) {
-      const processedValue = jsonReplacers.reduce(
-          (currentValue, replacer) => replacer(key, currentValue),
-          value
-      );
-
-      if (processedValue instanceof DotNetObject) {
-          return processedValue.serializeAsArg();
-      } else if (processedValue instanceof Uint8Array) {
+      if (value instanceof Element) {
+          return { [dotNetElementRefKey]: getCaptureIdFromElement(value) };
+      }
+      if (value instanceof DotNetObject) {
+          return value.serializeAsArg();
+      } else if (value instanceof Uint8Array) {
           const dotNetCallDispatcher = currentCallDispatcher!.getDotNetCallDispatcher();
-          dotNetCallDispatcher!.sendByteArray(nextByteArrayIndex, processedValue);
+          dotNetCallDispatcher!.sendByteArray(nextByteArrayIndex, value);
           const jsonValue = { [byteArrayRefKey]: nextByteArrayIndex };
           nextByteArrayIndex++;
           return jsonValue;
       }
 
-      return processedValue;
+      return value;
   }
 }