chore: changed to JSImport

unoplatform · Jan 2, 2024 · 82d1b5b · 82d1b5b
1 parent 26d3468
commit 82d1b5b
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 30 deletions.
diff --git a/Uno.Gallery/Uno.Gallery.Wasm/FragmentNavigationHandler.Interop.wasm.cs b/Uno.Gallery/Uno.Gallery.Wasm/FragmentNavigationHandler.Interop.wasm.cs
@@ -0,0 +1,18 @@
+using System.Runtime.InteropServices.JavaScript;
+
+namespace Uno.Gallery.Wasm
+{
+	internal sealed partial class FragmentNavigationHandler
+	{
+		internal static partial class NativeMethods
+		{
+			private const string JsType = "globalThis.Uno.Gallery.Wasm.FragmentNavigation";
+
+			[JSImport($"{JsType}.getCurrentFragment")]
+			internal static partial string GetCurrentFragment();
+
+			[JSImport($"{JsType}.setCurrentFragment")]
+			internal static partial string SetCurrentFragment(string fragment);
+		}
+	}
+}
diff --git a/Uno.Gallery/Uno.Gallery.Wasm/FragmentNavigationHandler.cs b/Uno.Gallery/Uno.Gallery.Wasm/FragmentNavigationHandler.cs
@@ -2,24 +2,19 @@
 
 namespace Uno.Gallery.Wasm
 {
-	public class FragmentNavigationHandler
+	internal partial class FragmentNavigationHandler
 	{
 		public static string CurrentFragment
 		{
 			get
 			{
-				const string command = "Uno.Gallery.Wasm.FragmentNavigationHandler.getCurrentFragment()";
-				var fragment = WebAssemblyRuntime.InvokeJS(command);
-				return fragment;
+				return NativeMethods.GetCurrentFragment();
 			}
 
 			set
 			{
 				var escaped = WebAssemblyRuntime.EscapeJs(value);
-				var command =
-					"Uno.Gallery.Wasm.FragmentNavigationHandler.setCurrentFragment(\"" + escaped + "\")";
-
-				WebAssemblyRuntime.InvokeJS(command);
+				NativeMethods.SetCurrentFragment(escaped);
 			}
 		}
 	}

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/LocationHrefNavigationHandler.Interop.wasm.cs b/Uno.Gallery/Uno.Gallery.Wasm/LocationHrefNavigationHandler.Interop.wasm.cs
@@ -0,0 +1,18 @@
+using System.Runtime.InteropServices.JavaScript;
+
+namespace Uno.Gallery.Wasm
+{
+	internal sealed partial class LocationHrefNavigationHandler
+	{
+		internal static partial class NativeMethods
+		{
+			private const string JsType = "globalThis.Uno.Gallery.Wasm.LocationHrefNavigation";
+
+			[JSImport($"{JsType}.getCurrentLocationHref")]
+			internal static partial string GetCurrentLocationHref();
+
+			[JSImport($"{JsType}.setCurrentLocationHref")]
+			internal static partial string SetCurrentLocationHref(string locationHref);
+		}
+	}
+}
diff --git a/Uno.Gallery/Uno.Gallery.Wasm/LocationHrefNavigationHandler.cs b/Uno.Gallery/Uno.Gallery.Wasm/LocationHrefNavigationHandler.cs
@@ -2,24 +2,19 @@
 
 namespace Uno.Gallery.Wasm
 {
-	public class LocationHrefNavigationHandler
+	internal partial class LocationHrefNavigationHandler
 	{
 		public static string CurrentLocationHref
 		{
 			get
 			{
-				const string command = "Uno.Gallery.Wasm.LocationHrefNavigationHandler.getCurrentLocationHref()";
-				var locationHref = WebAssemblyRuntime.InvokeJS(command);
-				return locationHref;
+				return NativeMethods.GetCurrentLocationHref();
 			}
 
 			set
 			{
 				var escaped = WebAssemblyRuntime.EscapeJs(value);
-				var command =
-					"Uno.Gallery.Wasm.LocationHrefNavigationHandler.setCurrentLocationHref(\"" + escaped + "\")";
-
-				WebAssemblyRuntime.InvokeJS(command);
+				NativeMethods.SetCurrentLocationHref(escaped);
 			}
 		}
 	}

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
@@ -148,6 +148,8 @@
 	<Import Project="..\Uno.Gallery.Shared\Uno.Gallery.Shared.projitems" Label="Shared" Condition="Exists('..\Uno.Gallery.Shared\Uno.Gallery.Shared.projitems')" />
 	<ItemGroup>
 	  <_Globbed_Compile Remove="FragmentNavigationHandler.cs" />
+	  <_Globbed_Compile Remove="FragmentNavigationHandler.Interop.wasm.cs" />
 	  <_Globbed_Compile Remove="LocationHrefNavigationHandler.cs" />
+	  <_Globbed_Compile Remove="LocationHrefNavigationHandler.Interop.wasm.cs" />
 	</ItemGroup>
 </Project>
diff --git a/Uno.Gallery/Uno.Gallery.Wasm/WasmScripts/UnoGallery.d.ts b/Uno.Gallery/Uno.Gallery.Wasm/WasmScripts/UnoGallery.d.ts
@@ -1,5 +1,5 @@
 declare namespace Uno.Gallery.Wasm {
-    class FragmentNavigationHandler {
+    class FragmentNavigation {
         private static currentFragment;
         static getCurrentFragment(): string;
         static setCurrentFragment(fragment: string): string;
@@ -18,7 +18,7 @@ declare namespace Uno.UI.Demo {
     }
 }
 declare namespace Uno.Gallery.Wasm {
-    class LocationHrefNavigationHandler {
+    class LocationHrefNavigation {
         private static currentLocationHref;
         static getCurrentLocationHref(): string;
         static setCurrentLocationHref(locationHref: string): string;

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/WasmScripts/UnoGallery.js b/Uno.Gallery/Uno.Gallery.Wasm/WasmScripts/UnoGallery.js
@@ -4,7 +4,7 @@ var Uno;
     (function (Gallery) {
         var Wasm;
         (function (Wasm) {
-            class FragmentNavigationHandler {
+            class FragmentNavigation {
                 static getCurrentFragment() {
                     return window.location.hash;
                 }
@@ -37,12 +37,12 @@ var Uno;
                         return; // already initialized.
                     }
                     const asm = MonoRuntime.assembly_load("Uno.Gallery.WASM");
-                    const handlerClass = MonoRuntime.find_class(asm, "Uno.UI.Wasm", "FragmentNavigationHandler");
+                    const handlerClass = MonoRuntime.find_class(asm, "Uno.Gallery.Wasm", "FragmentNavigation");
                     this.notifyFragmentChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyFragmentChanged", -1);
                 }
             }
-            FragmentNavigationHandler.subscribed = false;
-            Wasm.FragmentNavigationHandler = FragmentNavigationHandler;
+            FragmentNavigation.subscribed = false;
+            Wasm.FragmentNavigation = FragmentNavigation;
         })(Wasm = Gallery.Wasm || (Gallery.Wasm = {}));
     })(Gallery = Uno.Gallery || (Uno.Gallery = {}));
 })(Uno || (Uno = {}));
@@ -102,7 +102,7 @@ var Uno;
     (function (Gallery) {
         var Wasm;
         (function (Wasm) {
-            class LocationHrefNavigationHandler {
+            class LocationHrefNavigation {
                 static getCurrentLocationHref() {
                     return window.location.href;
                 }
@@ -135,12 +135,12 @@ var Uno;
                         return; // already initialized.
                     }
                     const asm = MonoRuntime.assembly_load("Uno.Gallery.WASM");
-                    const handlerClass = MonoRuntime.find_class(asm, "Uno.UI.Wasm", "LocationHrefHavigationHandler");
+                    const handlerClass = MonoRuntime.find_class(asm, "Uno.Gallery.Wasm", "LocationHrefHavigation");
                     this.notifyLocationHrefChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyLocationHrefChanged", -1);
                 }
             }
-            LocationHrefNavigationHandler.subscribed = false;
-            Wasm.LocationHrefNavigationHandler = LocationHrefNavigationHandler;
+            LocationHrefNavigation.subscribed = false;
+            Wasm.LocationHrefNavigation = LocationHrefNavigation;
         })(Wasm = Gallery.Wasm || (Gallery.Wasm = {}));
     })(Gallery = Uno.Gallery || (Uno.Gallery = {}));
 })(Uno || (Uno = {}));
diff --git a/Uno.Gallery/Uno.Gallery.Wasm/ts/FragmentNavigation.ts b/Uno.Gallery/Uno.Gallery.Wasm/ts/FragmentNavigation.ts
@@ -1,5 +1,5 @@
 namespace Uno.Gallery.Wasm {
-	export class FragmentNavigationHandler {
+	export class FragmentNavigation {
 
 		private static currentFragment: string;
 
@@ -55,7 +55,7 @@
 			}
 
 			const asm = MonoRuntime.assembly_load("Uno.Gallery.WASM");
-			const handlerClass = MonoRuntime.find_class(asm, "Uno.UI.Wasm", "FragmentNavigationHandler");
+			const handlerClass = MonoRuntime.find_class(asm, "Uno.Gallery.Wasm", "FragmentNavigation");
 			this.notifyFragmentChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyFragmentChanged", -1);
 		}
 	}

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/ts/LocationHrefNavigation.ts b/Uno.Gallery/Uno.Gallery.Wasm/ts/LocationHrefNavigation.ts
@@ -1,5 +1,5 @@
 namespace Uno.Gallery.Wasm {
-	export class LocationHrefNavigationHandler {
+	export class LocationHrefNavigation {
 
 		private static currentLocationHref: string;
 
@@ -55,7 +55,7 @@
 			}
 
 			const asm = MonoRuntime.assembly_load("Uno.Gallery.WASM");
-			const handlerClass = MonoRuntime.find_class(asm, "Uno.UI.Wasm", "LocationHrefHavigationHandler");
+			const handlerClass = MonoRuntime.find_class(asm, "Uno.Gallery.Wasm", "LocationHrefHavigation");
 			this.notifyLocationHrefChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyLocationHrefChanged", -1);
 		}
 	}