@panneau/medias 3.0.208 → 3.0.209

package/es/index.js

@@ -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] : {},

package/lib/index.js

@@ -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] : {},

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/medias",
-    "version": "3.0.208",
+    "version": "3.0.209",
     "description": "",
     "keywords": [
         "javascript"
@@ -47,19 +47,19 @@
     "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@panneau/core": "^3.0.194",
-        "@panneau/data": "^3.0.208",
+        "@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.208",
+        "@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",
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "784e87ce65299b81ce5f139a676ded4d70f5cfb1"
+    "gitHead": "35ea686893c9fbbd809ad9738634ae5c30344842"
 }