@atlaskit/editor-common 129.0.0 → 129.1.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.
Files changed (36) hide show
  1. package/CHANGELOG.md +30 -0
  2. package/dist/cjs/clipboard/index.js +41 -21
  3. package/dist/cjs/extensibility/extensionNodeView.js +17 -2
  4. package/dist/cjs/extensibility/preserveRemixNodeView.js +150 -0
  5. package/dist/cjs/extensions/native-embed-maui-extension-key.js +8 -0
  6. package/dist/cjs/monitoring/error.js +1 -1
  7. package/dist/cjs/quick-insert/get-matching-quick-insert-components.js +38 -9
  8. package/dist/cjs/quick-insert/getQuickInsertMenuRows.js +12 -0
  9. package/dist/cjs/quick-insert/registered-menu-model.js +7 -0
  10. package/dist/cjs/ui/DropList/index.js +1 -1
  11. package/dist/es2019/clipboard/index.js +18 -6
  12. package/dist/es2019/extensibility/extensionNodeView.js +15 -2
  13. package/dist/es2019/extensibility/preserveRemixNodeView.js +132 -0
  14. package/dist/es2019/extensions/native-embed-maui-extension-key.js +2 -0
  15. package/dist/es2019/monitoring/error.js +1 -1
  16. package/dist/es2019/quick-insert/get-matching-quick-insert-components.js +23 -3
  17. package/dist/es2019/quick-insert/getQuickInsertMenuRows.js +4 -0
  18. package/dist/es2019/quick-insert/registered-menu-model.js +1 -0
  19. package/dist/es2019/ui/DropList/index.js +1 -1
  20. package/dist/esm/clipboard/index.js +40 -20
  21. package/dist/esm/extensibility/extensionNodeView.js +17 -2
  22. package/dist/esm/extensibility/preserveRemixNodeView.js +145 -0
  23. package/dist/esm/extensions/native-embed-maui-extension-key.js +2 -0
  24. package/dist/esm/monitoring/error.js +1 -1
  25. package/dist/esm/quick-insert/get-matching-quick-insert-components.js +37 -9
  26. package/dist/esm/quick-insert/getQuickInsertMenuRows.js +5 -0
  27. package/dist/esm/quick-insert/registered-menu-model.js +1 -0
  28. package/dist/esm/ui/DropList/index.js +1 -1
  29. package/dist/types/extensibility/preserveRemixNodeView.d.ts +33 -0
  30. package/dist/types/extensions/native-embed-maui-extension-key.d.ts +1 -0
  31. package/dist/types/quick-insert/build-quick-insert-menu-model.d.ts +1 -0
  32. package/dist/types/quick-insert/getQuickInsertMenuRows.d.ts +3 -0
  33. package/dist/types/quick-insert/registered-menu-model.d.ts +1 -0
  34. package/extensibility/preserve-remix-node-view/package.json +10 -0
  35. package/extensions/native-embed-maui-extension-key/package.json +10 -0
  36. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,35 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 129.1.1
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 129.1.0
10
+
11
+ ### Minor Changes
12
+
13
+ - [`5351e01090c9c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5351e01090c9c) -
14
+ Show the five strongest matches first, then remaining matches in category order without category
15
+ titles, in slash-command and toolbar insert search. Share the row projection across rendering and
16
+ keyboard selection under the platform_editor_slash_command experiment.
17
+ - [`f2970988c7e5b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f2970988c7e5b) -
18
+ MAUI-1306: add a gated Remix NodeView lifecycle handoff that retains its React portal during
19
+ annotation wrapper replacement using cc_maui_annotations_on_extensions. Expose a shared MAUI
20
+ native-embed extension key through extensions/native-embed-maui-extension-key. Expose the lazy
21
+ preservation wrapper through extensibility/preserve-remix-node-view so both extension NodeView
22
+ factories can reclaim an existing instance without constructing a replacement. Clean up and
23
+ replace a reclaimed NodeView if its update rejects the node.
24
+
25
+ ### Patch Changes
26
+
27
+ - [`c889a6f17321a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c889a6f17321a) -
28
+ `copyHTMLToClipboard` and `copyHTMLToClipboardPolyfill` no longer leak an unhandled rejection when
29
+ called fire-and-forget (EDF-2436). `copyHTMLToClipboard` now awaits the polyfill so its existing
30
+ `try/catch` applies. Callers that await still receive the error.
31
+ - Updated dependencies
32
+
3
33
  ## 129.0.0
4
34
 
5
35
  ### Major Changes
@@ -17,7 +17,7 @@ var _browserApis = require("@atlaskit/browser-apis");
17
17
  var _state = require("@atlaskit/editor-prosemirror/state");
18
18
  var _analytics = require("../analytics");
19
19
  var _selection = require("../selection");
20
- function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t4 in e) "default" !== _t4 && {}.hasOwnProperty.call(e, _t4) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t4)) && (i.get || i.set) ? o(f, _t4, i) : f[_t4] = e[_t4]); return f; })(e, t); }
20
+ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t5 in e) "default" !== _t5 && {}.hasOwnProperty.call(e, _t5) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t5)) && (i.get || i.set) ? o(f, _t5, i) : f[_t5] = e[_t5]); return f; })(e, t); }
21
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; }
22
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; } // Ignored via go/ees005
23
23
  // eslint-disable-next-line import/no-namespace
@@ -91,10 +91,17 @@ var copyToClipboard = exports.copyToClipboard = /*#__PURE__*/function () {
91
91
  };
92
92
  }();
93
93
 
94
- // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
95
- var copyHTMLToClipboard = exports.copyHTMLToClipboard = /*#__PURE__*/function () {
94
+ // EDF-2436: the copy helpers below are called fire-and-forget from click handlers, so a
95
+ // late rejection (eg. the polyfill's DOM fallback running after the document is gone)
96
+ // becomes an unhandled rejection and takes down the whole process. Attaching a no-op
97
+ // handler marks it handled; callers that await still receive the error.
98
+ var markRejectionHandled = function markRejectionHandled(promise) {
99
+ promise.catch(function () {});
100
+ return promise;
101
+ };
102
+ var writeHTMLToClipboard = /*#__PURE__*/function () {
96
103
  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(elementToCopy, plainTextToCopy) {
97
- var data, _t3;
104
+ var data, _t3, _t4;
98
105
  return _regenerator.default.wrap(function (_context2) {
99
106
  while (1) switch (_context2.prev = _context2.next) {
100
107
  case 0:
@@ -121,34 +128,40 @@ var copyHTMLToClipboard = exports.copyHTMLToClipboard = /*#__PURE__*/function ()
121
128
  _t3 = _context2["catch"](1);
122
129
  throw new Error('Clipboard api is not supported');
123
130
  case 4:
124
- _context2.next = 6;
131
+ _context2.next = 9;
125
132
  break;
126
133
  case 5:
127
- if (!!document && (typeof document === "undefined" ? "undefined" : (0, _typeof2.default)(document)) === 'object') {
128
- try {
129
- // ED-17083 extension copy seems have issue with ClipboardItem API
130
- // Hence of use of this polyfill
131
- copyHTMLToClipboardPolyfill(elementToCopy, plainTextToCopy);
132
- } catch (error) {
133
- // eslint-disable-next-line no-console
134
- console.log(error);
135
- }
134
+ if (!(!!document && (typeof document === "undefined" ? "undefined" : (0, _typeof2.default)(document)) === 'object')) {
135
+ _context2.next = 9;
136
+ break;
136
137
  }
137
- case 6:
138
+ _context2.prev = 6;
139
+ _context2.next = 7;
140
+ return copyHTMLToClipboardPolyfill(elementToCopy, plainTextToCopy);
141
+ case 7:
142
+ _context2.next = 9;
143
+ break;
144
+ case 8:
145
+ _context2.prev = 8;
146
+ _t4 = _context2["catch"](6);
147
+ // eslint-disable-next-line no-console
148
+ console.log(_t4);
149
+ case 9:
138
150
  case "end":
139
151
  return _context2.stop();
140
152
  }
141
- }, _callee2, null, [[1, 3]]);
153
+ }, _callee2, null, [[1, 3], [6, 8]]);
142
154
  }));
143
- return function copyHTMLToClipboard(_x2, _x3) {
155
+ return function writeHTMLToClipboard(_x2, _x3) {
144
156
  return _ref2.apply(this, arguments);
145
157
  };
146
158
  }();
147
159
 
148
- // At the time of development, Firefox doesn't support ClipboardItem API
149
- // Hence of use of this polyfill
150
160
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
151
- var copyHTMLToClipboardPolyfill = exports.copyHTMLToClipboardPolyfill = /*#__PURE__*/function () {
161
+ var copyHTMLToClipboard = exports.copyHTMLToClipboard = function copyHTMLToClipboard(elementToCopy, plainTextToCopy) {
162
+ return markRejectionHandled(writeHTMLToClipboard(elementToCopy, plainTextToCopy));
163
+ };
164
+ var writeHTMLToClipboardPolyfill = /*#__PURE__*/function () {
152
165
  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(elementToCopy, plainTextToCopy) {
153
166
  var dt;
154
167
  return _regenerator.default.wrap(function (_context3) {
@@ -170,11 +183,18 @@ var copyHTMLToClipboardPolyfill = exports.copyHTMLToClipboardPolyfill = /*#__PUR
170
183
  }
171
184
  }, _callee3);
172
185
  }));
173
- return function copyHTMLToClipboardPolyfill(_x4, _x5) {
186
+ return function writeHTMLToClipboardPolyfill(_x4, _x5) {
174
187
  return _ref3.apply(this, arguments);
175
188
  };
176
189
  }();
177
190
 
191
+ // At the time of development, Firefox doesn't support ClipboardItem API
192
+ // Hence of use of this polyfill
193
+ // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
194
+ var copyHTMLToClipboardPolyfill = exports.copyHTMLToClipboardPolyfill = function copyHTMLToClipboardPolyfill(elementToCopy, plainTextToCopy) {
195
+ return markRejectionHandled(writeHTMLToClipboardPolyfill(elementToCopy, plainTextToCopy));
196
+ };
197
+
178
198
  // Safari can revoke transient user activation before asynchronous clipboard writes complete.
179
199
  // Keep this helper synchronous so callers can invoke it directly from a click handler.
180
200
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
@@ -23,6 +23,7 @@ var _reactNodeView = _interopRequireDefault(require("../react-node-view"));
23
23
  var _Extension = require("./Extension");
24
24
  var _ExtensionNodeWrapper = require("./ExtensionNodeWrapper");
25
25
  var _nativeEmbedExtension = require("./nativeEmbedExtension");
26
+ var _preserveRemixNodeView = require("./preserveRemixNodeView");
26
27
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
27
28
  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)); }
28
29
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -388,7 +389,7 @@ function ExtensionNodeRender(_ref2) {
388
389
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
389
390
  function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers, intl) {
390
391
  return function (node, view, getPos) {
391
- return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
392
+ var renderProps = {
392
393
  providerFactory: providerFactory,
393
394
  extensionHandlers: extensionHandlers,
394
395
  extensionLoadingHandlers: extensionLoadingHandlers,
@@ -399,6 +400,20 @@ function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory,
399
400
  showUpdatedLivePages1PBodiedExtensionUI: showUpdatedLivePages1PBodiedExtensionUI,
400
401
  rendererExtensionHandlers: rendererExtensionHandlers,
401
402
  intl: intl
402
- }).init();
403
+ };
404
+ var createExtensionNode = function createExtensionNode(currentNode) {
405
+ return new ExtensionNode(currentNode, view, getPos, portalProviderAPI, eventDispatcher, renderProps);
406
+ };
407
+ if (!(0, _coreUtils.isSSR)() && (0, _fg.fg)('cc_maui_annotations_on_extensions')) {
408
+ return (0, _preserveRemixNodeView.preserveRemixNodeView)({
409
+ node: node,
410
+ view: view,
411
+ getPos: getPos,
412
+ renderProps: renderProps,
413
+ rendererKind: ExtensionNode,
414
+ createExtensionNode: createExtensionNode
415
+ });
416
+ }
417
+ return createExtensionNode(node).init();
403
418
  };
404
419
  }
@@ -0,0 +1,150 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.preserveRemixNodeView = preserveRemixNodeView;
7
+ var _nativeEmbedMauiExtensionKey = require("../extensions/native-embed-maui-extension-key");
8
+ // Do not polyfill with insertBefore: it disconnects an iframe and resets its browsing context.
9
+
10
+ var editors = new WeakMap();
11
+ /** Only block Remix embeds with a stable identity can participate in the handoff. */
12
+ var isRemixNodeForPreservation = function isRemixNodeForPreservation(node) {
13
+ return node.type.name === 'extension' && node.attrs.extensionKey === _nativeEmbedMauiExtensionKey.NATIVE_EMBED_MAUI_EXTENSION_KEY && typeof node.attrs.localId === 'string' && node.attrs.localId.length > 0;
14
+ };
15
+ var sameChart = function sameChart(left, right) {
16
+ return left.mark(left.marks.filter(function (mark) {
17
+ return mark.type.name !== 'annotation';
18
+ })).eq(right.mark(right.marks.filter(function (mark) {
19
+ return mark.type.name !== 'annotation';
20
+ })));
21
+ };
22
+
23
+ /**
24
+ * A disposable ProseMirror slot around a retained React portal. destroy() parks the
25
+ * portal before ProseMirror disconnects its mark wrapper. After reconciliation, the
26
+ * replacement claims the parked portal without taking one from a still-live node.
27
+ */
28
+ function preserveRemixNodeView(_ref) {
29
+ var node = _ref.node,
30
+ view = _ref.view,
31
+ getPos = _ref.getPos,
32
+ renderProps = _ref.renderProps,
33
+ rendererKind = _ref.rendererKind,
34
+ createExtensionNode = _ref.createExtensionNode;
35
+ if (!isRemixNodeForPreservation(node)) {
36
+ return createExtensionNode(node).init();
37
+ }
38
+ var ownerDocument = view.dom.ownerDocument;
39
+ var slot = ownerDocument.createElement('div');
40
+ if (!view.dom.isConnected || typeof getPos !== 'function' || typeof slot.moveBefore !== 'function') {
41
+ return createExtensionNode(node).init();
42
+ }
43
+ var owner = {
44
+ getPos: getPos,
45
+ destroyed: false
46
+ };
47
+ var entries = editors.get(view);
48
+ if (!entries) {
49
+ entries = new Set();
50
+ editors.set(view, entries);
51
+ }
52
+ var registry = entries;
53
+ var entry;
54
+ var latestNode = node;
55
+ var latestDecorations = [];
56
+ var latestInnerDecorations;
57
+
58
+ // Construction can precede the old slot's destroy(). Defer portal adoption until
59
+ // both hooks have run; no rendering opportunity occurs between these microtasks.
60
+ queueMicrotask(function () {
61
+ if (owner.destroyed || view.isDestroyed || !slot.isConnected) {
62
+ return;
63
+ }
64
+ entry = Array.from(registry).find(function (existing) {
65
+ return existing.owner.destroyed && existing.rendererKind === rendererKind && sameChart(existing.inner.node, latestNode);
66
+ });
67
+ if (entry) {
68
+ var _slot$moveBefore, _entry$parking;
69
+ entry.owner = owner;
70
+ entry.inner.reactComponentProps = renderProps;
71
+ (_slot$moveBefore = slot.moveBefore) === null || _slot$moveBefore === void 0 || _slot$moveBefore.call(slot, entry.inner.dom, null);
72
+ (_entry$parking = entry.parking) === null || _entry$parking === void 0 || _entry$parking.remove();
73
+ entry.parking = undefined;
74
+ if (!entry.inner.update(latestNode, latestDecorations, latestInnerDecorations)) {
75
+ // A matching chart is normally accepted, but honour the NodeView contract
76
+ // if a renderer rejects it. Remove the old portal before creating a replacement.
77
+ registry.delete(entry);
78
+ var dom = entry.inner.dom;
79
+ entry.inner.destroy();
80
+ dom.remove();
81
+ entry = undefined;
82
+ }
83
+ }
84
+ if (!entry) {
85
+ // Construct only after the old slot has had a chance to park its portal.
86
+ var inner = createExtensionNode(latestNode);
87
+ var retained = {
88
+ inner: inner,
89
+ owner: owner,
90
+ rendererKind: rendererKind
91
+ };
92
+ entry = retained;
93
+ inner.getPos = function () {
94
+ return retained.owner.destroyed ? undefined : retained.owner.getPos();
95
+ };
96
+ inner.init();
97
+ slot.appendChild(inner.dom);
98
+ registry.add(retained);
99
+ }
100
+ });
101
+ return {
102
+ dom: slot,
103
+ // The retained extension is an atom: ProseMirror must not manage the portal's children.
104
+ update: function update(next, decorations, innerDecorations) {
105
+ if (next.type !== node.type || next.attrs.localId !== node.attrs.localId || next.attrs.extensionKey !== node.attrs.extensionKey) {
106
+ return false;
107
+ }
108
+ latestNode = next;
109
+ latestDecorations = decorations;
110
+ latestInnerDecorations = innerDecorations;
111
+ return entry ? entry.inner.update(next, decorations, innerDecorations) : true;
112
+ },
113
+ stopEvent: function stopEvent(event) {
114
+ var _entry$inner$stopEven, _entry;
115
+ return (_entry$inner$stopEven = (_entry = entry) === null || _entry === void 0 ? void 0 : _entry.inner.stopEvent(event)) !== null && _entry$inner$stopEven !== void 0 ? _entry$inner$stopEven : false;
116
+ },
117
+ ignoreMutation: function ignoreMutation(mutation) {
118
+ var _entry$inner$ignoreMu, _entry2;
119
+ return (_entry$inner$ignoreMu = (_entry2 = entry) === null || _entry2 === void 0 ? void 0 : _entry2.inner.ignoreMutation(mutation)) !== null && _entry$inner$ignoreMu !== void 0 ? _entry$inner$ignoreMu : mutation.type !== 'selection';
120
+ },
121
+ destroy: function destroy() {
122
+ owner.destroyed = true;
123
+ if (!entry) {
124
+ return;
125
+ }
126
+ var retained = entry;
127
+ if (retained.inner.dom.isConnected) {
128
+ var _parking$moveBefore;
129
+ var parking = ownerDocument.createElement('div');
130
+ // Transient, outside the editable document and inaccessible while awaiting handoff.
131
+ parking.hidden = true;
132
+ ownerDocument.body.appendChild(parking);
133
+ (_parking$moveBefore = parking.moveBefore) === null || _parking$moveBefore === void 0 || _parking$moveBefore.call(parking, retained.inner.dom, null);
134
+ retained.parking = parking;
135
+ }
136
+ // Give constructors queued after destroy() a chance to claim the portal first.
137
+ queueMicrotask(function () {
138
+ return queueMicrotask(function () {
139
+ if (retained.owner === owner && registry.delete(retained)) {
140
+ var _retained$parking;
141
+ var dom = retained.inner.dom;
142
+ retained.inner.destroy();
143
+ dom.remove();
144
+ (_retained$parking = retained.parking) === null || _retained$parking === void 0 || _retained$parking.remove();
145
+ }
146
+ });
147
+ });
148
+ }
149
+ };
150
+ }
@@ -0,0 +1,8 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.NATIVE_EMBED_MAUI_EXTENSION_KEY = void 0;
7
+ var _manifestHelpers = require("./manifest-helpers");
8
+ var NATIVE_EMBED_MAUI_EXTENSION_KEY = exports.NATIVE_EMBED_MAUI_EXTENSION_KEY = "".concat(_manifestHelpers.NATIVE_EMBED_EXTENSION_KEY, ":maui");
@@ -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 = "128.4.0";
30
+ var packageVersion = "129.1.0";
31
31
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
32
32
  // Remove URL as it has UGC
33
33
  // Ignored via go/ees007
@@ -1,9 +1,11 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
7
  exports.getMatchingQuickInsertComponents = void 0;
8
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
7
9
  var _surfaceRenderer = require("@atlaskit/editor-ui-control-model/surface-renderer");
8
10
  var _isMenuFooterSectionKey = require("../type-ahead/isMenuFooterSectionKey");
9
11
  var _isSectionOverflowItemKey = require("../type-ahead/isSectionOverflowItemKey");
@@ -11,6 +13,7 @@ var _keys = require("./keys");
11
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; } } }; }
12
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; } }
13
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 SEARCH_TOP_MATCH_LIMIT = 5;
14
17
  var getRank = function getRank(component, parentKey) {
15
18
  var _component$parents$fi, _component$parents;
16
19
  return (_component$parents$fi = (_component$parents = component.parents) === null || _component$parents === void 0 || (_component$parents = _component$parents.find(function (parent) {
@@ -18,20 +21,38 @@ var getRank = function getRank(component, parentKey) {
18
21
  })) === null || _component$parents === void 0 ? void 0 : _component$parents.rank) !== null && _component$parents$fi !== void 0 ? _component$parents$fi : Number.MAX_SAFE_INTEGER;
19
22
  };
20
23
  var compareMatchedItems = function compareMatchedItems(a, b) {
21
- return a.sectionRank - b.sectionRank || a.score - b.score || a.itemRank - b.itemRank || a.identity.localeCompare(b.identity);
24
+ return a.sectionRank - b.sectionRank || a.score - b.score || a.itemRank - b.itemRank || a.sourceIndex - b.sourceIndex || a.identity.localeCompare(b.identity);
25
+ };
26
+ var compareSearchResults = function compareSearchResults(a, b) {
27
+ return a.score - b.score || a.sectionRank - b.sectionRank || a.itemRank - b.itemRank || a.sourceIndex - b.sourceIndex || a.identity.localeCompare(b.identity);
28
+ };
29
+ var getSearchResults = function getSearchResults(matches) {
30
+ var topMatches = Array.from(matches).sort(compareSearchResults).slice(0, SEARCH_TOP_MATCH_LIMIT);
31
+ var topMatchIdentities = new Set(topMatches.map(function (_ref) {
32
+ var identity = _ref.identity;
33
+ return identity;
34
+ }));
35
+ var tailMatches = matches.filter(function (_ref2) {
36
+ var identity = _ref2.identity;
37
+ return !topMatchIdentities.has(identity);
38
+ });
39
+ return [].concat((0, _toConsumableArray2.default)(topMatches), (0, _toConsumableArray2.default)(tailMatches)).map(function (_ref3) {
40
+ var item = _ref3.item;
41
+ return item;
42
+ });
22
43
  };
23
44
 
24
45
  /**
25
46
  * Resolves registered menu items for a non-empty query. This intentionally has
26
47
  * no empty-query path so browse behavior remains owned by buildQuickInsertMenuModel.
27
48
  */
28
- var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents = function getMatchingQuickInsertComponents(_ref) {
49
+ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents = function getMatchingQuickInsertComponents(_ref4) {
29
50
  var _childrenMap$get2;
30
- var components = _ref.components,
31
- rootComponent = _ref.rootComponent,
32
- query = _ref.query,
33
- formatMessage = _ref.formatMessage,
34
- surfaceContext = _ref.surfaceContext;
51
+ var components = _ref4.components,
52
+ rootComponent = _ref4.rootComponent,
53
+ query = _ref4.query,
54
+ formatMessage = _ref4.formatMessage,
55
+ surfaceContext = _ref4.surfaceContext;
35
56
  var _resolveSurface = (0, _surfaceRenderer.resolveSurface)(components, rootComponent),
36
57
  childrenMap = _resolveSurface.childrenMap,
37
58
  root = _resolveSurface.root,
@@ -44,6 +65,9 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
44
65
  };
45
66
  }
46
67
  var matches = new Map();
68
+ var sourceIndexByComponent = new Map(components.map(function (component, index) {
69
+ return [component, index];
70
+ }));
47
71
  var _iterator = _createForOfIteratorHelper(topLevelChildren),
48
72
  _step;
49
73
  try {
@@ -57,7 +81,7 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
57
81
  _step3;
58
82
  try {
59
83
  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
60
- var _item$match, _match$score;
84
+ var _item$match, _match$score, _sourceIndexByCompone;
61
85
  var item = _step3.value;
62
86
  if (item.type !== 'menu-item' || (0, _isSectionOverflowItemKey.isSectionOverflowItemKey)(item.key) || !(0, _surfaceRenderer.willComponentRender)(item, childrenMap, surfaceContext)) {
63
87
  continue;
@@ -74,6 +98,7 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
74
98
  item: item,
75
99
  itemRank: getRank(item, section.key),
76
100
  score: Math.min(1, Math.max(0, (_match$score = match === null || match === void 0 ? void 0 : match.score) !== null && _match$score !== void 0 ? _match$score : 0)),
101
+ sourceIndex: (_sourceIndexByCompone = sourceIndexByComponent.get(item)) !== null && _sourceIndexByCompone !== void 0 ? _sourceIndexByCompone : Number.MAX_SAFE_INTEGER,
77
102
  section: section,
78
103
  sectionRank: getRank(section, root.key)
79
104
  };
@@ -93,8 +118,10 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
93
118
  } finally {
94
119
  _iterator.f();
95
120
  }
121
+ var uniqueMatches = Array.from(matches.values()).sort(compareMatchedItems);
122
+ var searchResults = query !== '' ? getSearchResults(uniqueMatches) : undefined;
96
123
  var sectionsByKey = new Map();
97
- var _iterator2 = _createForOfIteratorHelper(Array.from(matches.values()).sort(compareMatchedItems)),
124
+ var _iterator2 = _createForOfIteratorHelper(uniqueMatches),
98
125
  _step2;
99
126
  try {
100
127
  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -116,6 +143,7 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
116
143
  return {
117
144
  footer: undefined,
118
145
  root: root,
146
+ searchResults: searchResults,
119
147
  sections: sections
120
148
  };
121
149
  }
@@ -138,6 +166,7 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
138
166
  fallbackItems: fallbackItems,
139
167
  footer: footer,
140
168
  root: root,
169
+ searchResults: searchResults,
141
170
  sections: sections
142
171
  };
143
172
  };
@@ -0,0 +1,12 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.getQuickInsertMenuRows = void 0;
8
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
+ var getQuickInsertMenuRows = exports.getQuickInsertMenuRows = function getQuickInsertMenuRows(model) {
10
+ var _model$searchResults, _model$fallbackItems;
11
+ return [].concat((0, _toConsumableArray2.default)((_model$searchResults = model.searchResults) !== null && _model$searchResults !== void 0 ? _model$searchResults : model.sections.flat()), (0, _toConsumableArray2.default)((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : []));
12
+ };
@@ -15,6 +15,12 @@ Object.defineProperty(exports, "getMatchingQuickInsertComponents", {
15
15
  return _getMatchingQuickInsertComponents.getMatchingQuickInsertComponents;
16
16
  }
17
17
  });
18
+ Object.defineProperty(exports, "getQuickInsertMenuRows", {
19
+ enumerable: true,
20
+ get: function get() {
21
+ return _getQuickInsertMenuRows.getQuickInsertMenuRows;
22
+ }
23
+ });
18
24
  Object.defineProperty(exports, "quickInsertProviderMenuItemKey", {
19
25
  enumerable: true,
20
26
  get: function get() {
@@ -28,6 +34,7 @@ Object.defineProperty(exports, "selectQuickInsertCategoryItems", {
28
34
  }
29
35
  });
30
36
  var _buildQuickInsertMenuModel = require("./build-quick-insert-menu-model");
37
+ var _getQuickInsertMenuRows = require("./getQuickInsertMenuRows");
31
38
  var _getQuickInsertProviderMenuItemKey = require("./getQuickInsertProviderMenuItemKey");
32
39
  var _selectQuickInsertCategoryItems = require("./selectQuickInsertCategoryItems");
33
40
  var _getMatchingQuickInsertComponents = require("./get-matching-quick-insert-components");
@@ -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 = "128.4.0";
27
+ var packageVersion = "129.1.0";
28
28
  var halfFocusRing = 1;
29
29
  var dropOffset = '0, 8';
30
30
  var fadeIn = (0, _react2.keyframes)({
@@ -37,8 +37,15 @@ export const copyToClipboard = async textToCopy => {
37
37
  }
38
38
  };
39
39
 
40
- // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
41
- export const copyHTMLToClipboard = async (elementToCopy, plainTextToCopy) => {
40
+ // EDF-2436: the copy helpers below are called fire-and-forget from click handlers, so a
41
+ // late rejection (eg. the polyfill's DOM fallback running after the document is gone)
42
+ // becomes an unhandled rejection and takes down the whole process. Attaching a no-op
43
+ // handler marks it handled; callers that await still receive the error.
44
+ const markRejectionHandled = promise => {
45
+ promise.catch(() => {});
46
+ return promise;
47
+ };
48
+ const writeHTMLToClipboard = async (elementToCopy, plainTextToCopy) => {
42
49
  if (isClipboardApiSupported() && typeof ClipboardItem !== 'undefined') {
43
50
  try {
44
51
  const data = new ClipboardItem({
@@ -57,7 +64,8 @@ export const copyHTMLToClipboard = async (elementToCopy, plainTextToCopy) => {
57
64
  try {
58
65
  // ED-17083 extension copy seems have issue with ClipboardItem API
59
66
  // Hence of use of this polyfill
60
- copyHTMLToClipboardPolyfill(elementToCopy, plainTextToCopy);
67
+ // Awaited so the polyfill's async failures land in the catch below.
68
+ await copyHTMLToClipboardPolyfill(elementToCopy, plainTextToCopy);
61
69
  } catch (error) {
62
70
  // eslint-disable-next-line no-console
63
71
  console.log(error);
@@ -65,10 +73,9 @@ export const copyHTMLToClipboard = async (elementToCopy, plainTextToCopy) => {
65
73
  }
66
74
  };
67
75
 
68
- // At the time of development, Firefox doesn't support ClipboardItem API
69
- // Hence of use of this polyfill
70
76
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
71
- export const copyHTMLToClipboardPolyfill = async (elementToCopy, plainTextToCopy) => {
77
+ export const copyHTMLToClipboard = (elementToCopy, plainTextToCopy) => markRejectionHandled(writeHTMLToClipboard(elementToCopy, plainTextToCopy));
78
+ const writeHTMLToClipboardPolyfill = async (elementToCopy, plainTextToCopy) => {
72
79
  const dt = new clipboard.ClipboardItem({
73
80
  'text/html': new Blob([elementToCopy.innerHTML], {
74
81
  type: 'text/html'
@@ -80,6 +87,11 @@ export const copyHTMLToClipboardPolyfill = async (elementToCopy, plainTextToCopy
80
87
  await clipboard.write([dt]);
81
88
  };
82
89
 
90
+ // At the time of development, Firefox doesn't support ClipboardItem API
91
+ // Hence of use of this polyfill
92
+ // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
93
+ export const copyHTMLToClipboardPolyfill = (elementToCopy, plainTextToCopy) => markRejectionHandled(writeHTMLToClipboardPolyfill(elementToCopy, plainTextToCopy));
94
+
83
95
  // Safari can revoke transient user activation before asynchronous clipboard writes complete.
84
96
  // Keep this helper synchronous so callers can invoke it directly from a click handler.
85
97
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
@@ -7,6 +7,7 @@ import ReactNodeView from '../react-node-view';
7
7
  import { Extension } from './Extension';
8
8
  import { ExtensionNodeWrapper } from './ExtensionNodeWrapper';
9
9
  import { isNativeEmbedExtension } from './nativeEmbedExtension';
10
+ import { preserveRemixNodeView } from './preserveRemixNodeView';
10
11
  /**
11
12
  * Allowlists of extension keys + layout
12
13
  * Currently, only toc with default layout allows to skip React render.
@@ -334,7 +335,7 @@ function ExtensionNodeRender({
334
335
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
335
336
  export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionLoadingHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, showUpdatedLivePages1PBodiedExtensionUI, rendererExtensionHandlers, intl) {
336
337
  return (node, view, getPos) => {
337
- return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
338
+ const renderProps = {
338
339
  providerFactory,
339
340
  extensionHandlers,
340
341
  extensionLoadingHandlers,
@@ -345,6 +346,18 @@ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, pr
345
346
  showUpdatedLivePages1PBodiedExtensionUI,
346
347
  rendererExtensionHandlers,
347
348
  intl
348
- }).init();
349
+ };
350
+ const createExtensionNode = currentNode => new ExtensionNode(currentNode, view, getPos, portalProviderAPI, eventDispatcher, renderProps);
351
+ if (!isSSR() && fg('cc_maui_annotations_on_extensions')) {
352
+ return preserveRemixNodeView({
353
+ node,
354
+ view,
355
+ getPos,
356
+ renderProps,
357
+ rendererKind: ExtensionNode,
358
+ createExtensionNode
359
+ });
360
+ }
361
+ return createExtensionNode(node).init();
349
362
  };
350
363
  }