fix priority of options

Author: rikschennink

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.30.1
+
+-   Prioritize server prop before other props when passed to setOptions #606
+
 ## 4.30.0
 
 -   Add `labelFileSizeBytes`, `labelFileSizeKilobytes`, `labelFileSizeMegabytes`, `labelFileSizeGigabytes` #763

dist/filepond.css

@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.30.0
+ * FilePond 4.30.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

dist/filepond.esm.js

@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.30.0
+ * FilePond 4.30.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -4992,12 +4992,36 @@ const actions = (dispatch, query, state) => ({
     }),
 
     SET_OPTIONS: ({ options }) => {
-        forin(options, (key, value) => {
-            dispatch(`SET_${fromCamels(key, '_').toUpperCase()}`, { value });
+        // get all keys passed
+        const optionKeys = Object.keys(options);
+
+        // get prioritized keyed to include (remove once not in options object)
+        const prioritizedOptionKeys = PrioritizedOptions.filter(key => optionKeys.includes(key));
+
+        // order the keys, prioritized first, then rest
+        const orderedOptionKeys = [
+            // add prioritized first if passed to options, else remove
+            ...prioritizedOptionKeys,
+
+            // prevent duplicate keys
+            ...Object.keys(options).filter(key => !prioritizedOptionKeys.includes(key)),
+        ];
+
+        console.log(orderedOptionKeys);
+
+        // dispatch set event for each option
+        orderedOptionKeys.forEach(key => {
+            dispatch(`SET_${fromCamels(key, '_').toUpperCase()}`, {
+                value: options[key],
+            });
         });
     },
 });
 
+const PrioritizedOptions = [
+    'server', // must be processed before "files"
+];
+
 const formatFilename = name => name;
 
 const createElement$1 = tagName => {

dist/filepond.esm.min.js

@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.30.0
+ * FilePond 4.30.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -7395,13 +7395,38 @@
 
             SET_OPTIONS: function SET_OPTIONS(_ref11) {
                 var options = _ref11.options;
-                forin(options, function(key, value) {
-                    dispatch('SET_' + fromCamels(key, '_').toUpperCase(), { value: value });
+                // get all keys passed
+                var optionKeys = Object.keys(options);
+
+                // get prioritized keyed to include (remove once not in options object)
+                var prioritizedOptionKeys = PrioritizedOptions.filter(function(key) {
+                    return optionKeys.includes(key);
+                });
+
+                // order the keys, prioritized first, then rest
+                var orderedOptionKeys = [].concat(
+                    _toConsumableArray(prioritizedOptionKeys),
+                    _toConsumableArray(
+                        Object.keys(options).filter(function(key) {
+                            return !prioritizedOptionKeys.includes(key);
+                        })
+                    )
+                );
+
+                console.log(orderedOptionKeys);
+
+                // dispatch set event for each option
+                orderedOptionKeys.forEach(function(key) {
+                    dispatch('SET_' + fromCamels(key, '_').toUpperCase(), {
+                        value: options[key],
+                    });
                 });
             },
         };
     };
 
+    var PrioritizedOptions = ['server'];
+
     var formatFilename = function formatFilename(name) {
         return name;
     };

dist/filepond.js

@@ -1,6 +1,6 @@
 {
     "name": "filepond",
-    "version": "4.30.0",
+    "version": "4.30.1",
     "description": "FilePond, Where files go to stretch their bits.",
     "license": "MIT",
     "author": {

dist/filepond.min.css

@@ -928,12 +928,14 @@ export const actions = (dispatch, query, state) => ({
             );
         } else {
             // if is requesting revert and can revert need to call revert handler (not calling request_ because that would also trigger beforeRemoveHook)
-            if ((options.revert && item.origin !== FileOrigin.LOCAL && item.serverId !== null) ||
+            if (
+                (options.revert && item.origin !== FileOrigin.LOCAL && item.serverId !== null) ||
                 // if chunked uploads are enabled and we're uploading in chunks for this specific file
                 // or if the file isn't big enough for chunked uploads but chunkForce is set then call
                 // revert before removing from the view...
-                (state.options.chunkUploads && (item.file.size > state.options.chunkSize)) ||
-                (state.options.chunkUploads && state.options.chunkForce)) {
+                (state.options.chunkUploads && item.file.size > state.options.chunkSize) ||
+                (state.options.chunkUploads && state.options.chunkForce)
+            ) {
                 item.revert(
                     createRevertFunction(state.options.server.url, state.options.server.revert),
                     query('GET_FORCE_REVERT')
@@ -1014,14 +1016,32 @@ export const actions = (dispatch, query, state) => ({
     }),
 
     SET_OPTIONS: ({ options }) => {
-        // specify option keys that need to be processed before the others (internal order is preserved)
-        const prioritizedOptions = [
-            'server', // must be processed before "files"
-        ].filter(value => value in options);
-
-        // loop through all keys in options, but prioritizedOptions first
-        [...new Set([...prioritizedOptions,...Object.keys(options)])].forEach((optionKey) => {
-            dispatch(`SET_${fromCamels(optionKey, '_').toUpperCase()}`, { value: options[optionKey] });
+        // get all keys passed
+        const optionKeys = Object.keys(options);
+
+        // get prioritized keyed to include (remove once not in options object)
+        const prioritizedOptionKeys = PrioritizedOptions.filter(key => optionKeys.includes(key));
+
+        // order the keys, prioritized first, then rest
+        const orderedOptionKeys = [
+            // add prioritized first if passed to options, else remove
+            ...prioritizedOptionKeys,
+
+            // prevent duplicate keys
+            ...Object.keys(options).filter(key => !prioritizedOptionKeys.includes(key)),
+        ];
+
+        console.log(orderedOptionKeys);
+
+        // dispatch set event for each option
+        orderedOptionKeys.forEach(key => {
+            dispatch(`SET_${fromCamels(key, '_').toUpperCase()}`, {
+                value: options[key],
+            });
         });
     },
 });
+
+const PrioritizedOptions = [
+    'server', // must be processed before "files"
+];