@panneau/medias 3.0.212 → 3.0.214

package/es/index.js

@@ -384,6 +384,7 @@ var propTypes$7 = {
   onSave: PropTypes.func,
   onDelete: PropTypes.func,
   onClose: PropTypes.func,
+  withDelete: PropTypes.bool,
   withTrash: PropTypes.bool,
   className: PropTypes.string,
   children: PropTypes.node
@@ -395,6 +396,7 @@ var defaultProps$7 = {
   onSave: null,
   onDelete: null,
   onClose: null,
+  withDelete: false,
   withTrash: false,
   className: null,
   children: null
@@ -406,6 +408,7 @@ function MediaForm(_ref) {
     onSave = _ref.onSave,
     onDelete = _ref.onDelete,
     onClose = _ref.onClose,
+    withDelete = _ref.withDelete,
     withTrash = _ref.withTrash,
     className = _ref.className,
     children = _ref.children;
@@ -513,7 +516,7 @@ function MediaForm(_ref) {
     className: "d-inline text-truncate mb-0"
   }, name), /*#__PURE__*/React.createElement("span", {
     className: "mx-2"
-  }, type)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+  }, type)), /*#__PURE__*/React.createElement("div", null, withDelete ? /*#__PURE__*/React.createElement(Button, {
     className: "me-2 mb-1 mt-1",
     theme: "danger",
     icon: withTrash && deletedAt !== null ? 'trash-fill' : 'trash',
@@ -532,7 +535,7 @@ function MediaForm(_ref) {
       "type": 0,
       "value": "Delete"
     }]
-  })), onSave !== null ? /*#__PURE__*/React.createElement(Button, {
+  })) : null, onSave !== null ? /*#__PURE__*/React.createElement(Button, {
     className: "mb-1 mt-1",
     theme: "primary",
     icon: changed ? 'check' : 'check',
@@ -729,7 +732,7 @@ var defaultColumns = [{
       "value": "Actions"
     }]
   }),
-  actions: ['edit', 'delete']
+  actions: ['edit']
   // component: ItemActions,
   // label: 'Edit',
   // url: '/edit/1',
@@ -841,6 +844,7 @@ var propTypes$5 = {
   onSelectionChange: PropTypes.func,
   multipleSelection: PropTypes.bool,
   uppyConfig: PropTypes.shape({}),
+  withDelete: PropTypes.bool,
   withTrash: PropTypes.bool,
   withStickySelection: PropTypes.bool,
   withoutUpload: PropTypes.bool,
@@ -879,6 +883,7 @@ var defaultProps$5 = {
   onSelectionChange: null,
   multipleSelection: false,
   uppyConfig: null,
+  withDelete: false,
   withTrash: false,
   withStickySelection: false,
   withoutUpload: false,
@@ -907,6 +912,7 @@ function MediasBrowser(_ref) {
     onSelectionChange = _ref.onSelectionChange,
     multipleSelection = _ref.multipleSelection,
     uppyConfig = _ref.uppyConfig,
+    withDelete = _ref.withDelete,
     withTrash = _ref.withTrash,
     withStickySelection = _ref.withStickySelection,
     withoutUpload = _ref.withoutUpload,
@@ -1030,8 +1036,28 @@ function MediasBrowser(_ref) {
     }
   }, [reload]);
   var onTrashMedia = useCallback(function (id) {
-    return !showTrashed && withTrash ? mediaTrash(id).then(reload)["catch"](reload) : mediaDelete(id).then(reload)["catch"](reload);
-  }, [showTrashed, withTrash, mediaTrash, mediaDelete, reload]);
+    return !showTrashed && withTrash ? mediaTrash(id).then(function () {
+      if (!multipleSelection) {
+        var _ref4 = selectedItems || {},
+          _ref4$id = _ref4.id,
+          selectedId = _ref4$id === void 0 ? null : _ref4$id;
+        if (selectedId !== null && selectedId === id) {
+          onSelectionChange(null);
+        }
+      }
+      // Todo remove from mult selection
+    }).then(reload) : mediaDelete(id).then(function () {
+      if (!multipleSelection) {
+        var _ref5 = selectedItems || {},
+          _ref5$id = _ref5.id,
+          selectedId = _ref5$id === void 0 ? null : _ref5$id;
+        if (selectedId !== null && selectedId === id) {
+          onSelectionChange(null);
+        }
+      }
+      // Todo remove from selection
+    }).then(reload);
+  }, [showTrashed, withTrash, mediaTrash, mediaDelete, reload, selectedItems, multipleSelection, onSelectionChange]);
   var _useState7 = useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
     uploadedMedias = _useState8[0],
@@ -1046,10 +1072,10 @@ function MediasBrowser(_ref) {
     });
     setUploadedMedias(uploadedNewMedias);
     if (onSelectionChange !== null) {
-      var _ref4 = newMedias || [],
-        _ref5 = _slicedToArray(_ref4, 1),
-        _ref5$ = _ref5[0],
-        firstMedia = _ref5$ === void 0 ? null : _ref5$;
+      var _ref6 = newMedias || [],
+        _ref7 = _slicedToArray(_ref6, 1),
+        _ref7$ = _ref7[0],
+        firstMedia = _ref7$ === void 0 ? null : _ref7$;
       onSelectionChange(multipleSelection && isArray(newMedias) ? newMedias : firstMedia);
       onQueryReset();
       reload();
@@ -1102,9 +1128,9 @@ function MediasBrowser(_ref) {
     }]) : filters;
     if (types !== null && partialFilters !== null) {
       return (partialFilters || []).map(function (filter) {
-        var _ref6 = filter || {},
-          _ref6$id = _ref6.id,
-          id = _ref6$id === void 0 ? null : _ref6$id;
+        var _ref8 = filter || {},
+          _ref8$id = _ref8.id,
+          id = _ref8$id === void 0 ? null : _ref8$id;
         return id === 'types' ? _objectSpread(_objectSpread({}, filter), {}, {
           disabled: true
         }) : filter;
@@ -1114,9 +1140,9 @@ function MediasBrowser(_ref) {
   }, [filters, types, withTrash, showTrashed, onClickTrash]);
   var finalColumns = useMemo(function () {
     return withTrash && showTrashed ? (columns || []).map(function (column) {
-      var _ref7 = column || {},
-        _ref7$id = _ref7.id,
-        columnId = _ref7$id === void 0 ? null : _ref7$id;
+      var _ref9 = column || {},
+        _ref9$id = _ref9.id,
+        columnId = _ref9$id === void 0 ? null : _ref9$id;
       if (columnId === 'created_at') {
         return _objectSpread(_objectSpread({}, column), {}, {
           path: 'deleted_at',
@@ -1130,9 +1156,9 @@ function MediasBrowser(_ref) {
         });
       }
       if (columnId === 'actions') {
-        var _ref8 = column || {},
-          _ref8$actions = _ref8.actions,
-          actions = _ref8$actions === void 0 ? [] : _ref8$actions;
+        var _ref10 = column || {},
+          _ref10$actions = _ref10.actions,
+          actions = _ref10$actions === void 0 ? [] : _ref10$actions;
         return _objectSpread(_objectSpread({}, column), {}, {
           actions: (actions || []).reduce(function (acc, action) {
             if (action === 'delete') {
@@ -1167,9 +1193,9 @@ function MediasBrowser(_ref) {
         var _item$id = item.id,
           itemId = _item$id === void 0 ? null : _item$id;
         return (allItems || []).find(function () {
-          var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-            _ref9$id = _ref9.id,
-            otherId = _ref9$id === void 0 ? null : _ref9$id;
+          var _ref11 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+            _ref11$id = _ref11.id,
+            otherId = _ref11$id === void 0 ? null : _ref11$id;
           return otherId === itemId;
         }) || item || null;
       }).filter(function (it) {
@@ -1195,6 +1221,7 @@ function MediasBrowser(_ref) {
     onSave: onSaveMedia,
     onClose: onCloseMedia,
     onDelete: onDeleteMedia,
+    withDelete: withDelete,
     withTrash: withTrash
   }, formChildren) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classNames(['d-flex', 'justify-content-between'])
@@ -1277,19 +1304,18 @@ function MediasBrowser(_ref) {
     ,
     actionsProps: {
       getDeletePropsFromItem: function getDeletePropsFromItem() {
-        var _ref10 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-          _ref10$id = _ref10.id,
-          id = _ref10$id === void 0 ? null : _ref10$id;
-        return _objectSpread({
+        var _ref12 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref12$id = _ref12.id,
+          id = _ref12$id === void 0 ? null : _ref12$id;
+        return {
           href: null,
-          withConfirmation: !withTrash,
+          withConfirmation: false,
           disabled: trashing || deleting,
-          icon: showTrashed ? 'trash-fill' : 'trash'
-        }, withTrash ? {
+          icon: showTrashed ? 'trash-fill' : 'trash',
           onClick: function onClick() {
             return onTrashMedia(id);
           }
-        } : null);
+        };
       },
       getEditPropsFromItem: function getEditPropsFromItem(it) {
         return {

package/lib/index.js

@@ -386,6 +386,7 @@ var propTypes$7 = {
   onSave: PropTypes.func,
   onDelete: PropTypes.func,
   onClose: PropTypes.func,
+  withDelete: PropTypes.bool,
   withTrash: PropTypes.bool,
   className: PropTypes.string,
   children: PropTypes.node
@@ -397,6 +398,7 @@ var defaultProps$7 = {
   onSave: null,
   onDelete: null,
   onClose: null,
+  withDelete: false,
   withTrash: false,
   className: null,
   children: null
@@ -408,6 +410,7 @@ function MediaForm(_ref) {
     onSave = _ref.onSave,
     onDelete = _ref.onDelete,
     onClose = _ref.onClose,
+    withDelete = _ref.withDelete,
     withTrash = _ref.withTrash,
     className = _ref.className,
     children = _ref.children;
@@ -515,7 +518,7 @@ function MediaForm(_ref) {
     className: "d-inline text-truncate mb-0"
   }, name), /*#__PURE__*/React.createElement("span", {
     className: "mx-2"
-  }, type)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+  }, type)), /*#__PURE__*/React.createElement("div", null, withDelete ? /*#__PURE__*/React.createElement(Button, {
     className: "me-2 mb-1 mt-1",
     theme: "danger",
     icon: withTrash && deletedAt !== null ? 'trash-fill' : 'trash',
@@ -534,7 +537,7 @@ function MediaForm(_ref) {
       "type": 0,
       "value": "Delete"
     }]
-  })), onSave !== null ? /*#__PURE__*/React.createElement(Button, {
+  })) : null, onSave !== null ? /*#__PURE__*/React.createElement(Button, {
     className: "mb-1 mt-1",
     theme: "primary",
     icon: changed ? 'check' : 'check',
@@ -731,7 +734,7 @@ var defaultColumns = [{
       "value": "Actions"
     }]
   }),
-  actions: ['edit', 'delete']
+  actions: ['edit']
   // component: ItemActions,
   // label: 'Edit',
   // url: '/edit/1',
@@ -843,6 +846,7 @@ var propTypes$5 = {
   onSelectionChange: PropTypes.func,
   multipleSelection: PropTypes.bool,
   uppyConfig: PropTypes.shape({}),
+  withDelete: PropTypes.bool,
   withTrash: PropTypes.bool,
   withStickySelection: PropTypes.bool,
   withoutUpload: PropTypes.bool,
@@ -881,6 +885,7 @@ var defaultProps$5 = {
   onSelectionChange: null,
   multipleSelection: false,
   uppyConfig: null,
+  withDelete: false,
   withTrash: false,
   withStickySelection: false,
   withoutUpload: false,
@@ -909,6 +914,7 @@ function MediasBrowser(_ref) {
     onSelectionChange = _ref.onSelectionChange,
     multipleSelection = _ref.multipleSelection,
     uppyConfig = _ref.uppyConfig,
+    withDelete = _ref.withDelete,
     withTrash = _ref.withTrash,
     withStickySelection = _ref.withStickySelection,
     withoutUpload = _ref.withoutUpload,
@@ -1032,8 +1038,28 @@ function MediasBrowser(_ref) {
     }
   }, [reload]);
   var onTrashMedia = React.useCallback(function (id) {
-    return !showTrashed && withTrash ? mediaTrash(id).then(reload)["catch"](reload) : mediaDelete(id).then(reload)["catch"](reload);
-  }, [showTrashed, withTrash, mediaTrash, mediaDelete, reload]);
+    return !showTrashed && withTrash ? mediaTrash(id).then(function () {
+      if (!multipleSelection) {
+        var _ref4 = selectedItems || {},
+          _ref4$id = _ref4.id,
+          selectedId = _ref4$id === void 0 ? null : _ref4$id;
+        if (selectedId !== null && selectedId === id) {
+          onSelectionChange(null);
+        }
+      }
+      // Todo remove from mult selection
+    }).then(reload) : mediaDelete(id).then(function () {
+      if (!multipleSelection) {
+        var _ref5 = selectedItems || {},
+          _ref5$id = _ref5.id,
+          selectedId = _ref5$id === void 0 ? null : _ref5$id;
+        if (selectedId !== null && selectedId === id) {
+          onSelectionChange(null);
+        }
+      }
+      // Todo remove from selection
+    }).then(reload);
+  }, [showTrashed, withTrash, mediaTrash, mediaDelete, reload, selectedItems, multipleSelection, onSelectionChange]);
   var _useState7 = React.useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
     uploadedMedias = _useState8[0],
@@ -1048,10 +1074,10 @@ function MediasBrowser(_ref) {
     });
     setUploadedMedias(uploadedNewMedias);
     if (onSelectionChange !== null) {
-      var _ref4 = newMedias || [],
-        _ref5 = _slicedToArray(_ref4, 1),
-        _ref5$ = _ref5[0],
-        firstMedia = _ref5$ === void 0 ? null : _ref5$;
+      var _ref6 = newMedias || [],
+        _ref7 = _slicedToArray(_ref6, 1),
+        _ref7$ = _ref7[0],
+        firstMedia = _ref7$ === void 0 ? null : _ref7$;
       onSelectionChange(multipleSelection && isArray(newMedias) ? newMedias : firstMedia);
       onQueryReset();
       reload();
@@ -1104,9 +1130,9 @@ function MediasBrowser(_ref) {
     }]) : filters;
     if (types !== null && partialFilters !== null) {
       return (partialFilters || []).map(function (filter) {
-        var _ref6 = filter || {},
-          _ref6$id = _ref6.id,
-          id = _ref6$id === void 0 ? null : _ref6$id;
+        var _ref8 = filter || {},
+          _ref8$id = _ref8.id,
+          id = _ref8$id === void 0 ? null : _ref8$id;
         return id === 'types' ? _objectSpread(_objectSpread({}, filter), {}, {
           disabled: true
         }) : filter;
@@ -1116,9 +1142,9 @@ function MediasBrowser(_ref) {
   }, [filters, types, withTrash, showTrashed, onClickTrash]);
   var finalColumns = React.useMemo(function () {
     return withTrash && showTrashed ? (columns || []).map(function (column) {
-      var _ref7 = column || {},
-        _ref7$id = _ref7.id,
-        columnId = _ref7$id === void 0 ? null : _ref7$id;
+      var _ref9 = column || {},
+        _ref9$id = _ref9.id,
+        columnId = _ref9$id === void 0 ? null : _ref9$id;
       if (columnId === 'created_at') {
         return _objectSpread(_objectSpread({}, column), {}, {
           path: 'deleted_at',
@@ -1132,9 +1158,9 @@ function MediasBrowser(_ref) {
         });
       }
       if (columnId === 'actions') {
-        var _ref8 = column || {},
-          _ref8$actions = _ref8.actions,
-          actions = _ref8$actions === void 0 ? [] : _ref8$actions;
+        var _ref10 = column || {},
+          _ref10$actions = _ref10.actions,
+          actions = _ref10$actions === void 0 ? [] : _ref10$actions;
         return _objectSpread(_objectSpread({}, column), {}, {
           actions: (actions || []).reduce(function (acc, action) {
             if (action === 'delete') {
@@ -1169,9 +1195,9 @@ function MediasBrowser(_ref) {
         var _item$id = item.id,
           itemId = _item$id === void 0 ? null : _item$id;
         return (allItems || []).find(function () {
-          var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-            _ref9$id = _ref9.id,
-            otherId = _ref9$id === void 0 ? null : _ref9$id;
+          var _ref11 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+            _ref11$id = _ref11.id,
+            otherId = _ref11$id === void 0 ? null : _ref11$id;
           return otherId === itemId;
         }) || item || null;
       }).filter(function (it) {
@@ -1197,6 +1223,7 @@ function MediasBrowser(_ref) {
     onSave: onSaveMedia,
     onClose: onCloseMedia,
     onDelete: onDeleteMedia,
+    withDelete: withDelete,
     withTrash: withTrash
   }, formChildren) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classNames(['d-flex', 'justify-content-between'])
@@ -1279,19 +1306,18 @@ function MediasBrowser(_ref) {
     ,
     actionsProps: {
       getDeletePropsFromItem: function getDeletePropsFromItem() {
-        var _ref10 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-          _ref10$id = _ref10.id,
-          id = _ref10$id === void 0 ? null : _ref10$id;
-        return _objectSpread({
+        var _ref12 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref12$id = _ref12.id,
+          id = _ref12$id === void 0 ? null : _ref12$id;
+        return {
           href: null,
-          withConfirmation: !withTrash,
+          withConfirmation: false,
           disabled: trashing || deleting,
-          icon: showTrashed ? 'trash-fill' : 'trash'
-        }, withTrash ? {
+          icon: showTrashed ? 'trash-fill' : 'trash',
           onClick: function onClick() {
             return onTrashMedia(id);
           }
-        } : null);
+        };
       },
       getEditPropsFromItem: function getEditPropsFromItem(it) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/medias",
-    "version": "3.0.212",
+    "version": "3.0.214",
     "description": "",
     "keywords": [
         "javascript"
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "b9f002d844c6d4007c25a7c93fa54ba1989e6d40"
+    "gitHead": "21739f0646ff12bf3fe03a70d69a4604d31e1e49"
 }