@panneau/field-upload 3.0.57 → 3.0.59

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';
@@ -20,10 +20,10 @@ import Label from '@panneau/element-label';
 import ResourceItemsList from '@panneau/list-resource-items';
 import Dialog from '@panneau/modal-dialog';
 import { useUppy } from '@panneau/uppy';
-import '@uppy/core/dist/style.min.css';
-import '@uppy/dashboard/dist/style.min.css';
-import '@uppy/drag-drop/dist/style.min.css';
-import '@uppy/status-bar/dist/style.min.css';
+import '@uppy/core/dist/style.css';
+import '@uppy/dashboard/dist/style.css';
+import '@uppy/drag-drop/dist/style.css';
+import '@uppy/status-bar/dist/style.css';
 
 var styles = {"container":"panneau-field-upload-container","dashboard":"panneau-field-upload-dashboard","dashboardModal":"panneau-field-upload-dashboardModal"};
 
@@ -116,11 +116,6 @@ var UploadField = function UploadField(_ref) {
     disabled = _ref.disabled,
     onChange = _ref.onChange,
     className = _ref.className;
-  // const [{ pathname = null }] = useLocation();
-  // const { ref: containerRef, entry = null } = useResizeObserver();
-  // 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) {
@@ -188,7 +183,7 @@ var UploadField = function UploadField(_ref) {
   var closeModal = useCallback(function () {
     setModalOpened(false);
   }, [setModalOpened]);
-  useCallback(function () {
+  var closeModalAndClear = useCallback(function () {
     closeModal();
     if (uppy !== null) {
       uppy.cancelAll();
@@ -393,44 +388,49 @@ var UploadField = function UploadField(_ref) {
     showProgressDetails: true,
     areInsidesReadyToBeVisible: true,
     proudlyDisplayPoweredByUppy: false
-  }))) : null, !showResourceModal && !disabled && withButton && uppy !== null ? /*#__PURE__*/React.createElement(DashboardModal, Object.assign({
-    uppy: uppy,
-    className: styles.dashboardModal,
-    plugins: sources,
-    open: modalOpened,
-    isHidden: !modalOpened
+  }))) : 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
+  //     areInsidesReadyToBeVisible
+  //     isDashboardVisible
+  //     showProgressDetailss
+  //     showAddFilesPanel
+  // />
+  // ) : //
+  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, {
-    onRequestClose: closeModal,
+    plugins: sources,
+    inline: true,
+    showProgressDetails: true
+    // areInsidesReadyToBeVisible
+    // isDashboardVisible
+    ,
+    showAddFilesPanel: true,
     proudlyDisplayPoweredByUppy: false,
-    closeModalOnClickOutside: true,
-    areInsidesReadyToBeVisible: true,
-    isDashboardVisible: true,
-    showProgressDetailss: true,
-    showAddFilesPanel: true
-  })) :
-  // <Dialog size="lg" onClose={closeModal} title={addButtonLabel}>
-  //     <Dashboard
-  //         uppy={uppy}
-  //         // {...(containerWidth !== null && height !== null
-  //         //     ? { width: containerWidth }
-  //         // : null)}
-  //         {...(width !== null ? { width } : null)}
-  //         {...(height !== null ? { height } : null)}
-  //         plugins={sources}
-  //         inline
-  //         showProgressDetails
-  //         areInsidesReadyToBeVisible
-  //         isDashboardVisible
-  //         showAddFilesPanel
-  //         proudlyDisplayPoweredByUppy={false}
-  //         doneButtonHandler={closeModalAndClear}
-  //     />
-  // </Dialog>
-  null, showResourceModal ? /*#__PURE__*/React.createElement(Dialog, {
+    doneButtonHandler: closeModalAndClear
+  }))) : null, showResourceModal ? /*#__PURE__*/React.createElement(Dialog, {
     title: /*#__PURE__*/React.createElement(Label, null, searchButtonLabel),
     size: "lg",
     onClose: closeResourceModal

package/lib/index.js

@@ -24,10 +24,10 @@ var Label = require('@panneau/element-label');
 var ResourceItemsList = require('@panneau/list-resource-items');
 var Dialog = require('@panneau/modal-dialog');
 var uppy = require('@panneau/uppy');
-require('@uppy/core/dist/style.min.css');
-require('@uppy/dashboard/dist/style.min.css');
-require('@uppy/drag-drop/dist/style.min.css');
-require('@uppy/status-bar/dist/style.min.css');
+require('@uppy/core/dist/style.css');
+require('@uppy/dashboard/dist/style.css');
+require('@uppy/drag-drop/dist/style.css');
+require('@uppy/status-bar/dist/style.css');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -138,11 +138,6 @@ var UploadField = function UploadField(_ref) {
     disabled = _ref.disabled,
     onChange = _ref.onChange,
     className = _ref.className;
-  // const [{ pathname = null }] = useLocation();
-  // const { ref: containerRef, entry = null } = useResizeObserver();
-  // 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) {
@@ -210,7 +205,7 @@ var UploadField = function UploadField(_ref) {
   var closeModal = React.useCallback(function () {
     setModalOpened(false);
   }, [setModalOpened]);
-  React.useCallback(function () {
+  var closeModalAndClear = React.useCallback(function () {
     closeModal();
     if (uppy$1 !== null) {
       uppy$1.cancelAll();
@@ -415,44 +410,49 @@ var UploadField = function UploadField(_ref) {
     showProgressDetails: true,
     areInsidesReadyToBeVisible: true,
     proudlyDisplayPoweredByUppy: false
-  }))) : null, !showResourceModal && !disabled && withButton && uppy$1 !== null ? /*#__PURE__*/React__default["default"].createElement(react.DashboardModal, Object.assign({
-    uppy: uppy$1,
-    className: styles.dashboardModal,
-    plugins: sources,
-    open: modalOpened,
-    isHidden: !modalOpened
+  }))) : 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
+  //     areInsidesReadyToBeVisible
+  //     isDashboardVisible
+  //     showProgressDetailss
+  //     showAddFilesPanel
+  // />
+  // ) : //
+  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, {
-    onRequestClose: closeModal,
+    plugins: sources,
+    inline: true,
+    showProgressDetails: true
+    // areInsidesReadyToBeVisible
+    // isDashboardVisible
+    ,
+    showAddFilesPanel: true,
     proudlyDisplayPoweredByUppy: false,
-    closeModalOnClickOutside: true,
-    areInsidesReadyToBeVisible: true,
-    isDashboardVisible: true,
-    showProgressDetailss: true,
-    showAddFilesPanel: true
-  })) :
-  // <Dialog size="lg" onClose={closeModal} title={addButtonLabel}>
-  //     <Dashboard
-  //         uppy={uppy}
-  //         // {...(containerWidth !== null && height !== null
-  //         //     ? { width: containerWidth }
-  //         // : null)}
-  //         {...(width !== null ? { width } : null)}
-  //         {...(height !== null ? { height } : null)}
-  //         plugins={sources}
-  //         inline
-  //         showProgressDetails
-  //         areInsidesReadyToBeVisible
-  //         isDashboardVisible
-  //         showAddFilesPanel
-  //         proudlyDisplayPoweredByUppy={false}
-  //         doneButtonHandler={closeModalAndClear}
-  //     />
-  // </Dialog>
-  null, showResourceModal ? /*#__PURE__*/React__default["default"].createElement(Dialog__default["default"], {
+    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.57",
+    "version": "3.0.59",
     "description": "An Upload field",
     "keywords": [
         "javascript"
@@ -61,10 +61,10 @@
         "@panneau/element-button": "^3.0.55",
         "@panneau/element-card": "^3.0.55",
         "@panneau/element-label": "^3.0.45",
-        "@panneau/list-resource-items": "^3.0.55",
+        "@panneau/list-resource-items": "^3.0.59",
         "@panneau/modal-dialog": "^3.0.55",
         "@panneau/themes": "^3.0.55",
-        "@panneau/uppy": "^3.0.56",
+        "@panneau/uppy": "^3.0.59",
         "@uppy/core": "^3.5.0",
         "@uppy/dashboard": "^3.5.2",
         "@uppy/drag-drop": "^3.0.3",
@@ -82,5 +82,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "336779835a337f6ba502b74595b3733f6288d3c2"
+    "gitHead": "91d48907b776239b19aea03fe91f2227014d0556"
 }