From a11f3fa574048b4f73aa0c6586990c1945aa928c Mon Sep 17 00:00:00 2001
From: Marco Del Toro Barragan <marcodeltorob@gmail.com>
Date: Tue, 19 Nov 2019 12:40:35 -0600
Subject: [PATCH] fix: detect iPadOS as IS_IPAD (#6319)

iPadOS defaults to desktop mode unless Safari is opened in split screen mode. The only way to detect it is to assume that Safari with Touch enabled is iPad. This is good enough until and if a better way to detect it is made available.
---
 src/js/utils/browser.js | 78 ++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/js/utils/browser.js b/src/js/utils/browser.js
index bccc034cab..34daf646c2 100644
--- a/src/js/utils/browser.js
+++ b/src/js/utils/browser.js
@@ -9,27 +9,6 @@ const USER_AGENT = window.navigator && window.navigator.userAgent || '';
 const webkitVersionMap = (/AppleWebKit\/([\d.]+)/i).exec(USER_AGENT);
 const appleWebkitVersion = webkitVersionMap ? parseFloat(webkitVersionMap.pop()) : null;
 
-/**
- * Whether or not this device is an iPad.
- *
- * @static
- * @const
- * @type {Boolean}
- */
-export const IS_IPAD = (/iPad/i).test(USER_AGENT);
-
-/**
- * Whether or not this device is an iPhone.
- *
- * @static
- * @const
- * @type {Boolean}
- */
-// The Facebook app's UIWebView identifies as both an iPhone and iPad, so
-// to identify iPhones, we need to exclude iPads.
-// http://artsy.github.io/blog/2012/10/18/the-perils-of-ios-user-agent-sniffing/
-export const IS_IPHONE = (/iPhone/i).test(USER_AGENT) && !IS_IPAD;
-
 /**
  * Whether or not this device is an iPod.
  *
@@ -39,15 +18,6 @@ export const IS_IPHONE = (/iPhone/i).test(USER_AGENT) && !IS_IPAD;
  */
 export const IS_IPOD = (/iPod/i).test(USER_AGENT);
 
-/**
- * Whether or not this is an iOS device.
- *
- * @static
- * @const
- * @type {Boolean}
- */
-export const IS_IOS = IS_IPHONE || IS_IPAD || IS_IPOD;
-
 /**
  * The detected iOS version - or `null`.
  *
@@ -183,15 +153,6 @@ export const IE_VERSION = (function() {
  */
 export const IS_SAFARI = (/Safari/i).test(USER_AGENT) && !IS_CHROME && !IS_ANDROID && !IS_EDGE;
 
-/**
- * Whether or not this is any flavor of Safari - including iOS.
- *
- * @static
- * @const
- * @type {Boolean}
- */
-export const IS_ANY_SAFARI = (IS_SAFARI || IS_IOS) && !IS_CHROME;
-
 /**
  * Whether or not this is a Windows machine.
  *
@@ -212,3 +173,42 @@ export const TOUCH_ENABLED = Dom.isReal() && (
   'ontouchstart' in window ||
   window.navigator.maxTouchPoints ||
   window.DocumentTouch && window.document instanceof window.DocumentTouch);
+
+/**
+ * Whether or not this device is an iPad.
+ *
+ * @static
+ * @const
+ * @type {Boolean}
+ */
+export const IS_IPAD = (/iPad/i).test(USER_AGENT) || (IS_SAFARI && TOUCH_ENABLED);
+
+/**
+ * Whether or not this device is an iPhone.
+ *
+ * @static
+ * @const
+ * @type {Boolean}
+ */
+// The Facebook app's UIWebView identifies as both an iPhone and iPad, so
+// to identify iPhones, we need to exclude iPads.
+// http://artsy.github.io/blog/2012/10/18/the-perils-of-ios-user-agent-sniffing/
+export const IS_IPHONE = (/iPhone/i).test(USER_AGENT) && !IS_IPAD;
+
+/**
+ * Whether or not this is an iOS device.
+ *
+ * @static
+ * @const
+ * @type {Boolean}
+ */
+export const IS_IOS = IS_IPHONE || IS_IPAD || IS_IPOD;
+
+/**
+ * Whether or not this is any flavor of Safari - including iOS.
+ *
+ * @static
+ * @const
+ * @type {Boolean}
+ */
+export const IS_ANY_SAFARI = (IS_SAFARI || IS_IOS) && !IS_CHROME;