cozy-bar 21.1.2 → 22.0.0

package/dist/components/AppsMenu/AppsMenuContent.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.AppsMenuContent = void 0;
+exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactRedux = require("react-redux");
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -21,10 +21,11 @@ var styles = {
   "apps-menu-grid-item": "apps-menu-grid-item",
   "apps-menu-grid-item-icon": "apps-menu-grid-item-icon"
 };
-var AppsMenuContent = exports.AppsMenuContent = function AppsMenuContent(_ref) {
+var AppsMenuContent = function AppsMenuContent(_ref) {
   var isFetchingApps = _ref.isFetchingApps,
     apps = _ref.apps,
-    homeApp = _ref.homeApp;
+    homeApp = _ref.homeApp,
+    closeMenu = _ref.closeMenu;
   var _useI18n = (0, _useI18n2.default)(),
     t = _useI18n.t;
   if (!isFetchingApps && (!apps || !apps.length)) {
@@ -54,19 +55,20 @@ var AppsMenuContent = exports.AppsMenuContent = function AppsMenuContent(_ref) {
   }, sortedApps.map(function (app, index) {
     return /*#__PURE__*/_react.default.createElement(_AppItem.default, {
       key: index,
-      app: app
+      app: app,
+      onAppSwitch: closeMenu
     });
   }));
 };
 AppsMenuContent.propTypes = {
-  apps: _propTypes.default.array,
   isFetchingApps: _propTypes.default.bool.isRequired,
+  apps: _propTypes.default.array,
   homeApp: _propTypes.default.shape({
     isCurrentApp: _propTypes.default.bool,
     slug: _propTypes.default.string,
     href: _propTypes.default.string
   }),
-  className: _propTypes.default.string
+  closeMenu: _propTypes.default.func
 };
 var mapStateToProps = function mapStateToProps(state) {
   return {

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

@@ -32,12 +32,14 @@ var useStyles = (0, _styles.makeStyles)(function () {
   };
 });
 var AppItem = exports.AppItem = function AppItem(_ref) {
-  var app = _ref.app;
+  var app = _ref.app,
+    onAppSwitch = _ref.onAppSwitch;
   var appName = (0, _applications.getAppDisplayName)(app);
   var classes = useStyles();
   return /*#__PURE__*/_react.default.createElement(_AppLinker.default, {
     href: app.href || '',
-    app: app
+    app: app,
+    onAppSwitch: onAppSwitch
   }, function (_ref2) {
     var onClick = _ref2.onClick,
       href = _ref2.href;

package/dist/components/AppsMenu/index.js

@@ -14,8 +14,18 @@ var _Menu = _interopRequireDefault(require("cozy-ui/transpiled/react/Menu"));
 var _Mosaic = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Mosaic"));
 var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
 var _CozyDialogs = require("cozy-ui/transpiled/react/CozyDialogs");
+var _styles = require("cozy-ui/transpiled/react/styles");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var useStyles = (0, _styles.makeStyles)({
+  root: {
+    '& .dialogContentInner': {
+      '& .dialogContentWrapper': {
+        paddingBottom: '0 !important'
+      }
+    }
+  }
+});
 var AppsMenu = function AppsMenu() {
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -28,6 +38,7 @@ var AppsMenu = function AppsMenu() {
   var toggleMenu = function toggleMenu() {
     setOpen(!isOpen);
   };
+  var styles = useStyles();
   return /*#__PURE__*/_react.default.createElement("nav", {
     ref: containerRef
   }, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
@@ -40,7 +51,14 @@ 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, {
+      closeMenu: toggleMenu
+    }),
+    componentsProps: {
+      dialogContent: {
+        classes: styles
+      }
+    },
     classes: {
       paper: 'u-bdrs-7'
     }
@@ -61,6 +79,8 @@ var AppsMenu = function AppsMenu() {
     classes: {
       paper: 'u-bdrs-7'
     }
-  }, /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, null)));
+  }, /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, {
+    closeMenu: toggleMenu
+  })));
 };
 var _default = exports.default = AppsMenu;

package/dist/components/UserMenu/UserMenuContent.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.UserMenuContent = void 0;
+exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
@@ -33,10 +33,11 @@ var styles = {
   "user-menu-content": "user-menu-content",
   "user-menu-content-add-account": "user-menu-content-add-account"
 };
-var UserMenuContent = exports.UserMenuContent = function UserMenuContent(_ref) {
+var UserMenuContent = function UserMenuContent(_ref) {
   var onLogOut = _ref.onLogOut,
     instance = _ref.instance,
-    diskUsage = _ref.diskUsage;
+    diskUsage = _ref.diskUsage,
+    closeMenu = _ref.closeMenu;
   var webviewIntent = (0, _cozyIntent.useWebviewIntent)();
   var client = (0, _cozyClient.useClient)();
   var _useI18n = (0, _useI18n2.default)(),
@@ -82,7 +83,8 @@ var UserMenuContent = exports.UserMenuContent = function UserMenuContent(_ref) {
     gutters: gutters,
     size: "small",
     component: "a",
-    href: profileLink
+    href: profileLink,
+    onClick: closeMenu
   }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, /*#__PURE__*/_react.default.createElement(_Icon.default, {
     icon: _FromUser.default
   })), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
@@ -100,7 +102,8 @@ var UserMenuContent = exports.UserMenuContent = function UserMenuContent(_ref) {
     gutters: gutters,
     size: "small",
     component: "a",
-    href: storageLink
+    href: storageLink,
+    onClick: closeMenu
   }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, /*#__PURE__*/_react.default.createElement(_Icon.default, {
     icon: _CloudRainbow.default
   })), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {

package/dist/components/UserMenu/components/AvatarMyself.js

@@ -7,32 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _cozyClient = require("cozy-client");
-var _contact = require("cozy-client/dist/models/contact");
 var _Avatar = _interopRequireDefault(require("cozy-ui/transpiled/react/Avatar"));
-var _Skeleton = _interopRequireDefault(require("cozy-ui/transpiled/react/Skeleton"));
-var _queries = require("../../../lib/queries");
 var AvatarMyself = function AvatarMyself(_ref) {
   var className = _ref.className,
     _ref$size = _ref.size,
     size = _ref$size === void 0 ? 'm' : _ref$size;
-  var myselfQuery = (0, _queries.buildMyselfQuery)();
-  var _useQuery = (0, _cozyClient.useQuery)(myselfQuery.definition, myselfQuery.options),
-    fetchStatus = _useQuery.fetchStatus,
-    data = _useQuery.data;
-  if (fetchStatus !== 'loaded') {
-    return /*#__PURE__*/_react.default.createElement(_Skeleton.default, {
-      variant: "circle",
-      width: 32,
-      height: 32
-    });
-  }
-  var me = data[0];
-  if (me) {
-    var initials = (0, _contact.getInitials)(me);
-    return /*#__PURE__*/_react.default.createElement(_Avatar.default, {
-      className: className,
-      size: size
-    }, initials);
-  }
+  var client = (0, _cozyClient.useClient)();
+  var rootURL = client.getStackClient().uri;
+  return /*#__PURE__*/_react.default.createElement(_Avatar.default, {
+    className: className,
+    size: size
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    width: "100%",
+    height: "100%",
+    src: "".concat(rootURL, "/public/avatar?fallback=initials")
+  }));
 };
 var _default = exports.default = AvatarMyself;

package/dist/components/UserMenu/index.js

@@ -11,11 +11,21 @@ var _IconButton = _interopRequireDefault(require("cozy-ui/transpiled/react/IconB
 var _Menu = _interopRequireDefault(require("cozy-ui/transpiled/react/Menu"));
 var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
 var _CozyDialogs = require("cozy-ui/transpiled/react/CozyDialogs");
+var _styles = require("cozy-ui/transpiled/react/styles");
 var _cozyClient = require("cozy-client");
 var _UserMenuContent = _interopRequireDefault(require("./UserMenuContent"));
 var _AvatarMyself = _interopRequireDefault(require("./components/AvatarMyself"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var useStyles = (0, _styles.makeStyles)({
+  root: {
+    '& .dialogContentInner': {
+      '& .dialogContentWrapper': {
+        paddingBottom: '0 !important'
+      }
+    }
+  }
+});
 var UserMenu = function UserMenu(_ref) {
   var onLogOut = _ref.onLogOut;
   var _useState = (0, _react.useState)(false),
@@ -33,6 +43,7 @@ var UserMenu = function UserMenu(_ref) {
   var toggleMenu = function toggleMenu() {
     setOpen(!isOpen);
   };
+  var styles = useStyles();
   return /*#__PURE__*/_react.default.createElement("nav", {
     ref: containerRef
   }, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
@@ -48,8 +59,14 @@ var UserMenu = function UserMenu(_ref) {
     content: /*#__PURE__*/_react.default.createElement(_UserMenuContent.default, {
       onLogOut: onLogOut,
       instance: instance,
-      diskUsage: diskUsage
+      diskUsage: diskUsage,
+      closeMenu: toggleMenu
     }),
+    componentsProps: {
+      dialogContent: {
+        classes: styles
+      }
+    },
     classes: {
       paper: 'u-bdrs-7'
     }
@@ -73,7 +90,8 @@ var UserMenu = function UserMenu(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_UserMenuContent.default, {
     onLogOut: onLogOut,
     instance: instance,
-    diskUsage: diskUsage
+    diskUsage: diskUsage,
+    closeMenu: toggleMenu
   })));
 };
 var _default = exports.default = UserMenu;

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 = "\"21.1.2\"";
+var version = exports.version = "\"22.0.0\"";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "21.1.2",
+  "version": "22.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/)",
@@ -51,7 +51,7 @@
     "cozy-logger": "1.9.1",
     "cozy-realtime": "^4.0.5",
     "cozy-search": "^0.4.0",
-    "cozy-ui": "^122.6.0",
+    "cozy-ui": "^122.12.1",
     "eslint-config-cozy-app": "2.0.0",
     "identity-obj-proxy": "3.0.0",
     "jest": "24.9.0",
@@ -86,7 +86,7 @@
     "cozy-interapp": ">=0.4.9",
     "cozy-realtime": ">=4.0.5",
     "cozy-search": ">=0.4.0",
-    "cozy-ui": ">=122.6.0",
+    "cozy-ui": ">=122.12.1",
     "react": ">=16.10.1",
     "react-dom": ">=16.10.1",
     "react-router-dom": ">=6.14.2"