@panneau/field-upload 4.0.27 → 4.0.33

package/assets/css/styles.css

@@ -1 +1 @@
-.panneau-field-upload-container{position:relative;width:100%}.panneau-field-upload-container .panneau-field-upload-dashboard{position:relative}.panneau-field-upload-container .panneau-field-upload-dashboardModal{position:relative;z-index:10001}.panneau-field-upload-container .panneau-field-upload-uppyDashboardContainer{margin-top:0}
+.panneau-field-upload-container{position:relative;width:100%}.panneau-field-upload-container .panneau-field-upload-dashboard{margin-bottom:10px;position:relative}.panneau-field-upload-container .panneau-field-upload-dashboardModal{position:relative;z-index:10001}.panneau-field-upload-container .panneau-field-upload-uppyDashboardContainer{margin-top:0}

package/dist/index.js

@@ -119,7 +119,6 @@ function UploadField(_ref) {
     return newValue;
   }, []);
   var onComplete = useCallback(function (response) {
-    // console.log('upload complete', response); // eslint-disable-line
     var newValue = null;
     if (isArray(response)) {
       if (allowMultipleUploads) {
@@ -139,9 +138,6 @@ function UploadField(_ref) {
     } else if (newValue !== null) {
       newValue = mergeData(newValue);
     }
-
-    // console.log('new upload value', newValue); // eslint-disable-line
-
     if (onChange !== null) {
       onChange(newValue);
     }
@@ -284,6 +280,15 @@ function UploadField(_ref) {
     onListPageChange = _useQuery.onPageChange,
     onListQueryChange = _useQuery.onQueryChange,
     onListQueryReset = _useQuery.onQueryReset;
+  var finalOnPageChange = useCallback(function (e) {
+    var pageNumber = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    e.preventDefault();
+    e.stopPropagation();
+    onListPageChange(pageNumber);
+  }, [onListPageChange]);
+  var finalOnQueryChange = useCallback(function (newQuery) {
+    onListQueryChange(newQuery);
+  }, [onListQueryChange]);
   var containerRef = useRef(null);
 
   // Keep this stable, uppy doesnt like changes
@@ -351,44 +356,6 @@ function UploadField(_ref) {
           })
         })
       })
-    }) : null, withoutMedia || (!hasMedia || allowMultipleUploads) && withButton ? /*#__PURE__*/jsxs("div", {
-      className: "row",
-      children: [/*#__PURE__*/jsx("div", {
-        className: "col-auto",
-        children: /*#__PURE__*/jsx(Button, {
-          id: "trigger-uppy",
-          type: "button",
-          theme: "primary",
-          icon: finalLoading ? 'loading' : 'upload',
-          iconPosition: "right",
-          onClick: onClickAdd || openModal,
-          disabled: finalLoading || disabled,
-          outline: outline,
-          children: /*#__PURE__*/jsx(Label, {
-            children: finalLoading ? /*#__PURE__*/jsx(FormattedMessage, {
-              id: "NozDYd",
-              defaultMessage: [{
-                "type": 0,
-                "value": "Uploading"
-              }]
-            }) : addButtonLabel
-          })
-        })
-      }), withFind ? /*#__PURE__*/jsx("div", {
-        className: "col-auto ps-0",
-        children: /*#__PURE__*/jsx(Button, {
-          type: "button",
-          theme: "primary",
-          icon: "search",
-          iconPosition: "right",
-          onClick: finalOnClickFind,
-          disabled: disabled,
-          outline: outline,
-          children: /*#__PURE__*/jsx(Label, {
-            children: findButtonLabel
-          })
-        })
-      }) : null]
     }) : null, finalUppy !== null ? /*#__PURE__*/jsxs(UppyContextProvider, {
       uppy: finalUppy,
       children: [!uploadDisabled && !hasMedia && !withButton && finalUppy !== null ? /*#__PURE__*/jsx("div", {
@@ -424,12 +391,50 @@ function UploadField(_ref) {
         doneButtonHandler: closeModal,
         closeAfterFinish: closeAfterFinish
       }) : null]
+    }) : null, withoutMedia || (!hasMedia || allowMultipleUploads) && (withButton || withFind) ? /*#__PURE__*/jsxs("div", {
+      className: "row",
+      children: [withButton ? /*#__PURE__*/jsx("div", {
+        className: "col-auto mb-2 pe-0",
+        children: /*#__PURE__*/jsx(Button, {
+          id: "trigger-uppy",
+          type: "button",
+          theme: "primary",
+          icon: finalLoading ? 'loading' : 'upload',
+          iconPosition: "right",
+          onClick: onClickAdd || openModal,
+          disabled: finalLoading || disabled,
+          outline: outline,
+          children: /*#__PURE__*/jsx(Label, {
+            children: finalLoading ? /*#__PURE__*/jsx(FormattedMessage, {
+              id: "NozDYd",
+              defaultMessage: [{
+                "type": 0,
+                "value": "Uploading"
+              }]
+            }) : addButtonLabel
+          })
+        })
+      }) : null, withFind ? /*#__PURE__*/jsx("div", {
+        className: "col-auto mb-2",
+        children: /*#__PURE__*/jsx(Button, {
+          type: "button",
+          theme: "primary",
+          icon: "search",
+          iconPosition: "right",
+          onClick: finalOnClickFind,
+          disabled: disabled,
+          outline: outline,
+          children: /*#__PURE__*/jsx(Label, {
+            children: findButtonLabel
+          })
+        })
+      }) : null]
     }) : null, showResourceModal ? /*#__PURE__*/jsx(ModalResourceItems, {
       id: "upload-".concat(name),
       resource: resource,
       query: listQuery,
-      onPageChange: onListPageChange,
-      onQueryChange: onListQueryChange,
+      onPageChange: finalOnPageChange,
+      onQueryChange: finalOnQueryChange,
       onQueryReset: onListQueryReset,
       baseUrl: null,
       showActions: false,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/field-upload",
-    "version": "4.0.27",
+    "version": "4.0.33",
     "description": "An Upload field",
     "keywords": [
         "javascript"
@@ -67,11 +67,11 @@
         "@fortawesome/free-solid-svg-icons": "^6.5.1",
         "@fortawesome/react-fontawesome": "^0.2.0",
         "@panneau/core": "^4.0.27",
-        "@panneau/element-button": "^4.0.27",
+        "@panneau/element-button": "^4.0.33",
         "@panneau/element-label": "^4.0.27",
-        "@panneau/element-media-card": "^4.0.27",
-        "@panneau/modal-resource-items": "^4.0.27",
-        "@panneau/themes": "^4.0.27",
+        "@panneau/element-media-card": "^4.0.33",
+        "@panneau/modal-resource-items": "^4.0.33",
+        "@panneau/themes": "^4.0.33",
         "@panneau/uppy": "^4.0.27",
         "@uppy/core": "^5.1.1",
         "@uppy/dashboard": "^5.0.4",
@@ -85,5 +85,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "48e48752495d69c6b10ddc2c4fe2319d2cd86ff0"
+    "gitHead": "c0e63d849207a4f77f9e6d8d2c9f4b51c3d892d5"
 }