@panneau/field-upload 3.0.6 → 3.0.7

package/es/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { faTimes, faFileVideo, faFileImage, faFileAudio } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Dashboard, DashboardModal } from '@uppy/react';
@@ -110,8 +110,16 @@ var UploadField = function UploadField(_ref) {
   // const { contentRect } = entry || {};
   // const { width: containerWidth = null } = contentRect || {};
 
+  var mergeData = useCallback(function (newValue) {
+    // Merge the response from our back-end
+    if (isObject(newValue) && isObject(newValue.response) && newValue.response.status === 200 && newValue.response.body !== null) {
+      return _objectSpread(_objectSpread({}, newValue), newValue.response.body || null);
+    }
+    return newValue;
+  }, []);
   var onComplete = useCallback(function (response) {
     console.log('upload complete', response); // eslint-disable-line
+
     var newValue = null;
     if (isArray(response)) {
       if (allowMultipleUploads) {
@@ -124,17 +132,19 @@ var UploadField = function UploadField(_ref) {
     } else if (response && response.successful) {
       newValue = response.successful.length > 0 ? response.successful[0].response.body : null;
     }
-
-    // Merge the response from our back-end
-    if (isObject(newValue) && isObject(newValue.response) && newValue.response.status === 200 && newValue.response.body !== null) {
-      newValue = _objectSpread(_objectSpread({}, newValue), newValue.response.body || null);
+    if (isArray(newValue)) {
+      newValue = newValue.map(function (val) {
+        return mergeData(val);
+      });
+    } else {
+      newValue = mergeData(newValue);
     }
     console.log('new upload value', newValue); // eslint-disable-line
 
     if (onChange !== null) {
       onChange(newValue);
     }
-  }, [onChange, allowMultipleUploads]);
+  }, [onChange, allowMultipleUploads, mergeData]);
   var typesString = types.join('.');
   var allowedFileTypes = useMemo(function () {
     if (fileTypes !== null) {

package/lib/index.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var freeSolidSvgIcons = require('@fortawesome/free-solid-svg-icons');
 var reactFontawesome = require('@fortawesome/react-fontawesome');
 var react = require('@uppy/react');
@@ -31,8 +31,8 @@ require('@uppy/status-bar/dist/style.min.css');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
-var _objectSpread__default = /*#__PURE__*/_interopDefaultLegacy(_objectSpread);
 var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
+var _objectSpread__default = /*#__PURE__*/_interopDefaultLegacy(_objectSpread);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
 var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
@@ -131,8 +131,16 @@ var UploadField = function UploadField(_ref) {
   // const { contentRect } = entry || {};
   // const { width: containerWidth = null } = contentRect || {};
 
+  var mergeData = React.useCallback(function (newValue) {
+    // Merge the response from our back-end
+    if (isObject__default["default"](newValue) && isObject__default["default"](newValue.response) && newValue.response.status === 200 && newValue.response.body !== null) {
+      return _objectSpread__default["default"](_objectSpread__default["default"]({}, newValue), newValue.response.body || null);
+    }
+    return newValue;
+  }, []);
   var onComplete = React.useCallback(function (response) {
     console.log('upload complete', response); // eslint-disable-line
+
     var newValue = null;
     if (isArray__default["default"](response)) {
       if (allowMultipleUploads) {
@@ -145,17 +153,19 @@ var UploadField = function UploadField(_ref) {
     } else if (response && response.successful) {
       newValue = response.successful.length > 0 ? response.successful[0].response.body : null;
     }
-
-    // Merge the response from our back-end
-    if (isObject__default["default"](newValue) && isObject__default["default"](newValue.response) && newValue.response.status === 200 && newValue.response.body !== null) {
-      newValue = _objectSpread__default["default"](_objectSpread__default["default"]({}, newValue), newValue.response.body || null);
+    if (isArray__default["default"](newValue)) {
+      newValue = newValue.map(function (val) {
+        return mergeData(val);
+      });
+    } else {
+      newValue = mergeData(newValue);
     }
     console.log('new upload value', newValue); // eslint-disable-line
 
     if (onChange !== null) {
       onChange(newValue);
     }
-  }, [onChange, allowMultipleUploads]);
+  }, [onChange, allowMultipleUploads, mergeData]);
   var typesString = types.join('.');
   var allowedFileTypes = React.useMemo(function () {
     if (fileTypes !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/field-upload",
-    "version": "3.0.6",
+    "version": "3.0.7",
     "description": "An Upload field",
     "keywords": [
         "javascript"
@@ -56,13 +56,13 @@
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "@fortawesome/react-fontawesome": "^0.1.14",
-        "@panneau/core": "^3.0.6",
-        "@panneau/element-button": "^3.0.6",
-        "@panneau/element-card": "^3.0.6",
-        "@panneau/element-label": "^3.0.6",
-        "@panneau/list-resource-items": "^3.0.6",
-        "@panneau/modal-dialog": "^3.0.6",
-        "@panneau/themes": "^3.0.6",
+        "@panneau/core": "^3.0.7",
+        "@panneau/element-button": "^3.0.7",
+        "@panneau/element-card": "^3.0.7",
+        "@panneau/element-label": "^3.0.7",
+        "@panneau/list-resource-items": "^3.0.7",
+        "@panneau/modal-dialog": "^3.0.7",
+        "@panneau/themes": "^3.0.7",
         "@uppy/core": "^3.2.0",
         "@uppy/dashboard": "^3.4.0",
         "@uppy/drag-drop": "^3.0.2",
@@ -80,5 +80,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d63085d290a7391e19b77726d08c02deaa2f6ef1"
+    "gitHead": "a35958b1d0dcaae2aecac6f30dab29c2616fcc22"
 }