fix: final fix device detector (DevExpress#30546)

Author: sergey-kras

packages/devextreme/js/core/devices.js

@@ -68,7 +68,6 @@ const UA_PARSERS = {
         const navigator = getNavigator();
         const isIpadOs = /Macintosh/i.test(userAgent) && navigator?.maxTouchPoints > 2;
         const isAppleDevice = /ip(hone|od|ad)/i.test(userAgent);
-
         if(!isAppleDevice && !isIpadOs) {
             return null;
         }
@@ -78,9 +77,9 @@ const UA_PARSERS = {
         const version = matches ? [parseInt(matches[1], 10), parseInt(matches[2], 10), parseInt(matches[3] || 0, 10)] : [];
         const isIPhone4 = (window.screen.height === (960 / 2));
         const grade = isIPhone4 ? 'B' : 'A';
-
+        const isDesktopMode = /Macintosh/i.test(userAgent) && !/Mobile/i.test(userAgent);
         return {
-            deviceType: isPhone ? 'phone' : 'tablet',
+            deviceType: isDesktopMode ? 'desktop' : isPhone ? 'phone' : 'tablet',
             platform: 'ios',
             version,
             grade

packages/devextreme/testing/tests/DevExpress.core/devices.tests.js

@@ -22,11 +22,21 @@ const userAgents = {
         chrome: 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/98.0.4758.85 Mobile/15E148 Safari/604.1',
         firefox: 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/115.0 Mobile/15E148 Safari/605.1.15',
     },
+    iphone_16: {
+        safari: 'Mozilla/5.0 (iPhone; CPU iPhone OS 19_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1',
+        safari_desktop_mode: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Safari/605.1.15',
+        chrome: 'Mozilla/5.0 (iPhone; CPU iPhone OS 19_0_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/138.0.7204.119 Mobile/15E148 Safari/604.1',
+        firefox: 'Mozilla/5.0 (iPhone; CPU iPhone OS 19_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/140.3 Mobile/15E148 Safari/605.1.15',
+    },
     ipad_10: 'Mozilla/5.0 (iPad; CPU OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.0 Mobile/14G60 Safari/602.1',
     ipad_16: {
-        safari: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5.1 Safari/605.1.15',
+        safari: 'Mozilla/5.0 (iPad; CPU OS 16_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5.1 Mobile/15E148 Safari/604.1', // Expected: "tablet" Result: "desktop"
         chrome: 'Mozilla/5.0 (iPad; CPU OS 16_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/114.0.5735.124 Mobile/15E148 Safari/604.1',
-        firefox: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Safari/605.1.15',
+        firefox: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Safari/605.1.15', // Expected: "tablet" Result: "desktop"
+    },
+    ipad_17: {
+        safari: 'Mozilla/5.0 (iPad; CPU OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Mobile/15E148 Safari/604.1',
+        safari_desktop_mode: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Safari/605.1.15',
     },
     android_9: 'Mozilla/5.0 (Linux; Android 9; Mi A2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.143 Mobile Safari/537.36',
     android_tablet_7_1_1: 'Mozilla/5.0 (Linux; Android 7.1.1; SM-T555 Build/NMF26X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.158 Safari/537.36',
@@ -48,17 +58,25 @@ QUnit.module('devices', {
 
 [
     // iphone
-    ['iphone 12', userAgents.iphone_12, 'ios', '12.3.1', 'phone', null],
-    ['iphone 14 safari', userAgents.iphone_14.safari, 'ios', '16.5.1', 'phone', null],
-    ['iphone 14 chrome', userAgents.iphone_14.chrome, 'ios', '16.5.0', 'phone', null],
-    ['iphone 14 firefox', userAgents.iphone_14.firefox, 'ios', '16.5.1', 'phone', null],
+    ['iphone 12', userAgents.iphone_12, 'ios', '12.3.1', 'phone', { maxTouchPoints: 5 }],
+
+    ['iphone 14 safari', userAgents.iphone_14.safari, 'ios', '16.5.1', 'phone', { maxTouchPoints: 5 }],
+    ['iphone 14 chrome', userAgents.iphone_14.chrome, 'ios', '16.5.0', 'phone', { maxTouchPoints: 5 }],
+    ['iphone 14 firefox', userAgents.iphone_14.firefox, 'ios', '16.5.1', 'phone', { maxTouchPoints: 5 }],
+
+    ['iphone 16 safari', userAgents.iphone_16.safari, 'ios', '19.0.0', 'phone', { maxTouchPoints: 5 }],
+    ['iphone 16 safari with desktop mode', userAgents.iphone_16.safari_desktop_mode, 'ios', '10.15.7', 'desktop', { maxTouchPoints: 5 }],
+    ['iphone 16 chrome', userAgents.iphone_16.chrome, 'ios', '19.0.0', 'phone', { maxTouchPoints: 5 }],
+    ['iphone 16 firefox', userAgents.iphone_16.firefox, 'ios', '19.0.0', 'phone', { maxTouchPoints: 5 }],
     // android phone
     ['android phone 9', userAgents.android_9, 'android', '9.0.0', 'phone', null],
     // ipad
     ['ipad 10', userAgents.ipad_10, 'ios', '10.3.3', 'tablet', { maxTouchPoints: 5 }],
-    ['ipad 16 safari', userAgents.ipad_16.safari, 'ios', '10.15.7', 'tablet', { maxTouchPoints: 5 }],
+    ['ipad 16 safari', userAgents.ipad_16.safari, 'ios', '16.5.0', 'tablet', { maxTouchPoints: 5 }],
     ['ipad 16 chrome', userAgents.ipad_16.chrome, 'ios', '16.5.0', 'tablet', { maxTouchPoints: 5 }],
-    ['ipad 16 firefox', userAgents.ipad_16.firefox, 'ios', '10.15.7', 'tablet', { maxTouchPoints: 5 }],
+    ['ipad 16 firefox', userAgents.ipad_16.firefox, 'ios', '10.15.7', 'desktop', { maxTouchPoints: 5 }],
+    ['ipad 17 safari', userAgents.ipad_17.safari, 'ios', '17.5.0', 'tablet', { maxTouchPoints: 5 }],
+    ['ipad 17 with desktop mode', userAgents.ipad_17.safari_desktop_mode, 'ios', '10.15.7', 'desktop', { maxTouchPoints: 5 }],
     // android tablet
     ['android tablet 7.1.1', userAgents.android_tablet_7_1_1, 'android', '7.1.1', 'tablet', null],
     // others
@@ -77,6 +95,7 @@ QUnit.module('devices', {
             setWindow({ navigator: navigatorMock }, true);
         }
 
+        devices._currentDevice = undefined;
         const device = fromUA(userAgent);
         assert.equal(device.platform, platform, 'correct platform');
         assert.equal(device.version.join('.') || null, version, 'correct version');