perf(WindowManager): Add SetImageAsMonochrome binding

unoplatform · Mar 30, 2023 · aec6bcc · aec6bcc
1 parent 3006ede
commit aec6bcc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/Image/Image.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/Image/Image.wasm.cs
@@ -9,6 +9,7 @@
 using Uno.Disposables;
 using Windows.Storage.Streams;
 using System.Runtime.InteropServices;
+using Uno.UI.Xaml;
 using Uno.UI.Xaml.Media;
 using Windows.UI;
 
@@ -109,7 +110,7 @@ void OnSourceOpened(ImageData img)
 						default:
 							if (MonochromeColor != null)
 							{
-								WebAssemblyRuntime.InvokeJS("Uno.UI.WindowManager.current.setImageAsMonochrome(" + _htmlImage.HtmlId + ", \"" + img.Value + "\", \"" + MonochromeColor.Value.ToHexString() + "\");");
+								WindowManagerInterop.SetImageAsMonochrome(_htmlImage.HtmlId, img.Value, MonochromeColor.Value.ToHexString());
 							}
 							else
 							{

diff --git a/src/Uno.UI/UI/Xaml/WindowManagerInterop.wasm.cs b/src/Uno.UI/UI/Xaml/WindowManagerInterop.wasm.cs
@@ -1206,6 +1206,13 @@ internal static void SelectInputRange(IntPtr htmlId, int start, int length)
 				WebAssemblyRuntime.InvokeJS($"Uno.UI.WindowManager.current.selectInputRange({htmlId}, {start}, {length})");
 #endif
 
+		internal static void SetImageAsMonochrome(IntPtr htmlId, string url, string color)
+			=>
+#if NET7_0_OR_GREATER
+				NativeMethods.SetImageAsMonochrome(htmlId, url, color);
+#else
+				WebAssemblyRuntime.InvokeJS($"Uno.UI.WindowManager.current.setImageAsMonochrome({htmlId}, \"{url}\", \"{color}\");");
+#endif
 		internal static void SetRootElement(IntPtr htmlId)
 		{
 #if NET7_0_OR_GREATER
@@ -1303,6 +1310,9 @@ internal static partial void ArrangeElement(
 			[JSImport("globalThis.Uno.UI.WindowManager.current.setElementTransformNativeFast")]
 			internal static partial void SetElementTransform(IntPtr htmlId, float m11, float m12, float m21, float m22, float m31, float m32);
 
+			[JSImport("globalThis.Uno.UI.WindowManager.current.setImageAsMonochrome")]
+			internal static partial void SetImageAsMonochrome(IntPtr htmlId, string url, string color);
+
 			[JSImport("globalThis.Uno.UI.WindowManager.current.setPointerCapture")]
 			internal static partial void SetPointerCapture(IntPtr htmlId, double pointerId);
 

diff --git a/src/Uno.UI/ts/WindowManager.ts b/src/Uno.UI/ts/WindowManager.ts
@@ -1431,7 +1431,7 @@ namespace Uno.UI {
 		 * @param url the source image
 		 * @param color the color to apply to the monochrome pixels
 		 */
-		public setImageAsMonochrome(viewId: number, url: string, color: string): string {
+		public setImageAsMonochrome(viewId: number, url: string, color: string): void {
 			const element = this.getView(viewId);
 
 			if (element.tagName.toUpperCase() === "IMG") {
@@ -1458,8 +1458,6 @@ namespace Uno.UI {
 
 					imgElement.src = c.toDataURL();
 				}
-
-				return "ok";
 			}
 			else {
 				throw `setImageAsMonochrome: Element id ${viewId} is not an Img.`;