cozy-bar 19.2.0 → 21.0.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"));
@@ -17,12 +18,8 @@ var _reducers = require("../../lib/reducers");
17
18
  var styles = {
18
19
  "apps-menu-grid": "apps-menu-grid",
19
20
  "apps-menu-grid-item-wrapper": "apps-menu-grid-item-wrapper",
20
- "apps-menu-grid-item": "apps-menu-grid-item"
21
- };
22
- var sorter = function sorter(fn) {
23
- return function (itemA, itemB) {
24
- return fn(itemA) > fn(itemB);
25
- };
21
+ "apps-menu-grid-item": "apps-menu-grid-item",
22
+ "apps-menu-grid-item-icon": "apps-menu-grid-item-icon"
26
23
  };
27
24
  var AppsMenuContent = exports.AppsMenuContent = function AppsMenuContent(_ref) {
28
25
  var isFetchingApps = _ref.isFetchingApps,
@@ -50,10 +47,11 @@ var AppsMenuContent = exports.AppsMenuContent = function AppsMenuContent(_ref) {
50
47
  var homeSlug = homeApp && homeApp.slug;
51
48
  var displayedApps = apps.filter(function (app) {
52
49
  return app.slug !== homeSlug;
53
- }).sort(sorter(_applications.getAppDisplayName));
50
+ });
51
+ var sortedApps = (0, _cozyFlags.default)('apps.sort') ? (0, _applications.sortApplicationsList)(displayedApps, (0, _cozyFlags.default)('apps.sort')) : displayedApps;
54
52
  return /*#__PURE__*/_react.default.createElement("div", {
55
53
  className: styles['apps-menu-grid']
56
- }, displayedApps.map(function (app, index) {
54
+ }, sortedApps.map(function (app, index) {
57
55
  return /*#__PURE__*/_react.default.createElement(_AppItem.default, {
58
56
  key: index,
59
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"));
@@ -18,11 +19,22 @@ var _stack = _interopRequireDefault(require("../../../lib/stack"));
18
19
  var styles = {
19
20
  "apps-menu-grid": "apps-menu-grid",
20
21
  "apps-menu-grid-item-wrapper": "apps-menu-grid-item-wrapper",
21
- "apps-menu-grid-item": "apps-menu-grid-item"
22
+ "apps-menu-grid-item": "apps-menu-grid-item",
23
+ "apps-menu-grid-item-icon": "apps-menu-grid-item-icon"
22
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
+ });
23
34
  var AppItem = exports.AppItem = function AppItem(_ref) {
24
35
  var app = _ref.app;
25
36
  var appName = (0, _applications.getAppDisplayName)(app);
37
+ var classes = useStyles();
26
38
  return /*#__PURE__*/_react.default.createElement(_AppLinker.default, {
27
39
  href: app.href || '',
28
40
  app: app
@@ -39,13 +51,14 @@ var AppItem = exports.AppItem = function AppItem(_ref) {
39
51
  className: (0, _classnames.default)(styles['apps-menu-grid-item-wrapper'], 'u-bdrs-5'),
40
52
  label: /*#__PURE__*/_react.default.createElement("div", {
41
53
  className: styles['apps-menu-grid-item']
54
+ }, /*#__PURE__*/_react.default.createElement("div", {
55
+ className: styles['apps-menu-grid-item-icon']
42
56
  }, /*#__PURE__*/_react.default.createElement(_AppIcon.default, (0, _extends2.default)({
43
57
  app: app,
44
58
  key: app.slug
45
- }, _stack.default.get.iconProps())), /*#__PURE__*/_react.default.createElement(_Typography.default, {
46
- variant: "subtitle1",
59
+ }, _stack.default.get.iconProps()))), /*#__PURE__*/_react.default.createElement(_Typography.default, {
47
60
  noWrap: true,
48
- className: "u-mt-half"
61
+ className: classes.text
49
62
  }, appName))
50
63
  });
51
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
  };
@@ -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 = "\"19.2.0\"";
74
+ var version = exports.version = "\"21.0.0\"";
@@ -4,21 +4,31 @@
4
4
  display flex
5
5
  flex-wrap wrap
6
6
  width 100%
7
- box-sizing border-box
8
7
 
9
8
  +desktop()
10
- padding-left .5rem
11
- padding-right .5rem
9
+ width 15rem
10
+ margin 6px 10px
12
11
 
13
12
  .apps-menu-grid-item-wrapper
14
13
  width 33%
15
14
  aspect-ratio 1 // @stylint ignore Property is valid but unknown by stylint which is old and should be replaced
16
15
 
16
+ +desktop()
17
+ width 5rem
18
+ height 5rem
19
+
17
20
  .apps-menu-grid-item
18
21
  display flex
19
22
  flex-direction column
20
23
  justify-content center
21
24
  align-items center
22
25
  text-decoration none
26
+ gap 4px // @stylint ignore Property is valid but unknown by stylint which is old and should be replaced
27
+ width 100%
28
+
29
+ .apps-menu-grid-item-icon
23
30
  width 60%
24
- min-width 48px
31
+
32
+ +desktop()
33
+ width 2.625rem
34
+ height 2.625rem
@@ -4,26 +4,40 @@
4
4
  display: flex;
5
5
  flex-wrap: wrap;
6
6
  width: 100%;
7
- box-sizing: border-box;
8
7
  }
9
8
  @media (min-width: 64rem) {
10
9
  .apps-menu-grid {
11
- padding-left: 0.5rem;
12
- padding-right: 0.5rem;
10
+ width: 15rem;
11
+ margin: 6px 10px;
13
12
  }
14
13
  }
15
14
  .apps-menu-grid-item-wrapper {
16
15
  width: 33%;
17
16
  aspect-ratio: 1;
18
17
  }
18
+ @media (min-width: 64rem) {
19
+ .apps-menu-grid-item-wrapper {
20
+ width: 5rem;
21
+ height: 5rem;
22
+ }
23
+ }
19
24
  .apps-menu-grid-item {
20
25
  display: flex;
21
26
  flex-direction: column;
22
27
  justify-content: center;
23
28
  align-items: center;
24
29
  text-decoration: none;
30
+ gap: 4px;
31
+ width: 100%;
32
+ }
33
+ .apps-menu-grid-item-icon {
25
34
  width: 60%;
26
- min-width: 48px;
35
+ }
36
+ @media (min-width: 64rem) {
37
+ .apps-menu-grid-item-icon {
38
+ width: 2.625rem;
39
+ height: 2.625rem;
40
+ }
27
41
  }
28
42
  /* imported from user-menu.styl */
29
43
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cozy-bar",
3
- "version": "19.2.0",
3
+ "version": "21.0.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",
@@ -50,7 +50,8 @@
50
50
  "cozy-interapp": "0.4.9",
51
51
  "cozy-logger": "1.9.1",
52
52
  "cozy-realtime": "^4.0.5",
53
- "cozy-ui": "^122.0.1",
53
+ "cozy-search": "^0.4.0",
54
+ "cozy-ui": "^122.6.0",
54
55
  "eslint-config-cozy-app": "2.0.0",
55
56
  "identity-obj-proxy": "3.0.0",
56
57
  "jest": "24.9.0",
@@ -64,7 +65,6 @@
64
65
  "stylus-config-cozy-app": "^0.1.0"
65
66
  },
66
67
  "dependencies": {
67
- "cozy-search": "0.3.0",
68
68
  "hammerjs": "2.0.8",
69
69
  "lodash.debounce": "4.0.8",
70
70
  "lodash.set": "^4.3.2",
@@ -78,14 +78,15 @@
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",
85
85
  "cozy-intent": ">=2.29.1",
86
86
  "cozy-interapp": ">=0.4.9",
87
87
  "cozy-realtime": ">=4.0.5",
88
- "cozy-ui": ">=122.0.1",
88
+ "cozy-search": ">=0.4.0",
89
+ "cozy-ui": ">=122.6.0",
89
90
  "react": ">=16.10.1",
90
91
  "react-dom": ">=16.10.1",
91
92
  "react-router-dom": ">=6.14.2"