cozy-search 0.6.1 → 0.7.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/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/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/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.7.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": "21bd95efd3c72ebf08004962a42ba0914c0b322f"
 }

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;