@panneau/medias 3.0.207 → 3.0.209

package/es/index.js

@@ -194,42 +194,9 @@ var useMediaTrash = function useMediaTrash() {
 };
 var useMediaTrash$1 = useMediaTrash;
 
-var MediaContext = /*#__PURE__*/React.createContext(null);
-var useCurrentMedia = function useCurrentMedia() {
-  return useContext(MediaContext);
-};
-var propTypes$8 = {
-  media: PropTypes.shape({
-    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-  }),
-  children: PropTypes.node.isRequired
-};
-var defaultProps$8 = {
-  media: null
-};
-function MediaProvider(_ref) {
-  var providedMedia = _ref.media,
-    children = _ref.children;
-  var _useState = useState(providedMedia),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentMedia = _useState2[0],
-    setCurrentMedia = _useState2[1];
-  var values = useMemo(function () {
-    return {
-      currentMedia: currentMedia,
-      setCurrentMedia: setCurrentMedia
-    };
-  }, [currentMedia, setCurrentMedia]);
-  return /*#__PURE__*/React.createElement(MediaContext.Provider, {
-    value: values
-  }, children);
-}
-MediaProvider.propTypes = propTypes$8;
-MediaProvider.defaultProps = defaultProps$8;
-
 var styles = {"mediaFrame":"panneau-medias-mediaFrame","playButton":"panneau-medias-playButton"};
 
-var propTypes$7 = {
+var propTypes$8 = {
   value: PropTypes.shape({
     id: PropTypes.string,
     type: PropTypes.string
@@ -237,7 +204,7 @@ var propTypes$7 = {
   showPlayer: PropTypes.bool,
   className: PropTypes.string
 };
-var defaultProps$7 = {
+var defaultProps$8 = {
   value: null,
   showPlayer: true,
   className: null
@@ -270,8 +237,8 @@ function MediaFrame(_ref) {
     onClick: type === 'video' || type === 'audio' ? onClick : null
   }));
 }
-MediaFrame.propTypes = propTypes$7;
-MediaFrame.defaultProps = defaultProps$7;
+MediaFrame.propTypes = propTypes$8;
+MediaFrame.defaultProps = defaultProps$8;
 
 var defaultFields = [{
   name: 'name',
@@ -406,7 +373,7 @@ var defaultFields = [{
   }]
 }];
 
-var propTypes$6 = {
+var propTypes$7 = {
   value: PropTypes.shape({
     id: PropTypes.string
   }),
@@ -421,7 +388,7 @@ var propTypes$6 = {
   className: PropTypes.string,
   children: PropTypes.node
 };
-var defaultProps$6 = {
+var defaultProps$7 = {
   value: null,
   fields: defaultFields,
   onChange: null,
@@ -591,8 +558,41 @@ function MediaForm(_ref) {
     status: status
   })) : null)));
 }
-MediaForm.propTypes = propTypes$6;
-MediaForm.defaultProps = defaultProps$6;
+MediaForm.propTypes = propTypes$7;
+MediaForm.defaultProps = defaultProps$7;
+
+var MediaContext = /*#__PURE__*/React.createContext(null);
+var useCurrentMedia = function useCurrentMedia() {
+  return useContext(MediaContext);
+};
+var propTypes$6 = {
+  media: PropTypes.shape({
+    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
+  }),
+  children: PropTypes.node.isRequired
+};
+var defaultProps$6 = {
+  media: null
+};
+function MediaProvider(_ref) {
+  var providedMedia = _ref.media,
+    children = _ref.children;
+  var _useState = useState(providedMedia),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentMedia = _useState2[0],
+    setCurrentMedia = _useState2[1];
+  var values = useMemo(function () {
+    return {
+      currentMedia: currentMedia,
+      setCurrentMedia: setCurrentMedia
+    };
+  }, [currentMedia, setCurrentMedia]);
+  return /*#__PURE__*/React.createElement(MediaContext.Provider, {
+    value: values
+  }, children);
+}
+MediaProvider.propTypes = propTypes$6;
+MediaProvider.defaultProps = defaultProps$6;
 
 var defaultColumns = [{
   id: 'image',
@@ -905,9 +905,9 @@ function MediasBrowser(_ref) {
   var baseQuery = useMemo(function () {
     return _objectSpread(_objectSpread({
       count: 12
-    }, initialQuery), {}, {
+    }, initialQuery), types !== null ? {
       types: types
-    });
+    } : null);
   }, [initialQuery, types]);
   var _useQuery = useQuery(baseQuery),
     fullQuery = _useQuery.query,
@@ -937,8 +937,9 @@ function MediasBrowser(_ref) {
   // eslint-disable-next-line no-unused-vars
   var _ref3 = query || {};
     _ref3.types;
-    _ref3.trashed;
-    var queryWithoutTypes = _objectWithoutProperties(_ref3, _excluded2);
+    var _ref3$trashed = _ref3.trashed,
+    trashed = _ref3$trashed === void 0 ? null : _ref3$trashed,
+    queryWithoutTypes = _objectWithoutProperties(_ref3, _excluded2);
   var _useMediaTrash = useMediaTrash$1(),
     mediaTrash = _useMediaTrash.mediaTrash,
     trashing = _useMediaTrash.trashing;
@@ -1125,6 +1126,10 @@ function MediasBrowser(_ref) {
       return column;
     }) : columns;
   }, [columns, withTrash, showTrashed]);
+  var hasQueryItem = useMemo(function () {
+    var showOnTopQuery = types === null ? query : queryWithoutTypes;
+    return showOnTopQuery !== null && !trashed ? Object.keys(showOnTopQuery).length > 0 : false;
+  }, [types, query, queryWithoutTypes, trashed]);
   var finalItems = useMemo(function () {
     if (withStickySelection && (extraItems !== null || uploadedMedias !== null || uploadProcessing === true)) {
       return uniqBy([].concat(_toConsumableArray(uploadProcessing ? [{
@@ -1132,7 +1137,7 @@ function MediasBrowser(_ref) {
         loading: true,
         actionsDisabled: true,
         selectionDisabled: true
-      }] : []), _toConsumableArray(page === 1 ? uploadedMedias || [] : []), _toConsumableArray(page === 1 ? (extraItems || []).map(function (item) {
+      }] : []), _toConsumableArray(page === 1 && !hasQueryItem ? uploadedMedias || [] : []), _toConsumableArray(page === 1 && !hasQueryItem ? (extraItems || []).map(function (item) {
         var _item$id = item.id,
           itemId = _item$id === void 0 ? null : _item$id;
         return (allItems || []).find(function () {
@@ -1148,7 +1153,13 @@ function MediasBrowser(_ref) {
       });
     }
     return items;
-  }, [items, page, allItems, withStickySelection, extraItems, uploadProcessing]);
+  }, [items, page, allItems, withStickySelection, extraItems, uploadProcessing, hasQueryItem]);
+
+  // const emptyWithSticky = useMemo(
+  //     () => (items || []).length === 0 && (finalItems || []).length > 0,
+  //     [items, finalItems],
+  // );
+
   return /*#__PURE__*/React.createElement("div", {
     className: className
   }, currentMedia !== null ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -1227,6 +1238,7 @@ function MediasBrowser(_ref) {
     items: finalItems || [],
     loading: loading,
     loaded: loaded
+    // empty={emptyWithSticky}
   }) : null, layout === 'table' ? /*#__PURE__*/React.createElement(Table, {
     theme: theme,
     columns: finalColumns,
@@ -1239,7 +1251,9 @@ function MediasBrowser(_ref) {
     multipleSelection: multipleSelection,
     items: finalItems,
     loading: loading,
-    loaded: loaded,
+    loaded: loaded
+    // empty={emptyWithSticky}
+    ,
     actionsProps: {
       getDeletePropsFromItem: function getDeletePropsFromItem() {
         var _ref10 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -1544,4 +1558,4 @@ function MediasResourcePicker(_ref) {
 MediasResourcePicker.propTypes = propTypes;
 MediasResourcePicker.defaultProps = defaultProps;
 
-export { MediaForm, MediasApiProvider, MediasBrowser, MediasBrowserContainer, MediasPicker, MediasPickerContainer, MediasResourceBrowser, MediasResourcePicker, apiPropTypes, defaultColumns as columns, defaultFields as fields, defaultFilters as filters, useCurrentMedia, useMedia$1 as useMedia, useMediaCreate$1 as useMediaCreate, useMediaDelete$1 as useMediaDelete, useMediaTrash$1 as useMediaTrash, useMediaUpdate$1 as useMediaUpdate, useMedias$1 as useMedias, useMediasApi };
+export { MediaForm, MediaProvider, MediasApiProvider, MediasBrowser, MediasBrowserContainer, MediasPicker, MediasPickerContainer, MediasResourceBrowser, MediasResourcePicker, apiPropTypes, defaultColumns as columns, defaultFields as fields, defaultFilters as filters, useCurrentMedia, useMedia$1 as useMedia, useMediaCreate$1 as useMediaCreate, useMediaDelete$1 as useMediaDelete, useMediaTrash$1 as useMediaTrash, useMediaUpdate$1 as useMediaUpdate, useMedias$1 as useMedias, useMediasApi };

package/lib/index.js

@@ -196,42 +196,9 @@ var useMediaTrash = function useMediaTrash() {
 };
 var useMediaTrash$1 = useMediaTrash;
 
-var MediaContext = /*#__PURE__*/React.createContext(null);
-var useCurrentMedia = function useCurrentMedia() {
-  return React.useContext(MediaContext);
-};
-var propTypes$8 = {
-  media: PropTypes.shape({
-    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-  }),
-  children: PropTypes.node.isRequired
-};
-var defaultProps$8 = {
-  media: null
-};
-function MediaProvider(_ref) {
-  var providedMedia = _ref.media,
-    children = _ref.children;
-  var _useState = React.useState(providedMedia),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentMedia = _useState2[0],
-    setCurrentMedia = _useState2[1];
-  var values = React.useMemo(function () {
-    return {
-      currentMedia: currentMedia,
-      setCurrentMedia: setCurrentMedia
-    };
-  }, [currentMedia, setCurrentMedia]);
-  return /*#__PURE__*/React.createElement(MediaContext.Provider, {
-    value: values
-  }, children);
-}
-MediaProvider.propTypes = propTypes$8;
-MediaProvider.defaultProps = defaultProps$8;
-
 var styles = {"mediaFrame":"panneau-medias-mediaFrame","playButton":"panneau-medias-playButton"};
 
-var propTypes$7 = {
+var propTypes$8 = {
   value: PropTypes.shape({
     id: PropTypes.string,
     type: PropTypes.string
@@ -239,7 +206,7 @@ var propTypes$7 = {
   showPlayer: PropTypes.bool,
   className: PropTypes.string
 };
-var defaultProps$7 = {
+var defaultProps$8 = {
   value: null,
   showPlayer: true,
   className: null
@@ -272,8 +239,8 @@ function MediaFrame(_ref) {
     onClick: type === 'video' || type === 'audio' ? onClick : null
   }));
 }
-MediaFrame.propTypes = propTypes$7;
-MediaFrame.defaultProps = defaultProps$7;
+MediaFrame.propTypes = propTypes$8;
+MediaFrame.defaultProps = defaultProps$8;
 
 var defaultFields = [{
   name: 'name',
@@ -408,7 +375,7 @@ var defaultFields = [{
   }]
 }];
 
-var propTypes$6 = {
+var propTypes$7 = {
   value: PropTypes.shape({
     id: PropTypes.string
   }),
@@ -423,7 +390,7 @@ var propTypes$6 = {
   className: PropTypes.string,
   children: PropTypes.node
 };
-var defaultProps$6 = {
+var defaultProps$7 = {
   value: null,
   fields: defaultFields,
   onChange: null,
@@ -593,8 +560,41 @@ function MediaForm(_ref) {
     status: status
   })) : null)));
 }
-MediaForm.propTypes = propTypes$6;
-MediaForm.defaultProps = defaultProps$6;
+MediaForm.propTypes = propTypes$7;
+MediaForm.defaultProps = defaultProps$7;
+
+var MediaContext = /*#__PURE__*/React.createContext(null);
+var useCurrentMedia = function useCurrentMedia() {
+  return React.useContext(MediaContext);
+};
+var propTypes$6 = {
+  media: PropTypes.shape({
+    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
+  }),
+  children: PropTypes.node.isRequired
+};
+var defaultProps$6 = {
+  media: null
+};
+function MediaProvider(_ref) {
+  var providedMedia = _ref.media,
+    children = _ref.children;
+  var _useState = React.useState(providedMedia),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentMedia = _useState2[0],
+    setCurrentMedia = _useState2[1];
+  var values = React.useMemo(function () {
+    return {
+      currentMedia: currentMedia,
+      setCurrentMedia: setCurrentMedia
+    };
+  }, [currentMedia, setCurrentMedia]);
+  return /*#__PURE__*/React.createElement(MediaContext.Provider, {
+    value: values
+  }, children);
+}
+MediaProvider.propTypes = propTypes$6;
+MediaProvider.defaultProps = defaultProps$6;
 
 var defaultColumns = [{
   id: 'image',
@@ -907,9 +907,9 @@ function MediasBrowser(_ref) {
   var baseQuery = React.useMemo(function () {
     return _objectSpread(_objectSpread({
       count: 12
-    }, initialQuery), {}, {
+    }, initialQuery), types !== null ? {
       types: types
-    });
+    } : null);
   }, [initialQuery, types]);
   var _useQuery = hooks.useQuery(baseQuery),
     fullQuery = _useQuery.query,
@@ -939,8 +939,9 @@ function MediasBrowser(_ref) {
   // eslint-disable-next-line no-unused-vars
   var _ref3 = query || {};
     _ref3.types;
-    _ref3.trashed;
-    var queryWithoutTypes = _objectWithoutProperties(_ref3, _excluded2);
+    var _ref3$trashed = _ref3.trashed,
+    trashed = _ref3$trashed === void 0 ? null : _ref3$trashed,
+    queryWithoutTypes = _objectWithoutProperties(_ref3, _excluded2);
   var _useMediaTrash = useMediaTrash$1(),
     mediaTrash = _useMediaTrash.mediaTrash,
     trashing = _useMediaTrash.trashing;
@@ -1127,6 +1128,10 @@ function MediasBrowser(_ref) {
       return column;
     }) : columns;
   }, [columns, withTrash, showTrashed]);
+  var hasQueryItem = React.useMemo(function () {
+    var showOnTopQuery = types === null ? query : queryWithoutTypes;
+    return showOnTopQuery !== null && !trashed ? Object.keys(showOnTopQuery).length > 0 : false;
+  }, [types, query, queryWithoutTypes, trashed]);
   var finalItems = React.useMemo(function () {
     if (withStickySelection && (extraItems !== null || uploadedMedias !== null || uploadProcessing === true)) {
       return uniqBy([].concat(_toConsumableArray(uploadProcessing ? [{
@@ -1134,7 +1139,7 @@ function MediasBrowser(_ref) {
         loading: true,
         actionsDisabled: true,
         selectionDisabled: true
-      }] : []), _toConsumableArray(page === 1 ? uploadedMedias || [] : []), _toConsumableArray(page === 1 ? (extraItems || []).map(function (item) {
+      }] : []), _toConsumableArray(page === 1 && !hasQueryItem ? uploadedMedias || [] : []), _toConsumableArray(page === 1 && !hasQueryItem ? (extraItems || []).map(function (item) {
         var _item$id = item.id,
           itemId = _item$id === void 0 ? null : _item$id;
         return (allItems || []).find(function () {
@@ -1150,7 +1155,13 @@ function MediasBrowser(_ref) {
       });
     }
     return items;
-  }, [items, page, allItems, withStickySelection, extraItems, uploadProcessing]);
+  }, [items, page, allItems, withStickySelection, extraItems, uploadProcessing, hasQueryItem]);
+
+  // const emptyWithSticky = useMemo(
+  //     () => (items || []).length === 0 && (finalItems || []).length > 0,
+  //     [items, finalItems],
+  // );
+
   return /*#__PURE__*/React.createElement("div", {
     className: className
   }, currentMedia !== null ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -1229,6 +1240,7 @@ function MediasBrowser(_ref) {
     items: finalItems || [],
     loading: loading,
     loaded: loaded
+    // empty={emptyWithSticky}
   }) : null, layout === 'table' ? /*#__PURE__*/React.createElement(Table, {
     theme: theme,
     columns: finalColumns,
@@ -1241,7 +1253,9 @@ function MediasBrowser(_ref) {
     multipleSelection: multipleSelection,
     items: finalItems,
     loading: loading,
-    loaded: loaded,
+    loaded: loaded
+    // empty={emptyWithSticky}
+    ,
     actionsProps: {
       getDeletePropsFromItem: function getDeletePropsFromItem() {
         var _ref10 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -1547,6 +1561,7 @@ MediasResourcePicker.propTypes = propTypes;
 MediasResourcePicker.defaultProps = defaultProps;
 
 exports.MediaForm = MediaForm;
+exports.MediaProvider = MediaProvider;
 exports.MediasApiProvider = MediasApiProvider;
 exports.MediasBrowser = MediasBrowser;
 exports.MediasBrowserContainer = MediasBrowserContainer;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/medias",
-    "version": "3.0.207",
+    "version": "3.0.209",
     "description": "",
     "keywords": [
         "javascript"
@@ -47,20 +47,20 @@
     "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@panneau/core": "^3.0.194",
-        "@panneau/data": "^3.0.203",
+        "@panneau/data": "^3.0.209",
         "@panneau/display-image": "^3.0.201",
         "@panneau/element-button": "^3.0.194",
         "@panneau/element-buttons": "^3.0.194",
         "@panneau/element-form": "^3.0.199",
         "@panneau/element-form-status": "^3.0.194",
-        "@panneau/element-grid": "^3.0.200",
+        "@panneau/element-grid": "^3.0.209",
         "@panneau/element-icon": "^3.0.194",
         "@panneau/element-media-card": "^3.0.201",
         "@panneau/element-media-player": "^3.0.199",
         "@panneau/element-pagination": "^3.0.194",
-        "@panneau/element-table": "^3.0.200",
-        "@panneau/field-upload": "^3.0.203",
-        "@panneau/filter-filters": "^3.0.194",
+        "@panneau/element-table": "^3.0.209",
+        "@panneau/field-upload": "^3.0.209",
+        "@panneau/filter-filters": "^3.0.208",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "21f52c4a17ca3acc469a10dc00e70bcf01235768"
+    "gitHead": "35ea686893c9fbbd809ad9738634ae5c30344842"
 }