cozy-bar 20.0.0 → 21.0.0

package/dist/components/AppsMenu/AppsMenuContent.js

@@ -8,6 +8,7 @@ exports.default = exports.AppsMenuContent = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactRedux = require("react-redux");
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
 var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
 var _applications = require("cozy-client/dist/models/applications");
 var _AppItem = _interopRequireDefault(require("./components/AppItem"));
@@ -20,11 +21,6 @@ var styles = {
   "apps-menu-grid-item": "apps-menu-grid-item",
   "apps-menu-grid-item-icon": "apps-menu-grid-item-icon"
 };
-var sorter = function sorter(fn) {
-  return function (itemA, itemB) {
-    return fn(itemA) > fn(itemB);
-  };
-};
 var AppsMenuContent = exports.AppsMenuContent = function AppsMenuContent(_ref) {
   var isFetchingApps = _ref.isFetchingApps,
     apps = _ref.apps,
@@ -51,10 +47,11 @@ var AppsMenuContent = exports.AppsMenuContent = function AppsMenuContent(_ref) {
   var homeSlug = homeApp && homeApp.slug;
   var displayedApps = apps.filter(function (app) {
     return app.slug !== homeSlug;
-  }).sort(sorter(_applications.getAppDisplayName));
+  });
+  var sortedApps = (0, _cozyFlags.default)('apps.sort') ? (0, _applications.sortApplicationsList)(displayedApps, (0, _cozyFlags.default)('apps.sort')) : displayedApps;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: styles['apps-menu-grid']
-  }, displayedApps.map(function (app, index) {
+  }, sortedApps.map(function (app, index) {
     return /*#__PURE__*/_react.default.createElement(_AppItem.default, {
       key: index,
       app: app

package/dist/components/AppsMenu/components/AppItem.js

@@ -8,6 +8,7 @@ exports.default = exports.AppItem = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _applications = require("cozy-client/dist/models/applications");
+var _styles = require("cozy-ui/transpiled/react/styles");
 var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
 var _AppIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/AppIcon"));
 var _AppLinker = _interopRequireDefault(require("cozy-ui/transpiled/react/AppLinker"));
@@ -21,9 +22,19 @@ var styles = {
   "apps-menu-grid-item": "apps-menu-grid-item",
   "apps-menu-grid-item-icon": "apps-menu-grid-item-icon"
 };
+var useStyles = (0, _styles.makeStyles)(function () {
+  return {
+    text: {
+      lineHeight: '22.5px',
+      fontSize: '12px',
+      fontWeight: 400
+    }
+  };
+});
 var AppItem = exports.AppItem = function AppItem(_ref) {
   var app = _ref.app;
   var appName = (0, _applications.getAppDisplayName)(app);
+  var classes = useStyles();
   return /*#__PURE__*/_react.default.createElement(_AppLinker.default, {
     href: app.href || '',
     app: app
@@ -46,8 +57,8 @@ var AppItem = exports.AppItem = function AppItem(_ref) {
         app: app,
         key: app.slug
       }, _stack.default.get.iconProps()))), /*#__PURE__*/_react.default.createElement(_Typography.default, {
-        variant: "subtitle1",
-        noWrap: true
+        noWrap: true,
+        className: classes.text
       }, appName))
     });
   });

package/dist/components/AppsMenu/index.js

@@ -40,7 +40,10 @@ var AppsMenu = function AppsMenu() {
   })), isMobile ? /*#__PURE__*/_react.default.createElement(_CozyDialogs.ConfirmDialog, {
     open: isOpen,
     onClose: toggleMenu,
-    content: /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, null)
+    content: /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, null),
+    classes: {
+      paper: 'u-bdrs-7'
+    }
   }) : /*#__PURE__*/_react.default.createElement(_Menu.default, {
     open: isOpen,
     anchorEl: buttonRef.current,
@@ -54,6 +57,9 @@ var AppsMenu = function AppsMenu() {
     transformOrigin: {
       vertical: -10,
       horizontal: 0
+    },
+    classes: {
+      paper: 'u-bdrs-7'
     }
   }, /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, null)));
 };

package/dist/components/UserMenu/index.js

@@ -49,7 +49,10 @@ var UserMenu = function UserMenu(_ref) {
       onLogOut: onLogOut,
       instance: instance,
       diskUsage: diskUsage
-    })
+    }),
+    classes: {
+      paper: 'u-bdrs-7'
+    }
   }) : /*#__PURE__*/_react.default.createElement(_Menu.default, {
     open: isOpen,
     anchorEl: buttonRef.current,
@@ -63,6 +66,9 @@ var UserMenu = function UserMenu(_ref) {
     transformOrigin: {
       vertical: -10,
       horizontal: 0
+    },
+    classes: {
+      paper: 'u-bdrs-7'
     }
   }, /*#__PURE__*/_react.default.createElement(_UserMenuContent.default, {
     onLogOut: onLogOut,

package/dist/index.js

@@ -71,4 +71,4 @@ var _BarProvider = _interopRequireDefault(require("./components/BarProvider"));
 var _reducers = require("./lib/reducers");
 /* global __VERSION__ */
 
-var version = exports.version = "\"20.0.0\"";
+var version = exports.version = "\"21.0.0\"";

package/dist/styles/apps-menu.styl

@@ -7,8 +7,7 @@
 
     +desktop()
         width 15rem
-        margin-left .5rem
-        margin-right .5rem
+        margin 6px 10px
   
 .apps-menu-grid-item-wrapper
     width 33%
@@ -24,7 +23,7 @@
     justify-content center
     align-items center
     text-decoration none
-    gap .2rem // @stylint ignore Property is valid but unknown by stylint which is old and should be replaced
+    gap 4px // @stylint ignore Property is valid but unknown by stylint which is old and should be replaced
     width 100%
 
 .apps-menu-grid-item-icon

package/dist/stylesheet.css

@@ -8,8 +8,7 @@
 @media (min-width: 64rem) {
   .apps-menu-grid {
     width: 15rem;
-    margin-left: 0.5rem;
-    margin-right: 0.5rem;
+    margin: 6px 10px;
   }
 }
 .apps-menu-grid-item-wrapper {
@@ -28,7 +27,7 @@
   justify-content: center;
   align-items: center;
   text-decoration: none;
-  gap: 0.2rem;
+  gap: 4px;
   width: 100%;
 }
 .apps-menu-grid-item-icon {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "20.0.0",
+  "version": "21.0.0",
   "description": "cozy-bar.js library, a small lib provided by cozy-stack to inject the Cozy-bar component into each app",
   "main": "dist/index.js",
   "author": "Cozy Cloud <contact@cozycloud.cc> (https://cozy.io/)",
@@ -42,7 +42,7 @@
     "babel-plugin-module-resolver": "^4.0.0",
     "babel-plugin-transform-define": "^2.0.0",
     "babel-preset-cozy-app": "^2.8.1",
-    "cozy-client": "^52.1.0",
+    "cozy-client": "^57.7.0",
     "cozy-dataproxy-lib": "^4.1.0",
     "cozy-device-helper": "2.6.0",
     "cozy-flags": "^4.6.1",
@@ -51,7 +51,7 @@
     "cozy-logger": "1.9.1",
     "cozy-realtime": "^4.0.5",
     "cozy-search": "^0.4.0",
-    "cozy-ui": "^122.0.1",
+    "cozy-ui": "^122.6.0",
     "eslint-config-cozy-app": "2.0.0",
     "identity-obj-proxy": "3.0.0",
     "jest": "24.9.0",
@@ -78,7 +78,7 @@
   },
   "peerDependencies": {
     "@cozy/minilog": ">=1.0.0",
-    "cozy-client": ">=52.1.0",
+    "cozy-client": ">=57.7.0",
     "cozy-dataproxy-lib": ">=4.1.0",
     "cozy-device-helper": ">=2.6.0",
     "cozy-flags": ">=4.6.1",
@@ -86,7 +86,7 @@
     "cozy-interapp": ">=0.4.9",
     "cozy-realtime": ">=4.0.5",
     "cozy-search": ">=0.4.0",
-    "cozy-ui": ">=122.0.1",
+    "cozy-ui": ">=122.6.0",
     "react": ">=16.10.1",
     "react-dom": ">=16.10.1",
     "react-router-dom": ">=6.14.2"