perf(WindowManager): Add GetAttribute binding

unoplatform · Mar 24, 2023 · 9a46fda · 9a46fda
1 parent 9f57900
commit 9a46fda
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/Uno.UI/UI/Xaml/UIElement.wasm.cs b/src/Uno.UI/UI/Xaml/UIElement.wasm.cs
@@ -282,8 +282,7 @@ protected internal void SetAttribute(params (string name, string value)[] attrib
 
 		protected internal string GetAttribute(string name)
 		{
-			var command = "Uno.UI.WindowManager.current.getAttribute(" + HtmlId + ", \"" + name + "\");";
-			return WebAssemblyRuntime.InvokeJS(command);
+			return WindowManagerInterop.GetAttribute(HtmlId, name);
 		}
 
 		protected internal void SetProperty(string name, string value)

diff --git a/src/Uno.UI/UI/Xaml/WindowManagerInterop.wasm.cs b/src/Uno.UI/UI/Xaml/WindowManagerInterop.wasm.cs
@@ -538,9 +538,13 @@ private struct WindowManagerSetAttributeParams
 		#region GetAttribute
 		internal static string GetAttribute(IntPtr htmlId, string name)
 		{
+#if NET7_0_OR_GREATER
+			return NativeMethods.GetAttribute(htmlId, name);
+#else
 			var command = "Uno.UI.WindowManager.current.getAttribute(\"" + htmlId + "\", \"" + name + "\");";
 
 			return WebAssemblyRuntime.InvokeJS(command);
+#endif
 		}
 		#endregion
 
@@ -1193,6 +1197,9 @@ internal static partial void ArrangeElement(
 			[JSImport("globalThis.Uno.UI.WindowManager.current.destroyViewNativeFast")]
 			internal static partial void DestroyView(IntPtr htmlId);
 
+			[JSImport("globalThis.Uno.UI.WindowManager.current.getAttribute")]
+			internal static partial string GetAttribute(IntPtr htmlId, string name);
+
 			[JSImport("globalThis.Uno.UI.WindowManager.current.measureViewNativeFast")]
 			internal static partial void MeasureView(IntPtr htmlId, double availableWidth, double availableHeight, bool measureContent, IntPtr pReturn);
 

diff --git a/src/Uno.UI/ts/WindowManager.ts b/src/Uno.UI/ts/WindowManager.ts
@@ -423,7 +423,7 @@ namespace Uno.UI {
 		/**
 			* Get an attribute for an element.
 			*/
-		public getAttribute(elementId: number, name: string): any {
+		public getAttribute(elementId: number, name: string): string {
 
 			return this.getView(elementId).getAttribute(name);
 		}