perf: Add DispatchNativePositionChange export

unoplatform · Jun 1, 2023 · f178115 · f178115
1 parent 06f31f2
commit f178115
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/FocusVisual/SystemFocusVisual.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/FocusVisual/SystemFocusVisual.wasm.cs
@@ -39,6 +39,9 @@ partial void DetachVisualPartial()
 #endif
 	}
 
+#if NET7_0_OR_GREATER
+	[JSExport]
+#endif
 	public static int DispatchNativePositionChange(int focusVisualId)
 	{
 		var element = UIElement.GetElementFromHandle(focusVisualId) as SystemFocusVisual;

diff --git a/src/Uno.UI/ts/Windows/UI/Xaml/Input/FocusVisual.ts b/src/Uno.UI/ts/Windows/UI/Xaml/Input/FocusVisual.ts
@@ -25,8 +25,12 @@
 
 		private static onDocumentScroll() {
 			if (!FocusVisual.dispatchPositionChange) {
-				FocusVisual.dispatchPositionChange = (<any>Module).mono_bind_static_method(
-					"[Uno.UI] Uno.UI.Xaml.Controls.SystemFocusVisual:DispatchNativePositionChange");
+				if ((<any>globalThis).DotnetExports !== undefined) {
+					FocusVisual.dispatchPositionChange = (<any>globalThis).DotnetExports.UnoUI.Uno.UI.Xaml.Controls.SystemFocusVisual.DispatchNativePositionChange;
+				} else {
+					FocusVisual.dispatchPositionChange = (<any>Module).mono_bind_static_method(
+						"[Uno.UI] Uno.UI.Xaml.Controls.SystemFocusVisual:DispatchNativePositionChange");
+				}
 			}
 
 			FocusVisual.updatePosition();