cozy-bar 33.0.1 → 33.1.1

package/README.md

@@ -51,10 +51,11 @@ The `BarComponent` will get default params into `data-cozy` attribute of the ele
 
 There is also other parameter to adapt the bar to your app:
 
-- `isInvertedTheme`: To make the icon of Cozy(`icon-cozy-home.svg`) compatible with an inverted theme
 - `isPublic`: To show the public version of the Bar
 - `onLogout`: A callback to react to the logout of the user
-- `disableInternalStore`: Allow to disable the internal store of the Bar
+- `appIcon`: To change the app icon
+- `appTextIcon`: To change the app text next to the app icon
+- `searchOptions`: To pass some props to the search engine
 
 ## Customizing the content of the bar
 
@@ -75,28 +76,6 @@ import { BarLeft, BarCenter, BarRight, BarSearch } from 'cozy-bar'
 </BarLeft>
 ```
 
-### Access your application store in custom components
-
-By default, the Bar has its own redux store to fetch data and manage ui state. If you are using a Redux store into your application and you need to access it into your Bar customization you need to integrate the cozy-bar store into your own.
-
-```js
-import { barReducers } from 'cozy-bar'
-
-const reducers = {
-  ...baseReducers,
-  ...barReducers,
-  cozy: client.reducer()
-}
-
-const appReducer = combineReducers(reducers)
-```
-
-You also need to disable the internal store onto the `BarComponent` with the property `disableInternalStore`
-
-```jsx
-<BarComponent disableInternalStore />
-```
-
 ## Search and AI assistant
 
 Search and AI assistant is now proposed by the cozy-bar. They are enabled by default so you need to:

package/dist/components/Bar.js

@@ -13,17 +13,15 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _AppsMenu = _interopRequireDefault(require("./AppsMenu"));
-
 var _Banner = _interopRequireDefault(require("./Banner"));
 
-var _UserMenu = _interopRequireDefault(require("./UserMenu"));
+var _BarLeft = _interopRequireDefault(require("./Elements/BarLeft"));
 
-var _helpers = require("./helpers");
+var _BarSearch = _interopRequireDefault(require("./Elements/BarSearch"));
 
-var _ButtonCozyHome = _interopRequireDefault(require("./utils/ButtonCozyHome"));
+var _TwakeRight = _interopRequireDefault(require("./Elements/TwakeRight"));
 
-var _HelpLink = _interopRequireDefault(require("./utils/HelpLink"));
+var _helpers = require("./helpers");
 
 var _SearchButton = _interopRequireDefault(require("./utils/SearchButton"));
 
@@ -35,18 +33,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _cozyClient = require("cozy-client");
 
-var _cozyDeviceHelper = require("cozy-device-helper");
-
-var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
-
-var _cozySearch = require("cozy-search");
-
-var _AppTitle = _interopRequireDefault(require("cozy-ui/transpiled/react/AppTitle"));
-
-var _Divider = _interopRequireDefault(require("cozy-ui/transpiled/react/Divider"));
-
-var _Grid = _interopRequireDefault(require("cozy-ui/transpiled/react/Grid"));
-
 var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -70,14 +56,12 @@ var Bar = function Bar(_ref) {
       appIcon = _ref.appIcon,
       appTextIcon = _ref.appTextIcon,
       searchOptions = _ref.searchOptions,
-      isInvertedTheme = _ref.isInvertedTheme,
       appSlug = _ref.appSlug,
       componentsProps = _ref.componentsProps;
 
   var _useBreakpoints = (0, _Breakpoints.useBreakpoints)(),
       isMobile = _useBreakpoints.isMobile;
 
-  var shortcuts = (0, _cozyClient.useFetchHomeShortcuts)();
   var appsQuery = (0, _queries.buildAppsQuery)();
   var appsResult = (0, _cozyClient.useQuery)(appsQuery.definition, _objectSpread(_objectSpread({}, appsQuery.options), {}, {
     enabled: !isPublic
@@ -94,76 +78,6 @@ var Bar = function Bar(_ref) {
       isSettingsAppInstalled = _useMemo.isSettingsAppInstalled;
 
   var isSearchEnabled = searchOptions.enabled && !isPublic;
-
-  var renderCenter = function renderCenter() {
-    return null;
-  };
-
-  var renderLeft = function renderLeft() {
-    if ((0, _cozyDeviceHelper.isFlagshipApp)() || (0, _cozyFlags.default)('flagship.debug')) {
-      return /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.default, {
-        isInvertedTheme: isInvertedTheme
-      });
-    }
-
-    var homeHref = !isPublic && homeApp && homeApp.href;
-
-    if (isMobile) {
-      return /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.default, {
-        homeHref: homeHref
-      });
-    }
-
-    var isHome = appSlug === 'home';
-    return /*#__PURE__*/_react.default.createElement(_Grid.default, {
-      container: true,
-      alignItems: "center",
-      className: "u-w-auto"
-    }, !isHome && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.default, {
-      homeHref: homeHref
-    }), /*#__PURE__*/_react.default.createElement(_Divider.default, {
-      orientation: "vertical",
-      className: "u-mr-half",
-      flexItem: true
-    })), /*#__PURE__*/_react.default.createElement(_AppTitle.default, {
-      appIcon: appIcon,
-      appTextIcon: appTextIcon
-    }));
-  };
-
-  var renderTwakeRight = function renderTwakeRight() {
-    // Special case because search on Drive on mobile still rely
-    // on old search UI that is injected in the cozy-bar and
-    // not in a modal as the new search UI
-    // So we need to hide these menu buttons when old search UI
-    // is injected in the cozy-bar
-    // When https://github.com/cozy/cozy-drive/pull/3320 will be merged
-    // Drive will rely on cozy-bar embedded search and we will be able
-    // to remove this special case
-    if (appSlug === 'drive' && isMobile && barSearch) return null;
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_HelpLink.default, null), /*#__PURE__*/_react.default.createElement(_AppsMenu.default, {
-      apps: apps,
-      homeApp: homeApp,
-      isFetchingApps: isFetchingApps,
-      shortcuts: shortcuts
-    }), /*#__PURE__*/_react.default.createElement(_UserMenu.default, {
-      onLogOut: onLogOut,
-      isSettingsAppInstalled: isSettingsAppInstalled
-    }));
-  };
-
-  var renderSearch = function renderSearch() {
-    return isSearchEnabled && !isMobile ? /*#__PURE__*/_react.default.createElement("div", {
-      className: "u-flex-grow u-mh-2"
-    }, /*#__PURE__*/_react.default.createElement(_cozySearch.AssistantDesktop, {
-      componentsProps: {
-        SearchBarDesktop: {
-          size: 'small'
-        }
-      }
-    })) : null;
-  };
-
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, componentsProps === null || componentsProps === void 0 ? void 0 : componentsProps.Wrapper, {
     className: (0, _classnames.default)('coz-bar-wrapper', componentsProps === null || componentsProps === void 0 ? void 0 : (_componentsProps$Wrap = componentsProps.Wrapper) === null || _componentsProps$Wrap === void 0 ? void 0 : _componentsProps$Wrap.className),
     "data-testid": "coz-bar-wrapper"
@@ -173,16 +87,31 @@ var Bar = function Bar(_ref) {
     id: "cozy-bar-modal-dom-place"
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "coz-bar-container"
-  }, barLeft || renderLeft(), barCenter || renderCenter(), /*#__PURE__*/_react.default.createElement("div", {
+  }, barLeft || /*#__PURE__*/_react.default.createElement(_BarLeft.default, (0, _extends2.default)({}, componentsProps === null || componentsProps === void 0 ? void 0 : componentsProps.BarLeft, {
+    isPublic: isPublic,
+    homeApp: homeApp,
+    appSlug: appSlug,
+    appIcon: appIcon,
+    appTextIcon: appTextIcon
+  })), barCenter, /*#__PURE__*/_react.default.createElement("div", {
     className: "u-flex-grow"
-  }, barSearch || renderSearch()), isSearchEnabled && isMobile ? /*#__PURE__*/_react.default.createElement(_SearchButton.default, null) : null, barRight, !isPublic && renderTwakeRight()), userActionRequired && /*#__PURE__*/_react.default.createElement(_Banner.default, userActionRequired));
+  }, barSearch || /*#__PURE__*/_react.default.createElement(_BarSearch.default, {
+    isSearchEnabled: isSearchEnabled
+  })), isSearchEnabled && isMobile ? /*#__PURE__*/_react.default.createElement(_SearchButton.default, null) : null, barRight, !isPublic && /*#__PURE__*/_react.default.createElement(_TwakeRight.default, {
+    apps: apps,
+    appSlug: appSlug,
+    homeApp: homeApp,
+    barSearch: barSearch,
+    isFetchingApps: isFetchingApps,
+    isSettingsAppInstalled: isSettingsAppInstalled,
+    onLogOut: onLogOut
+  })), userActionRequired && /*#__PURE__*/_react.default.createElement(_Banner.default, userActionRequired));
 };
 
 exports.Bar = Bar;
 Bar.propTypes = {
   appSlug: _propTypes.default.string,
   isPublic: _propTypes.default.bool,
-  isInvertedTheme: _propTypes.default.bool,
   onLogOut: _propTypes.default.func,
   userActionRequired: _propTypes.default.object,
   componentsProps: _propTypes.default.shape({

package/dist/components/BarComponent.js

@@ -90,7 +90,6 @@ var BarComponent = function BarComponent(_ref2) {
       appSlug = _ref2$appSlug === void 0 ? (0, _dom.getAppSlug)() : _ref2$appSlug,
       _ref2$iconPath = _ref2.iconPath,
       iconPath = _ref2$iconPath === void 0 ? (0, _dom.getDefaultIcon)() : _ref2$iconPath,
-      isInvertedTheme = _ref2.isInvertedTheme,
       _ref2$isPublic = _ref2.isPublic,
       isPublic = _ref2$isPublic === void 0 ? false : _ref2$isPublic,
       onLogOut = _ref2.onLogOut,
@@ -120,7 +119,6 @@ var BarComponent = function BarComponent(_ref2) {
   var isPublicForce = !isPublic && /^\/public/.test(window.location.pathname);
   var options = {
     appName: appName,
-    isInvertedTheme: isInvertedTheme,
     appNamePrefix: appNamePrefix,
     appSlug: appSlug,
     cozyClient: cozyClient,

package/dist/components/Elements/BarLeft.js

@@ -0,0 +1,90 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _ButtonCozyHome = _interopRequireDefault(require("../utils/ButtonCozyHome"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _cozyDeviceHelper = require("cozy-device-helper");
+
+var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
+
+var _AppTitle = _interopRequireDefault(require("cozy-ui/transpiled/react/AppTitle"));
+
+var _Divider = _interopRequireDefault(require("cozy-ui/transpiled/react/Divider"));
+
+var _Grid = _interopRequireDefault(require("cozy-ui/transpiled/react/Grid"));
+
+var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
+
+var BarLeft = function BarLeft(_ref) {
+  var isPublic = _ref.isPublic,
+      homeApp = _ref.homeApp,
+      appSlug = _ref.appSlug,
+      appIcon = _ref.appIcon,
+      appTextIcon = _ref.appTextIcon,
+      noCozyHome = _ref.noCozyHome;
+
+  var _useBreakpoints = (0, _Breakpoints.useBreakpoints)(),
+      isMobile = _useBreakpoints.isMobile;
+
+  if ((0, _cozyDeviceHelper.isFlagshipApp)() || (0, _cozyFlags.default)('flagship.debug')) {
+    return /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.default, null);
+  }
+
+  var homeHref = !isPublic && homeApp && homeApp.href;
+
+  if (isMobile) {
+    if (noCozyHome) {
+      if (homeHref) {
+        return /*#__PURE__*/_react.default.createElement("a", {
+          className: "coz-nav-apps-btns-home u-ml-half",
+          href: homeHref
+        }, /*#__PURE__*/_react.default.createElement(_AppTitle.default, {
+          appIcon: appIcon,
+          appTextIcon: appTextIcon
+        }));
+      }
+
+      return /*#__PURE__*/_react.default.createElement(_AppTitle.default, {
+        appIcon: appIcon,
+        appTextIcon: appTextIcon
+      });
+    }
+
+    return /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.default, {
+      homeHref: homeHref
+    });
+  }
+
+  var isHome = appSlug === 'home';
+  return /*#__PURE__*/_react.default.createElement(_Grid.default, {
+    container: true,
+    alignItems: "center",
+    className: "u-w-auto"
+  }, !isHome && !noCozyHome && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_ButtonCozyHome.default, {
+    homeHref: homeHref
+  }), /*#__PURE__*/_react.default.createElement(_Divider.default, {
+    orientation: "vertical",
+    className: "u-mr-half",
+    flexItem: true
+  })), noCozyHome && homeHref ? /*#__PURE__*/_react.default.createElement("a", {
+    className: "coz-nav-apps-btns-home u-ml-half",
+    href: homeHref
+  }, /*#__PURE__*/_react.default.createElement(_AppTitle.default, {
+    appIcon: appIcon,
+    appTextIcon: appTextIcon
+  })) : /*#__PURE__*/_react.default.createElement(_AppTitle.default, {
+    appIcon: appIcon,
+    appTextIcon: appTextIcon
+  }));
+};
+
+var _default = BarLeft;
+exports.default = _default;

package/dist/components/Elements/BarSearch.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _cozySearch = require("cozy-search");
+
+var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
+
+var BarSearch = function BarSearch(_ref) {
+  var isSearchEnabled = _ref.isSearchEnabled;
+
+  var _useBreakpoints = (0, _Breakpoints.useBreakpoints)(),
+      isMobile = _useBreakpoints.isMobile;
+
+  if (isSearchEnabled && !isMobile) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "u-flex-grow u-mh-2"
+    }, /*#__PURE__*/_react.default.createElement(_cozySearch.AssistantDesktop, {
+      componentsProps: {
+        SearchBarDesktop: {
+          size: 'small'
+        }
+      }
+    }));
+  }
+
+  return null;
+};
+
+var _default = BarSearch;
+exports.default = _default;

package/dist/components/Elements/TwakeRight.js

@@ -0,0 +1,56 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _AppsMenu = _interopRequireDefault(require("../AppsMenu"));
+
+var _UserMenu = _interopRequireDefault(require("../UserMenu"));
+
+var _HelpLink = _interopRequireDefault(require("../utils/HelpLink"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _cozyClient = require("cozy-client");
+
+var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
+
+var TwakeRight = function TwakeRight(_ref) {
+  var apps = _ref.apps,
+      appSlug = _ref.appSlug,
+      homeApp = _ref.homeApp,
+      barSearch = _ref.barSearch,
+      isFetchingApps = _ref.isFetchingApps,
+      isSettingsAppInstalled = _ref.isSettingsAppInstalled,
+      onLogOut = _ref.onLogOut;
+
+  var _useBreakpoints = (0, _Breakpoints.useBreakpoints)(),
+      isMobile = _useBreakpoints.isMobile;
+
+  var shortcuts = (0, _cozyClient.useFetchHomeShortcuts)(); // Special case because search on Drive on mobile still rely
+  // on old search UI that is injected in the cozy-bar and
+  // not in a modal as the new search UI
+  // So we need to hide these menu buttons when old search UI
+  // is injected in the cozy-bar
+  // When https://github.com/cozy/cozy-drive/pull/3320 will be merged
+  // Drive will rely on cozy-bar embedded search and we will be able
+  // to remove this special case
+
+  if (appSlug === 'drive' && isMobile && barSearch) return null;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_HelpLink.default, null), /*#__PURE__*/_react.default.createElement(_AppsMenu.default, {
+    apps: apps,
+    homeApp: homeApp,
+    isFetchingApps: isFetchingApps,
+    shortcuts: shortcuts
+  }), /*#__PURE__*/_react.default.createElement(_UserMenu.default, {
+    onLogOut: onLogOut,
+    isSettingsAppInstalled: isSettingsAppInstalled
+  }));
+};
+
+var _default = TwakeRight;
+exports.default = _default;

package/dist/components/utils/ButtonCozyHome.js

@@ -20,8 +20,7 @@ var _cozyFlags = _interopRequireDefault(require("cozy-flags"));
 var _cozyIntent = require("cozy-intent");
 
 var ButtonCozyHome = function ButtonCozyHome(_ref) {
-  var homeHref = _ref.homeHref,
-      isInvertedTheme = _ref.isInvertedTheme;
+  var homeHref = _ref.homeHref;
   var webviewIntent = (0, _cozyIntent.useWebviewIntent)();
   if ((0, _cozyDeviceHelper.isFlagshipApp)() || (0, _cozyFlags.default)('flagship.debug')) return /*#__PURE__*/_react.default.createElement("a", {
     onClick: function onClick() {
@@ -30,8 +29,7 @@ var ButtonCozyHome = function ButtonCozyHome(_ref) {
     className: "coz-nav-apps-btns-home coz-nav-apps-btns-home--is-flagship",
     "data-testid": "buttonCozyHome"
   }, /*#__PURE__*/_react.default.createElement(_IconCozyHome.default, {
-    className: "coz-nav-apps-btns-home-svg",
-    isInvertedTheme: isInvertedTheme
+    className: "coz-nav-apps-btns-home-svg"
   }));
 
   if (homeHref) {
@@ -40,8 +38,7 @@ var ButtonCozyHome = function ButtonCozyHome(_ref) {
       className: "coz-nav-apps-btns-home",
       "data-testid": "buttonCozyHome"
     }, /*#__PURE__*/_react.default.createElement(_IconCozyHome.default, {
-      className: "coz-nav-apps-btns-home-svg",
-      isInvertedTheme: isInvertedTheme
+      className: "coz-nav-apps-btns-home-svg"
     }));
   }
 
@@ -49,14 +46,12 @@ var ButtonCozyHome = function ButtonCozyHome(_ref) {
     className: "coz-nav-apps-btns-home",
     "data-testid": "buttonCozyHome"
   }, /*#__PURE__*/_react.default.createElement(_IconCozyHome.default, {
-    className: "coz-nav-apps-btns-home-svg",
-    isInvertedTheme: isInvertedTheme
+    className: "coz-nav-apps-btns-home-svg"
   }));
 };
 
 ButtonCozyHome.propTypes = {
-  homeHref: _propTypes.default.string,
-  isInvertedTheme: _propTypes.default.bool
+  homeHref: _propTypes.default.string
 };
 var _default = ButtonCozyHome;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-bar",
-  "version": "33.0.1",
+  "version": "33.1.1",
   "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/)",
@@ -43,7 +43,7 @@
     "cozy-realtime": "^4.0.5",
     "cozy-search": "^0.24.0",
     "cozy-ui": "^138.1.0",
-    "cozy-ui-plus": "^6.0.0",
+    "cozy-ui-plus": "^6.1.0",
     "identity-obj-proxy": "3.0.0",
     "jest": "30.3.0",
     "react": "18.0.0",
@@ -73,5 +73,5 @@
     "react-router-dom": ">=6.14.2",
     "twake-i18n": ">=0.3.0"
   },
-  "gitHead": "b29b2e743486797c94cc810d898197d98e553792"
+  "gitHead": "0ac8873a7ba8909f3b02cb719d9fc05133bf5a1d"
 }