@panneau/field-upload 3.0.23 → 3.0.25

package/es/index.js

@@ -4,7 +4,7 @@ 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';
+import { Dashboard } from '@uppy/react';
 import classNames from 'classnames';
 import get from 'lodash/get';
 import isArray from 'lodash/isArray';
@@ -188,6 +188,12 @@ var UploadField = function UploadField(_ref) {
   var closeModal = useCallback(function () {
     setModalOpened(false);
   }, [setModalOpened]);
+  var closeModalAndClear = useCallback(function () {
+    closeModal();
+    if (uppy !== null) {
+      uppy.cancelAll();
+    }
+  }, [uppy, closeModal]);
   var onClickRemove = useCallback(function (idx) {
     if (onChange !== null && isArray(value) && value.length > 1) {
       onChange(value.filter(function (v, i) {
@@ -387,14 +393,41 @@ var UploadField = function UploadField(_ref) {
     areInsidesReadyToBeVisible: true,
     proudlyDisplayPoweredByUppy: false,
     showProgressDetails: true
-  }))) : null, !showResourceModal && !disabled && withButton && uppy !== null ? /*#__PURE__*/React.createElement(DashboardModal, {
-    uppy: uppy,
-    className: styles.dashboardModal,
+  }))) : null, !showResourceModal && !disabled && withButton && uppy !== null && modalOpened ?
+  /*#__PURE__*/
+  // <DashboardModal
+  //     uppy={uppy}
+  //     className={styles.dashboardModal}
+  //     plugins={sources}
+  //     open={modalOpened}
+  //     isHidden={!modalOpened}
+  //     {...(width !== null ? { width } : null)}
+  //     {...(height !== null ? { height } : null)}
+  //     onRequestClose={closeModal}
+  //     proudlyDisplayPoweredByUppy={false}
+  //     closeModalOnClickOutside
+  // />
+  React.createElement(Dialog, {
+    size: "lg",
+    onClose: closeModal,
+    title: addButtonLabel
+  }, /*#__PURE__*/React.createElement(Dashboard, Object.assign({
+    uppy: uppy
+    // {...(containerWidth !== null && height !== null
+    //     ? { width: containerWidth }
+    // : null)}
+  }, width !== null ? {
+    width: width
+  } : null, height !== null ? {
+    height: height
+  } : null, {
     plugins: sources,
-    open: modalOpened,
-    onRequestClose: closeModal,
-    closeModalOnClickOutside: true
-  }) : null, showResourceModal ? /*#__PURE__*/React.createElement(Dialog, {
+    inline: true,
+    showProgressDetails: true,
+    areInsidesReadyToBeVisible: true,
+    proudlyDisplayPoweredByUppy: false,
+    doneButtonHandler: closeModalAndClear
+  }))) : null, showResourceModal ? /*#__PURE__*/React.createElement(Dialog, {
     title: /*#__PURE__*/React.createElement(Label, null, searchButtonLabel),
     size: "lg",
     onClose: closeResourceModal

package/lib/index.js

@@ -210,6 +210,12 @@ var UploadField = function UploadField(_ref) {
   var closeModal = React.useCallback(function () {
     setModalOpened(false);
   }, [setModalOpened]);
+  var closeModalAndClear = React.useCallback(function () {
+    closeModal();
+    if (uppy$1 !== null) {
+      uppy$1.cancelAll();
+    }
+  }, [uppy$1, closeModal]);
   var onClickRemove = React.useCallback(function (idx) {
     if (onChange !== null && isArray__default["default"](value) && value.length > 1) {
       onChange(value.filter(function (v, i) {
@@ -409,14 +415,41 @@ var UploadField = function UploadField(_ref) {
     areInsidesReadyToBeVisible: true,
     proudlyDisplayPoweredByUppy: false,
     showProgressDetails: true
-  }))) : null, !showResourceModal && !disabled && withButton && uppy$1 !== null ? /*#__PURE__*/React__default["default"].createElement(react.DashboardModal, {
-    uppy: uppy$1,
-    className: styles.dashboardModal,
+  }))) : null, !showResourceModal && !disabled && withButton && uppy$1 !== null && modalOpened ?
+  /*#__PURE__*/
+  // <DashboardModal
+  //     uppy={uppy}
+  //     className={styles.dashboardModal}
+  //     plugins={sources}
+  //     open={modalOpened}
+  //     isHidden={!modalOpened}
+  //     {...(width !== null ? { width } : null)}
+  //     {...(height !== null ? { height } : null)}
+  //     onRequestClose={closeModal}
+  //     proudlyDisplayPoweredByUppy={false}
+  //     closeModalOnClickOutside
+  // />
+  React__default["default"].createElement(Dialog__default["default"], {
+    size: "lg",
+    onClose: closeModal,
+    title: addButtonLabel
+  }, /*#__PURE__*/React__default["default"].createElement(react.Dashboard, Object.assign({
+    uppy: uppy$1
+    // {...(containerWidth !== null && height !== null
+    //     ? { width: containerWidth }
+    // : null)}
+  }, width !== null ? {
+    width: width
+  } : null, height !== null ? {
+    height: height
+  } : null, {
     plugins: sources,
-    open: modalOpened,
-    onRequestClose: closeModal,
-    closeModalOnClickOutside: true
-  }) : null, showResourceModal ? /*#__PURE__*/React__default["default"].createElement(Dialog__default["default"], {
+    inline: true,
+    showProgressDetails: true,
+    areInsidesReadyToBeVisible: true,
+    proudlyDisplayPoweredByUppy: false,
+    doneButtonHandler: closeModalAndClear
+  }))) : null, showResourceModal ? /*#__PURE__*/React__default["default"].createElement(Dialog__default["default"], {
     title: /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, searchButtonLabel),
     size: "lg",
     onClose: closeResourceModal

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/field-upload",
-    "version": "3.0.23",
+    "version": "3.0.25",
     "description": "An Upload field",
     "keywords": [
         "javascript"
@@ -62,7 +62,7 @@
         "@panneau/element-card": "^3.0.23",
         "@panneau/element-label": "^3.0.23",
         "@panneau/list-resource-items": "^3.0.23",
-        "@panneau/modal-dialog": "^3.0.23",
+        "@panneau/modal-dialog": "^3.0.24",
         "@panneau/themes": "^3.0.23",
         "@panneau/uppy": "^3.0.23",
         "@uppy/core": "^3.5.0",
@@ -82,5 +82,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "82545a45cec2f58e9a98d08527dd96fcf92d5daa"
+    "gitHead": "0743de3708364f23d0ade952b62a45c66d7bb699"
 }