fix problem with paste throwing an error and counting ignored files w…

…hen dropping folders
pqina · May 20, 2019 · 07c3959 · 07c3959
1 parent 607ecd0
commit 07c3959
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.4.7
+
+- Fix issue where pasting a file would throw an error.
+- Fix issue where ignored files would be counted as files when dropping a folder.
+
+
 ## 4.4.6
 
 - Fix issue where `processFiles` would re-process `local` server images.

diff --git a/dist/filepond.css b/dist/filepond.css
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.4.6
+ * FilePond 4.4.7
  * 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.4.6
+ * FilePond 4.4.7
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -3090,7 +3090,7 @@ const createFileStub = source => {
 };
 
 const isFile = value =>
-  value instanceof File || (value instanceof Blob && value.name);
+  !!(value instanceof File || (value instanceof Blob && value.name));
 
 const deepCloneObject = src => {
   if (!isObject(src)) return src;
@@ -6774,7 +6774,11 @@ const createHopper = (scope, validateItems, options) => {
   scope.classList.add('filepond--hopper');
 
   // shortcuts
-  const { catchesDropsOnPage, requiresDropOnElement } = options;
+  const {
+    catchesDropsOnPage,
+    requiresDropOnElement,
+    filterItems = items => items
+  } = options;
 
   // create a dnd client
   const client = createDragNDropClient(
@@ -6791,18 +6795,20 @@ const createHopper = (scope, validateItems, options) => {
   client.allowdrop = items => {
     // TODO: if we can, throw error to indicate the items cannot by dropped
 
-    return validateItems(items);
+    return validateItems(filterItems(items));
   };
 
   client.ondrop = (position, items) => {
-    if (!validateItems(items)) {
+    const filteredItems = filterItems(items);
+
+    if (!validateItems(filteredItems)) {
       api.ondragend(position);
       return;
     }
 
     currentState = 'drag-drop';
 
-    api.onload(items, position);
+    api.onload(filteredItems, position);
   };
 
   client.ondrag = position => {
@@ -7499,6 +7505,15 @@ const toggleDrop = root => {
           : true;
       },
       {
+        filterItems: items => {
+          const ignoredFiles = root.query('GET_IGNORED_FILES');
+          return items.filter(item => {
+            if (isFile(item)) {
+              return !ignoredFiles.includes(item.name.toLowerCase());
+            }
+            return true;
+          });
+        },
         catchesDropsOnPage: root.query('GET_DROP_ON_PAGE'),
         requiresDropOnElement: root.query('GET_DROP_ON_ELEMENT')
       }
@@ -7581,7 +7596,7 @@ const togglePaste = root => {
     root.ref.paster.onload = items => {
       root.dispatch('ADD_ITEMS', {
         items,
-        index: getDragIndex(root.ref.list, position),
+        index: -1,
         interactionMethod: InteractionMethod.PASTE
       });
     };

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.4.6
+ * FilePond 4.4.7
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -3629,7 +3629,7 @@
   };
 
   var isFile = function isFile(value) {
-    return value instanceof File || (value instanceof Blob && value.name);
+    return !!(value instanceof File || (value instanceof Blob && value.name));
   };
 
   var deepCloneObject = function deepCloneObject(src) {
@@ -7812,7 +7812,14 @@
 
     // shortcuts
     var catchesDropsOnPage = options.catchesDropsOnPage,
-      requiresDropOnElement = options.requiresDropOnElement;
+      requiresDropOnElement = options.requiresDropOnElement,
+      _options$filterItems = options.filterItems,
+      filterItems =
+        _options$filterItems === void 0
+          ? function(items) {
+              return items;
+            }
+          : _options$filterItems;
 
     // create a dnd client
     var client = createDragNDropClient(
@@ -7829,18 +7836,20 @@
     client.allowdrop = function(items) {
       // TODO: if we can, throw error to indicate the items cannot by dropped
 
-      return validateItems(items);
+      return validateItems(filterItems(items));
     };
 
     client.ondrop = function(position, items) {
-      if (!validateItems(items)) {
+      var filteredItems = filterItems(items);
+
+      if (!validateItems(filteredItems)) {
         api.ondragend(position);
         return;
       }
 
       currentState = 'drag-drop';
 
-      api.onload(items, position);
+      api.onload(filteredItems, position);
     };
 
     client.ondrag = function(position) {
@@ -8606,6 +8615,15 @@
             : true;
         },
         {
+          filterItems: function filterItems(items) {
+            var ignoredFiles = root.query('GET_IGNORED_FILES');
+            return items.filter(function(item) {
+              if (isFile(item)) {
+                return !ignoredFiles.includes(item.name.toLowerCase());
+              }
+              return true;
+            });
+          },
           catchesDropsOnPage: root.query('GET_DROP_ON_PAGE'),
           requiresDropOnElement: root.query('GET_DROP_ON_ELEMENT')
         }
@@ -8691,7 +8709,7 @@
       root.ref.paster.onload = function(items) {
         root.dispatch('ADD_ITEMS', {
           items: items,
-          index: getDragIndex(root.ref.list, position),
+          index: -1,
           interactionMethod: InteractionMethod.PASTE
         });
       };

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.4.6",
+    "version": "4.4.7",
     "description": "FilePond, Where files go to stretch their bits.",
     "license": "MIT",
     "author": {

diff --git a/src/js/app/utils/createHopper.js b/src/js/app/utils/createHopper.js
@@ -5,7 +5,7 @@ export const createHopper = (scope, validateItems, options) => {
     scope.classList.add('filepond--hopper');
 
     // shortcuts
-    const { catchesDropsOnPage, requiresDropOnElement } = options;
+    const { catchesDropsOnPage, requiresDropOnElement, filterItems = items => items } = options;
 
     // create a dnd client
     const client = createDragNDropClient(
@@ -22,19 +22,21 @@ export const createHopper = (scope, validateItems, options) => {
     client.allowdrop = items => {
         // TODO: if we can, throw error to indicate the items cannot by dropped
 
-        return validateItems(items);
+        return validateItems(filterItems(items));
     };
 
     client.ondrop = (position, items) => {
+
+        const filteredItems = filterItems(items);
 
-        if (!validateItems(items)) {
+        if (!validateItems(filteredItems)) {
             api.ondragend(position);
             return;
         }
 
         currentState = 'drag-drop';
 
-        api.onload(items, position);
+        api.onload(filteredItems, position);
     };
 
     client.ondrag = position => {

diff --git a/src/js/app/view/root.js b/src/js/app/view/root.js
@@ -16,6 +16,7 @@ import { toCamels } from '../../utils/toCamels';
 import { createElement } from '../../utils/createElement';
 import { createResponse } from '../../utils/createResponse';
 import { debounce } from '../../utils/debounce';
+import { isFile } from '../../utils/isFile';
 
 const MAX_FILES_LIMIT = 1000000;
 
@@ -451,6 +452,15 @@ const toggleDrop = (root) => {
                 ) : true;
             },
             {
+                filterItems: items => {
+                    const ignoredFiles = root.query('GET_IGNORED_FILES');
+                    return items.filter(item => {
+                        if (isFile(item)) {
+                            return !ignoredFiles.includes(item.name.toLowerCase())
+                        }
+                        return true;
+                    })
+                },
                 catchesDropsOnPage: root.query('GET_DROP_ON_PAGE'),
                 requiresDropOnElement: root.query('GET_DROP_ON_ELEMENT')
             }
@@ -538,7 +548,7 @@ const togglePaste = (root) => {
         root.ref.paster.onload = items => {
             root.dispatch('ADD_ITEMS', {
                 items,
-                index: getDragIndex(root.ref.list, position),
+                index: -1,
                 interactionMethod: InteractionMethod.PASTE
             });
         };

diff --git a/src/js/utils/isFile.js b/src/js/utils/isFile.js
@@ -1 +1 @@
-export const isFile = value => value instanceof File || (value instanceof Blob && value.name);
+export const isFile = value => !!(value instanceof File || (value instanceof Blob && value.name));