Improve Web Browser detection logic

DavBfr · Oct 5, 2024 · ee6e4ad · ee6e4ad
1 parent b542e0c
commit ee6e4ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/printing/CHANGELOG.md b/printing/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.13.4
+
+- Improve Web Browser detection logic
+
 ## 5.13.3
 
 - Update gfonts [Minh-Danh]

diff --git a/printing/lib/printing_web.dart b/printing/lib/printing_web.dart
@@ -191,12 +191,13 @@ class PrintingPlugin extends PrintingPlatform {
       return false;
     }
 
+    // UserAgent can contain both Chrome and Safari for Chrome browser.
+    // UserAgent contains only Safari for Safari browser.
     final userAgent = web.window.navigator.userAgent;
-    final isChrome = web.window['chrome'].isUndefinedOrNull;
-    final isSafari = web.window['safari'].isUndefinedOrNull &&
-        !userAgent.contains(RegExp(r'Version/14\.1\.'));
-    final isMobile = userAgent.contains('Mobile');
+    final isChrome = userAgent.contains('Chrome');
+    final isSafari = userAgent.contains('Safari') && !isChrome;
     final isFirefox = userAgent.contains('Firefox');
+    final isMobile = userAgent.contains('Mobile');
 
     // Chrome, Safari, and Firefox on a desktop computer
     if ((isChrome || isSafari || isFirefox) && !isMobile) {

diff --git a/printing/pubspec.yaml b/printing/pubspec.yaml
@@ -15,7 +15,7 @@ topics:
   - print
   - printing
   - report
-version: 5.13.3
+version: 5.13.4
 
 environment:
   sdk: ">=3.3.0 <4.0.0"