@atlaskit/editor-common 130.5.0 → 131.0.1

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,40 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 131.0.1
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 131.0.0
10
+
11
+ ### Major Changes
12
+
13
+ - [`317175303ec6a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/317175303ec6a) -
14
+ Replace `buildQuickInsertMenuModel` and `getMatchingQuickInsertComponents` in
15
+ `@atlaskit/editor-common/quick-insert/registered-menu-model` with a single
16
+ `getQuickInsertMenuModel`. It resolves the surface, root and footer once, then builds browse
17
+ sections for an empty query or ranked search results otherwise.
18
+
19
+ Breaking: `buildQuickInsertMenuModel` and `getMatchingQuickInsertComponents` are no longer
20
+ exported.
21
+
22
+ Migration:
23
+ - `buildQuickInsertMenuModel(components, rootComponent, selectCategoryItems, surfaceContext)` →
24
+ `getQuickInsertMenuModel({ components, formatMessage, query: '', rootComponent, selectCategoryItems, surfaceContext })`
25
+ - `getMatchingQuickInsertComponents({ components, formatMessage, query, rootComponent, surfaceContext })`
26
+ → `getQuickInsertMenuModel({ components, formatMessage, query, rootComponent, surfaceContext })`
27
+
28
+ ### Patch Changes
29
+
30
+ - Updated dependencies
31
+
32
+ ## 130.5.1
33
+
34
+ ### Patch Changes
35
+
36
+ - Updated dependencies
37
+
3
38
  ## 130.5.0
4
39
 
5
40
  ### Minor Changes
@@ -27,7 +27,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
27
27
  var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
28
28
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
29
29
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
30
- var packageVersion = "130.4.2";
30
+ var packageVersion = "131.0.0";
31
31
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
32
32
  // Remove URL as it has UGC
33
33
  // Ignored via go/ees007
@@ -4,13 +4,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.getMatchingQuickInsertComponents = void 0;
7
+ exports.getQuickInsertMenuModel = void 0;
8
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
8
9
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
10
  var _surfaceRenderer = require("@atlaskit/editor-ui-control-model/surface-renderer");
10
11
  var _isMenuFooterSectionKey = require("../type-ahead/isMenuFooterSectionKey");
11
12
  var _isSectionOverflowItemKey = require("../type-ahead/isSectionOverflowItemKey");
12
13
  var _itemRank = require("../type-ahead/item-rank");
13
14
  var _keys = require("./keys");
15
+ 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; }
16
+ 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; }
14
17
  function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
15
18
  function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
16
19
  function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -42,51 +45,74 @@ var getSearchResults = function getSearchResults(matches) {
42
45
  return item;
43
46
  });
44
47
  };
45
-
46
- /**
47
- * Resolves registered menu items for a non-empty query. This intentionally has
48
- * no empty-query path so browse behavior remains owned by buildQuickInsertMenuModel.
49
- */
50
- var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents = function getMatchingQuickInsertComponents(_ref4) {
48
+ var getRenderedMenuItems = function getRenderedMenuItems(section, childrenMap, surfaceContext) {
51
49
  var _childrenMap$get;
52
- var components = _ref4.components,
53
- rootComponent = _ref4.rootComponent,
54
- query = _ref4.query,
55
- formatMessage = _ref4.formatMessage,
56
- surfaceContext = _ref4.surfaceContext,
57
- getItemRank = _ref4.getItemRank;
58
- var rankedComponents = (0, _itemRank.applyRegisteredItemRanks)(components, getItemRank);
59
- var _resolveSurface = (0, _surfaceRenderer.resolveSurface)(rankedComponents, rootComponent),
60
- childrenMap = _resolveSurface.childrenMap,
61
- root = _resolveSurface.root,
62
- topLevelChildren = _resolveSurface.topLevelChildren;
63
- if (!root || !(0, _surfaceRenderer.willComponentRender)(root, childrenMap, surfaceContext) || !topLevelChildren) {
64
- return {
65
- footer: undefined,
66
- root: undefined,
67
- sections: []
68
- };
69
- }
70
- var matches = new Map();
71
- var sourceIndexByComponent = new Map(rankedComponents.map(function (component, index) {
72
- return [component, index];
73
- }));
74
- var _iterator = _createForOfIteratorHelper(topLevelChildren),
50
+ return ((_childrenMap$get = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []).filter(function (child) {
51
+ return child.type === 'menu-item' && (0, _surfaceRenderer.willComponentRender)(child, childrenMap, surfaceContext);
52
+ });
53
+ };
54
+ var buildBrowseSections = function buildBrowseSections(_ref4) {
55
+ var childrenMap = _ref4.childrenMap,
56
+ contentSections = _ref4.contentSections,
57
+ selectCategoryItems = _ref4.selectCategoryItems,
58
+ surfaceContext = _ref4.surfaceContext;
59
+ var sections = [];
60
+ var _iterator = _createForOfIteratorHelper(contentSections),
75
61
  _step;
76
62
  try {
77
63
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
78
- var _childrenMap$get3;
79
64
  var section = _step.value;
80
- if (section.type !== 'menu-section' || (0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(section.key) || !(0, _surfaceRenderer.willComponentRender)(section, childrenMap, surfaceContext)) {
65
+ var children = getRenderedMenuItems(section, childrenMap, surfaceContext);
66
+ var overflowItems = children.filter(function (child) {
67
+ return (0, _isSectionOverflowItemKey.isSectionOverflowItemKey)(child.key);
68
+ });
69
+ var viewMoreItem = overflowItems[overflowItems.length - 1];
70
+ var items = children.filter(function (child) {
71
+ return !(0, _isSectionOverflowItemKey.isSectionOverflowItemKey)(child.key);
72
+ });
73
+ if (items.length === 0) {
81
74
  continue;
82
75
  }
83
- var _iterator3 = _createForOfIteratorHelper((_childrenMap$get3 = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : []),
84
- _step3;
76
+ var selectedItems = viewMoreItem !== undefined && selectCategoryItems !== undefined ? selectCategoryItems(items) : items;
77
+ if (selectedItems.length < items.length && viewMoreItem !== undefined) {
78
+ sections.push([section].concat((0, _toConsumableArray2.default)(selectedItems), [viewMoreItem]));
79
+ } else {
80
+ sections.push([section].concat((0, _toConsumableArray2.default)(selectedItems)));
81
+ }
82
+ }
83
+ } catch (err) {
84
+ _iterator.e(err);
85
+ } finally {
86
+ _iterator.f();
87
+ }
88
+ return {
89
+ sections: sections
90
+ };
91
+ };
92
+ var buildSearchSections = function buildSearchSections(_ref5) {
93
+ var childrenMap = _ref5.childrenMap,
94
+ components = _ref5.components,
95
+ contentSections = _ref5.contentSections,
96
+ formatMessage = _ref5.formatMessage,
97
+ query = _ref5.query,
98
+ root = _ref5.root,
99
+ surfaceContext = _ref5.surfaceContext;
100
+ var matches = new Map();
101
+ var sourceIndexByComponent = new Map(components.map(function (component, index) {
102
+ return [component, index];
103
+ }));
104
+ var _iterator2 = _createForOfIteratorHelper(contentSections),
105
+ _step2;
106
+ try {
107
+ for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
108
+ var section = _step2.value;
109
+ var _iterator4 = _createForOfIteratorHelper(getRenderedMenuItems(section, childrenMap, surfaceContext)),
110
+ _step4;
85
111
  try {
86
- for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
112
+ for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
87
113
  var _item$match, _match$score, _sourceIndexByCompone;
88
- var item = _step3.value;
89
- if (item.type !== 'menu-item' || (0, _isSectionOverflowItemKey.isSectionOverflowItemKey)(item.key) || !(0, _surfaceRenderer.willComponentRender)(item, childrenMap, surfaceContext)) {
114
+ var item = _step4.value;
115
+ if ((0, _isSectionOverflowItemKey.isSectionOverflowItemKey)(item.key)) {
90
116
  continue;
91
117
  }
92
118
  var match = (_item$match = item.match) === null || _item$match === void 0 ? void 0 : _item$match.call(item, {
@@ -111,24 +137,24 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
111
137
  }
112
138
  }
113
139
  } catch (err) {
114
- _iterator3.e(err);
140
+ _iterator4.e(err);
115
141
  } finally {
116
- _iterator3.f();
142
+ _iterator4.f();
117
143
  }
118
144
  }
119
145
  } catch (err) {
120
- _iterator.e(err);
146
+ _iterator2.e(err);
121
147
  } finally {
122
- _iterator.f();
148
+ _iterator2.f();
123
149
  }
124
150
  var uniqueMatches = Array.from(matches.values()).sort(compareMatchedItems);
125
- var searchResults = query !== '' ? getSearchResults(uniqueMatches) : undefined;
151
+ var searchResults = getSearchResults(uniqueMatches);
126
152
  var sectionsByKey = new Map();
127
- var _iterator2 = _createForOfIteratorHelper(uniqueMatches),
128
- _step2;
153
+ var _iterator3 = _createForOfIteratorHelper(uniqueMatches),
154
+ _step3;
129
155
  try {
130
- for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
131
- var _match = _step2.value;
156
+ for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
157
+ var _match = _step3.value;
132
158
  var _existing = sectionsByKey.get(_match.section.key);
133
159
  if (_existing) {
134
160
  _existing.push(_match.item);
@@ -137,49 +163,83 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
137
163
  }
138
164
  }
139
165
  } catch (err) {
140
- _iterator2.e(err);
166
+ _iterator3.e(err);
141
167
  } finally {
142
- _iterator2.f();
168
+ _iterator3.f();
143
169
  }
144
170
  var sections = Array.from(sectionsByKey.values());
145
- // An empty query is browse mode: `buildQuickInsertMenuModel` supplies the footer there,
146
- // so this search model must not add a second one.
147
- if (query === '') {
148
- return {
149
- footer: undefined,
150
- root: root,
151
- searchResults: searchResults,
152
- sections: sections
153
- };
154
- }
155
- var footerSection = topLevelChildren.find(function (section) {
156
- return section.type === 'menu-section' && (0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(section.key) && (0, _surfaceRenderer.willComponentRender)(section, childrenMap, surfaceContext);
157
- });
158
- var footer = footerSection ? ((_childrenMap$get = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(footerSection))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []).find(function (child) {
159
- return child.type === 'menu-item' && (0, _surfaceRenderer.willComponentRender)(child, childrenMap, surfaceContext);
160
- }) : undefined;
161
171
  if (sections.length > 0) {
162
172
  return {
163
- footer: footer,
164
- root: root,
165
173
  searchResults: searchResults,
166
174
  sections: sections
167
175
  };
168
176
  }
169
- var fallbackItem = topLevelChildren.filter(function (section) {
170
- return section.type === 'menu-section' && !(0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(section.key) && (0, _surfaceRenderer.willComponentRender)(section, childrenMap, surfaceContext);
171
- }).flatMap(function (section) {
177
+ var fallbackItem = contentSections.flatMap(function (section) {
172
178
  var _childrenMap$get2;
173
179
  return (_childrenMap$get2 = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : [];
174
180
  }).find(function (component) {
175
181
  return component.type === _keys.ASK_ROVO_MENU_ITEM.type && component.key === _keys.ASK_ROVO_MENU_ITEM.key && (0, _surfaceRenderer.willComponentRender)(component, childrenMap, surfaceContext);
176
182
  });
177
- var fallbackItems = fallbackItem ? [fallbackItem] : [];
178
183
  return {
179
- fallbackItems: fallbackItems,
180
- footer: footer,
181
- root: root,
184
+ fallbackItems: fallbackItem ? [fallbackItem] : [],
182
185
  searchResults: searchResults,
183
186
  sections: sections
184
187
  };
188
+ };
189
+
190
+ /**
191
+ * Builds the registered quick-insert menu model. An empty query browses every
192
+ * category; a non-empty query returns ranked matches. The footer is shared by both.
193
+ */
194
+ var getQuickInsertMenuModel = exports.getQuickInsertMenuModel = function getQuickInsertMenuModel(_ref6) {
195
+ var components = _ref6.components,
196
+ formatMessage = _ref6.formatMessage,
197
+ getItemRank = _ref6.getItemRank,
198
+ query = _ref6.query,
199
+ rootComponent = _ref6.rootComponent,
200
+ selectCategoryItems = _ref6.selectCategoryItems,
201
+ surfaceContext = _ref6.surfaceContext;
202
+ var rankedComponents = (0, _itemRank.applyRegisteredItemRanks)(components, getItemRank);
203
+ var _resolveSurface = (0, _surfaceRenderer.resolveSurface)(rankedComponents, rootComponent),
204
+ childrenMap = _resolveSurface.childrenMap,
205
+ root = _resolveSurface.root,
206
+ _resolveSurface$topLe = _resolveSurface.topLevelChildren,
207
+ topLevelChildren = _resolveSurface$topLe === void 0 ? [] : _resolveSurface$topLe;
208
+ if (!root || !(0, _surfaceRenderer.willComponentRender)(root, childrenMap, surfaceContext)) {
209
+ return {
210
+ footer: undefined,
211
+ root: undefined,
212
+ sections: []
213
+ };
214
+ }
215
+ var renderedSections = topLevelChildren.filter(function (section) {
216
+ return section.type === 'menu-section' && (0, _surfaceRenderer.willComponentRender)(section, childrenMap, surfaceContext);
217
+ });
218
+ var footerSection = renderedSections.find(function (_ref7) {
219
+ var key = _ref7.key;
220
+ return (0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(key);
221
+ });
222
+ var contentSections = renderedSections.filter(function (_ref8) {
223
+ var key = _ref8.key;
224
+ return !(0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(key);
225
+ });
226
+ var content = query === '' ? buildBrowseSections({
227
+ childrenMap: childrenMap,
228
+ contentSections: contentSections,
229
+ selectCategoryItems: selectCategoryItems,
230
+ surfaceContext: surfaceContext
231
+ }) : buildSearchSections({
232
+ childrenMap: childrenMap,
233
+ components: rankedComponents,
234
+ contentSections: contentSections,
235
+ formatMessage: formatMessage,
236
+ query: query,
237
+ root: root,
238
+ surfaceContext: surfaceContext
239
+ });
240
+ var footer = footerSection ? getRenderedMenuItems(footerSection, childrenMap, surfaceContext)[0] : undefined;
241
+ return _objectSpread(_objectSpread({}, content), {}, {
242
+ footer: footer,
243
+ root: root
244
+ });
185
245
  };
@@ -3,16 +3,10 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- Object.defineProperty(exports, "buildQuickInsertMenuModel", {
6
+ Object.defineProperty(exports, "getQuickInsertMenuModel", {
7
7
  enumerable: true,
8
8
  get: function get() {
9
- return _buildQuickInsertMenuModel.buildQuickInsertMenuModel;
10
- }
11
- });
12
- Object.defineProperty(exports, "getMatchingQuickInsertComponents", {
13
- enumerable: true,
14
- get: function get() {
15
- return _getMatchingQuickInsertComponents.getMatchingQuickInsertComponents;
9
+ return _getQuickInsertMenuModel.getQuickInsertMenuModel;
16
10
  }
17
11
  });
18
12
  Object.defineProperty(exports, "getQuickInsertMenuRows", {
@@ -33,8 +27,7 @@ Object.defineProperty(exports, "selectQuickInsertCategoryItems", {
33
27
  return _selectQuickInsertCategoryItems.selectQuickInsertCategoryItems;
34
28
  }
35
29
  });
36
- var _buildQuickInsertMenuModel = require("./build-quick-insert-menu-model");
30
+ var _getQuickInsertMenuModel = require("./get-quick-insert-menu-model");
37
31
  var _getQuickInsertMenuRows = require("./getQuickInsertMenuRows");
38
32
  var _getQuickInsertProviderMenuItemKey = require("./getQuickInsertProviderMenuItemKey");
39
- var _selectQuickInsertCategoryItems = require("./selectQuickInsertCategoryItems");
40
- var _getMatchingQuickInsertComponents = require("./get-matching-quick-insert-components");
33
+ var _selectQuickInsertCategoryItems = require("./selectQuickInsertCategoryItems");
@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
24
24
  * @jsx jsx
25
25
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
26
26
  var packageName = "@atlaskit/editor-common";
27
- var packageVersion = "130.4.2";
27
+ var packageVersion = "131.0.0";
28
28
  var halfFocusRing = 1;
29
29
  var dropOffset = '0, 8';
30
30
  var fadeIn = (0, _react2.keyframes)({
@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
13
13
  const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
14
14
  const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
15
15
  const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
16
- const packageVersion = "130.4.2";
16
+ const packageVersion = "131.0.0";
17
17
  const sanitiseSentryEvents = (data, _hint) => {
18
18
  // Remove URL as it has UGC
19
19
  // Ignored via go/ees007
@@ -22,42 +22,51 @@ const getSearchResults = matches => {
22
22
  item
23
23
  }) => item);
24
24
  };
25
-
26
- /**
27
- * Resolves registered menu items for a non-empty query. This intentionally has
28
- * no empty-query path so browse behavior remains owned by buildQuickInsertMenuModel.
29
- */
30
- export const getMatchingQuickInsertComponents = ({
25
+ const getRenderedMenuItems = (section, childrenMap, surfaceContext) => {
26
+ var _childrenMap$get;
27
+ return ((_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []).filter(child => child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext));
28
+ };
29
+ const buildBrowseSections = ({
30
+ childrenMap,
31
+ contentSections,
32
+ selectCategoryItems,
33
+ surfaceContext
34
+ }) => {
35
+ const sections = [];
36
+ for (const section of contentSections) {
37
+ const children = getRenderedMenuItems(section, childrenMap, surfaceContext);
38
+ const overflowItems = children.filter(child => isSectionOverflowItemKey(child.key));
39
+ const viewMoreItem = overflowItems[overflowItems.length - 1];
40
+ const items = children.filter(child => !isSectionOverflowItemKey(child.key));
41
+ if (items.length === 0) {
42
+ continue;
43
+ }
44
+ const selectedItems = viewMoreItem !== undefined && selectCategoryItems !== undefined ? selectCategoryItems(items) : items;
45
+ if (selectedItems.length < items.length && viewMoreItem !== undefined) {
46
+ sections.push([section, ...selectedItems, viewMoreItem]);
47
+ } else {
48
+ sections.push([section, ...selectedItems]);
49
+ }
50
+ }
51
+ return {
52
+ sections
53
+ };
54
+ };
55
+ const buildSearchSections = ({
56
+ childrenMap,
31
57
  components,
32
- rootComponent,
33
- query,
58
+ contentSections,
34
59
  formatMessage,
35
- surfaceContext,
36
- getItemRank
60
+ query,
61
+ root,
62
+ surfaceContext
37
63
  }) => {
38
- var _childrenMap$get2;
39
- const rankedComponents = applyRegisteredItemRanks(components, getItemRank);
40
- const {
41
- childrenMap,
42
- root,
43
- topLevelChildren
44
- } = resolveSurface(rankedComponents, rootComponent);
45
- if (!root || !willComponentRender(root, childrenMap, surfaceContext) || !topLevelChildren) {
46
- return {
47
- footer: undefined,
48
- root: undefined,
49
- sections: []
50
- };
51
- }
52
64
  const matches = new Map();
53
- const sourceIndexByComponent = new Map(rankedComponents.map((component, index) => [component, index]));
54
- for (const section of topLevelChildren) {
55
- if (section.type !== 'menu-section' || isMenuFooterSectionKey(section.key) || !willComponentRender(section, childrenMap, surfaceContext)) {
56
- continue;
57
- }
58
- for (const item of (_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []) {
59
- var _childrenMap$get, _item$match, _match$score, _sourceIndexByCompone;
60
- if (item.type !== 'menu-item' || isSectionOverflowItemKey(item.key) || !willComponentRender(item, childrenMap, surfaceContext)) {
65
+ const sourceIndexByComponent = new Map(components.map((component, index) => [component, index]));
66
+ for (const section of contentSections) {
67
+ for (const item of getRenderedMenuItems(section, childrenMap, surfaceContext)) {
68
+ var _item$match, _match$score, _sourceIndexByCompone;
69
+ if (isSectionOverflowItemKey(item.key)) {
61
70
  continue;
62
71
  }
63
72
  const match = (_item$match = item.match) === null || _item$match === void 0 ? void 0 : _item$match.call(item, {
@@ -83,7 +92,7 @@ export const getMatchingQuickInsertComponents = ({
83
92
  }
84
93
  }
85
94
  const uniqueMatches = Array.from(matches.values()).sort(compareMatchedItems);
86
- const searchResults = query !== '' ? getSearchResults(uniqueMatches) : undefined;
95
+ const searchResults = getSearchResults(uniqueMatches);
87
96
  const sectionsByKey = new Map();
88
97
  for (const match of uniqueMatches) {
89
98
  const existing = sectionsByKey.get(match.section.key);
@@ -94,36 +103,74 @@ export const getMatchingQuickInsertComponents = ({
94
103
  }
95
104
  }
96
105
  const sections = Array.from(sectionsByKey.values());
97
- // An empty query is browse mode: `buildQuickInsertMenuModel` supplies the footer there,
98
- // so this search model must not add a second one.
99
- if (query === '') {
100
- return {
101
- footer: undefined,
102
- root,
103
- searchResults,
104
- sections
105
- };
106
- }
107
- const footerSection = topLevelChildren.find(section => section.type === 'menu-section' && isMenuFooterSectionKey(section.key) && willComponentRender(section, childrenMap, surfaceContext));
108
- const footer = footerSection ? ((_childrenMap$get2 = childrenMap.get(getComponentIdentity(footerSection))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : []).find(child => child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext)) : undefined;
109
106
  if (sections.length > 0) {
110
107
  return {
111
- footer,
112
- root,
113
108
  searchResults,
114
109
  sections
115
110
  };
116
111
  }
117
- const fallbackItem = topLevelChildren.filter(section => section.type === 'menu-section' && !isMenuFooterSectionKey(section.key) && willComponentRender(section, childrenMap, surfaceContext)).flatMap(section => {
118
- var _childrenMap$get3;
119
- return (_childrenMap$get3 = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : [];
112
+ const fallbackItem = contentSections.flatMap(section => {
113
+ var _childrenMap$get2;
114
+ return (_childrenMap$get2 = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : [];
120
115
  }).find(component => component.type === ASK_ROVO_MENU_ITEM.type && component.key === ASK_ROVO_MENU_ITEM.key && willComponentRender(component, childrenMap, surfaceContext));
121
- const fallbackItems = fallbackItem ? [fallbackItem] : [];
122
116
  return {
123
- fallbackItems,
124
- footer,
125
- root,
117
+ fallbackItems: fallbackItem ? [fallbackItem] : [],
126
118
  searchResults,
127
119
  sections
128
120
  };
121
+ };
122
+
123
+ /**
124
+ * Builds the registered quick-insert menu model. An empty query browses every
125
+ * category; a non-empty query returns ranked matches. The footer is shared by both.
126
+ */
127
+ export const getQuickInsertMenuModel = ({
128
+ components,
129
+ formatMessage,
130
+ getItemRank,
131
+ query,
132
+ rootComponent,
133
+ selectCategoryItems,
134
+ surfaceContext
135
+ }) => {
136
+ const rankedComponents = applyRegisteredItemRanks(components, getItemRank);
137
+ const {
138
+ childrenMap,
139
+ root,
140
+ topLevelChildren = []
141
+ } = resolveSurface(rankedComponents, rootComponent);
142
+ if (!root || !willComponentRender(root, childrenMap, surfaceContext)) {
143
+ return {
144
+ footer: undefined,
145
+ root: undefined,
146
+ sections: []
147
+ };
148
+ }
149
+ const renderedSections = topLevelChildren.filter(section => section.type === 'menu-section' && willComponentRender(section, childrenMap, surfaceContext));
150
+ const footerSection = renderedSections.find(({
151
+ key
152
+ }) => isMenuFooterSectionKey(key));
153
+ const contentSections = renderedSections.filter(({
154
+ key
155
+ }) => !isMenuFooterSectionKey(key));
156
+ const content = query === '' ? buildBrowseSections({
157
+ childrenMap,
158
+ contentSections,
159
+ selectCategoryItems,
160
+ surfaceContext
161
+ }) : buildSearchSections({
162
+ childrenMap,
163
+ components: rankedComponents,
164
+ contentSections,
165
+ formatMessage,
166
+ query,
167
+ root,
168
+ surfaceContext
169
+ });
170
+ const footer = footerSection ? getRenderedMenuItems(footerSection, childrenMap, surfaceContext)[0] : undefined;
171
+ return {
172
+ ...content,
173
+ footer,
174
+ root
175
+ };
129
176
  };
@@ -1,7 +1,6 @@
1
1
  /* eslint-disable @atlaskit/editor/no-re-export */
2
2
 
3
- export { buildQuickInsertMenuModel } from './build-quick-insert-menu-model';
3
+ export { getQuickInsertMenuModel } from './get-quick-insert-menu-model';
4
4
  export { getQuickInsertMenuRows } from './getQuickInsertMenuRows';
5
5
  export { quickInsertProviderMenuItemKey } from './getQuickInsertProviderMenuItemKey';
6
- export { selectQuickInsertCategoryItems } from './selectQuickInsertCategoryItems';
7
- export { getMatchingQuickInsertComponents } from './get-matching-quick-insert-components';
6
+ export { selectQuickInsertCategoryItems } from './selectQuickInsertCategoryItems';
@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
14
14
  import { fg } from '@atlaskit/platform-feature-flags/fg';
15
15
  import Layer from '../Layer';
16
16
  const packageName = "@atlaskit/editor-common";
17
- const packageVersion = "130.4.2";
17
+ const packageVersion = "131.0.0";
18
18
  const halfFocusRing = 1;
19
19
  const dropOffset = '0, 8';
20
20
  const fadeIn = keyframes({
@@ -19,7 +19,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
19
19
  var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
20
20
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
21
21
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
22
- var packageVersion = "130.4.2";
22
+ var packageVersion = "131.0.0";
23
23
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
24
24
  // Remove URL as it has UGC
25
25
  // Ignored via go/ees007
@@ -1,4 +1,7 @@
1
+ import _defineProperty from "@babel/runtime/helpers/defineProperty";
1
2
  import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
3
+ 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; }
4
+ 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) { _defineProperty(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; }
2
5
  function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
3
6
  function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
4
7
  function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -35,51 +38,74 @@ var getSearchResults = function getSearchResults(matches) {
35
38
  return item;
36
39
  });
37
40
  };
38
-
39
- /**
40
- * Resolves registered menu items for a non-empty query. This intentionally has
41
- * no empty-query path so browse behavior remains owned by buildQuickInsertMenuModel.
42
- */
43
- export var getMatchingQuickInsertComponents = function getMatchingQuickInsertComponents(_ref4) {
41
+ var getRenderedMenuItems = function getRenderedMenuItems(section, childrenMap, surfaceContext) {
44
42
  var _childrenMap$get;
45
- var components = _ref4.components,
46
- rootComponent = _ref4.rootComponent,
47
- query = _ref4.query,
48
- formatMessage = _ref4.formatMessage,
49
- surfaceContext = _ref4.surfaceContext,
50
- getItemRank = _ref4.getItemRank;
51
- var rankedComponents = applyRegisteredItemRanks(components, getItemRank);
52
- var _resolveSurface = resolveSurface(rankedComponents, rootComponent),
53
- childrenMap = _resolveSurface.childrenMap,
54
- root = _resolveSurface.root,
55
- topLevelChildren = _resolveSurface.topLevelChildren;
56
- if (!root || !willComponentRender(root, childrenMap, surfaceContext) || !topLevelChildren) {
57
- return {
58
- footer: undefined,
59
- root: undefined,
60
- sections: []
61
- };
62
- }
63
- var matches = new Map();
64
- var sourceIndexByComponent = new Map(rankedComponents.map(function (component, index) {
65
- return [component, index];
66
- }));
67
- var _iterator = _createForOfIteratorHelper(topLevelChildren),
43
+ return ((_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []).filter(function (child) {
44
+ return child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext);
45
+ });
46
+ };
47
+ var buildBrowseSections = function buildBrowseSections(_ref4) {
48
+ var childrenMap = _ref4.childrenMap,
49
+ contentSections = _ref4.contentSections,
50
+ selectCategoryItems = _ref4.selectCategoryItems,
51
+ surfaceContext = _ref4.surfaceContext;
52
+ var sections = [];
53
+ var _iterator = _createForOfIteratorHelper(contentSections),
68
54
  _step;
69
55
  try {
70
56
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
71
- var _childrenMap$get3;
72
57
  var section = _step.value;
73
- if (section.type !== 'menu-section' || isMenuFooterSectionKey(section.key) || !willComponentRender(section, childrenMap, surfaceContext)) {
58
+ var children = getRenderedMenuItems(section, childrenMap, surfaceContext);
59
+ var overflowItems = children.filter(function (child) {
60
+ return isSectionOverflowItemKey(child.key);
61
+ });
62
+ var viewMoreItem = overflowItems[overflowItems.length - 1];
63
+ var items = children.filter(function (child) {
64
+ return !isSectionOverflowItemKey(child.key);
65
+ });
66
+ if (items.length === 0) {
74
67
  continue;
75
68
  }
76
- var _iterator3 = _createForOfIteratorHelper((_childrenMap$get3 = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : []),
77
- _step3;
69
+ var selectedItems = viewMoreItem !== undefined && selectCategoryItems !== undefined ? selectCategoryItems(items) : items;
70
+ if (selectedItems.length < items.length && viewMoreItem !== undefined) {
71
+ sections.push([section].concat(_toConsumableArray(selectedItems), [viewMoreItem]));
72
+ } else {
73
+ sections.push([section].concat(_toConsumableArray(selectedItems)));
74
+ }
75
+ }
76
+ } catch (err) {
77
+ _iterator.e(err);
78
+ } finally {
79
+ _iterator.f();
80
+ }
81
+ return {
82
+ sections: sections
83
+ };
84
+ };
85
+ var buildSearchSections = function buildSearchSections(_ref5) {
86
+ var childrenMap = _ref5.childrenMap,
87
+ components = _ref5.components,
88
+ contentSections = _ref5.contentSections,
89
+ formatMessage = _ref5.formatMessage,
90
+ query = _ref5.query,
91
+ root = _ref5.root,
92
+ surfaceContext = _ref5.surfaceContext;
93
+ var matches = new Map();
94
+ var sourceIndexByComponent = new Map(components.map(function (component, index) {
95
+ return [component, index];
96
+ }));
97
+ var _iterator2 = _createForOfIteratorHelper(contentSections),
98
+ _step2;
99
+ try {
100
+ for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
101
+ var section = _step2.value;
102
+ var _iterator4 = _createForOfIteratorHelper(getRenderedMenuItems(section, childrenMap, surfaceContext)),
103
+ _step4;
78
104
  try {
79
- for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
105
+ for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
80
106
  var _item$match, _match$score, _sourceIndexByCompone;
81
- var item = _step3.value;
82
- if (item.type !== 'menu-item' || isSectionOverflowItemKey(item.key) || !willComponentRender(item, childrenMap, surfaceContext)) {
107
+ var item = _step4.value;
108
+ if (isSectionOverflowItemKey(item.key)) {
83
109
  continue;
84
110
  }
85
111
  var match = (_item$match = item.match) === null || _item$match === void 0 ? void 0 : _item$match.call(item, {
@@ -104,24 +130,24 @@ export var getMatchingQuickInsertComponents = function getMatchingQuickInsertCom
104
130
  }
105
131
  }
106
132
  } catch (err) {
107
- _iterator3.e(err);
133
+ _iterator4.e(err);
108
134
  } finally {
109
- _iterator3.f();
135
+ _iterator4.f();
110
136
  }
111
137
  }
112
138
  } catch (err) {
113
- _iterator.e(err);
139
+ _iterator2.e(err);
114
140
  } finally {
115
- _iterator.f();
141
+ _iterator2.f();
116
142
  }
117
143
  var uniqueMatches = Array.from(matches.values()).sort(compareMatchedItems);
118
- var searchResults = query !== '' ? getSearchResults(uniqueMatches) : undefined;
144
+ var searchResults = getSearchResults(uniqueMatches);
119
145
  var sectionsByKey = new Map();
120
- var _iterator2 = _createForOfIteratorHelper(uniqueMatches),
121
- _step2;
146
+ var _iterator3 = _createForOfIteratorHelper(uniqueMatches),
147
+ _step3;
122
148
  try {
123
- for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
124
- var _match = _step2.value;
149
+ for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
150
+ var _match = _step3.value;
125
151
  var _existing = sectionsByKey.get(_match.section.key);
126
152
  if (_existing) {
127
153
  _existing.push(_match.item);
@@ -130,49 +156,83 @@ export var getMatchingQuickInsertComponents = function getMatchingQuickInsertCom
130
156
  }
131
157
  }
132
158
  } catch (err) {
133
- _iterator2.e(err);
159
+ _iterator3.e(err);
134
160
  } finally {
135
- _iterator2.f();
161
+ _iterator3.f();
136
162
  }
137
163
  var sections = Array.from(sectionsByKey.values());
138
- // An empty query is browse mode: `buildQuickInsertMenuModel` supplies the footer there,
139
- // so this search model must not add a second one.
140
- if (query === '') {
141
- return {
142
- footer: undefined,
143
- root: root,
144
- searchResults: searchResults,
145
- sections: sections
146
- };
147
- }
148
- var footerSection = topLevelChildren.find(function (section) {
149
- return section.type === 'menu-section' && isMenuFooterSectionKey(section.key) && willComponentRender(section, childrenMap, surfaceContext);
150
- });
151
- var footer = footerSection ? ((_childrenMap$get = childrenMap.get(getComponentIdentity(footerSection))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []).find(function (child) {
152
- return child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext);
153
- }) : undefined;
154
164
  if (sections.length > 0) {
155
165
  return {
156
- footer: footer,
157
- root: root,
158
166
  searchResults: searchResults,
159
167
  sections: sections
160
168
  };
161
169
  }
162
- var fallbackItem = topLevelChildren.filter(function (section) {
163
- return section.type === 'menu-section' && !isMenuFooterSectionKey(section.key) && willComponentRender(section, childrenMap, surfaceContext);
164
- }).flatMap(function (section) {
170
+ var fallbackItem = contentSections.flatMap(function (section) {
165
171
  var _childrenMap$get2;
166
172
  return (_childrenMap$get2 = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : [];
167
173
  }).find(function (component) {
168
174
  return component.type === ASK_ROVO_MENU_ITEM.type && component.key === ASK_ROVO_MENU_ITEM.key && willComponentRender(component, childrenMap, surfaceContext);
169
175
  });
170
- var fallbackItems = fallbackItem ? [fallbackItem] : [];
171
176
  return {
172
- fallbackItems: fallbackItems,
173
- footer: footer,
174
- root: root,
177
+ fallbackItems: fallbackItem ? [fallbackItem] : [],
175
178
  searchResults: searchResults,
176
179
  sections: sections
177
180
  };
181
+ };
182
+
183
+ /**
184
+ * Builds the registered quick-insert menu model. An empty query browses every
185
+ * category; a non-empty query returns ranked matches. The footer is shared by both.
186
+ */
187
+ export var getQuickInsertMenuModel = function getQuickInsertMenuModel(_ref6) {
188
+ var components = _ref6.components,
189
+ formatMessage = _ref6.formatMessage,
190
+ getItemRank = _ref6.getItemRank,
191
+ query = _ref6.query,
192
+ rootComponent = _ref6.rootComponent,
193
+ selectCategoryItems = _ref6.selectCategoryItems,
194
+ surfaceContext = _ref6.surfaceContext;
195
+ var rankedComponents = applyRegisteredItemRanks(components, getItemRank);
196
+ var _resolveSurface = resolveSurface(rankedComponents, rootComponent),
197
+ childrenMap = _resolveSurface.childrenMap,
198
+ root = _resolveSurface.root,
199
+ _resolveSurface$topLe = _resolveSurface.topLevelChildren,
200
+ topLevelChildren = _resolveSurface$topLe === void 0 ? [] : _resolveSurface$topLe;
201
+ if (!root || !willComponentRender(root, childrenMap, surfaceContext)) {
202
+ return {
203
+ footer: undefined,
204
+ root: undefined,
205
+ sections: []
206
+ };
207
+ }
208
+ var renderedSections = topLevelChildren.filter(function (section) {
209
+ return section.type === 'menu-section' && willComponentRender(section, childrenMap, surfaceContext);
210
+ });
211
+ var footerSection = renderedSections.find(function (_ref7) {
212
+ var key = _ref7.key;
213
+ return isMenuFooterSectionKey(key);
214
+ });
215
+ var contentSections = renderedSections.filter(function (_ref8) {
216
+ var key = _ref8.key;
217
+ return !isMenuFooterSectionKey(key);
218
+ });
219
+ var content = query === '' ? buildBrowseSections({
220
+ childrenMap: childrenMap,
221
+ contentSections: contentSections,
222
+ selectCategoryItems: selectCategoryItems,
223
+ surfaceContext: surfaceContext
224
+ }) : buildSearchSections({
225
+ childrenMap: childrenMap,
226
+ components: rankedComponents,
227
+ contentSections: contentSections,
228
+ formatMessage: formatMessage,
229
+ query: query,
230
+ root: root,
231
+ surfaceContext: surfaceContext
232
+ });
233
+ var footer = footerSection ? getRenderedMenuItems(footerSection, childrenMap, surfaceContext)[0] : undefined;
234
+ return _objectSpread(_objectSpread({}, content), {}, {
235
+ footer: footer,
236
+ root: root
237
+ });
178
238
  };
@@ -1,7 +1,6 @@
1
1
  /* eslint-disable @atlaskit/editor/no-re-export */
2
2
 
3
- export { buildQuickInsertMenuModel } from './build-quick-insert-menu-model';
3
+ export { getQuickInsertMenuModel } from './get-quick-insert-menu-model';
4
4
  export { getQuickInsertMenuRows } from './getQuickInsertMenuRows';
5
5
  export { quickInsertProviderMenuItemKey } from './getQuickInsertProviderMenuItemKey';
6
- export { selectQuickInsertCategoryItems } from './selectQuickInsertCategoryItems';
7
- export { getMatchingQuickInsertComponents } from './get-matching-quick-insert-components';
6
+ export { selectQuickInsertCategoryItems } from './selectQuickInsertCategoryItems';
@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
21
21
  import { fg } from '@atlaskit/platform-feature-flags/fg';
22
22
  import Layer from '../Layer';
23
23
  var packageName = "@atlaskit/editor-common";
24
- var packageVersion = "130.4.2";
24
+ var packageVersion = "131.0.0";
25
25
  var halfFocusRing = 1;
26
26
  var dropOffset = '0, 8';
27
27
  var fadeIn = keyframes({
@@ -1,3 +1,4 @@
1
+ import type { IntlShape } from 'react-intl';
1
2
  import type { SurfaceIdentifier } from '@atlaskit/editor-ui-control-model/surface-renderer/types';
2
3
  import type { RegisterComponent, RegisterMenuItem, RegisterMenuSection, SurfaceContext } from '@atlaskit/editor-ui-control-model/types';
3
4
  import { type RegisteredItemRankResolver } from '../type-ahead/item-rank';
@@ -10,4 +11,16 @@ export type QuickInsertMenuModel = {
10
11
  searchResults?: RegisterMenuItem[];
11
12
  sections: QuickInsertMenuSection[];
12
13
  };
13
- export declare const buildQuickInsertMenuModel: (components: RegisterComponent[], rootComponent: SurfaceIdentifier, selectCategoryItems?: QuickInsertCategoryItemSelectionPolicy, surfaceContext?: SurfaceContext, getItemRank?: RegisteredItemRankResolver) => QuickInsertMenuModel;
14
+ /**
15
+ * Builds the registered quick-insert menu model. An empty query browses every
16
+ * category; a non-empty query returns ranked matches. The footer is shared by both.
17
+ */
18
+ export declare const getQuickInsertMenuModel: ({ components, formatMessage, getItemRank, query, rootComponent, selectCategoryItems, surfaceContext, }: {
19
+ components: RegisterComponent[];
20
+ formatMessage: IntlShape['formatMessage'];
21
+ getItemRank?: RegisteredItemRankResolver;
22
+ query: string;
23
+ rootComponent: SurfaceIdentifier;
24
+ selectCategoryItems?: QuickInsertCategoryItemSelectionPolicy;
25
+ surfaceContext?: SurfaceContext;
26
+ }) => QuickInsertMenuModel;
@@ -1,3 +1,3 @@
1
1
  import type { RegisterMenuItem, RegisterMenuSection } from '@atlaskit/editor-ui-control-model/types';
2
- import type { QuickInsertMenuModel } from './build-quick-insert-menu-model';
2
+ import type { QuickInsertMenuModel } from './get-quick-insert-menu-model';
3
3
  export declare const getQuickInsertMenuRows: (model: QuickInsertMenuModel) => Array<RegisterMenuItem | RegisterMenuSection>;
@@ -1,7 +1,6 @@
1
- export { buildQuickInsertMenuModel } from './build-quick-insert-menu-model';
1
+ export { getQuickInsertMenuModel } from './get-quick-insert-menu-model';
2
2
  export { getQuickInsertMenuRows } from './getQuickInsertMenuRows';
3
3
  export { quickInsertProviderMenuItemKey } from './getQuickInsertProviderMenuItemKey';
4
4
  export { selectQuickInsertCategoryItems } from './selectQuickInsertCategoryItems';
5
- export { getMatchingQuickInsertComponents } from './get-matching-quick-insert-components';
6
- export type { QuickInsertMenuModel, QuickInsertMenuSection } from './build-quick-insert-menu-model';
5
+ export type { QuickInsertMenuModel, QuickInsertMenuSection } from './get-quick-insert-menu-model';
7
6
  export type { QuickInsertCategoryItemSelectionPolicy } from './selectQuickInsertCategoryItems';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "130.5.0",
3
+ "version": "131.0.1",
4
4
  "description": "A package that contains common classes and components for editor and renderer",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -85,8 +85,8 @@
85
85
  "@atlaskit/task-decision": "^21.12.0",
86
86
  "@atlaskit/teams-app-config": "^3.1.0",
87
87
  "@atlaskit/textfield": "^10.2.0",
88
- "@atlaskit/tmp-editor-statsig": "^234.0.0",
89
- "@atlaskit/tokens": "^20.4.0",
88
+ "@atlaskit/tmp-editor-statsig": "^236.0.0",
89
+ "@atlaskit/tokens": "^20.5.0",
90
90
  "@atlaskit/tooltip": "^24.4.0",
91
91
  "@atlaskit/width-detector": "^7.2.0",
92
92
  "@babel/runtime": "^7.0.0",
@@ -1,78 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
- Object.defineProperty(exports, "__esModule", {
5
- value: true
6
- });
7
- exports.buildQuickInsertMenuModel = void 0;
8
- var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
- var _surfaceRenderer = require("@atlaskit/editor-ui-control-model/surface-renderer");
10
- var _isMenuFooterSectionKey = require("../type-ahead/isMenuFooterSectionKey");
11
- var _isSectionOverflowItemKey = require("../type-ahead/isSectionOverflowItemKey");
12
- var _itemRank = require("../type-ahead/item-rank");
13
- function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
14
- function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
15
- function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
16
- var buildQuickInsertMenuModel = exports.buildQuickInsertMenuModel = function buildQuickInsertMenuModel(components, rootComponent, selectCategoryItems, surfaceContext, getItemRank) {
17
- var rankedComponents = (0, _itemRank.applyRegisteredItemRanks)(components, getItemRank);
18
- var _resolveSurface = (0, _surfaceRenderer.resolveSurface)(rankedComponents, rootComponent),
19
- root = _resolveSurface.root,
20
- childrenMap = _resolveSurface.childrenMap,
21
- topLevelChildren = _resolveSurface.topLevelChildren;
22
- if (!root || !(0, _surfaceRenderer.willComponentRender)(root, childrenMap, surfaceContext)) {
23
- return {
24
- footer: undefined,
25
- root: undefined,
26
- sections: []
27
- };
28
- }
29
- var sections = [];
30
- var footer;
31
- var _iterator = _createForOfIteratorHelper(topLevelChildren !== null && topLevelChildren !== void 0 ? topLevelChildren : []),
32
- _step;
33
- try {
34
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
35
- var _childrenMap$get;
36
- var section = _step.value;
37
- if (section.type !== 'menu-section' || !(0, _surfaceRenderer.willComponentRender)(section, childrenMap, surfaceContext)) {
38
- continue;
39
- }
40
- var children = (_childrenMap$get = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : [];
41
- if ((0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(section.key)) {
42
- footer = children.find(function (child) {
43
- return child.type === 'menu-item' && (0, _surfaceRenderer.willComponentRender)(child, childrenMap, surfaceContext);
44
- });
45
- continue;
46
- }
47
- var viewMoreItem = void 0;
48
- for (var index = children.length - 1; index >= 0; index--) {
49
- var child = children[index];
50
- if ((child === null || child === void 0 ? void 0 : child.type) === 'menu-item' && (0, _isSectionOverflowItemKey.isSectionOverflowItemKey)(child.key) && (0, _surfaceRenderer.willComponentRender)(child, childrenMap, surfaceContext)) {
51
- viewMoreItem = child;
52
- break;
53
- }
54
- }
55
- var items = children.filter(function (child) {
56
- return child.type === 'menu-item' && !(0, _isSectionOverflowItemKey.isSectionOverflowItemKey)(child.key) && (0, _surfaceRenderer.willComponentRender)(child, childrenMap, surfaceContext);
57
- });
58
- if (items.length === 0) {
59
- continue;
60
- }
61
- var selectedItems = viewMoreItem !== undefined && selectCategoryItems !== undefined ? selectCategoryItems(items) : items;
62
- if (selectedItems.length < items.length && viewMoreItem !== undefined) {
63
- sections.push([section].concat((0, _toConsumableArray2.default)(selectedItems), [viewMoreItem]));
64
- } else {
65
- sections.push([section].concat((0, _toConsumableArray2.default)(selectedItems)));
66
- }
67
- }
68
- } catch (err) {
69
- _iterator.e(err);
70
- } finally {
71
- _iterator.f();
72
- }
73
- return {
74
- footer: footer,
75
- root: root,
76
- sections: sections
77
- };
78
- };
@@ -1,55 +0,0 @@
1
- import { getComponentIdentity, resolveSurface, willComponentRender } from '@atlaskit/editor-ui-control-model/surface-renderer';
2
- import { isMenuFooterSectionKey } from '../type-ahead/isMenuFooterSectionKey';
3
- import { isSectionOverflowItemKey } from '../type-ahead/isSectionOverflowItemKey';
4
- import { applyRegisteredItemRanks } from '../type-ahead/item-rank';
5
- export const buildQuickInsertMenuModel = (components, rootComponent, selectCategoryItems, surfaceContext, getItemRank) => {
6
- const rankedComponents = applyRegisteredItemRanks(components, getItemRank);
7
- const {
8
- root,
9
- childrenMap,
10
- topLevelChildren
11
- } = resolveSurface(rankedComponents, rootComponent);
12
- if (!root || !willComponentRender(root, childrenMap, surfaceContext)) {
13
- return {
14
- footer: undefined,
15
- root: undefined,
16
- sections: []
17
- };
18
- }
19
- const sections = [];
20
- let footer;
21
- for (const section of topLevelChildren !== null && topLevelChildren !== void 0 ? topLevelChildren : []) {
22
- var _childrenMap$get;
23
- if (section.type !== 'menu-section' || !willComponentRender(section, childrenMap, surfaceContext)) {
24
- continue;
25
- }
26
- const children = (_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : [];
27
- if (isMenuFooterSectionKey(section.key)) {
28
- footer = children.find(child => child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext));
29
- continue;
30
- }
31
- let viewMoreItem;
32
- for (let index = children.length - 1; index >= 0; index--) {
33
- const child = children[index];
34
- if ((child === null || child === void 0 ? void 0 : child.type) === 'menu-item' && isSectionOverflowItemKey(child.key) && willComponentRender(child, childrenMap, surfaceContext)) {
35
- viewMoreItem = child;
36
- break;
37
- }
38
- }
39
- const items = children.filter(child => child.type === 'menu-item' && !isSectionOverflowItemKey(child.key) && willComponentRender(child, childrenMap, surfaceContext));
40
- if (items.length === 0) {
41
- continue;
42
- }
43
- const selectedItems = viewMoreItem !== undefined && selectCategoryItems !== undefined ? selectCategoryItems(items) : items;
44
- if (selectedItems.length < items.length && viewMoreItem !== undefined) {
45
- sections.push([section, ...selectedItems, viewMoreItem]);
46
- } else {
47
- sections.push([section, ...selectedItems]);
48
- }
49
- }
50
- return {
51
- footer,
52
- root,
53
- sections
54
- };
55
- };
@@ -1,71 +0,0 @@
1
- import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
2
- function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
3
- function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
4
- function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
5
- import { getComponentIdentity, resolveSurface, willComponentRender } from '@atlaskit/editor-ui-control-model/surface-renderer';
6
- import { isMenuFooterSectionKey } from '../type-ahead/isMenuFooterSectionKey';
7
- import { isSectionOverflowItemKey } from '../type-ahead/isSectionOverflowItemKey';
8
- import { applyRegisteredItemRanks } from '../type-ahead/item-rank';
9
- export var buildQuickInsertMenuModel = function buildQuickInsertMenuModel(components, rootComponent, selectCategoryItems, surfaceContext, getItemRank) {
10
- var rankedComponents = applyRegisteredItemRanks(components, getItemRank);
11
- var _resolveSurface = resolveSurface(rankedComponents, rootComponent),
12
- root = _resolveSurface.root,
13
- childrenMap = _resolveSurface.childrenMap,
14
- topLevelChildren = _resolveSurface.topLevelChildren;
15
- if (!root || !willComponentRender(root, childrenMap, surfaceContext)) {
16
- return {
17
- footer: undefined,
18
- root: undefined,
19
- sections: []
20
- };
21
- }
22
- var sections = [];
23
- var footer;
24
- var _iterator = _createForOfIteratorHelper(topLevelChildren !== null && topLevelChildren !== void 0 ? topLevelChildren : []),
25
- _step;
26
- try {
27
- for (_iterator.s(); !(_step = _iterator.n()).done;) {
28
- var _childrenMap$get;
29
- var section = _step.value;
30
- if (section.type !== 'menu-section' || !willComponentRender(section, childrenMap, surfaceContext)) {
31
- continue;
32
- }
33
- var children = (_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : [];
34
- if (isMenuFooterSectionKey(section.key)) {
35
- footer = children.find(function (child) {
36
- return child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext);
37
- });
38
- continue;
39
- }
40
- var viewMoreItem = void 0;
41
- for (var index = children.length - 1; index >= 0; index--) {
42
- var child = children[index];
43
- if ((child === null || child === void 0 ? void 0 : child.type) === 'menu-item' && isSectionOverflowItemKey(child.key) && willComponentRender(child, childrenMap, surfaceContext)) {
44
- viewMoreItem = child;
45
- break;
46
- }
47
- }
48
- var items = children.filter(function (child) {
49
- return child.type === 'menu-item' && !isSectionOverflowItemKey(child.key) && willComponentRender(child, childrenMap, surfaceContext);
50
- });
51
- if (items.length === 0) {
52
- continue;
53
- }
54
- var selectedItems = viewMoreItem !== undefined && selectCategoryItems !== undefined ? selectCategoryItems(items) : items;
55
- if (selectedItems.length < items.length && viewMoreItem !== undefined) {
56
- sections.push([section].concat(_toConsumableArray(selectedItems), [viewMoreItem]));
57
- } else {
58
- sections.push([section].concat(_toConsumableArray(selectedItems)));
59
- }
60
- }
61
- } catch (err) {
62
- _iterator.e(err);
63
- } finally {
64
- _iterator.f();
65
- }
66
- return {
67
- footer: footer,
68
- root: root,
69
- sections: sections
70
- };
71
- };
@@ -1,17 +0,0 @@
1
- import type { IntlShape } from 'react-intl';
2
- import type { SurfaceIdentifier } from '@atlaskit/editor-ui-control-model/surface-renderer/types';
3
- import type { RegisterComponent, SurfaceContext } from '@atlaskit/editor-ui-control-model/types';
4
- import { type RegisteredItemRankResolver } from '../type-ahead/item-rank';
5
- import type { QuickInsertMenuModel } from './build-quick-insert-menu-model';
6
- /**
7
- * Resolves registered menu items for a non-empty query. This intentionally has
8
- * no empty-query path so browse behavior remains owned by buildQuickInsertMenuModel.
9
- */
10
- export declare const getMatchingQuickInsertComponents: ({ components, rootComponent, query, formatMessage, surfaceContext, getItemRank, }: {
11
- components: RegisterComponent[];
12
- formatMessage: IntlShape['formatMessage'];
13
- getItemRank?: RegisteredItemRankResolver;
14
- query: string;
15
- rootComponent: SurfaceIdentifier;
16
- surfaceContext?: SurfaceContext;
17
- }) => QuickInsertMenuModel;