Fix crashing after opening a uri on browser (#17524)

* Fix crashing after opening a uri on browser * Update NavigationHelper.cs
AvaloniaUI · Nov 19, 2024 · 9091d66 · 9091d66
1 parent 6728f06
commit 9091d66
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Browser/Avalonia.Browser/Interop/NavigationHelper.cs b/src/Browser/Avalonia.Browser/Interop/NavigationHelper.cs
@@ -16,7 +16,7 @@ public static Task<bool> OnBackRequested()
             .OnBackRequested() ?? false;
         return Task.FromResult(handled);
     }
-    
-    [JSImport("globalThis.open")]
-    public static partial JSObject? WindowOpen(string uri, string target);
+
+    [JSImport("NavigationHelper.openUri", AvaloniaModule.MainModuleName)]
+    public static partial bool WindowOpen(string uri, string target);
 }
diff --git a/src/Browser/Avalonia.Browser/Storage/BrowserLauncher.cs b/src/Browser/Avalonia.Browser/Storage/BrowserLauncher.cs
@@ -13,8 +13,7 @@ public Task<bool> LaunchUriAsync(Uri uri)
 
         if (uri.IsAbsoluteUri)
         {
-            var window = NavigationHelper.WindowOpen(uri.AbsoluteUri, "_blank");
-            return Task.FromResult(window is not null);
+            return Task.FromResult(NavigationHelper.WindowOpen(uri.AbsoluteUri, "_blank"));
         }
         return Task.FromResult(false);
     }

diff --git a/src/Browser/Avalonia.Browser/webapp/modules/avalonia/navigationHelper.ts b/src/Browser/Avalonia.Browser/webapp/modules/avalonia/navigationHelper.ts
@@ -11,4 +11,8 @@ export class NavigationHelper {
             }
         };
     }
+
+    public static openUri(uri?: string, target?: string) {
+        return !!window.open(uri, target);
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,8 @@ export class NavigationHelper { @@
                 }
             };
         }
+        public static openUri(uri?: string, target?: string) {
+            return !!window.open(uri, target);
+        }
     }