From 523c87d5b030394182de4693bfac5dfdaab83dbc Mon Sep 17 00:00:00 2001 From: Max Katz Date: Thu, 10 Nov 2022 00:25:34 -0500 Subject: [PATCH] Browser: use JS side mobile checks --- .../Avalonia.Web/BrowserRuntimePlatform.cs | 23 ++++--------------- .../Avalonia.Web/BrowserSingleViewLifetime.cs | 7 ------ .../Avalonia.Web/Interop/AvaloniaModule.cs | 5 +++- src/Web/Avalonia.Web/WindowingPlatform.cs | 8 ++++--- .../webapp/modules/avalonia/caniuse.ts | 18 ++++++++++++--- 5 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs b/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs index b04b0142e7..96fda806ce 100644 --- a/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs +++ b/src/Web/Avalonia.Web/BrowserRuntimePlatform.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; using System.Runtime.InteropServices.JavaScript; using System.Text.RegularExpressions; using Avalonia.Platform; +using Avalonia.Web.Interop; namespace Avalonia.Web; @@ -27,23 +28,7 @@ internal class BrowserRuntimePlatform : StandardRuntimePlatform else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("Browser"))) { os = OperatingSystemType.Browser; - - var navigator = JSHost.GlobalThis.GetPropertyAsJSObject("navigator"); - var u = navigator?.GetPropertyAsString("userAgent"); - - if (u != null) - { - var b = new Regex( - @"(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino", - RegexOptions.IgnoreCase | RegexOptions.Multiline); - var v = new Regex( - @"1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-", - RegexOptions.IgnoreCase | RegexOptions.Multiline); - if ((b.IsMatch(u) || v.IsMatch(u.Substring(0, 4)))) - { - isBrowserMobile = true; - } - } + isBrowserMobile = AvaloniaModule.IsMobile(); } else throw new Exception("Unknown OS platform " + RuntimeInformation.OSDescription); @@ -80,10 +65,10 @@ internal class BrowserRuntimePlatform : StandardRuntimePlatform result.IsDesktop = true; } } - + return result; }); - + public override RuntimePlatformInfo GetRuntimeInfo() => Info.Value; } diff --git a/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs b/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs index 29cffb9c8f..0dcc474f76 100644 --- a/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs +++ b/src/Web/Avalonia.Web/BrowserSingleViewLifetime.cs @@ -47,13 +47,6 @@ public static class WebAppBuilder where T : AppBuilderBase, new() { return builder - .AfterSetup(_ => - { - var standardPlatform = new BrowserRuntimePlatform(); - - AvaloniaLocator.CurrentMutable - .Bind().ToConstant(standardPlatform); - }) .UseWindowingSubsystem(BrowserWindowingPlatform.Register) .UseSkia() .With(new SkiaOptions { CustomGpuFactory = () => new BrowserSkiaGpu() }); diff --git a/src/Web/Avalonia.Web/Interop/AvaloniaModule.cs b/src/Web/Avalonia.Web/Interop/AvaloniaModule.cs index 176b8d60fc..0e54deb515 100644 --- a/src/Web/Avalonia.Web/Interop/AvaloniaModule.cs +++ b/src/Web/Avalonia.Web/Interop/AvaloniaModule.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; namespace Avalonia.Web.Interop; -internal static class AvaloniaModule +internal static partial class AvaloniaModule { public const string MainModuleName = "avalonia"; public const string StorageModuleName = "storage"; @@ -19,4 +19,7 @@ internal static class AvaloniaModule var options = AvaloniaLocator.Current.GetService() ?? new BrowserPlatformOptions(); return JSHost.ImportAsync(StorageModuleName, options.FrameworkAssetPathResolver("storage.js")); } + + [JSImport("Caniuse.isMobile", AvaloniaModule.MainModuleName)] + public static partial bool IsMobile(); } diff --git a/src/Web/Avalonia.Web/WindowingPlatform.cs b/src/Web/Avalonia.Web/WindowingPlatform.cs index c399c22c61..828964afa7 100644 --- a/src/Web/Avalonia.Web/WindowingPlatform.cs +++ b/src/Web/Avalonia.Web/WindowingPlatform.cs @@ -31,8 +31,10 @@ namespace Avalonia.Web public static void Register() { var instance = new BrowserWindowingPlatform(); + s_keyboard = new KeyboardDevice(); AvaloniaLocator.CurrentMutable + .Bind().ToSingleton() .Bind().ToSingleton() .Bind().ToSingleton() .Bind().ToConstant(s_keyboard) @@ -64,11 +66,11 @@ namespace Avalonia.Web { if (_signaled) return; - + _signaled = true; - + IDisposable? disp = null; - + disp = GetRuntimePlatform() .StartSystemTimer(TimeSpan.FromMilliseconds(1), () => diff --git a/src/Web/Avalonia.Web/webapp/modules/avalonia/caniuse.ts b/src/Web/Avalonia.Web/webapp/modules/avalonia/caniuse.ts index 6dedcb724f..e019f92113 100644 --- a/src/Web/Avalonia.Web/webapp/modules/avalonia/caniuse.ts +++ b/src/Web/Avalonia.Web/webapp/modules/avalonia/caniuse.ts @@ -1,13 +1,25 @@ export class Caniuse { public static canShowOpenFilePicker(): boolean { - return typeof window.showOpenFilePicker !== "undefined"; + return typeof globalThis.showOpenFilePicker !== "undefined"; } public static canShowSaveFilePicker(): boolean { - return typeof window.showSaveFilePicker !== "undefined"; + return typeof globalThis.showSaveFilePicker !== "undefined"; } public static canShowDirectoryPicker(): boolean { - return typeof window.showDirectoryPicker !== "undefined"; + return typeof globalThis.showDirectoryPicker !== "undefined"; + } + + public static isMobile(): boolean { + const userAgentData = (globalThis.navigator as any)?.userAgentData; + if (userAgentData) { + return userAgentData.mobile; + } + + const userAgent = navigator.userAgent; + const regex1 = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i; + const regex2 = /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw(n|u)|c55\/|capi|ccwa|cdm|cell|chtm|cldc|cmd|co(mp|nd)|craw|da(it|ll|ng)|dbte|dcs|devi|dica|dmob|do(c|p)o|ds(12|d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(|_)|g1 u|g560|gene|gf5|gmo|go(\.w|od)|gr(ad|un)|haie|hcit|hd(m|p|t)|hei|hi(pt|ta)|hp( i|ip)|hsc|ht(c(| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i(20|go|ma)|i230|iac( ||\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|[a-w])|libw|lynx|m1w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|mcr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|([1-8]|c))|phil|pire|pl(ay|uc)|pn2|po(ck|rt|se)|prox|psio|ptg|qaa|qc(07|12|21|32|60|[2-7]|i)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h|oo|p)|sdk\/|se(c(|0|1)|47|mc|nd|ri)|sgh|shar|sie(|m)|sk0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h|v|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl|tdg|tel(i|m)|tim|tmo|to(pl|sh)|ts(70|m|m3|m5)|tx9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas|your|zeto|zte/i; + return regex1.test(userAgent) || regex2.test(userAgent.substr(0, 4)); } }