cozy-search 0.6.1 → 0.8.0

package/dist/components/AssistantMobile.d.ts

@@ -1,2 +1,14 @@
-export function AssistantMobile(): JSX.Element;
+export function AssistantMobile({ componentsProps }: {
+    componentsProps: any;
+}): JSX.Element;
+export namespace AssistantMobile {
+    namespace propTypes {
+        let componentsProps: PropTypes.Requireable<PropTypes.InferProps<{
+            SearchBar: PropTypes.Requireable<PropTypes.InferProps<{
+                className: PropTypes.Requireable<string>;
+            }>>;
+        }>>;
+    }
+}
 export default AssistantMobile;
+import PropTypes from 'prop-types';

package/dist/components/AssistantMobile.js

@@ -7,8 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.AssistantMobile = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _reactRouterDom = require("react-router-dom");
@@ -19,27 +23,25 @@ var _Magnifier = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/
 
 var _SearchBar = _interopRequireDefault(require("cozy-ui/transpiled/react/SearchBar"));
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
 var _useExtendI18n = _interopRequireDefault(require("cozy-ui/transpiled/react/providers/I18n/useExtendI18n"));
 
 var _locales = require("../locales");
 
-var _helpers = require("./helpers");
-
 var styles = {
   "searchBarDesktop--result": "styles__searchBarDesktop--result___2bQQy",
   "suggestionsPlaceholder": "styles__suggestionsPlaceholder___y-vsv",
   "search-bar-icon": "styles__search-bar-icon___1affF"
 };
 
-var AssistantMobile = function AssistantMobile() {
-  var _useI18n = (0, _I18n.useI18n)(),
-      t = _useI18n.t;
-
+var AssistantMobile = function AssistantMobile(_ref) {
+  var componentsProps = _ref.componentsProps;
   var navigate = (0, _reactRouterDom.useNavigate)();
+
+  var _useLocation = (0, _reactRouterDom.useLocation)(),
+      pathname = _useLocation.pathname;
+
   (0, _useExtendI18n.default)(_locales.locales);
-  return /*#__PURE__*/_react.default.createElement(_SearchBar.default, {
+  return /*#__PURE__*/_react.default.createElement(_SearchBar.default, (0, _extends2.default)({}, componentsProps === null || componentsProps === void 0 ? void 0 : componentsProps.SearchBar, {
     size: "medium",
     icon: /*#__PURE__*/_react.default.createElement(_Icon.default, {
       className: (0, _classnames.default)('u-ml-1 u-mr-half', styles['search-bar-icon']),
@@ -47,15 +49,20 @@ var AssistantMobile = function AssistantMobile() {
       size: 16
     }),
     type: "button",
-    label: (0, _helpers.isAssistantEnabled)() ? t('assistant.search.placeholder') : undefined // fallback on SearchBar default
-    ,
     onClick: function onClick() {
-      return navigate('connected/search');
+      return navigate("connected/search?returnPath=".concat(pathname));
     } // FIXME this route is related to home app
 
-  });
+  }));
 };
 
 exports.AssistantMobile = AssistantMobile;
+AssistantMobile.propTypes = {
+  componentsProps: _propTypes.default.shape({
+    SearchBar: _propTypes.default.shape({
+      className: _propTypes.default.string
+    })
+  })
+};
 var _default = AssistantMobile;
 exports.default = _default;

package/dist/components/AssistantProvider.js

@@ -63,7 +63,7 @@ var AssistantProvider = function AssistantProvider(_ref) {
 
   var _useState = (0, _react.useState)({
     message: {},
-    status: 'pending',
+    status: 'idle',
     messagesId: []
   }),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),

package/dist/components/Conversations/Sources/SourcesItem.js

@@ -27,14 +27,40 @@ var styles = {
   "sourcesItem": "styles__sourcesItem___204Zw"
 };
 
+var getSlug = function getSlug(file) {
+  if ((0, _file.isNote)(file)) {
+    return 'notes';
+  }
+
+  if ((0, _file.isDocs)(file)) {
+    return 'docs';
+  }
+
+  return 'drive';
+};
+
+var getHash = function getHash(file, slug) {
+  if (slug === 'notes') {
+    return "/n/".concat(file._id);
+  }
+
+  if (slug === 'docs') {
+    return "/bridge/docs/".concat(file.metadata.externalId);
+  }
+
+  return "/folder/".concat(file.dir_id, "/file/").concat(file._id);
+};
+
 var SourcesItem = function SourcesItem(_ref) {
   var file = _ref.file;
   var client = (0, _cozyClient.useClient)();
+  var slug = getSlug(file);
+  var hash = getHash(file, slug);
   var docUrl = (0, _cozyClient.generateWebLink)({
-    slug: (0, _file.isNote)(file) ? 'notes' : 'drive',
+    slug: slug,
     cozyUrl: client === null || client === void 0 ? void 0 : client.getStackClient().uri,
     subDomainType: client === null || client === void 0 ? void 0 : client.getInstanceOptions().subdomain,
-    hash: (0, _file.isNote)(file) ? "/n/".concat(file._id) : "/folder/".concat(file.dir_id, "/file/").concat(file._id)
+    hash: hash
   });
   return /*#__PURE__*/_react.default.createElement(_ListItem.default, {
     className: styles['sourcesItem'],
@@ -43,7 +69,7 @@ var SourcesItem = function SourcesItem(_ref) {
     target: "_blank",
     button: true
   }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, /*#__PURE__*/_react.default.createElement(_Icon.default, {
-    icon: (0, _getIconForSearchResult.getDriveMimeTypeIcon)(false, file.name, file.mime),
+    icon: (0, _getIconForSearchResult.getDriveMimeTypeIcon)(file),
     size: 32
   })), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
     primary: file.name,

package/dist/components/ResultMenu/ResultMenu.d.ts

@@ -1,6 +1,6 @@
 export default ResultMenu;
-declare function ResultMenu({ anchorRef, listRef, onClick }: {
+declare function ResultMenu({ anchorRef, listRef, onClear }: {
     anchorRef: any;
     listRef: any;
-    onClick: any;
+    onClear: any;
 }): JSX.Element;

package/dist/components/ResultMenu/ResultMenu.js

@@ -17,13 +17,14 @@ var _ResultMenuContent = _interopRequireDefault(require("./ResultMenuContent"));
 
 var styles = {
   "resultMenu": "styles__resultMenu___o76q-",
-  "resultMenu-inner": "styles__resultMenu-inner___2Lf0d"
+  "resultMenu-inner": "styles__resultMenu-inner___2Lf0d",
+  "resultMenuItem": "styles__resultMenuItem___3-bLe"
 };
 
 var ResultMenu = function ResultMenu(_ref) {
   var anchorRef = _ref.anchorRef,
       listRef = _ref.listRef,
-      onClick = _ref.onClick;
+      onClear = _ref.onClear;
   return /*#__PURE__*/_react.default.createElement(_Popper.default, {
     style: {
       width: anchorRef.current.offsetWidth,
@@ -39,7 +40,7 @@ var ResultMenu = function ResultMenu(_ref) {
     className: styles['resultMenu-inner']
   }, /*#__PURE__*/_react.default.createElement(_ResultMenuContent.default, {
     ref: listRef,
-    onClick: onClick
+    onClear: onClear
   }))));
 };
 

package/dist/components/ResultMenu/ResultMenuContent.js

@@ -23,13 +23,13 @@ var _ResultMenuItem = _interopRequireDefault(require("./ResultMenuItem"));
 
 var _SearchProvider = require("../Search/SearchProvider");
 
-var _helpers = require("../helpers");
-
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var SearchResult = function SearchResult() {
+var SearchResult = function SearchResult(_ref) {
+  var onClear = _ref.onClear;
+
   var _useSearch = (0, _SearchProvider.useSearch)(),
       isLoading = _useSearch.isLoading,
       results = _useSearch.results,
@@ -59,24 +59,29 @@ var SearchResult = function SearchResult() {
       key: result.id || idx,
       icon: result.icon,
       slug: result.slug,
+      url: result.url,
       primaryText: result.primary,
       secondaryText: result.secondary,
       secondaryUrl: result.secondaryUrl,
       query: searchValue,
       highlightQuery: "true",
-      selected: (0, _helpers.isAssistantEnabled)() ? selectedIndex === idx + 1 : selectedIndex === idx,
-      onClick: result.onClick
+      selected: selectedIndex === idx,
+      onClear: onClear
     });
   });
 };
 
-var ResultMenuContent = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var ResultMenuContent = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
+  var onClear = _ref2.onClear;
+
   var _useDataProxy = (0, _cozyDataproxyLib.useDataProxy)(),
       dataProxyServicesAvailable = _useDataProxy.dataProxyServicesAvailable;
 
   return /*#__PURE__*/_react.default.createElement(_List.default, {
     ref: ref
-  }, dataProxyServicesAvailable && /*#__PURE__*/_react.default.createElement(SearchResult, null));
+  }, dataProxyServicesAvailable && /*#__PURE__*/_react.default.createElement(SearchResult, {
+    onClear: onClear
+  }));
 });
 ResultMenuContent.displayName = 'ResultMenuContent';
 var _default = ResultMenuContent;

package/dist/components/ResultMenu/ResultMenuItem.d.ts

@@ -1,12 +1,13 @@
 export default ResultMenuItem;
-declare function ResultMenuItem({ icon, primaryText, secondaryText, secondaryUrl, slug, selected, onClick, query, highlightQuery }: {
+declare function ResultMenuItem({ icon, url, primaryText, secondaryText, secondaryUrl, slug, selected, query, highlightQuery, onClear }: {
     icon: any;
+    url: any;
     primaryText: any;
     secondaryText: any;
     secondaryUrl: any;
     slug: any;
     selected: any;
-    onClick: any;
     query: any;
     highlightQuery?: boolean | undefined;
+    onClear: any;
 }): JSX.Element;

package/dist/components/ResultMenu/ResultMenuItem.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _AppIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/AppIcon"));
 
@@ -23,17 +23,29 @@ var _SuggestionItemTextHighlighted = _interopRequireDefault(require("./Suggestio
 
 var _SuggestionItemTextSecondary = _interopRequireDefault(require("./SuggestionItemTextSecondary"));
 
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var styles = {
+  "resultMenu": "styles__resultMenu___o76q-",
+  "resultMenu-inner": "styles__resultMenu-inner___2Lf0d",
+  "resultMenuItem": "styles__resultMenuItem___3-bLe"
+};
+
 var ResultMenuItem = function ResultMenuItem(_ref) {
   var icon = _ref.icon,
+      url = _ref.url,
       primaryText = _ref.primaryText,
       secondaryText = _ref.secondaryText,
       secondaryUrl = _ref.secondaryUrl,
       slug = _ref.slug,
       selected = _ref.selected,
-      onClick = _ref.onClick,
       query = _ref.query,
       _ref$highlightQuery = _ref.highlightQuery,
-      highlightQuery = _ref$highlightQuery === void 0 ? false : _ref$highlightQuery;
+      highlightQuery = _ref$highlightQuery === void 0 ? false : _ref$highlightQuery,
+      onClear = _ref.onClear;
+  var itemRef = (0, _react.useRef)();
   var iconComponent = icon.type === 'component' ? /*#__PURE__*/_react.default.createElement(_Icon.default, {
     icon: icon.component,
     size: 32
@@ -50,11 +62,25 @@ var ResultMenuItem = function ResultMenuItem(_ref) {
     slug: slug,
     url: secondaryUrl
   }) : secondaryText;
+  (0, _react.useEffect)(function () {
+    if (selected) {
+      var _itemRef$current;
+
+      itemRef === null || itemRef === void 0 ? void 0 : (_itemRef$current = itemRef.current) === null || _itemRef$current === void 0 ? void 0 : _itemRef$current.scrollIntoView({
+        behavior: 'smooth',
+        block: 'nearest',
+        inline: 'nearest'
+      });
+    }
+  }, [selected]);
   return /*#__PURE__*/_react.default.createElement(_ListItem.default, {
-    button: true,
+    component: "a",
+    href: url,
+    ref: itemRef,
     size: "small",
     selected: selected,
-    onClick: onClick
+    className: styles.resultMenuItem,
+    onClick: onClear
   }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, iconComponent), /*#__PURE__*/_react.default.createElement(_ListItemText.default, {
     primary: primary,
     secondary: secondary

package/dist/components/ResultMenu/styles.styl

@@ -6,3 +6,6 @@
   &-inner
     max-height 16.5rem
     overflow auto
+
+.resultMenuItem
+  color: var(--primaryTextColor) // to avoid visited color on a component

package/dist/components/Search/AssistantButton.d.ts

@@ -1,4 +1,3 @@
-export function AssistantButton({ onClick, size }: {
-    onClick: any;
+export function AssistantButton({ size }: {
     size: any;
 }): JSX.Element;

package/dist/components/Search/AssistantButton.js

@@ -9,6 +9,8 @@ exports.AssistantButton = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _reactRouterDom = require("react-router-dom");
+
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 
 var _IconButton = _interopRequireDefault(require("cozy-ui/transpiled/react/IconButton"));
@@ -17,9 +19,30 @@ var _InputAdornment = _interopRequireDefault(require("cozy-ui/transpiled/react/I
 
 var _TwakeAssistantIcon = require("../AssistantIcon/TwakeAssistantIcon");
 
+var _AssistantProvider = require("../AssistantProvider");
+
+var _helpers = require("../helpers");
+
 var AssistantButton = function AssistantButton(_ref) {
-  var onClick = _ref.onClick,
-      size = _ref.size;
+  var size = _ref.size;
+
+  var _useAssistant = (0, _AssistantProvider.useAssistant)(),
+      onAssistantExecute = _useAssistant.onAssistantExecute;
+
+  var navigate = (0, _reactRouterDom.useNavigate)();
+
+  var _useLocation = (0, _reactRouterDom.useLocation)(),
+      pathname = _useLocation.pathname;
+
+  var onClick = function onClick() {
+    var conversationId = (0, _helpers.makeConversationId)();
+    onAssistantExecute({
+      value: '',
+      conversationId: conversationId
+    });
+    navigate("assistant/".concat(conversationId, "?returnPath=").concat(pathname));
+  };
+
   return /*#__PURE__*/_react.default.createElement(_InputAdornment.default, {
     position: "end",
     className: "u-mr-half"

package/dist/components/Search/AssistantLink.js

@@ -27,6 +27,9 @@ var AssistantLink = function AssistantLink(_ref) {
 
   var navigate = (0, _reactRouterDom.useNavigate)();
 
+  var _useLocation = (0, _reactRouterDom.useLocation)(),
+      pathname = _useLocation.pathname;
+
   var openAssistant = function openAssistant() {
     if (!(0, _helpers.isAssistantEnabled)()) return;
     var conversationId = (0, _helpers.makeConversationId)();
@@ -34,7 +37,7 @@ var AssistantLink = function AssistantLink(_ref) {
       value: '',
       conversationId: conversationId
     });
-    navigate("assistant/".concat(conversationId));
+    navigate("assistant/".concat(conversationId, "?returnPath=").concat(pathname));
   };
 
   return /*#__PURE__*/_react.default.createElement(_AssistantProvider.default, null, children({

package/dist/components/Search/Icons/DocsIcon.d.ts

@@ -0,0 +1,2 @@
+export default DocsIcon;
+declare function DocsIcon(): JSX.Element;

package/dist/components/Search/Icons/DocsIcon.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+// TODO: should be moved in cozy-ui
+var DocsIcon = function DocsIcon() {
+  return /*#__PURE__*/_react.default.createElement("svg", {
+    viewBox: "0 0 32 33",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/_react.default.createElement("path", {
+    d: "M21.6305 29.5812C22.7983 29.2538 23.9166 28.6562 24.6505 27.6003C25.3749 26.5663 25.5789 25.2547 25.5789 23.9925V5.50099C25.5789 5.17358 25.5611 4.84557 25.5216 4.52148C26.1016 4.74961 26.5486 5.12658 26.8626 5.65239C27.2331 6.25024 27.4184 7.03757 27.4184 8.01435V26.7964C27.4184 28.1184 27.0942 29.1078 26.4458 29.7646C25.7974 30.4214 24.8207 30.7498 23.5155 30.7498H16.4209C16.5889 30.7204 16.7574 30.6901 16.9262 30.659C18.4067 30.3944 19.9713 30.0354 21.6185 29.5846L21.6305 29.5812Z",
+    fill: "#C9191E"
+  }), /*#__PURE__*/_react.default.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M4.58203 26.405V7.5977C4.58203 6.45251 4.88938 5.58519 5.50408 4.99575C6.1272 4.40631 6.95242 4.08212 7.97972 4.02318C9.49542 3.93055 10.9311 3.80425 12.2868 3.64425C13.6425 3.47584 14.9393 3.28217 16.1771 3.06324C17.4234 2.8443 18.6359 2.60011 19.8148 2.33065C21.0274 2.04435 21.9578 2.1875 22.6062 2.7601C23.2546 3.33269 23.5788 4.24632 23.5788 5.50099V23.9925C23.5788 25.0956 23.3893 25.9166 23.0104 26.4555C22.6315 27.0029 21.9915 27.4028 21.0905 27.6554C19.4906 28.0933 17.9833 28.4386 16.5687 28.6912C15.154 28.9522 13.7731 29.1501 12.4258 29.2848C11.0785 29.4196 9.69751 29.5248 8.28286 29.6006C7.11241 29.668 6.20299 29.4238 5.5546 28.868C4.90622 28.3207 4.58203 27.4997 4.58203 26.405ZM9.20865 11.0124C11.0635 10.8944 12.7632 10.7131 14.3075 10.4683C14.6822 10.4072 15.0564 10.3436 15.4291 10.2776C15.8192 10.2085 16.1013 9.86859 16.1013 9.47337C16.1013 8.96154 15.638 8.57609 15.135 8.66189C14.846 8.71118 14.5555 8.75909 14.2635 8.80562C12.7346 9.04923 11.0452 9.22998 9.19523 9.3477C8.91819 9.36558 8.69776 9.45188 8.55608 9.62391C8.42209 9.78661 8.35645 9.98229 8.35645 10.2053C8.35645 10.4321 8.43296 10.6295 8.58568 10.7918L8.58783 10.7939C8.75336 10.9595 8.96369 11.0311 9.20865 11.0124ZM9.20801 15.206C11.0631 15.088 12.763 14.9066 14.3075 14.6619C15.8588 14.4089 17.3936 14.1138 18.9112 13.7766C19.2191 13.7081 19.4498 13.6003 19.5652 13.433C19.6786 13.2721 19.7347 13.0876 19.7347 12.8832C19.7347 12.6526 19.6469 12.454 19.476 12.2926C19.2921 12.1189 19.0348 12.0784 18.7304 12.1411L18.7285 12.1415C17.2823 12.4694 15.794 12.7553 14.2635 12.9992C12.7346 13.2428 11.0452 13.4235 9.19523 13.5413C8.91819 13.5591 8.69776 13.6454 8.55608 13.8175C8.42276 13.9794 8.35645 14.1705 8.35645 14.3863C8.35645 14.6203 8.43209 14.8223 8.58558 14.9854L8.59 14.9896C8.75499 15.1449 8.96316 15.2155 9.20551 15.2062L9.20801 15.206ZM9.20847 19.3994C11.0634 19.2729 12.7631 19.0874 14.3075 18.8427C15.8589 18.5982 17.3934 18.3073 18.9112 17.97C19.2199 17.9014 19.4508 17.7891 19.566 17.6127C19.6783 17.4529 19.7347 17.2733 19.7347 17.0766C19.7347 16.8461 19.6469 16.6474 19.476 16.4861C19.2921 16.3123 19.0348 16.2718 18.7304 16.3345L18.729 16.3348C17.2827 16.6543 15.7942 16.9361 14.2635 17.18C12.7345 17.4236 11.045 17.6086 9.19495 17.7347C8.91804 17.7526 8.69771 17.8389 8.55608 18.0109C8.42276 18.1728 8.35645 18.3639 8.35645 18.5797C8.35645 18.8137 8.43209 19.0158 8.58558 19.1789L8.59 19.183C8.75499 19.3383 8.96316 19.4089 9.20551 19.3996L9.20847 19.3994ZM14.3075 23.007C12.7632 23.2518 11.0635 23.4331 9.20867 23.5512C8.9637 23.5698 8.75337 23.4982 8.58783 23.3326L8.58572 23.3305C8.433 23.1682 8.35645 22.9708 8.35645 22.7441C8.35645 22.521 8.42209 22.3253 8.55608 22.1626C8.69776 21.9906 8.91827 21.9043 9.19531 21.8864C11.0453 21.7687 12.7346 21.588 14.2635 21.3443C14.5555 21.2978 14.846 21.2499 15.135 21.2006C15.638 21.1148 16.1013 21.5003 16.1013 22.0121C16.1013 22.4073 15.8192 22.7472 15.4291 22.8163C15.0564 22.8823 14.6822 22.9459 14.3075 23.007Z",
+    fill: "#000091"
+  }));
+};
+
+var _default = DocsIcon;
+exports.default = _default;

package/dist/components/Search/SearchBarDesktop.js

@@ -11,8 +11,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _reactRouterDom = require("react-router-dom");
-
 var _ClickAwayListener = _interopRequireDefault(require("cozy-ui/transpiled/react/ClickAwayListener"));
 
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
@@ -25,8 +23,6 @@ var _AssistantButton = require("./AssistantButton");
 
 var _SearchProvider = require("./SearchProvider");
 
-var _AssistantProvider = require("../AssistantProvider");
-
 var _ResultMenu = _interopRequireDefault(require("../ResultMenu/ResultMenu"));
 
 var _helpers = require("../helpers");
@@ -57,28 +53,9 @@ var SearchBarDesktop = function SearchBarDesktop(_ref) {
       selectedIndex = _useSearch.selectedIndex,
       setSelectedIndex = _useSearch.setSelectedIndex;
 
-  var _useAssistant = (0, _AssistantProvider.useAssistant)(),
-      onAssistantExecute = _useAssistant.onAssistantExecute;
-
-  var navigate = (0, _reactRouterDom.useNavigate)();
   var searchRef = (0, _react.useRef)();
   var listRef = (0, _react.useRef)();
 
-  var handleClick = function handleClick() {
-    if (!(0, _helpers.isAssistantEnabled)()) return;
-    var conversationId = (0, _helpers.makeConversationId)();
-    onAssistantExecute({
-      value: value,
-      conversationId: conversationId
-    });
-    navigate("assistant/".concat(conversationId)); // setTimeout usefull to prevent the field from emptying before the route is changed
-    // works because the modal appears on top of the view that carries the input and not instead of it.
-
-    setTimeout(function () {
-      onClear();
-    }, 100);
-  };
-
   var handleKeyDown = function handleKeyDown(ev) {
     var _listRef$current;
 
@@ -116,13 +93,12 @@ var SearchBarDesktop = function SearchBarDesktop(_ref) {
     if (ev.key === 'Enter') {
       ev.preventDefault();
 
-      if (selectedIndex) {
-        var _results;
+      if (selectedIndex !== undefined) {
+        var _results$selectedInde;
 
-        var onClickFn = (results === null || results === void 0 ? void 0 : (_results = results[selectedIndex - 1]) === null || _results === void 0 ? void 0 : _results.onClick) || handleClick;
+        var onClickFn = results === null || results === void 0 ? void 0 : (_results$selectedInde = results[selectedIndex]) === null || _results$selectedInde === void 0 ? void 0 : _results$selectedInde.onClick;
+        onClear();
         onClickFn();
-      } else if (value !== '') {
-        handleClick();
       }
     }
   };
@@ -147,10 +123,9 @@ var SearchBarDesktop = function SearchBarDesktop(_ref) {
     componentsProps: {
       inputBase: {
         onKeyDown: handleKeyDown,
-        endAdornment: (0, _helpers.isAssistantEnabled)() ? /*#__PURE__*/_react.default.createElement(_AssistantButton.AssistantButton, {
-          onClick: handleClick,
+        endAdornment: (0, _helpers.isAssistantEnabled)() && /*#__PURE__*/_react.default.createElement(_AssistantButton.AssistantButton, {
           size: size
-        }) : undefined
+        })
       }
     },
     disabledClear: true,
@@ -160,7 +135,7 @@ var SearchBarDesktop = function SearchBarDesktop(_ref) {
   }), searchValue && /*#__PURE__*/_react.default.createElement(_ResultMenu.default, {
     listRef: listRef,
     anchorRef: searchRef,
-    onClick: handleClick
+    onClear: onClear
   })));
 };
 

package/dist/components/Search/SearchBarMobile.js

@@ -7,20 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _SearchBar = _interopRequireDefault(require("cozy-ui/transpiled/react/SearchBar"));
 
-var _useEventListener = _interopRequireDefault(require("cozy-ui/transpiled/react/hooks/useEventListener"));
-
-var _SuggestionsPlaceholder = _interopRequireDefault(require("./SuggestionsPlaceholder"));
-
-var _helpers = require("../helpers");
-
-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); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var styles = {
   "conversationBar": "styles__conversationBar___2J-Us",
   "conversationBar-input": "styles__conversationBar-input___2DfdZ"
@@ -30,36 +20,22 @@ var SearchBarMobile = function SearchBarMobile(_ref) {
   var value = _ref.value,
       onClear = _ref.onClear,
       onChange = _ref.onChange;
-  var inputRef = (0, _react.useRef)(); // to adjust input height for multiline when typing in it
-
-  (0, _useEventListener.default)(inputRef.current, 'input', function () {
-    inputRef.current.style.height = 'auto'; // to resize input when emptying it
-
-    inputRef.current.style.height = "".concat(inputRef.current.scrollHeight, "px");
-  });
 
   var handleClear = function handleClear() {
     onClear();
-    inputRef.current.style.height = 'auto';
   };
 
   return /*#__PURE__*/_react.default.createElement(_SearchBar.default, {
     className: styles['conversationBar'],
     size: "auto",
     icon: null,
-    placeholder: (0, _helpers.isAssistantEnabled)() ? ' ' : undefined // if assistant enabled, we set a blank space because we want only the SuggestionsPlaceholder below
-    ,
     value: value,
     componentsProps: {
       inputBase: {
         inputProps: {
           className: styles['conversationBar-input']
         },
-        inputRef: inputRef,
-        autoFocus: true,
-        rows: 1,
-        multiline: true,
-        startAdornment: (0, _helpers.isAssistantEnabled)() && !value && /*#__PURE__*/_react.default.createElement(_SuggestionsPlaceholder.default, null)
+        autoFocus: true
       }
     },
     onChange: onChange,

package/dist/components/Search/getIconForSearchResult.d.ts

@@ -7,6 +7,6 @@ export function getIconForSearchResult(searchResult: any): {
     component: any;
     app?: undefined;
 };
-export function getDriveMimeTypeIcon(isDirectory: boolean, name: string, mime: string, { isEncrypted }?: {
+export function getDriveMimeTypeIcon(file: import("cozy-client/types/types").IOCozyFile, { isEncrypted }?: {
     isEncrypted?: boolean | undefined;
 } | undefined): import("react").ReactNode;

package/dist/components/Search/getIconForSearchResult.js

@@ -9,6 +9,8 @@ exports.getIconForSearchResult = exports.getDriveMimeTypeIcon = void 0;
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
+var _file = require("cozy-client/dist/models/file");
+
 var _Contacts = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Contacts"));
 
 var _FileTypeAudio = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/FileTypeAudio"));
@@ -37,7 +39,9 @@ var _FileTypeVideo = _interopRequireDefault(require("cozy-ui/transpiled/react/Ic
 
 var _FileTypeZip = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/FileTypeZip"));
 
-var _EncryptedFolderIcon = _interopRequireDefault(require("./EncryptedFolderIcon"));
+var _DocsIcon = _interopRequireDefault(require("./Icons/DocsIcon"));
+
+var _EncryptedFolderIcon = _interopRequireDefault(require("./Icons/EncryptedFolderIcon"));
 
 var _getFileMimetype = require("./getFileMimetype");
 
@@ -59,7 +63,7 @@ var getIconForSearchResult = function getIconForSearchResult(searchResult) {
   if (searchResult.slug === 'drive') {
     return {
       type: 'component',
-      component: getDriveMimeTypeIcon(searchResult.doc.type === 'directory', searchResult.doc.name, searchResult.doc.mime)
+      component: getDriveMimeTypeIcon(searchResult.doc)
     };
   }
 
@@ -82,9 +86,7 @@ var getIconForSearchResult = function getIconForSearchResult(searchResult) {
  *
  * See source: https://github.com/cozy/cozy-drive/blob/fbe2df67199683b23a40f476ccdacb00ee027459/src/lib/getMimeTypeIcon.js
  *
- * @param {boolean} isDirectory - Indicates whether the file is a directory.
- * @param {string} name - The name of the file.
- * @param {string} mime - The mime type of the file.
+ * @param {import('cozy-client/types/types').IOCozyFile} file - The io.cozy.files .
  * @param {Object} [options] - Additional options.
  * @param {boolean} [options.isEncrypted] - Indicates whether the file is encrypted. Default is false.
  * @returns {import('react').ReactNode} - The icon corresponding to the file's mime type.
@@ -93,19 +95,25 @@ var getIconForSearchResult = function getIconForSearchResult(searchResult) {
 
 exports.getIconForSearchResult = getIconForSearchResult;
 
-var getDriveMimeTypeIcon = function getDriveMimeTypeIcon(isDirectory, name, mime) {
-  var _ref = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
+var getDriveMimeTypeIcon = function getDriveMimeTypeIcon(file) {
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
       _ref$isEncrypted = _ref.isEncrypted,
       isEncrypted = _ref$isEncrypted === void 0 ? false : _ref$isEncrypted;
 
+  var isDirectory = file.type === 'directory';
+  var name = file.name,
+      mime = file.mime;
+
   if (isEncrypted) {
     return _EncryptedFolderIcon.default;
   }
 
   if (isDirectory) {
     return _FileTypeFolder.default;
-  } else if (/\.cozy-note$/.test(name)) {
+  } else if ((0, _file.isNote)(file)) {
     return _FileTypeNote.default;
+  } else if ((0, _file.isDocs)(file)) {
+    return _DocsIcon.default;
   } else {
     var iconsByMimeType = {
       audio: _FileTypeAudio.default,

package/dist/components/Search/useFetchResult.js

@@ -15,6 +15,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _react = require("react");
 
+var _reactRouterDom = require("react-router-dom");
+
+var _cozyClient = require("cozy-client");
+
 var _cozyDataproxyLib = require("cozy-dataproxy-lib");
 
 var _cozyMinilog = _interopRequireDefault(require("cozy-minilog"));
@@ -96,6 +100,9 @@ var searchWithRetry = /*#__PURE__*/function () {
 }();
 
 var useFetchResult = function useFetchResult(searchValue) {
+  var client = (0, _cozyClient.useClient)();
+  var navigate = (0, _reactRouterDom.useNavigate)();
+
   var _useState = (0, _react.useState)({
     isLoading: true,
     results: null,
@@ -143,11 +150,22 @@ var useFetchResult = function useFetchResult(searchValue) {
                     id: r.doc._id,
                     icon: icon,
                     slug: r.slug,
+                    url: r.url,
                     secondaryUrl: r.secondaryUrl,
                     primary: r.title,
                     secondary: r.subTitle,
                     onClick: function onClick() {
-                      window.open(r.url);
+                      if (r.slug === client.appMetadata.slug) {
+                        try {
+                          var url = new URL(r.url);
+                          var hash = url.hash.replace('#', '');
+                          navigate(hash);
+                        } catch (_unused) {
+                          window.open(r.url);
+                        }
+                      } else {
+                        window.open(r.url);
+                      }
                     }
                   };
                 });

package/dist/components/Views/AssistantDialog.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _reactRouterDom = require("react-router-dom");
@@ -36,11 +38,25 @@ var AssistantDialog = function AssistantDialog() {
 
   var navigate = (0, _reactRouterDom.useNavigate)();
 
+  var _useSearchParams = (0, _reactRouterDom.useSearchParams)(),
+      _useSearchParams2 = (0, _slicedToArray2.default)(_useSearchParams, 1),
+      searchParams = _useSearchParams2[0];
+
   var _useParams = (0, _reactRouterDom.useParams)(),
       conversationId = _useParams.conversationId;
 
   var onClose = function onClose() {
-    navigate('..');
+    try {
+      var returnPath = searchParams.get('returnPath');
+
+      if (returnPath) {
+        navigate(returnPath);
+      } else {
+        navigate('..');
+      }
+    } catch (_unused) {
+      navigate('..');
+    }
   };
 
   return /*#__PURE__*/_react.default.createElement(_CozyDialogs.FixedDialog, {

package/dist/components/Views/SearchDialog.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _reactRouterDom = require("react-router-dom");
@@ -19,7 +21,7 @@ var _useExtendI18n = _interopRequireDefault(require("cozy-ui/transpiled/react/pr
 
 var _locales = require("../../locales");
 
-var _AssistantProvider = _interopRequireWildcard(require("../AssistantProvider"));
+var _AssistantProvider = _interopRequireDefault(require("../AssistantProvider"));
 
 var _ResultMenuContent = _interopRequireDefault(require("../ResultMenu/ResultMenuContent"));
 
@@ -27,38 +29,33 @@ var _SearchBar = _interopRequireDefault(require("../Search/SearchBar"));
 
 var _SearchProvider = _interopRequireWildcard(require("../Search/SearchProvider"));
 
-var _SearchSubmitFab = _interopRequireDefault(require("../Search/SearchSubmitFab"));
-
-var _helpers = require("../helpers");
-
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var SearchDialog = function SearchDialog() {
   (0, _useExtendI18n.default)(_locales.locales);
-
-  var _useAssistant = (0, _AssistantProvider.useAssistant)(),
-      onAssistantExecute = _useAssistant.onAssistantExecute;
-
   var navigate = (0, _reactRouterDom.useNavigate)();
 
+  var _useSearchParams = (0, _reactRouterDom.useSearchParams)(),
+      _useSearchParams2 = (0, _slicedToArray2.default)(_useSearchParams, 1),
+      searchParams = _useSearchParams2[0];
+
   var _useSearch = (0, _SearchProvider.useSearch)(),
       searchValue = _useSearch.searchValue;
 
-  var handleClick = function handleClick() {
-    var conversationId = (0, _helpers.makeConversationId)();
-    onAssistantExecute({
-      value: searchValue,
-      conversationId: conversationId
-    });
-    navigate("../assistant/".concat(conversationId), {
-      replace: true
-    });
-  };
+  var onClose = function onClose() {
+    try {
+      var returnPath = searchParams.get('returnPath');
 
-  var handleClose = function handleClose() {
-    navigate('..');
+      if (returnPath) {
+        navigate(returnPath);
+      } else {
+        navigate('..');
+      }
+    } catch (_unused) {
+      navigate('..');
+    }
   };
 
   return /*#__PURE__*/_react.default.createElement(_CozyDialogs.FixedDialog, {
@@ -76,13 +73,8 @@ var SearchDialog = function SearchDialog() {
       }
     },
     title: /*#__PURE__*/_react.default.createElement(_SearchBar.default, null),
-    content: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, searchValue && /*#__PURE__*/_react.default.createElement(_ResultMenuContent.default, {
-      onClick: handleClick
-    }), (0, _helpers.isAssistantEnabled)() && /*#__PURE__*/_react.default.createElement(_SearchSubmitFab.default, {
-      searchValue: searchValue,
-      onClick: handleClick
-    })),
-    onClose: handleClose
+    content: searchValue && /*#__PURE__*/_react.default.createElement(_ResultMenuContent.default, null),
+    onClose: onClose
   });
 };
 

package/dist/stylesheet.css

@@ -49,3 +49,6 @@
   max-height: 16.5rem;
   overflow: auto;
 }
+.styles__resultMenuItem___3-bLe {
+  color: var(--primaryTextColor);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cozy-search",
   "description": "UI components about search bar and IA assistant",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "author": {
     "name": "Cozy Cloud",
     "url": "https://github.com/cozy"
@@ -87,5 +87,5 @@
     "lint": "cd .. && yarn eslint --ext js,jsx,ts packages/cozy-search"
   },
   "types": "dist/index.d.ts",
-  "gitHead": "e1c26533651aaa8d8a7c6f8ddd4508a3b319c28a"
+  "gitHead": "9cf6ca284745f747492e9cd42d2eb96c5cc9e900"
 }

package/dist/components/Search/SearchSubmitFab.d.ts

@@ -1,5 +0,0 @@
-export default SearchSubmitFab;
-declare function SearchSubmitFab({ searchValue, onClick }: {
-    searchValue: any;
-    onClick: any;
-}): JSX.Element;

package/dist/components/Search/SearchSubmitFab.js

@@ -1,59 +0,0 @@
-"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 _cozyDeviceHelper = require("cozy-device-helper");
-
-var _Fab = _interopRequireDefault(require("cozy-ui/transpiled/react/Fab"));
-
-var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
-
-var _Paperplane = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Paperplane"));
-
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
-var _styles = require("cozy-ui/transpiled/react/styles");
-
-var useStyles = (0, _styles.makeStyles)({
-  root: {
-    right: '1rem',
-    bottom: '1rem',
-    position: 'fixed',
-    marginBottom: function marginBottom(_ref) {
-      var immersive = _ref.immersive;
-      return immersive ? 'var(--flagship-bottom-height)' : 0;
-    }
-  }
-});
-
-var SearchSubmitFab = function SearchSubmitFab(_ref2) {
-  var searchValue = _ref2.searchValue,
-      onClick = _ref2.onClick;
-
-  var _useI18n = (0, _I18n.useI18n)(),
-      t = _useI18n.t;
-
-  var styles = useStyles({
-    immersive: (0, _cozyDeviceHelper.getFlagshipMetadata)().immersive
-  });
-  return /*#__PURE__*/_react.default.createElement(_Fab.default, {
-    "aria-label": t('assistant.search.send'),
-    color: "primary",
-    size: "medium",
-    classes: styles,
-    disabled: !searchValue,
-    onClick: onClick
-  }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
-    icon: _Paperplane.default
-  }));
-};
-
-var _default = SearchSubmitFab;
-exports.default = _default;