cozy-search 0.2.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,9 +6,11 @@ declare namespace AssistantDesktop {
6
6
  namespace propTypes {
7
7
  let componentsProps: PropTypes.Requireable<PropTypes.InferProps<{
8
8
  SearchBarDesktop: PropTypes.Requireable<PropTypes.InferProps<{
9
- elevation: PropTypes.Requireable<boolean>;
9
+ elevation: PropTypes.Requireable<number>;
10
10
  size: PropTypes.Requireable<string>;
11
11
  hasHalfBorderRadius: PropTypes.Requireable<boolean>;
12
+ className: PropTypes.Requireable<string>;
13
+ disabledHover: PropTypes.Requireable<boolean>;
12
14
  }>>;
13
15
  }>>;
14
16
  }
@@ -34,9 +34,11 @@ var AssistantDesktop = function AssistantDesktop(_ref) {
34
34
  AssistantDesktop.propTypes = {
35
35
  componentsProps: _propTypes.default.shape({
36
36
  SearchBarDesktop: _propTypes.default.shape({
37
- elevation: _propTypes.default.bool,
37
+ elevation: _propTypes.default.number,
38
38
  size: _propTypes.default.string,
39
- hasHalfBorderRadius: _propTypes.default.bool
39
+ hasHalfBorderRadius: _propTypes.default.bool,
40
+ className: _propTypes.default.string,
41
+ disabledHover: _propTypes.default.bool
40
42
  })
41
43
  })
42
44
  };
@@ -0,0 +1 @@
1
+ export function TwakeAssistantIcon(props: any): JSX.Element;
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.TwakeAssistantIcon = void 0;
9
+
10
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
11
+
12
+ var _react = _interopRequireDefault(require("react"));
13
+
14
+ var TwakeAssistantIcon = function TwakeAssistantIcon(props) {
15
+ return /*#__PURE__*/_react.default.createElement("svg", (0, _extends2.default)({
16
+ viewBox: "0 0 22 22",
17
+ fill: "none"
18
+ }, props), /*#__PURE__*/_react.default.createElement("path", {
19
+ fillRule: "evenodd",
20
+ clipRule: "evenodd",
21
+ d: "M10.094.305a1.5 1.5 0 012.351.79l.005.02 1.581 6.135a1 1 0 00.718.719l6.136 1.58.016.005a1.5 1.5 0 010 2.892l-.016.004-6.135 1.581a1 1 0 00-.719.719l-1.582 6.135-.005.02a1.5 1.5 0 01-2.889 0l-.005-.02-1.581-6.135a1.001 1.001 0 00-.719-.719L1.115 12.45l-.023-.006a1.5 1.5 0 010-2.886l.023-.006L7.25 7.968a1 1 0 00.719-.718L9.55 1.115l.005-.02a1.5 1.5 0 01.538-.79zM11 3.503l1.095 4.247a3.002 3.002 0 002.155 2.155L18.498 11l-4.248 1.095a3.001 3.001 0 00-2.155 2.155L11 18.497 9.905 14.25a3 3 0 00-2.155-2.156L3.504 11 7.75 9.904A3 3 0 009.905 7.75L11 3.503zM19 1a1 1 0 011 1v1h1a1 1 0 110 2h-1v1a1 1 0 11-2 0V5h-1a1 1 0 110-2h1V2a1 1 0 011-1zM3 15a1 1 0 011 1 1 1 0 110 2 1 1 0 11-2 0 1 1 0 110-2 1 1 0 011-1z"
22
+ }));
23
+ };
24
+
25
+ exports.TwakeAssistantIcon = TwakeAssistantIcon;
@@ -7,21 +7,35 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = exports.AssistantMobile = void 0;
9
9
 
10
+ var _classnames = _interopRequireDefault(require("classnames"));
11
+
10
12
  var _react = _interopRequireDefault(require("react"));
11
13
 
12
14
  var _reactRouterDom = require("react-router-dom");
13
15
 
14
16
  var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
15
17
 
18
+ var _Magnifier = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Magnifier"));
19
+
16
20
  var _SearchBar = _interopRequireDefault(require("cozy-ui/transpiled/react/SearchBar"));
17
21
 
22
+ var _isTwakeTheme = require("cozy-ui/transpiled/react/helpers/isTwakeTheme");
23
+
18
24
  var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
19
25
 
20
26
  var _useExtendI18n = _interopRequireDefault(require("cozy-ui/transpiled/react/providers/I18n/useExtendI18n"));
21
27
 
28
+ var _locales = require("../locales");
29
+
22
30
  var _AssistantIcon = require("./AssistantIcon/AssistantIcon");
23
31
 
24
- var _locales = require("../locales");
32
+ var _helpers = require("./helpers");
33
+
34
+ var styles = {
35
+ "searchBarDesktop--result": "styles__searchBarDesktop--result___2bQQy",
36
+ "suggestionsPlaceholder": "styles__suggestionsPlaceholder___y-vsv",
37
+ "search-bar-icon": "styles__search-bar-icon___1affF"
38
+ };
25
39
 
26
40
  var AssistantMobile = function AssistantMobile() {
27
41
  var _useI18n = (0, _I18n.useI18n)(),
@@ -32,12 +46,13 @@ var AssistantMobile = function AssistantMobile() {
32
46
  return /*#__PURE__*/_react.default.createElement(_SearchBar.default, {
33
47
  size: "medium",
34
48
  icon: /*#__PURE__*/_react.default.createElement(_Icon.default, {
35
- className: "u-ml-1 u-mr-half",
36
- icon: _AssistantIcon.AssistantIcon,
37
- size: 24
49
+ className: (0, _classnames.default)('u-ml-1 u-mr-half', (0, _isTwakeTheme.isTwakeTheme)() ? styles['search-bar-icon'] : undefined),
50
+ icon: (0, _isTwakeTheme.isTwakeTheme)() ? _Magnifier.default : _AssistantIcon.AssistantIcon,
51
+ size: (0, _isTwakeTheme.isTwakeTheme)() ? 16 : 24
38
52
  }),
39
53
  type: "button",
40
- label: t('assistant.search.placeholder'),
54
+ label: (0, _helpers.isAssistantEnabled)() ? t('assistant.search.placeholder') : undefined // fallback on SearchBar default
55
+ ,
41
56
  onClick: function onClick() {
42
57
  return navigate('connected/search');
43
58
  } // FIXME this route is related to home app
@@ -15,6 +15,8 @@ var _react = _interopRequireDefault(require("react"));
15
15
 
16
16
  var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
17
17
 
18
+ var _isTwakeTheme = require("cozy-ui/transpiled/react/helpers/isTwakeTheme");
19
+
18
20
  var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
19
21
 
20
22
  var _ChatItem = _interopRequireDefault(require("./ChatItem"));
@@ -23,6 +25,8 @@ var _Sources = _interopRequireDefault(require("./Sources/Sources"));
23
25
 
24
26
  var _AssistantIcon = require("../AssistantIcon/AssistantIcon");
25
27
 
28
+ var _TwakeAssistantIcon = require("../AssistantIcon/TwakeAssistantIcon");
29
+
26
30
  var _excluded = ["label", "className", "id", "sources"];
27
31
 
28
32
  var ChatAssistantItem = function ChatAssistantItem(_ref) {
@@ -39,10 +43,14 @@ var ChatAssistantItem = function ChatAssistantItem(_ref) {
39
43
  label: label,
40
44
  className: className,
41
45
  icon: /*#__PURE__*/_react.default.createElement(_Icon.default, {
42
- icon: _AssistantIcon.AssistantIcon,
43
- size: 32
46
+ icon: (0, _isTwakeTheme.isTwakeTheme)() ? _TwakeAssistantIcon.TwakeAssistantIcon : _AssistantIcon.AssistantIcon,
47
+ size: (0, _isTwakeTheme.isTwakeTheme)() ? 24 : 32,
48
+ className: (0, _isTwakeTheme.isTwakeTheme)() ? 'u-mh-half' : undefined,
49
+ color: "var(--primaryColor)"
44
50
  }),
45
- name: t('assistant.name')
51
+ name: t('assistant.name', {
52
+ name: (0, _isTwakeTheme.isTwakeTheme)() ? 'Twake' : 'Cozy'
53
+ })
46
54
  })), (sources === null || sources === void 0 ? void 0 : sources.length) > 0 && /*#__PURE__*/_react.default.createElement(_Sources.default, {
47
55
  messageId: id,
48
56
  sources: sources
@@ -21,6 +21,8 @@ var _List = _interopRequireDefault(require("cozy-ui/transpiled/react/List"));
21
21
 
22
22
  var _ListItemSkeleton = _interopRequireDefault(require("cozy-ui/transpiled/react/Skeletons/ListItemSkeleton"));
23
23
 
24
+ var _isTwakeTheme = require("cozy-ui/transpiled/react/helpers/isTwakeTheme");
25
+
24
26
  var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
25
27
 
26
28
  var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
@@ -98,7 +100,7 @@ var ResultMenuContent = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
98
100
 
99
101
  return /*#__PURE__*/_react.default.createElement(_List.default, {
100
102
  ref: ref
101
- }, (0, _helpers.isAssistantEnabled)() && /*#__PURE__*/_react.default.createElement(_ResultMenuItem.default, {
103
+ }, (0, _helpers.isAssistantEnabled)() && !(0, _isTwakeTheme.isTwakeTheme)() && /*#__PURE__*/_react.default.createElement(_ResultMenuItem.default, {
102
104
  icon: /*#__PURE__*/_react.default.createElement(_Circle.default, {
103
105
  size: "small"
104
106
  }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
@@ -0,0 +1,4 @@
1
+ export function AssistantButton({ onClick, size }: {
2
+ onClick: any;
3
+ size: any;
4
+ }): JSX.Element;
@@ -0,0 +1,36 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.AssistantButton = void 0;
9
+
10
+ var _react = _interopRequireDefault(require("react"));
11
+
12
+ var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
13
+
14
+ var _IconButton = _interopRequireDefault(require("cozy-ui/transpiled/react/IconButton"));
15
+
16
+ var _InputAdornment = _interopRequireDefault(require("cozy-ui/transpiled/react/InputAdornment"));
17
+
18
+ var _TwakeAssistantIcon = require("../AssistantIcon/TwakeAssistantIcon");
19
+
20
+ var AssistantButton = function AssistantButton(_ref) {
21
+ var onClick = _ref.onClick,
22
+ size = _ref.size;
23
+ return /*#__PURE__*/_react.default.createElement(_InputAdornment.default, {
24
+ position: "end",
25
+ className: "u-mr-half"
26
+ }, /*#__PURE__*/_react.default.createElement(_IconButton.default, {
27
+ onClick: onClick,
28
+ size: "small",
29
+ color: "primary"
30
+ }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
31
+ icon: _TwakeAssistantIcon.TwakeAssistantIcon,
32
+ size: size === 'medium' ? 24 : 16
33
+ })));
34
+ };
35
+
36
+ exports.AssistantButton = AssistantButton;
@@ -1,15 +1,17 @@
1
1
  export default SearchBarDesktop;
2
- declare function SearchBarDesktop({ value, onClear, onChange, elevation, size, hasHalfBorderRadius }: {
2
+ declare function SearchBarDesktop({ value, onClear, onChange, elevation, size, hasHalfBorderRadius, className, disabledHover }: {
3
3
  value: any;
4
4
  onClear: any;
5
5
  onChange: any;
6
6
  elevation: any;
7
7
  size: any;
8
8
  hasHalfBorderRadius: any;
9
+ className: any;
10
+ disabledHover: any;
9
11
  }): JSX.Element;
10
12
  declare namespace SearchBarDesktop {
11
13
  namespace defaultProps {
12
14
  let size: string;
13
- let elevation: boolean;
15
+ let elevation: number;
14
16
  }
15
17
  }
@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _classnames = _interopRequireDefault(require("classnames"));
11
+
10
12
  var _react = _interopRequireWildcard(require("react"));
11
13
 
12
14
  var _reactRouterDom = require("react-router-dom");
@@ -23,6 +25,8 @@ var _isTwakeTheme = require("cozy-ui/transpiled/react/helpers/isTwakeTheme");
23
25
 
24
26
  var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
25
27
 
28
+ var _AssistantButton = require("./AssistantButton");
29
+
26
30
  var _SearchProvider = require("./SearchProvider");
27
31
 
28
32
  var _AssistantIcon = require("../AssistantIcon/AssistantIcon");
@@ -39,7 +43,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
39
43
 
40
44
  var styles = {
41
45
  "searchBarDesktop--result": "styles__searchBarDesktop--result___2bQQy",
42
- "suggestionsPlaceholder": "styles__suggestionsPlaceholder___y-vsv"
46
+ "suggestionsPlaceholder": "styles__suggestionsPlaceholder___y-vsv",
47
+ "search-bar-icon": "styles__search-bar-icon___1affF"
43
48
  };
44
49
 
45
50
  var SearchBarDesktop = function SearchBarDesktop(_ref) {
@@ -48,7 +53,9 @@ var SearchBarDesktop = function SearchBarDesktop(_ref) {
48
53
  onChange = _ref.onChange,
49
54
  elevation = _ref.elevation,
50
55
  size = _ref.size,
51
- hasHalfBorderRadius = _ref.hasHalfBorderRadius;
56
+ hasHalfBorderRadius = _ref.hasHalfBorderRadius,
57
+ className = _ref.className,
58
+ disabledHover = _ref.disabledHover;
52
59
 
53
60
  var _useI18n = (0, _I18n.useI18n)(),
54
61
  t = _useI18n.t;
@@ -133,28 +140,33 @@ var SearchBarDesktop = function SearchBarDesktop(_ref) {
133
140
  onClickAway: onClear
134
141
  }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_SearchBar.default, {
135
142
  elevation: elevation,
136
- className: searchValue && hasHalfBorderRadius ? styles['searchBarDesktop--result'] : '',
143
+ className: (0, _classnames.default)(className, searchValue && hasHalfBorderRadius ? styles['searchBarDesktop--result'] : ''),
137
144
  ref: searchRef,
138
145
  size: size,
139
146
  icon: size === 'large' ? /*#__PURE__*/_react.default.createElement(_Icon.default, {
140
- className: "u-mh-1",
147
+ className: (0, _classnames.default)('u-mh-1', (0, _isTwakeTheme.isTwakeTheme)() ? styles['search-bar-icon'] : undefined),
141
148
  icon: (0, _isTwakeTheme.isTwakeTheme)() ? _Magnifier.default : _AssistantIcon.AssistantIcon,
142
149
  size: (0, _isTwakeTheme.isTwakeTheme)() ? 24 : 32
143
150
  }) : /*#__PURE__*/_react.default.createElement(_Icon.default, {
144
- className: "u-ml-1 u-mr-half",
151
+ className: (0, _classnames.default)('u-ml-1 u-mr-half', (0, _isTwakeTheme.isTwakeTheme)() ? styles['search-bar-icon'] : undefined),
145
152
  icon: (0, _isTwakeTheme.isTwakeTheme)() ? _Magnifier.default : _AssistantIcon.AssistantIcon,
146
153
  size: (0, _isTwakeTheme.isTwakeTheme)() ? 16 : 24
147
154
  }),
148
- placeholder: (0, _helpers.isAssistantEnabled)() ? t('assistant.search.placeholder') : undefined // fallback on SearchBar default
155
+ placeholder: (0, _helpers.isAssistantEnabled)() && !(0, _isTwakeTheme.isTwakeTheme)() ? t('assistant.search.placeholder') : undefined // fallback on SearchBar default
149
156
  ,
150
157
  value: value,
151
158
  componentsProps: {
152
159
  inputBase: {
153
- onKeyDown: handleKeyDown
160
+ onKeyDown: handleKeyDown,
161
+ endAdornment: (0, _helpers.isAssistantEnabled)() && (0, _isTwakeTheme.isTwakeTheme)() ? /*#__PURE__*/_react.default.createElement(_AssistantButton.AssistantButton, {
162
+ onClick: handleClick,
163
+ size: size
164
+ }) : undefined
154
165
  }
155
166
  },
156
167
  disabledClear: true,
157
168
  disabledFocus: value !== '',
169
+ disabledHover: disabledHover,
158
170
  onChange: onChange
159
171
  }), searchValue && /*#__PURE__*/_react.default.createElement(_ResultMenu.default, {
160
172
  listRef: listRef,
@@ -165,7 +177,7 @@ var SearchBarDesktop = function SearchBarDesktop(_ref) {
165
177
 
166
178
  SearchBarDesktop.defaultProps = {
167
179
  size: 'large',
168
- elevation: false
180
+ elevation: 0
169
181
  };
170
182
  var _default = SearchBarDesktop;
171
183
  exports.default = _default;
@@ -25,7 +25,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
25
25
 
26
26
  var styles = {
27
27
  "searchBarDesktop--result": "styles__searchBarDesktop--result___2bQQy",
28
- "suggestionsPlaceholder": "styles__suggestionsPlaceholder___y-vsv"
28
+ "suggestionsPlaceholder": "styles__suggestionsPlaceholder___y-vsv",
29
+ "search-bar-icon": "styles__search-bar-icon___1affF"
29
30
  };
30
31
 
31
32
  var SuggestionsPlaceholder = function SuggestionsPlaceholder() {
@@ -5,3 +5,6 @@
5
5
  position absolute
6
6
  opacity 0.42
7
7
  pointer-events none
8
+
9
+ .search-bar-icon
10
+ opacity 0.42
@@ -10,7 +10,7 @@
10
10
  "dialog": {
11
11
  "close": "Close"
12
12
  },
13
- "name": "Cozy Assistant",
13
+ "name": "%{name} Assistant",
14
14
  "sources": "%{smart_count} source |||| %{smart_count} sources",
15
15
  "suggestions": {
16
16
  "find_file": "Search a file",
@@ -10,7 +10,7 @@
10
10
  "dialog": {
11
11
  "close": "Fermer"
12
12
  },
13
- "name": "Assistant Cozy",
13
+ "name": "Assistant %{name}",
14
14
  "sources": "%{smart_count} source |||| %{smart_count} sources",
15
15
  "suggestions": {
16
16
  "find_file": "Rechercher un fichier",
@@ -16,7 +16,7 @@ var en = {
16
16
  dialog: {
17
17
  close: "Close"
18
18
  },
19
- name: "Cozy Assistant",
19
+ name: "%{name} Assistant",
20
20
  sources: "%{smart_count} source |||| %{smart_count} sources",
21
21
  suggestions: {
22
22
  find_file: "Search a file",
@@ -37,7 +37,7 @@ var fr = {
37
37
  dialog: {
38
38
  close: "Fermer"
39
39
  },
40
- name: "Assistant Cozy",
40
+ name: "Assistant %{name}",
41
41
  sources: "%{smart_count} source |||| %{smart_count} sources",
42
42
  suggestions: {
43
43
  find_file: "Rechercher un fichier",
@@ -1,5 +1,18 @@
1
1
  /* imported from styles.styl */
2
2
 
3
+ .styles__searchBarDesktop--result___2bQQy {
4
+ border-radius: 28px 28px 0 0 !important;
5
+ }
6
+ .styles__suggestionsPlaceholder___y-vsv {
7
+ position: absolute;
8
+ opacity: 0.42;
9
+ pointer-events: none;
10
+ }
11
+ .styles__search-bar-icon___1affF {
12
+ opacity: 0.42;
13
+ }
14
+ /* imported from styles.styl */
15
+
3
16
  .styles__conversationBar___2J-Us {
4
17
  max-height: 95px;
5
18
  min-height: 48px;
@@ -36,13 +49,3 @@
36
49
  max-height: 16.5rem;
37
50
  overflow: auto;
38
51
  }
39
- /* imported from styles.styl */
40
-
41
- .styles__searchBarDesktop--result___2bQQy {
42
- border-radius: 28px 28px 0 0 !important;
43
- }
44
- .styles__suggestionsPlaceholder___y-vsv {
45
- position: absolute;
46
- opacity: 0.42;
47
- pointer-events: none;
48
- }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cozy-search",
3
3
  "description": "UI components about search bar and IA assistant",
4
- "version": "0.2.0",
4
+ "version": "0.4.0",
5
5
  "author": {
6
6
  "name": "Cozy Cloud",
7
7
  "url": "https://github.com/cozy"
@@ -33,7 +33,7 @@
33
33
  "cozy-minilog": "^3.10.0",
34
34
  "cozy-pouch-link": "^54.0.0",
35
35
  "cozy-realtime": "^5.6.4",
36
- "cozy-ui": "^121.5.0",
36
+ "cozy-ui": "^122.0.0",
37
37
  "cross-fetch": "^4.0.0",
38
38
  "jest": "26.6.3",
39
39
  "react": "16.12.0",
@@ -65,7 +65,7 @@
65
65
  "cozy-minilog": ">=3.3.1",
66
66
  "cozy-pouch-link": "54.0.0",
67
67
  "cozy-realtime": ">=5.6.4",
68
- "cozy-ui": ">=121.5.0",
68
+ "cozy-ui": ">=122.0.0",
69
69
  "react": ">=16.12.0",
70
70
  "react-dom": ">=16.12.0",
71
71
  "react-router-dom": "^6.28.0"
@@ -87,5 +87,5 @@
87
87
  "lint": "cd .. && yarn eslint --ext js,jsx,ts packages/cozy-search"
88
88
  },
89
89
  "types": "dist/index.d.ts",
90
- "gitHead": "d2122e0f9492fa7c715991843f5a8f644ef202e4"
90
+ "gitHead": "65814cf1789101b9b9bf84575810dc26eb05d8c4"
91
91
  }