@atlaskit/quick-search 8.2.3 → 9.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/CHANGELOG.md +31 -0
  2. package/dist/cjs/components/QuickSearch.js +22 -25
  3. package/dist/cjs/components/ResultItem/ResultItem.js +11 -21
  4. package/dist/cjs/components/ResultItem/ResultItemGroup.js +9 -13
  5. package/dist/cjs/components/ResultItem/styled.js +1 -15
  6. package/dist/cjs/components/Results/ContainerResult.js +6 -9
  7. package/dist/cjs/components/Results/ObjectResult.js +6 -9
  8. package/dist/cjs/components/Results/PersonResult.js +7 -10
  9. package/dist/cjs/components/Results/ResultBase.js +11 -20
  10. package/dist/cjs/components/Search/Search.js +8 -11
  11. package/dist/cjs/components/decorateWithAnalyticsData.js +10 -13
  12. package/dist/es2019/components/ResultItem/ResultItem.js +6 -11
  13. package/dist/es2019/components/ResultItem/ResultItemGroup.js +4 -6
  14. package/dist/es2019/components/ResultItem/styled.js +0 -14
  15. package/dist/es2019/components/Results/ResultBase.js +2 -8
  16. package/dist/es2019/components/decorateWithAnalyticsData.js +4 -4
  17. package/dist/esm/components/QuickSearch.js +22 -25
  18. package/dist/esm/components/ResultItem/ResultItem.js +11 -18
  19. package/dist/esm/components/ResultItem/ResultItemGroup.js +9 -13
  20. package/dist/esm/components/ResultItem/styled.js +0 -14
  21. package/dist/esm/components/Results/ContainerResult.js +6 -9
  22. package/dist/esm/components/Results/ObjectResult.js +6 -9
  23. package/dist/esm/components/Results/PersonResult.js +7 -10
  24. package/dist/esm/components/Results/ResultBase.js +11 -20
  25. package/dist/esm/components/Search/Search.js +8 -11
  26. package/dist/esm/components/decorateWithAnalyticsData.js +10 -13
  27. package/dist/types/components/ResultItem/ResultItem.d.ts +1 -9
  28. package/dist/types/components/ResultItem/ResultItemGroup.d.ts +1 -1
  29. package/dist/types/components/ResultItem/styled.d.ts +0 -2
  30. package/dist/types-ts4.5/components/ResultItem/ResultItem.d.ts +1 -9
  31. package/dist/types-ts4.5/components/ResultItem/ResultItemGroup.d.ts +1 -1
  32. package/dist/types-ts4.5/components/ResultItem/styled.d.ts +0 -2
  33. package/package.json +4 -4
  34. package/tsconfig.json +0 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,36 @@
1
1
  # @atlaskit/quick-search
2
2
 
3
+ ## 9.0.0
4
+
5
+ ### Major Changes
6
+
7
+ - [#105355](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105355)
8
+ [`ca71694e29a27`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ca71694e29a27) -
9
+ Removed dependency on `@atlaskit/item` and replaced its usage with `@atlaskit/menu`. The following
10
+ ResultItem props have been **removed** as a result of this change:
11
+
12
+ - onMouseEnter
13
+ - onMouseLeave
14
+ - isCompact
15
+ - linkComponent
16
+
17
+ Additionally the following types have changed:
18
+
19
+ - ResultItemGroup's `title` prop has been restricted to `string`
20
+ - ResultItem's `onClick` prop has been changed to
21
+ `(e: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>): void` to match that of
22
+ `@atlaskit/menu`'s LinkItem types
23
+
24
+ ### Patch Changes
25
+
26
+ - Updated dependencies
27
+
28
+ ## 8.2.4
29
+
30
+ ### Patch Changes
31
+
32
+ - Updated dependencies
33
+
3
34
  ## 8.2.3
4
35
 
5
36
  ### Patch Changes
@@ -7,10 +7,9 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = exports.QuickSearch = void 0;
8
8
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
9
9
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
10
- var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
11
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
12
10
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
13
11
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
12
+ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
14
13
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
14
  var _react = _interopRequireDefault(require("react"));
16
15
  var _keycode = _interopRequireDefault(require("keycode"));
@@ -21,7 +20,7 @@ var _decorateWithAnalyticsData = _interopRequireDefault(require("./decorateWithA
21
20
  var _constants = require("./constants");
22
21
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
23
22
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
24
- function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
23
+ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
25
24
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
26
25
  /**
27
26
  * Get the result ID of a result by its index in the flatResults array
@@ -77,16 +76,14 @@ var adjustIndex = function adjustIndex(arrayLength, currentIndex, adjustment) {
77
76
  return adjustedIndex >= 0 ? adjustedIndex : adjustedIndex + arrayLength;
78
77
  };
79
78
  var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component) {
80
- (0, _inherits2.default)(QuickSearch, _React$Component);
81
- var _super = _createSuper(QuickSearch);
82
79
  function QuickSearch(props) {
83
80
  var _this;
84
81
  (0, _classCallCheck2.default)(this, QuickSearch);
85
- _this = _super.call(this, props);
86
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "flatResults", []);
87
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "hasSearchQueryEventFired", false);
88
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "hasKeyDownEventFired", false);
89
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "lastKeyPressed", '');
82
+ _this = _callSuper(this, QuickSearch, [props]);
83
+ (0, _defineProperty2.default)(_this, "flatResults", []);
84
+ (0, _defineProperty2.default)(_this, "hasSearchQueryEventFired", false);
85
+ (0, _defineProperty2.default)(_this, "hasKeyDownEventFired", false);
86
+ (0, _defineProperty2.default)(_this, "lastKeyPressed", '');
90
87
  /**
91
88
  * Uses the virtual list, this.flatResults, to move the selection across grouped results as if
92
89
  * results were in a single, circular list.
@@ -96,7 +93,7 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
96
93
  * 2. Increments or decrements this index by the supplied adjustment amount,
97
94
  * 3. Sets the new selectedResultId based on the modifed index
98
95
  */
99
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "adjustSelectedResultIndex", function (adjustment) {
96
+ (0, _defineProperty2.default)(_this, "adjustSelectedResultIndex", function (adjustment) {
100
97
  var currentIndex = getResultIndexById(_this.flatResults, _this.state.selectedResultId);
101
98
  var newIndex = adjustIndex(_this.flatResults.length, currentIndex, adjustment);
102
99
  var selectedResultId = getResultIdByIndex(_this.flatResults, newIndex);
@@ -111,17 +108,17 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
111
108
  }
112
109
  });
113
110
  /** Select next result */
114
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selectNext", function () {
111
+ (0, _defineProperty2.default)(_this, "selectNext", function () {
115
112
  _this.adjustSelectedResultIndex(+1);
116
113
  });
117
114
  /** Select previous result */
118
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selectPrevious", function () {
115
+ (0, _defineProperty2.default)(_this, "selectPrevious", function () {
119
116
  _this.adjustSelectedResultIndex(-1);
120
117
  });
121
118
  /**
122
119
  * Callback for register results in flatResults
123
120
  */
124
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleRegisterResult", function (result) {
121
+ (0, _defineProperty2.default)(_this, "handleRegisterResult", function (result) {
125
122
  if (!getResultById(_this.flatResults, result.props.resultId)) {
126
123
  _this.flatResults.push(result);
127
124
  }
@@ -134,7 +131,7 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
134
131
  * 3. All ResultBase components call registerResult() in order to register itself in quick search
135
132
  * 4. All ResultBase components call unregisterResult() in order to unregister itself in quick search
136
133
  */
137
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleUnregisterResult", function (result) {
134
+ (0, _defineProperty2.default)(_this, "handleUnregisterResult", function (result) {
138
135
  var resultIndex = getResultIndexById(_this.flatResults, result.props.resultId);
139
136
  if (resultIndex !== null && +resultIndex >= 0) {
140
137
  _this.flatResults.splice(resultIndex, 1);
@@ -144,7 +141,7 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
144
141
  * Callback for mouseEnter events on individual results
145
142
  * Move selection to hovered result
146
143
  */
147
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleResultMouseEnter", function (resultData) {
144
+ (0, _defineProperty2.default)(_this, "handleResultMouseEnter", function (resultData) {
148
145
  _this.setState({
149
146
  selectedResultId: resultData && resultData.resultId
150
147
  });
@@ -153,7 +150,7 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
153
150
  * Callback for mouseLeave events on individual results
154
151
  * Clear result selection
155
152
  */
156
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleResultMouseLeave", function () {
153
+ (0, _defineProperty2.default)(_this, "handleResultMouseLeave", function () {
157
154
  _this.setState({
158
155
  selectedResultId: null
159
156
  });
@@ -161,13 +158,13 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
161
158
  /**
162
159
  * Clear result selection when search input is blurred
163
160
  */
164
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSearchBlur", function (event) {
161
+ (0, _defineProperty2.default)(_this, "handleSearchBlur", function (event) {
165
162
  _this.props.onSearchBlur(event);
166
163
  _this.setState({
167
164
  selectedResultId: null
168
165
  });
169
166
  });
170
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onInput", function (event) {
167
+ (0, _defineProperty2.default)(_this, "onInput", function (event) {
171
168
  var onSearchInput = _this.props.onSearchInput;
172
169
  _this.setState({
173
170
  value: event.currentTarget.value
@@ -183,7 +180,7 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
183
180
  * Enter - Submit selected result
184
181
  * Tab / ArrowRight - Accept autocomplete
185
182
  */
186
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleSearchKeyDown", function (event) {
183
+ (0, _defineProperty2.default)(_this, "handleSearchKeyDown", function (event) {
187
184
  var firePrivateAnalyticsEvent = _this.props.firePrivateAnalyticsEvent;
188
185
  _this.props.onSearchKeyDown(event);
189
186
  _this.lastKeyPressed = event.key;
@@ -252,7 +249,7 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
252
249
  }
253
250
  }
254
251
  });
255
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "acceptAutocomplete", function (event, text) {
252
+ (0, _defineProperty2.default)(_this, "acceptAutocomplete", function (event, text) {
256
253
  var onSearchInput = _this.props.onSearchInput;
257
254
  var newValue = "".concat(text, " ");
258
255
  if (_this.inputSearchRef) {
@@ -266,12 +263,12 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
266
263
  onSearchInput(event, true);
267
264
  }
268
265
  });
269
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setSearchInputRef", function (refs) {
266
+ (0, _defineProperty2.default)(_this, "setSearchInputRef", function (refs) {
270
267
  if (refs && refs.inputRef) {
271
268
  _this.inputSearchRef = refs.inputRef;
272
269
  }
273
270
  });
274
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "focusSearchInput", function () {
271
+ (0, _defineProperty2.default)(_this, "focusSearchInput", function () {
275
272
  if (_this.inputSearchRef &&
276
273
  // @ts-ignore unchecked
277
274
  typeof _this.inputSearchRef.focus === 'function') {
@@ -297,7 +294,8 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
297
294
  };
298
295
  return _this;
299
296
  }
300
- (0, _createClass2.default)(QuickSearch, [{
297
+ (0, _inherits2.default)(QuickSearch, _React$Component);
298
+ return (0, _createClass2.default)(QuickSearch, [{
301
299
  key: "componentDidMount",
302
300
  value: function componentDidMount() {
303
301
  var firePrivateAnalyticsEvent = this.props.firePrivateAnalyticsEvent;
@@ -387,7 +385,6 @@ var QuickSearch = exports.QuickSearch = /*#__PURE__*/function (_React$Component)
387
385
  }, this.props.children)));
388
386
  }
389
387
  }]);
390
- return QuickSearch;
391
388
  }(_react.default.Component);
392
389
  /**
393
390
  * HOCs:
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
- var _typeof = require("@babel/runtime/helpers/typeof");
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
@@ -9,26 +8,22 @@ exports.default = void 0;
9
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
9
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
13
11
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
14
12
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
13
+ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
15
14
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
16
15
  var _react = _interopRequireDefault(require("react"));
17
- var _item = _interopRequireWildcard(require("@atlaskit/item"));
16
+ var _menu = require("@atlaskit/menu");
18
17
  var _styled = require("./styled");
19
- function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
20
- function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
21
- function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
18
+ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
22
19
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
23
- var Item = (0, _item.withItemClick)((0, _item.withItemFocus)(_item.default));
24
20
  var ResultItem = /*#__PURE__*/function (_React$PureComponent) {
25
- (0, _inherits2.default)(ResultItem, _React$PureComponent);
26
- var _super = _createSuper(ResultItem);
27
21
  function ResultItem() {
28
22
  (0, _classCallCheck2.default)(this, ResultItem);
29
- return _super.apply(this, arguments);
23
+ return _callSuper(this, ResultItem, arguments);
30
24
  }
31
- (0, _createClass2.default)(ResultItem, [{
25
+ (0, _inherits2.default)(ResultItem, _React$PureComponent);
26
+ return (0, _createClass2.default)(ResultItem, [{
32
27
  key: "render",
33
28
  value: function render() {
34
29
  var icon = this.props.icon ? /*#__PURE__*/_react.default.createElement(_styled.ResultItemIcon, null, this.props.icon) : null;
@@ -40,22 +35,17 @@ var ResultItem = /*#__PURE__*/function (_React$PureComponent) {
40
35
  var wrappedSubText = this.props.subText ? /*#__PURE__*/_react.default.createElement(_styled.ResultItemSubText, null, this.props.subText) : null;
41
36
  var interactiveWrapperProps = {
42
37
  onClick: this.props.onClick,
43
- onMouseEnter: this.props.onMouseEnter,
44
- onMouseLeave: this.props.onMouseLeave,
45
38
  href: this.props.href
46
39
  };
47
- return /*#__PURE__*/_react.default.createElement(Item, (0, _extends2.default)({
48
- elemBefore: icon,
49
- elemAfter: after,
50
- description: wrappedSubText,
40
+ return /*#__PURE__*/_react.default.createElement(_menu.LinkItem, (0, _extends2.default)({
41
+ iconBefore: icon,
42
+ iconAfter: after,
43
+ description: wrappedSubText || undefined,
51
44
  isSelected: this.props.isSelected,
52
- isCompact: this.props.isCompact,
53
- target: this.props.target,
54
- linkComponent: this.props.linkComponent
45
+ target: this.props.target
55
46
  }, interactiveWrapperProps), this.props.text, wrappedCaption);
56
47
  }
57
48
  }]);
58
- return ResultItem;
59
49
  }(_react.default.PureComponent);
60
50
  (0, _defineProperty2.default)(ResultItem, "defaultProps", {
61
51
  isSelected: false,
@@ -7,32 +7,28 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = void 0;
8
8
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
9
9
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
10
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
11
10
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
12
11
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
12
+ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
13
13
  var _react = _interopRequireDefault(require("react"));
14
- var _item = require("@atlaskit/item");
15
- var _styled = require("./styled");
16
- function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
14
+ var _menu = require("@atlaskit/menu");
15
+ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
17
16
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
18
17
  var ResultItemGroup = exports.default = /*#__PURE__*/function (_React$Component) {
19
- (0, _inherits2.default)(ResultItemGroup, _React$Component);
20
- var _super = _createSuper(ResultItemGroup);
21
18
  function ResultItemGroup() {
22
19
  (0, _classCallCheck2.default)(this, ResultItemGroup);
23
- return _super.apply(this, arguments);
20
+ return _callSuper(this, ResultItemGroup, arguments);
24
21
  }
25
- (0, _createClass2.default)(ResultItemGroup, [{
22
+ (0, _inherits2.default)(ResultItemGroup, _React$Component);
23
+ return (0, _createClass2.default)(ResultItemGroup, [{
26
24
  key: "render",
27
25
  value: function render() {
28
26
  var _this$props = this.props,
29
27
  title = _this$props.title,
30
28
  children = _this$props.children;
31
- var wrappedTitle = /*#__PURE__*/_react.default.createElement(_styled.ResultItemGroupHeader, null, /*#__PURE__*/_react.default.createElement(_styled.ResultItemGroupTitle, null, title));
32
- return /*#__PURE__*/_react.default.createElement(_item.ItemGroup, {
33
- title: wrappedTitle
34
- }, children);
29
+ return /*#__PURE__*/_react.default.createElement(_menu.MenuGroup, null, /*#__PURE__*/_react.default.createElement(_menu.Section, {
30
+ title: title
31
+ }, children));
35
32
  }
36
33
  }]);
37
- return ResultItemGroup;
38
34
  }(_react.default.Component);
@@ -4,25 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.ResultItemTextAfter = exports.ResultItemSubText = exports.ResultItemIcon = exports.ResultItemGroupTitle = exports.ResultItemGroupHeader = exports.ResultItemCaption = exports.ResultItemAfterWrapper = exports.ResultItemAfter = void 0;
7
+ exports.ResultItemTextAfter = exports.ResultItemSubText = exports.ResultItemIcon = exports.ResultItemCaption = exports.ResultItemAfterWrapper = exports.ResultItemAfter = void 0;
8
8
  var _styledComponents = _interopRequireDefault(require("styled-components"));
9
9
  var _colors = require("@atlaskit/theme/colors");
10
10
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
11
11
 
12
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
13
- var ResultItemGroupHeader = exports.ResultItemGroupHeader = _styledComponents.default.div({
14
- display: 'flex',
15
- marginLeft: "var(--ds-space-negative-150, -12px)",
16
- marginTop: "var(--ds-space-150, 12px)"
17
- });
18
-
19
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
20
- var ResultItemGroupTitle = exports.ResultItemGroupTitle = _styledComponents.default.div({
21
- font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
22
- lineHeight: '16px',
23
- fontWeight: "var(--ds-font-weight-semibold, 600)"
24
- });
25
-
26
12
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-dynamic-styles -- Ignored via go/DSP-18766
27
13
  var ResultItemAfter = exports.ResultItemAfter = _styledComponents.default.div(function (props) {
28
14
  return {
@@ -9,31 +9,28 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
9
9
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
10
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
- var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
13
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
14
12
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
15
13
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
14
+ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
16
15
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
16
  var _react = _interopRequireDefault(require("react"));
18
17
  var _avatar = _interopRequireDefault(require("@atlaskit/avatar"));
19
18
  var _ResultBase = _interopRequireDefault(require("./ResultBase"));
20
19
  var _excluded = ["name", "isPrivate", "type", "subText"];
21
- function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
20
+ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
22
21
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
23
22
  /**
24
23
  * Generic result type for Atlassian containers.
25
24
  */
26
25
  var ContainerResult = exports.default = /*#__PURE__*/function (_React$PureComponent) {
27
- (0, _inherits2.default)(ContainerResult, _React$PureComponent);
28
- var _super = _createSuper(ContainerResult);
29
26
  function ContainerResult() {
30
27
  var _this;
31
28
  (0, _classCallCheck2.default)(this, ContainerResult);
32
29
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
33
30
  args[_key] = arguments[_key];
34
31
  }
35
- _this = _super.call.apply(_super, [this].concat(args));
36
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getAvatar", function () {
32
+ _this = _callSuper(this, ContainerResult, [].concat(args));
33
+ (0, _defineProperty2.default)(_this, "getAvatar", function () {
37
34
  if (_this.props.avatar) {
38
35
  return _this.props.avatar;
39
36
  }
@@ -47,7 +44,8 @@ var ContainerResult = exports.default = /*#__PURE__*/function (_React$PureCompon
47
44
  });
48
45
  return _this;
49
46
  }
50
- (0, _createClass2.default)(ContainerResult, [{
47
+ (0, _inherits2.default)(ContainerResult, _React$PureComponent);
48
+ return (0, _createClass2.default)(ContainerResult, [{
51
49
  key: "render",
52
50
  value: function render() {
53
51
  var _this$props = this.props,
@@ -65,5 +63,4 @@ var ContainerResult = exports.default = /*#__PURE__*/function (_React$PureCompon
65
63
  }));
66
64
  }
67
65
  }]);
68
- return ContainerResult;
69
66
  }(_react.default.PureComponent);
@@ -9,31 +9,28 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
9
9
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
10
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
- var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
13
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
14
12
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
15
13
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
14
+ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
16
15
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
16
  var _react = _interopRequireDefault(require("react"));
18
17
  var _avatar = _interopRequireDefault(require("@atlaskit/avatar"));
19
18
  var _ResultBase = _interopRequireDefault(require("./ResultBase"));
20
19
  var _excluded = ["name", "containerName", "isPrivate", "objectKey", "type"];
21
- function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
20
+ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
22
21
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
23
22
  /**
24
23
  * Generic result type for Atlassian objects.
25
24
  */
26
25
  var ObjectResult = exports.default = /*#__PURE__*/function (_React$PureComponent) {
27
- (0, _inherits2.default)(ObjectResult, _React$PureComponent);
28
- var _super = _createSuper(ObjectResult);
29
26
  function ObjectResult() {
30
27
  var _this;
31
28
  (0, _classCallCheck2.default)(this, ObjectResult);
32
29
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
33
30
  args[_key] = arguments[_key];
34
31
  }
35
- _this = _super.call.apply(_super, [this].concat(args));
36
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getAvatar", function () {
32
+ _this = _callSuper(this, ObjectResult, [].concat(args));
33
+ (0, _defineProperty2.default)(_this, "getAvatar", function () {
37
34
  if (_this.props.avatar) {
38
35
  return _this.props.avatar;
39
36
  }
@@ -48,7 +45,8 @@ var ObjectResult = exports.default = /*#__PURE__*/function (_React$PureComponent
48
45
  });
49
46
  return _this;
50
47
  }
51
- (0, _createClass2.default)(ObjectResult, [{
48
+ (0, _inherits2.default)(ObjectResult, _React$PureComponent);
49
+ return (0, _createClass2.default)(ObjectResult, [{
52
50
  key: "getSubtext",
53
51
  value: function getSubtext() {
54
52
  var _this$props = this.props,
@@ -78,5 +76,4 @@ var ObjectResult = exports.default = /*#__PURE__*/function (_React$PureComponent
78
76
  }));
79
77
  }
80
78
  }]);
81
- return ObjectResult;
82
79
  }(_react.default.PureComponent);
@@ -9,31 +9,28 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
9
9
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
10
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
- var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
13
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
14
12
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
15
13
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
14
+ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
16
15
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
16
  var _react = _interopRequireDefault(require("react"));
18
17
  var _avatar = _interopRequireDefault(require("@atlaskit/avatar"));
19
18
  var _ResultBase = _interopRequireDefault(require("./ResultBase"));
20
19
  var _excluded = ["name", "mentionName", "mentionPrefix", "presenceMessage", "presenceState", "type"];
21
- function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
20
+ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
22
21
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
23
22
  var PersonResult = exports.default = /*#__PURE__*/function (_React$PureComponent) {
24
- (0, _inherits2.default)(PersonResult, _React$PureComponent);
25
- var _super = _createSuper(PersonResult);
26
23
  function PersonResult() {
27
24
  var _this;
28
25
  (0, _classCallCheck2.default)(this, PersonResult);
29
26
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
30
27
  args[_key] = arguments[_key];
31
28
  }
32
- _this = _super.call.apply(_super, [this].concat(args));
33
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getMention", function () {
29
+ _this = _callSuper(this, PersonResult, [].concat(args));
30
+ (0, _defineProperty2.default)(_this, "getMention", function () {
34
31
  return _this.props.mentionName ? "".concat(_this.props.mentionPrefix).concat(_this.props.mentionName) : undefined;
35
32
  });
36
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getAvatar", function () {
33
+ (0, _defineProperty2.default)(_this, "getAvatar", function () {
37
34
  if (_this.props.avatar) {
38
35
  return _this.props.avatar;
39
36
  }
@@ -45,7 +42,8 @@ var PersonResult = exports.default = /*#__PURE__*/function (_React$PureComponent
45
42
  });
46
43
  return _this;
47
44
  }
48
- (0, _createClass2.default)(PersonResult, [{
45
+ (0, _inherits2.default)(PersonResult, _React$PureComponent);
46
+ return (0, _createClass2.default)(PersonResult, [{
49
47
  key: "render",
50
48
  value: function render() {
51
49
  var _this$props = this.props,
@@ -66,7 +64,6 @@ var PersonResult = exports.default = /*#__PURE__*/function (_React$PureComponent
66
64
  }));
67
65
  }
68
66
  }]);
69
- return PersonResult;
70
67
  }(_react.default.PureComponent);
71
68
  (0, _defineProperty2.default)(PersonResult, "defaultProps", {
72
69
  mentionPrefix: '@',
@@ -8,10 +8,9 @@ exports.default = exports.ResultBase = void 0;
8
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
10
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
11
- var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
12
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
13
11
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
14
12
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
13
+ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
15
14
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
16
15
  var _react = _interopRequireDefault(require("react"));
17
16
  var _constants = require("../constants");
@@ -19,24 +18,22 @@ var _ResultItem = _interopRequireDefault(require("../ResultItem/ResultItem"));
19
18
  var _context = require("../context");
20
19
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
21
20
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
22
- function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
21
+ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
23
22
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
24
23
  // context is an optional prop but the component provides a defaultProp. However, TS still complains
25
24
  // when you don't pass it. There doesn't seem to be a better way of declaring optional default props.
26
25
  var ResultBase = exports.ResultBase = /*#__PURE__*/function (_React$PureComponent) {
27
- (0, _inherits2.default)(ResultBase, _React$PureComponent);
28
- var _super = _createSuper(ResultBase);
29
26
  function ResultBase() {
30
27
  var _this;
31
28
  (0, _classCallCheck2.default)(this, ResultBase);
32
29
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
33
30
  args[_key] = arguments[_key];
34
31
  }
35
- _this = _super.call.apply(_super, [this].concat(args));
36
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
32
+ _this = _callSuper(this, ResultBase, [].concat(args));
33
+ (0, _defineProperty2.default)(_this, "state", {
37
34
  isMouseSelected: false
38
35
  });
39
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleClick", function (e) {
36
+ (0, _defineProperty2.default)(_this, "handleClick", function (e) {
40
37
  var _this$props = _this.props,
41
38
  onClick = _this$props.onClick,
42
39
  resultId = _this$props.resultId,
@@ -56,7 +53,7 @@ var ResultBase = exports.ResultBase = /*#__PURE__*/function (_React$PureComponen
56
53
  });
57
54
  }
58
55
  });
59
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleMouseEnter", function (event) {
56
+ (0, _defineProperty2.default)(_this, "handleMouseEnter", function (event) {
60
57
  _this.props.context.onMouseEnter({
61
58
  resultId: _this.props.resultId,
62
59
  type: _this.props.type,
@@ -66,7 +63,7 @@ var ResultBase = exports.ResultBase = /*#__PURE__*/function (_React$PureComponen
66
63
  isMouseSelected: true
67
64
  });
68
65
  });
69
- (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleMouseLeave", function () {
66
+ (0, _defineProperty2.default)(_this, "handleMouseLeave", function () {
70
67
  _this.props.context.onMouseLeave();
71
68
  _this.setState({
72
69
  isMouseSelected: false
@@ -74,7 +71,8 @@ var ResultBase = exports.ResultBase = /*#__PURE__*/function (_React$PureComponen
74
71
  });
75
72
  return _this;
76
73
  }
77
- (0, _createClass2.default)(ResultBase, [{
74
+ (0, _inherits2.default)(ResultBase, _React$PureComponent);
75
+ return (0, _createClass2.default)(ResultBase, [{
78
76
  key: "registerResult",
79
77
  value: function registerResult() {
80
78
  var context = this.props.context;
@@ -122,11 +120,9 @@ var ResultBase = exports.ResultBase = /*#__PURE__*/function (_React$PureComponen
122
120
  href = _this$props3.href,
123
121
  target = _this$props3.target,
124
122
  icon = _this$props3.icon,
125
- isCompact = _this$props3.isCompact,
126
123
  subText = _this$props3.subText,
127
124
  text = _this$props3.text,
128
- resultId = _this$props3.resultId,
129
- context = _this$props3.context;
125
+ resultId = _this$props3.resultId;
130
126
  var isMouseSelected = this.state.isMouseSelected;
131
127
  return /*#__PURE__*/_react.default.createElement(_context.SelectedResultIdContext.Consumer, null, function (selectedResultId) {
132
128
  return /*#__PURE__*/_react.default.createElement(_ResultItem.default, {
@@ -134,22 +130,17 @@ var ResultBase = exports.ResultBase = /*#__PURE__*/function (_React$PureComponen
134
130
  href: href,
135
131
  target: target,
136
132
  icon: icon,
137
- isCompact: isCompact,
138
133
  isSelected: resultId === selectedResultId,
139
134
  onClick: _this2.handleClick,
140
- onMouseEnter: _this2.handleMouseEnter,
141
- onMouseLeave: _this2.handleMouseLeave,
142
135
  isMouseSelected: isMouseSelected,
143
136
  subText: subText,
144
137
  text: text,
145
138
  textAfter: elemAfter,
146
- selectedIcon: selectedIcon,
147
- linkComponent: context.linkComponent
139
+ selectedIcon: selectedIcon
148
140
  });
149
141
  });
150
142
  }
151
143
  }]);
152
- return ResultBase;
153
144
  }(_react.default.PureComponent);
154
145
  (0, _defineProperty2.default)(ResultBase, "defaultProps", {
155
146
  type: 'base',