Fix iOS sniffing to include iPadOS 13+.

haltu · Aug 12, 2020 · 8ae3445 · 8ae3445
1 parent a3d9e06
commit 8ae3445
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/dist/muuri.js b/dist/muuri.js
@@ -2738,7 +2738,9 @@
     }
   }
 
-  var IS_IOS = /iPad|iPhone|iPod/.test(window.navigator.platform);
+  var IS_IOS =
+    /^(iPad|iPhone|iPod)/.test(window.navigator.platform) ||
+    (/^Mac/.test(window.navigator.platform) && window.navigator.maxTouchPoints > 1);
   var START_PREDICATE_INACTIVE = 0;
   var START_PREDICATE_PENDING = 1;
   var START_PREDICATE_RESOLVED = 2;

diff --git a/dist/muuri.min.js b/dist/muuri.min.js
diff --git a/dist/muuri.module.js b/dist/muuri.module.js
@@ -2732,7 +2732,9 @@ function removeClass(element, className) {
   }
 }
 
-var IS_IOS = /iPad|iPhone|iPod/.test(window.navigator.platform);
+var IS_IOS =
+  /^(iPad|iPhone|iPod)/.test(window.navigator.platform) ||
+  (/^Mac/.test(window.navigator.platform) && window.navigator.maxTouchPoints > 1);
 var START_PREDICATE_INACTIVE = 0;
 var START_PREDICATE_PENDING = 1;
 var START_PREDICATE_RESOLVED = 2;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "prosthetic-hand": "^1.3.1",
     "qunit": "^2.10.1",
     "rimraf": "^3.0.2",
-    "rollup": "^2.23.0",
+    "rollup": "^2.23.1",
     "terser": "^5.0.0",
     "web-animations-js": "^2.3.2"
   }

diff --git a/src/Item/ItemDrag.js b/src/Item/ItemDrag.js
@@ -49,7 +49,9 @@ import isFunction from '../utils/isFunction';
 import normalizeArrayIndex from '../utils/normalizeArrayIndex';
 import removeClass from '../utils/removeClass';
 
-var IS_IOS = /iPad|iPhone|iPod/.test(window.navigator.platform);
+var IS_IOS =
+  /^(iPad|iPhone|iPod)/.test(window.navigator.platform) ||
+  (/^Mac/.test(window.navigator.platform) && window.navigator.maxTouchPoints > 1);
 var START_PREDICATE_INACTIVE = 0;
 var START_PREDICATE_PENDING = 1;
 var START_PREDICATE_RESOLVED = 2;