cozy-bar 20.0.0 → 21.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -8,6 +8,7 @@ exports.default = exports.AppsMenuContent = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
  var _reactRedux = require("react-redux");
10
10
  var _propTypes = _interopRequireDefault(require("prop-types"));
11
+ var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
11
12
  var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
12
13
  var _applications = require("cozy-client/dist/models/applications");
13
14
  var _AppItem = _interopRequireDefault(require("./components/AppItem"));
@@ -20,11 +21,6 @@ var styles = {
20
21
  "apps-menu-grid-item": "apps-menu-grid-item",
21
22
  "apps-menu-grid-item-icon": "apps-menu-grid-item-icon"
22
23
  };
23
- var sorter = function sorter(fn) {
24
- return function (itemA, itemB) {
25
- return fn(itemA) > fn(itemB);
26
- };
27
- };
28
24
  var AppsMenuContent = exports.AppsMenuContent = function AppsMenuContent(_ref) {
29
25
  var isFetchingApps = _ref.isFetchingApps,
30
26
  apps = _ref.apps,
@@ -51,10 +47,11 @@ var AppsMenuContent = exports.AppsMenuContent = function AppsMenuContent(_ref) {
51
47
  var homeSlug = homeApp && homeApp.slug;
52
48
  var displayedApps = apps.filter(function (app) {
53
49
  return app.slug !== homeSlug;
54
- }).sort(sorter(_applications.getAppDisplayName));
50
+ });
51
+ var sortedApps = (0, _cozyFlags.default)('apps.sort') ? (0, _applications.sortApplicationsList)(displayedApps, (0, _cozyFlags.default)('apps.sort')) : displayedApps;
55
52
  return /*#__PURE__*/_react.default.createElement("div", {
56
53
  className: styles['apps-menu-grid']
57
- }, displayedApps.map(function (app, index) {
54
+ }, sortedApps.map(function (app, index) {
58
55
  return /*#__PURE__*/_react.default.createElement(_AppItem.default, {
59
56
  key: index,
60
57
  app: app
@@ -8,6 +8,7 @@ exports.default = exports.AppItem = void 0;
8
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
  var _react = _interopRequireDefault(require("react"));
10
10
  var _applications = require("cozy-client/dist/models/applications");
11
+ var _styles = require("cozy-ui/transpiled/react/styles");
11
12
  var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
12
13
  var _AppIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/AppIcon"));
13
14
  var _AppLinker = _interopRequireDefault(require("cozy-ui/transpiled/react/AppLinker"));
@@ -21,9 +22,19 @@ var styles = {
21
22
  "apps-menu-grid-item": "apps-menu-grid-item",
22
23
  "apps-menu-grid-item-icon": "apps-menu-grid-item-icon"
23
24
  };
25
+ var useStyles = (0, _styles.makeStyles)(function () {
26
+ return {
27
+ text: {
28
+ lineHeight: '22.5px',
29
+ fontSize: '12px',
30
+ fontWeight: 400
31
+ }
32
+ };
33
+ });
24
34
  var AppItem = exports.AppItem = function AppItem(_ref) {
25
35
  var app = _ref.app;
26
36
  var appName = (0, _applications.getAppDisplayName)(app);
37
+ var classes = useStyles();
27
38
  return /*#__PURE__*/_react.default.createElement(_AppLinker.default, {
28
39
  href: app.href || '',
29
40
  app: app
@@ -46,8 +57,8 @@ var AppItem = exports.AppItem = function AppItem(_ref) {
46
57
  app: app,
47
58
  key: app.slug
48
59
  }, _stack.default.get.iconProps()))), /*#__PURE__*/_react.default.createElement(_Typography.default, {
49
- variant: "subtitle1",
50
- noWrap: true
60
+ noWrap: true,
61
+ className: classes.text
51
62
  }, appName))
52
63
  });
53
64
  });
@@ -40,7 +40,10 @@ var AppsMenu = function AppsMenu() {
40
40
  })), isMobile ? /*#__PURE__*/_react.default.createElement(_CozyDialogs.ConfirmDialog, {
41
41
  open: isOpen,
42
42
  onClose: toggleMenu,
43
- content: /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, null)
43
+ content: /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, null),
44
+ classes: {
45
+ paper: 'u-bdrs-7'
46
+ }
44
47
  }) : /*#__PURE__*/_react.default.createElement(_Menu.default, {
45
48
  open: isOpen,
46
49
  anchorEl: buttonRef.current,
@@ -54,6 +57,9 @@ var AppsMenu = function AppsMenu() {
54
57
  transformOrigin: {
55
58
  vertical: -10,
56
59
  horizontal: 0
60
+ },
61
+ classes: {
62
+ paper: 'u-bdrs-7'
57
63
  }
58
64
  }, /*#__PURE__*/_react.default.createElement(_AppsMenuContent.default, null)));
59
65
  };
@@ -198,7 +198,7 @@ var Bar = exports.Bar = function Bar(_ref) {
198
198
  className: "coz-bar-container"
199
199
  }, barLeft || renderLeft(), barCenter || renderCenter(), /*#__PURE__*/_react.default.createElement("div", {
200
200
  className: "u-flex-grow"
201
- }, barSearch || renderSearch()), searchOptions.enabled && isMobile ? /*#__PURE__*/_react.default.createElement(_SearchButton.default, null) : null, (0, _isTwakeTheme.isTwakeTheme)() ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, barRight, renderTwakeRight()) : barRight || renderRight(), showDrawerAndBurger ? /*#__PURE__*/_react.default.createElement(_Drawer.default, {
201
+ }, barSearch || renderSearch()), searchOptions.enabled && isMobile ? /*#__PURE__*/_react.default.createElement(_SearchButton.default, null) : null, (0, _isTwakeTheme.isTwakeTheme)() ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, barRight, isPublic && renderTwakeRight()) : barRight || renderRight(), showDrawerAndBurger ? /*#__PURE__*/_react.default.createElement(_Drawer.default, {
202
202
  visible: drawerVisible,
203
203
  onClose: toggleDrawer,
204
204
  drawerListener: function drawerListener() {
@@ -49,7 +49,10 @@ var UserMenu = function UserMenu(_ref) {
49
49
  onLogOut: onLogOut,
50
50
  instance: instance,
51
51
  diskUsage: diskUsage
52
- })
52
+ }),
53
+ classes: {
54
+ paper: 'u-bdrs-7'
55
+ }
53
56
  }) : /*#__PURE__*/_react.default.createElement(_Menu.default, {
54
57
  open: isOpen,
55
58
  anchorEl: buttonRef.current,
@@ -63,6 +66,9 @@ var UserMenu = function UserMenu(_ref) {
63
66
  transformOrigin: {
64
67
  vertical: -10,
65
68
  horizontal: 0
69
+ },
70
+ classes: {
71
+ paper: 'u-bdrs-7'
66
72
  }
67
73
  }, /*#__PURE__*/_react.default.createElement(_UserMenuContent.default, {
68
74
  onLogOut: onLogOut,
package/dist/index.js CHANGED
@@ -71,4 +71,4 @@ var _BarProvider = _interopRequireDefault(require("./components/BarProvider"));
71
71
  var _reducers = require("./lib/reducers");
72
72
  /* global __VERSION__ */
73
73
 
74
- var version = exports.version = "\"20.0.0\"";
74
+ var version = exports.version = "\"21.1.0\"";
@@ -7,8 +7,7 @@
7
7
 
8
8
  +desktop()
9
9
  width 15rem
10
- margin-left .5rem
11
- margin-right .5rem
10
+ margin 6px 10px
12
11
 
13
12
  .apps-menu-grid-item-wrapper
14
13
  width 33%
@@ -24,7 +23,7 @@
24
23
  justify-content center
25
24
  align-items center
26
25
  text-decoration none
27
- gap .2rem // @stylint ignore Property is valid but unknown by stylint which is old and should be replaced
26
+ gap 4px // @stylint ignore Property is valid but unknown by stylint which is old and should be replaced
28
27
  width 100%
29
28
 
30
29
  .apps-menu-grid-item-icon
@@ -8,8 +8,7 @@
8
8
  @media (min-width: 64rem) {
9
9
  .apps-menu-grid {
10
10
  width: 15rem;
11
- margin-left: 0.5rem;
12
- margin-right: 0.5rem;
11
+ margin: 6px 10px;
13
12
  }
14
13
  }
15
14
  .apps-menu-grid-item-wrapper {
@@ -28,7 +27,7 @@
28
27
  justify-content: center;
29
28
  align-items: center;
30
29
  text-decoration: none;
31
- gap: 0.2rem;
30
+ gap: 4px;
32
31
  width: 100%;
33
32
  }
34
33
  .apps-menu-grid-item-icon {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cozy-bar",
3
- "version": "20.0.0",
3
+ "version": "21.1.0",
4
4
  "description": "cozy-bar.js library, a small lib provided by cozy-stack to inject the Cozy-bar component into each app",
5
5
  "main": "dist/index.js",
6
6
  "author": "Cozy Cloud <contact@cozycloud.cc> (https://cozy.io/)",
@@ -42,7 +42,7 @@
42
42
  "babel-plugin-module-resolver": "^4.0.0",
43
43
  "babel-plugin-transform-define": "^2.0.0",
44
44
  "babel-preset-cozy-app": "^2.8.1",
45
- "cozy-client": "^52.1.0",
45
+ "cozy-client": "^57.7.0",
46
46
  "cozy-dataproxy-lib": "^4.1.0",
47
47
  "cozy-device-helper": "2.6.0",
48
48
  "cozy-flags": "^4.6.1",
@@ -51,7 +51,7 @@
51
51
  "cozy-logger": "1.9.1",
52
52
  "cozy-realtime": "^4.0.5",
53
53
  "cozy-search": "^0.4.0",
54
- "cozy-ui": "^122.0.1",
54
+ "cozy-ui": "^122.6.0",
55
55
  "eslint-config-cozy-app": "2.0.0",
56
56
  "identity-obj-proxy": "3.0.0",
57
57
  "jest": "24.9.0",
@@ -78,7 +78,7 @@
78
78
  },
79
79
  "peerDependencies": {
80
80
  "@cozy/minilog": ">=1.0.0",
81
- "cozy-client": ">=52.1.0",
81
+ "cozy-client": ">=57.7.0",
82
82
  "cozy-dataproxy-lib": ">=4.1.0",
83
83
  "cozy-device-helper": ">=2.6.0",
84
84
  "cozy-flags": ">=4.6.1",
@@ -86,7 +86,7 @@
86
86
  "cozy-interapp": ">=0.4.9",
87
87
  "cozy-realtime": ">=4.0.5",
88
88
  "cozy-search": ">=0.4.0",
89
- "cozy-ui": ">=122.0.1",
89
+ "cozy-ui": ">=122.6.0",
90
90
  "react": ">=16.10.1",
91
91
  "react-dom": ">=16.10.1",
92
92
  "react-router-dom": ">=6.14.2"