fix chrome android pull to refresh bug

pqina · Dec 13, 2019 · 8865fdc · 8865fdc
1 parent 7de04d0
commit 8865fdc
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.9.1
+
+- Fix issue where Chrome on Android would launch pull-to-refresh when trying to drag a file item.
+
+
 ## 4.9.0
 
 - Add drag to reorder file items, enable by setting `allowReorder` to `true`.

diff --git a/dist/filepond.css b/dist/filepond.css
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.9.0
+ * FilePond 4.9.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

diff --git a/dist/filepond.esm.js b/dist/filepond.esm.js
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.9.0
+ * FilePond 4.9.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -7816,7 +7816,10 @@ const create$d = ({ root, props }) => {
   root.ref.updateHistory = [];
 
   // prevent scrolling and zooming on iOS (only if supports pointer events, for then we can enable reorder)
-  if (root.query('GET_ALLOW_REORDER') && 'onpointerdown' in window && isIOS()) {
+  const canHover = window.matchMedia('(pointer: fine) and (hover: hover)')
+    .matches;
+  const hasPointerEvents = 'PointerEvent' in window;
+  if (root.query('GET_ALLOW_REORDER') && hasPointerEvents && !canHover) {
     root.element.addEventListener('touchmove', prevent, { passive: false });
     root.element.addEventListener('gesturestart', prevent);
   }

diff --git a/dist/filepond.esm.min.js b/dist/filepond.esm.min.js
diff --git a/dist/filepond.js b/dist/filepond.js
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.9.0
+ * FilePond 4.9.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -10661,11 +10661,10 @@
     root.ref.updateHistory = [];
 
     // prevent scrolling and zooming on iOS (only if supports pointer events, for then we can enable reorder)
-    if (
-      root.query('GET_ALLOW_REORDER') &&
-      'onpointerdown' in window &&
-      isIOS()
-    ) {
+    var canHover = window.matchMedia('(pointer: fine) and (hover: hover)')
+      .matches;
+    var hasPointerEvents = 'PointerEvent' in window;
+    if (root.query('GET_ALLOW_REORDER') && hasPointerEvents && !canHover) {
       root.element.addEventListener('touchmove', prevent, { passive: false });
       root.element.addEventListener('gesturestart', prevent);
     }

diff --git a/dist/filepond.min.css b/dist/filepond.min.css
diff --git a/dist/filepond.min.js b/dist/filepond.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "filepond",
-    "version": "4.9.0",
+    "version": "4.9.1",
     "description": "FilePond, Where files go to stretch their bits.",
     "license": "MIT",
     "author": {

diff --git a/src/js/app/view/root.js b/src/js/app/view/root.js
@@ -91,7 +91,9 @@ const create = ({ root, props }) => {
     root.ref.updateHistory = [];
 
     // prevent scrolling and zooming on iOS (only if supports pointer events, for then we can enable reorder)
-    if (root.query('GET_ALLOW_REORDER') && 'onpointerdown' in window && isIOS()) {
+    const canHover = window.matchMedia('(pointer: fine) and (hover: hover)').matches;
+    const hasPointerEvents = 'PointerEvent' in window;
+    if (root.query('GET_ALLOW_REORDER') && hasPointerEvents && !canHover) {
         root.element.addEventListener('touchmove', prevent, { passive: false });
         root.element.addEventListener('gesturestart', prevent);
     }