Fix JS interop cases in WebView (#31054)

SteveSandersonMS · web-flow · commit 89c25734e27b · 2021-03-19T19:15:30.000Z
diff --git a/src/Components/Web.JS/dist/Release/blazor.webview.js b/src/Components/Web.JS/dist/Release/blazor.webview.js
diff --git a/src/Components/Web.JS/src/Platform/WebView/WebViewIpcReceiver.ts b/src/Components/Web.JS/src/Platform/WebView/WebViewIpcReceiver.ts
@@ -31,7 +31,10 @@ export function startIpcReceiver() {
 
     'BeginInvokeJS': DotNet.jsCallDispatcher.beginInvokeJSFromDotNet,
 
-    'EndInvokeDotNet': DotNet.jsCallDispatcher.endInvokeDotNetFromJS,
+    'EndInvokeDotNet': (asyncCallId: string, success: boolean, invocationResultOrError: string) => {
+      const resultOrExceptionMessage: any = DotNet.parseJsonWithRevivers(invocationResultOrError);
+      DotNet.jsCallDispatcher.endInvokeDotNetFromJS(asyncCallId, success, resultOrExceptionMessage);
+    },
 
     'Navigate': navigationManagerFunctions.navigateTo,
   };
diff --git a/src/Components/WebView/Platforms/WindowsForms/testassets/WinFormsTestApp/wwwroot/webviewhost.html b/src/Components/WebView/Platforms/WindowsForms/testassets/WinFormsTestApp/wwwroot/webviewhost.html
@@ -7,6 +7,12 @@
     <title>WinFormsTestApp</title>
     <base href="/" />
     <link href="css/app.css" rel="stylesheet" />
+
+    <!-- Used by ExternalContentPackage -->
+    <link href="_content/TestContentPackage/styles.css" rel="stylesheet" />
+
+    <!-- App bundle that contains a reference to the scoped css bundle created by TestContentPackage -->
+    <link href="WinFormsTestApp.styles.css" rel="stylesheet" />
 </head>
 
 <body>
diff --git a/src/Components/WebView/Platforms/Wpf/testassets/WpfTestApp/wwwroot/webviewhost.html b/src/Components/WebView/Platforms/Wpf/testassets/WpfTestApp/wwwroot/webviewhost.html
@@ -7,6 +7,12 @@
     <title>WinFormsTestApp</title>
     <base href="/" />
     <link href="css/app.css" rel="stylesheet" />
+
+    <!-- Used by ExternalContentPackage -->
+    <link href="_content/TestContentPackage/styles.css" rel="stylesheet" />
+
+    <!-- App bundle that contains a reference to the scoped css bundle created by TestContentPackage -->
+    <link href="WpfTestApp.styles.css" rel="stylesheet" />
 </head>
 
 <body>
diff --git a/src/Components/WebView/WebView/src/IpcReceiver.cs b/src/Components/WebView/WebView/src/IpcReceiver.cs
@@ -82,14 +82,7 @@ private void BeginInvokeDotNet(PageContext pageContext, string callId, string as
 
         private void EndInvokeJS(PageContext pageContext, long asyncHandle, bool succeeded, string argumentsOrError)
         {
-            if (succeeded)
-            {
-                DotNetDispatcher.EndInvokeJS(pageContext.JSRuntime, argumentsOrError);
-            }
-            else
-            {
-                throw new InvalidOperationException(argumentsOrError);
-            }
+            DotNetDispatcher.EndInvokeJS(pageContext.JSRuntime, argumentsOrError);
         }
 
         private Task DispatchBrowserEventAsync(PageContext pageContext, string eventDescriptor, string eventArgs)

Original file line number	Diff line number	Diff line change
`@@ -82,14 +82,7 @@ private void BeginInvokeDotNet(PageContext pageContext, string callId, string as`
`82`	`82`
`83`	`83`	`private void EndInvokeJS(PageContext pageContext, long asyncHandle, bool succeeded, string argumentsOrError)`
`84`	`84`	`{`
`85`		`- if (succeeded)`
`86`		`- {`
`87`		`- DotNetDispatcher.EndInvokeJS(pageContext.JSRuntime, argumentsOrError);`
`88`		`- }`
`89`		`- else`
`90`		`- {`
`91`		`- throw new InvalidOperationException(argumentsOrError);`
`92`		`- }`
	`85`	`+ DotNetDispatcher.EndInvokeJS(pageContext.JSRuntime, argumentsOrError);`
`93`	`86`	`}`
`94`	`87`
`95`	`88`	`private Task DispatchBrowserEventAsync(PageContext pageContext, string eventDescriptor, string eventArgs)`