chore: Adjust invokejs semantics

unoplatform · Sep 5, 2024 · 70a016a · 70a016a
1 parent aa6fdd2
commit 70a016a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Uno.Foundation.Runtime.WebAssembly/Interop/WebAssembly.Runtime.cs b/src/Uno.Foundation.Runtime.WebAssembly/Interop/WebAssembly.Runtime.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable enable
+
+using System;
 using System.ComponentModel;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -17,7 +19,7 @@ internal sealed partial class Runtime
 		internal static partial string InvokeJS(string value);
 
 		[JSImport("globalThis.MonoSupport.jsCallDispatcher.invokeJSUnmarshalled")]
-		internal static partial IntPtr InvokeJSUnmarshalled(string functionIdentifier, IntPtr arg0, IntPtr arg1, IntPtr arg2);
+		internal static partial IntPtr InvokeJSUnmarshalled(string? functionIdentifier, IntPtr arg0, IntPtr arg1, IntPtr arg2);
 	}
 
 	namespace JSInterop

diff --git a/src/Uno.UI/ts/Interop/Runtime.ts b/src/Uno.UI/ts/Interop/Runtime.ts
@@ -6,8 +6,10 @@
 			return "";
 		}
 
-		public static InvokeJS(command: string) : string {
-			return eval(command);
+		public static InvokeJS(command: string): string {
+			// Preseve the original emscripten marshalling semantics
+			// to always return a valid string.
+			return String(eval(command) || "");
 		}
 	}
 }