@atlaskit/editor-common 100.1.0 → 100.1.2

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 (29) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/dist/cjs/extensibility/ExtensionComponent.js +72 -374
  3. package/dist/cjs/monitoring/error.js +1 -1
  4. package/dist/cjs/ui/DropList/index.js +1 -1
  5. package/dist/cjs/ui/Mention/index.js +1 -13
  6. package/dist/cjs/ui/Mention/mention-with-providers.js +2 -105
  7. package/dist/cjs/ui-menu/DropdownMenu/index.js +1 -1
  8. package/dist/cjs/utils/editor-core-utils.js +6 -1
  9. package/dist/es2019/extensibility/ExtensionComponent.js +7 -287
  10. package/dist/es2019/monitoring/error.js +1 -1
  11. package/dist/es2019/ui/DropList/index.js +1 -1
  12. package/dist/es2019/ui/Mention/index.js +2 -14
  13. package/dist/es2019/ui/Mention/mention-with-providers.js +2 -83
  14. package/dist/es2019/ui-menu/DropdownMenu/index.js +3 -1
  15. package/dist/es2019/utils/editor-core-utils.js +6 -1
  16. package/dist/esm/extensibility/ExtensionComponent.js +69 -372
  17. package/dist/esm/monitoring/error.js +1 -1
  18. package/dist/esm/ui/DropList/index.js +1 -1
  19. package/dist/esm/ui/Mention/index.js +2 -14
  20. package/dist/esm/ui/Mention/mention-with-providers.js +2 -105
  21. package/dist/esm/ui-menu/DropdownMenu/index.js +3 -1
  22. package/dist/esm/utils/editor-core-utils.js +6 -1
  23. package/dist/types/extensibility/ExtensionComponent.d.ts +1 -29
  24. package/dist/types/ui/Mention/mention-with-providers.d.ts +1 -8
  25. package/dist/types/ui-menu/DropdownMenu/index.d.ts +0 -4
  26. package/dist/types-ts4.5/extensibility/ExtensionComponent.d.ts +1 -29
  27. package/dist/types-ts4.5/ui/Mention/mention-with-providers.d.ts +1 -8
  28. package/dist/types-ts4.5/ui-menu/DropdownMenu/index.d.ts +0 -4
  29. package/package.json +9 -12
package/CHANGELOG.md CHANGED
@@ -1,5 +1,26 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 100.1.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#118657](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/118657)
8
+ [`849aa409da86d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/849aa409da86d) -
9
+ [ux] ED-26673 Toolbar overflow menu shows active docking preference
10
+ - Updated dependencies
11
+
12
+ ## 100.1.1
13
+
14
+ ### Patch Changes
15
+
16
+ - [#118516](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/118516)
17
+ [`d550ae651b8f4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d550ae651b8f4) -
18
+ [ux] ED-26762 Change implementation of isElementInTableCell so that it finds whichever is closest
19
+ out of td or th instead of favouring returning the first td first. This solves an issues with
20
+ nested tables where the currently hovered nested table was not being tracked but rather the parent
21
+ cell.
22
+ - Updated dependencies
23
+
3
24
  ## 100.1.0
4
25
 
5
26
  ### Minor Changes
@@ -5,10 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.ExtensionComponentOld = exports.ExtensionComponentNew = exports.ExtensionComponent = void 0;
9
- var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
- var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
8
+ exports.ExtensionComponent = void 0;
12
9
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
10
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
14
11
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -17,10 +14,12 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
17
14
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
18
15
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
19
16
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
17
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
18
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
19
+ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
20
20
  var _react = _interopRequireWildcard(require("react"));
21
21
  var _memoizeOne = _interopRequireDefault(require("memoize-one"));
22
22
  var _state = require("@atlaskit/editor-prosemirror/state");
23
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
24
23
  var _extensions = require("../extensions");
25
24
  var _utils = require("../utils");
26
25
  var _Extension = _interopRequireDefault(require("./Extension/Extension"));
@@ -28,10 +27,11 @@ var _extensionUtils = require("./Extension/Extension/extension-utils");
28
27
  var _InlineExtension = _interopRequireDefault(require("./Extension/InlineExtension"));
29
28
  var _MultiBodiedExtension = _interopRequireDefault(require("./MultiBodiedExtension"));
30
29
  var _excluded = ["extensionProvider", "showLivePagesBodiedMacrosRendererView", "node"];
30
+ /* eslint-disable @repo/internal/react/no-class-components */
31
31
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
32
32
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
33
33
  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)); }
34
- function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable @repo/internal/react/no-class-components */
34
+ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
35
35
  /* temporary type until FG cleaned up */
36
36
 
37
37
  /* temporary type until FG cleaned up */
@@ -43,17 +43,54 @@ var getBodiedExtensionContent = function getBodiedExtensionContent(node) {
43
43
  });
44
44
  return !!bodiedExtensionContent.length ? bodiedExtensionContent : node.attrs.text;
45
45
  };
46
- var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/function (_Component) {
47
- function ExtensionComponentOld() {
46
+ var ExtensionComponent = exports.ExtensionComponent = function ExtensionComponent(props) {
47
+ var extensionProviderResolver = props.extensionProvider,
48
+ showLivePagesBodiedMacrosRendererView = props.showLivePagesBodiedMacrosRendererView,
49
+ node = props.node,
50
+ restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
51
+ var _useState = (0, _react.useState)(undefined),
52
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
53
+ extensionProvider = _useState2[0],
54
+ setExtensionProvider = _useState2[1];
55
+ var _useState3 = (0, _react.useState)(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !(0, _extensionUtils.isEmptyBodiedMacro)(node)),
56
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
57
+ showBodiedExtensionRendererView = _useState4[0],
58
+ setShowBodiedExtensionRendererView = _useState4[1];
59
+ var mountedRef = (0, _react.useRef)(true);
60
+ (0, _react.useLayoutEffect)(function () {
61
+ mountedRef.current = true;
62
+ return function () {
63
+ mountedRef.current = false;
64
+ };
65
+ }, []);
66
+ (0, _react.useEffect)(function () {
67
+ extensionProviderResolver === null || extensionProviderResolver === void 0 || extensionProviderResolver.then(function (provider) {
68
+ if (mountedRef.current) {
69
+ setExtensionProvider(provider);
70
+ }
71
+ });
72
+ }, [extensionProviderResolver]);
73
+ return /*#__PURE__*/_react.default.createElement(ExtensionComponentInner
74
+ // Ignored via go/ees005
75
+ // eslint-disable-next-line react/jsx-props-no-spreading
76
+ , (0, _extends2.default)({}, restProps, {
77
+ extensionProvider: extensionProvider,
78
+ node: node,
79
+ showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
80
+ showBodiedExtensionRendererView: showBodiedExtensionRendererView,
81
+ setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
82
+ }));
83
+ };
84
+ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
85
+ function ExtensionComponentInner() {
48
86
  var _this;
49
- (0, _classCallCheck2.default)(this, ExtensionComponentOld);
87
+ (0, _classCallCheck2.default)(this, ExtensionComponentInner);
50
88
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
51
89
  args[_key] = arguments[_key];
52
90
  }
53
- _this = _callSuper(this, ExtensionComponentOld, [].concat(args));
91
+ _this = _callSuper(this, ExtensionComponentInner, [].concat(args));
54
92
  (0, _defineProperty2.default)(_this, "privatePropsParsed", false);
55
93
  (0, _defineProperty2.default)(_this, "state", {});
56
- (0, _defineProperty2.default)(_this, "mounted", false);
57
94
  // memoized to avoid rerender on extension state changes
58
95
  (0, _defineProperty2.default)(_this, "getNodeRenderer", (0, _memoizeOne.default)(_extensions.getNodeRenderer));
59
96
  (0, _defineProperty2.default)(_this, "getExtensionModuleNodePrivateProps", (0, _memoizeOne.default)(_extensions.getExtensionModuleNodePrivateProps));
@@ -65,21 +102,6 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
65
102
  });
66
103
  }
67
104
  });
68
- (0, _defineProperty2.default)(_this, "setShowBodiedExtensionRendererView", function (showRendererView) {
69
- _this.setState({
70
- showBodiedExtensionRendererView: showRendererView
71
- });
72
- });
73
- // Ignored via go/ees005
74
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
75
- (0, _defineProperty2.default)(_this, "setStateFromPromise", function (stateKey, promise) {
76
- promise && promise.then(function (p) {
77
- if (!_this.mounted) {
78
- return;
79
- }
80
- _this.setState((0, _defineProperty2.default)({}, stateKey, p));
81
- });
82
- });
83
105
  /**
84
106
  * Parses any private nodes once an extension provider is available.
85
107
  *
@@ -92,7 +114,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
92
114
  return _regenerator.default.wrap(function _callee$(_context) {
93
115
  while (1) switch (_context.prev = _context.next) {
94
116
  case 0:
95
- if (!(_this.privatePropsParsed || !_this.state.extensionProvider)) {
117
+ if (!(_this.privatePropsParsed || !_this.props.extensionProvider)) {
96
118
  _context.next = 2;
97
119
  break;
98
120
  }
@@ -106,7 +128,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
106
128
  */
107
129
  _context.prev = 4;
108
130
  _context.next = 7;
109
- return _this.getExtensionModuleNodePrivateProps(_this.state.extensionProvider, extensionType, extensionKey);
131
+ return _this.getExtensionModuleNodePrivateProps(_this.props.extensionProvider, extensionType, extensionKey);
110
132
  case 7:
111
133
  privateProps = _context.sent;
112
134
  _this.setState({
@@ -132,8 +154,8 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
132
154
  var _this$props = _this.props,
133
155
  extensionHandlers = _this$props.extensionHandlers,
134
156
  editorView = _this$props.editorView,
157
+ showBodiedExtensionRendererView = _this$props.showBodiedExtensionRendererView,
135
158
  rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
136
- var showBodiedExtensionRendererView = _this.state.showBodiedExtensionRendererView; // State will only be true if the gate is on and meets requirements
137
159
  var _pmNode$attrs = pmNode.attrs,
138
160
  extensionType = _pmNode$attrs.extensionType,
139
161
  extensionKey = _pmNode$attrs.extensionKey,
@@ -169,7 +191,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
169
191
  result = render(node, editorView.state.doc, actions);
170
192
  }
171
193
  if (!result) {
172
- var extensionHandlerFromProvider = _this.state.extensionProvider && _this.getNodeRenderer(_this.state.extensionProvider, extensionType, extensionKey);
194
+ var extensionHandlerFromProvider = _this.props.extensionProvider && _this.getNodeRenderer(_this.props.extensionProvider, extensionType, extensionKey);
173
195
  if (extensionHandlerFromProvider) {
174
196
  var NodeRenderer = extensionHandlerFromProvider;
175
197
  if (node.type === 'multiBodiedExtension') {
@@ -190,321 +212,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
190
212
  });
191
213
  return _this;
192
214
  }
193
- (0, _inherits2.default)(ExtensionComponentOld, _Component);
194
- return (0, _createClass2.default)(ExtensionComponentOld, [{
195
- key: "UNSAFE_componentWillMount",
196
- value:
197
- // Ignored via go/ees005
198
- // eslint-disable-next-line react/no-unsafe
199
- function UNSAFE_componentWillMount() {
200
- this.mounted = true;
201
- var _this$props2 = this.props,
202
- node = _this$props2.node,
203
- showLivePagesBodiedMacrosRendererView = _this$props2.showLivePagesBodiedMacrosRendererView;
204
- // We only care about this empty state on first page load or insertion to determine the view
205
- if (!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !(0, _extensionUtils.isEmptyBodiedMacro)(node)) {
206
- this.setState({
207
- showBodiedExtensionRendererView: true
208
- });
209
- }
210
- }
211
- }, {
212
- key: "componentDidMount",
213
- value: function componentDidMount() {
214
- var extensionProvider = this.props.extensionProvider;
215
- if (extensionProvider) {
216
- this.setStateFromPromise('extensionProvider', extensionProvider);
217
- }
218
- }
219
- }, {
220
- key: "componentDidUpdate",
221
- value: function componentDidUpdate() {
222
- this.parsePrivateNodePropsIfNeeded();
223
- }
224
- }, {
225
- key: "componentWillUnmount",
226
- value: function componentWillUnmount() {
227
- this.mounted = false;
228
- }
229
-
230
- // Ignored via go/ees005
231
- // eslint-disable-next-line react/no-unsafe
232
- }, {
233
- key: "UNSAFE_componentWillReceiveProps",
234
- value: function UNSAFE_componentWillReceiveProps(nextProps) {
235
- var extensionProvider = nextProps.extensionProvider;
236
- if (extensionProvider && this.props.extensionProvider !== extensionProvider) {
237
- this.setStateFromPromise('extensionProvider', extensionProvider);
238
- }
239
- }
240
- }, {
241
- key: "render",
242
- value: function render() {
243
- var _this$state$_privateP;
244
- var _this$props3 = this.props,
245
- node = _this$props3.node,
246
- handleContentDOMRef = _this$props3.handleContentDOMRef,
247
- editorView = _this$props3.editorView,
248
- references = _this$props3.references,
249
- editorAppearance = _this$props3.editorAppearance,
250
- pluginInjectionApi = _this$props3.pluginInjectionApi,
251
- getPos = _this$props3.getPos,
252
- eventDispatcher = _this$props3.eventDispatcher,
253
- macroInteractionDesignFeatureFlags = _this$props3.macroInteractionDesignFeatureFlags,
254
- showLivePagesBodiedMacrosRendererView = _this$props3.showLivePagesBodiedMacrosRendererView,
255
- showUpdatedLivePages1PBodiedExtensionUI = _this$props3.showUpdatedLivePages1PBodiedExtensionUI,
256
- isLivePageViewMode = _this$props3.isLivePageViewMode;
257
- var selection = editorView.state.selection;
258
- var selectedNode = selection instanceof _state.NodeSelection && selection.node;
259
- var position = typeof getPos === 'function' && getPos();
260
- var resolvedPosition = position && editorView.state.doc.resolve(position);
261
- var isNodeNested = !!(resolvedPosition && resolvedPosition.depth > 0);
262
- if (node.type.name === 'multiBodiedExtension') {
263
- return /*#__PURE__*/_react.default.createElement(_MultiBodiedExtension.default, {
264
- node: node,
265
- editorView: editorView,
266
- getPos: getPos,
267
- handleContentDOMRef: handleContentDOMRef,
268
- tryExtensionHandler: this.tryExtensionHandler.bind(this),
269
- eventDispatcher: eventDispatcher,
270
- pluginInjectionApi: pluginInjectionApi,
271
- editorAppearance: editorAppearance,
272
- macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
273
- isNodeSelected: selectedNode === node,
274
- isNodeNested: isNodeNested,
275
- isNodeHovered: this.state.isNodeHovered,
276
- setIsNodeHovered: this.setIsNodeHovered,
277
- isLivePageViewMode: isLivePageViewMode
278
- });
279
- }
280
- var extensionHandlerResult = this.tryExtensionHandler(undefined);
281
- switch (node.type.name) {
282
- case 'extension':
283
- case 'bodiedExtension':
284
- return /*#__PURE__*/_react.default.createElement(_Extension.default, {
285
- node: node,
286
- getPos: this.props.getPos,
287
- references: references,
288
- extensionProvider: this.state.extensionProvider,
289
- handleContentDOMRef: handleContentDOMRef,
290
- view: editorView,
291
- editorAppearance: editorAppearance,
292
- hideFrame: (_this$state$_privateP = this.state._privateProps) === null || _this$state$_privateP === void 0 ? void 0 : _this$state$_privateP.__hideFrame,
293
- pluginInjectionApi: pluginInjectionApi,
294
- macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
295
- isNodeSelected: selectedNode === node,
296
- isNodeHovered: this.state.isNodeHovered,
297
- isNodeNested: isNodeNested,
298
- setIsNodeHovered: this.setIsNodeHovered,
299
- showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
300
- showUpdatedLivePages1PBodiedExtensionUI: !!(showUpdatedLivePages1PBodiedExtensionUI !== null && showUpdatedLivePages1PBodiedExtensionUI !== void 0 && showUpdatedLivePages1PBodiedExtensionUI((0, _utils.nodeToJSON)(node))),
301
- showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
302
- setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView,
303
- isLivePageViewMode: isLivePageViewMode
304
- }, extensionHandlerResult);
305
- case 'inlineExtension':
306
- return /*#__PURE__*/_react.default.createElement(_InlineExtension.default, {
307
- node: node,
308
- macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
309
- isNodeSelected: selectedNode === node,
310
- pluginInjectionApi: pluginInjectionApi,
311
- isNodeHovered: this.state.isNodeHovered,
312
- setIsNodeHovered: this.setIsNodeHovered,
313
- isLivePageViewMode: isLivePageViewMode
314
- }, extensionHandlerResult);
315
- default:
316
- return null;
317
- }
318
- }
319
- }, {
320
- key: "tryExtensionHandler",
321
- value: function tryExtensionHandler(actions) {
322
- var node = this.props.node;
323
- try {
324
- var extensionContent = this.handleExtension(node, actions);
325
- if (extensionContent && /*#__PURE__*/_react.default.isValidElement(extensionContent)) {
326
- return extensionContent;
327
- }
328
- } catch (e) {
329
- // eslint-disable-next-line no-console
330
- console.error('Provided extension handler has thrown an error\n', e);
331
- /** We don't want this error to block renderer */
332
- /** We keep rendering the default content */
333
- }
334
- return null;
335
- }
336
- }]);
337
- }(_react.Component);
338
- var ExtensionComponentNew = exports.ExtensionComponentNew = function ExtensionComponentNew(props) {
339
- var extensionProviderResolver = props.extensionProvider,
340
- showLivePagesBodiedMacrosRendererView = props.showLivePagesBodiedMacrosRendererView,
341
- node = props.node,
342
- restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
343
- var _useState = (0, _react.useState)(undefined),
344
- _useState2 = (0, _slicedToArray2.default)(_useState, 2),
345
- extensionProvider = _useState2[0],
346
- setExtensionProvider = _useState2[1];
347
- var _useState3 = (0, _react.useState)(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !(0, _extensionUtils.isEmptyBodiedMacro)(node)),
348
- _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
349
- showBodiedExtensionRendererView = _useState4[0],
350
- setShowBodiedExtensionRendererView = _useState4[1];
351
- var mountedRef = (0, _react.useRef)(true);
352
- (0, _react.useLayoutEffect)(function () {
353
- mountedRef.current = true;
354
- return function () {
355
- mountedRef.current = false;
356
- };
357
- }, []);
358
- (0, _react.useEffect)(function () {
359
- extensionProviderResolver === null || extensionProviderResolver === void 0 || extensionProviderResolver.then(function (provider) {
360
- if (mountedRef.current) {
361
- setExtensionProvider(provider);
362
- }
363
- });
364
- }, [extensionProviderResolver]);
365
- return /*#__PURE__*/_react.default.createElement(ExtensionComponentInner
366
- // Ignored via go/ees005
367
- // eslint-disable-next-line react/jsx-props-no-spreading
368
- , (0, _extends2.default)({}, restProps, {
369
- extensionProvider: extensionProvider,
370
- node: node,
371
- showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
372
- showBodiedExtensionRendererView: showBodiedExtensionRendererView,
373
- setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
374
- }));
375
- };
376
- var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
377
- function ExtensionComponentInner() {
378
- var _this2;
379
- (0, _classCallCheck2.default)(this, ExtensionComponentInner);
380
- for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
381
- args[_key2] = arguments[_key2];
382
- }
383
- _this2 = _callSuper(this, ExtensionComponentInner, [].concat(args));
384
- (0, _defineProperty2.default)(_this2, "privatePropsParsed", false);
385
- (0, _defineProperty2.default)(_this2, "state", {});
386
- // memoized to avoid rerender on extension state changes
387
- (0, _defineProperty2.default)(_this2, "getNodeRenderer", (0, _memoizeOne.default)(_extensions.getNodeRenderer));
388
- (0, _defineProperty2.default)(_this2, "getExtensionModuleNodePrivateProps", (0, _memoizeOne.default)(_extensions.getExtensionModuleNodePrivateProps));
389
- (0, _defineProperty2.default)(_this2, "setIsNodeHovered", function (isHovered) {
390
- // Don't want to show hover interactions for live page view mode
391
- if (!_this2.props.isLivePageViewMode) {
392
- _this2.setState({
393
- isNodeHovered: isHovered
394
- });
395
- }
396
- });
397
- /**
398
- * Parses any private nodes once an extension provider is available.
399
- *
400
- * We do this separately from resolving a node renderer component since the
401
- * private props come from extension provider, rather than an extension
402
- * handler which only handles `render`/component concerns.
403
- */
404
- (0, _defineProperty2.default)(_this2, "parsePrivateNodePropsIfNeeded", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
405
- var _this2$props$node$att, extensionType, extensionKey, privateProps;
406
- return _regenerator.default.wrap(function _callee2$(_context2) {
407
- while (1) switch (_context2.prev = _context2.next) {
408
- case 0:
409
- if (!(_this2.privatePropsParsed || !_this2.props.extensionProvider)) {
410
- _context2.next = 2;
411
- break;
412
- }
413
- return _context2.abrupt("return");
414
- case 2:
415
- _this2.privatePropsParsed = true;
416
- _this2$props$node$att = _this2.props.node.attrs, extensionType = _this2$props$node$att.extensionType, extensionKey = _this2$props$node$att.extensionKey;
417
- /**
418
- * getExtensionModuleNodePrivateProps can throw if there are issues in the
419
- * manifest
420
- */
421
- _context2.prev = 4;
422
- _context2.next = 7;
423
- return _this2.getExtensionModuleNodePrivateProps(_this2.props.extensionProvider, extensionType, extensionKey);
424
- case 7:
425
- privateProps = _context2.sent;
426
- _this2.setState({
427
- _privateProps: privateProps
428
- });
429
- _context2.next = 14;
430
- break;
431
- case 11:
432
- _context2.prev = 11;
433
- _context2.t0 = _context2["catch"](4);
434
- // eslint-disable-next-line no-console
435
- console.error('Provided extension handler has thrown an error\n', _context2.t0);
436
- /** We don't want this error to block renderer */
437
- /** We keep rendering the default content */
438
- case 14:
439
- case "end":
440
- return _context2.stop();
441
- }
442
- }, _callee2, null, [[4, 11]]);
443
- })));
444
- (0, _defineProperty2.default)(_this2, "handleExtension", function (pmNode, actions) {
445
- var _pmNode$marks2;
446
- var _this2$props = _this2.props,
447
- extensionHandlers = _this2$props.extensionHandlers,
448
- editorView = _this2$props.editorView,
449
- showBodiedExtensionRendererView = _this2$props.showBodiedExtensionRendererView,
450
- rendererExtensionHandlers = _this2$props.rendererExtensionHandlers;
451
- var _pmNode$attrs2 = pmNode.attrs,
452
- extensionType = _pmNode$attrs2.extensionType,
453
- extensionKey = _pmNode$attrs2.extensionKey,
454
- parameters = _pmNode$attrs2.parameters,
455
- text = _pmNode$attrs2.text;
456
- var isBodiedExtension = pmNode.type.name === 'bodiedExtension';
457
- if (isBodiedExtension && !showBodiedExtensionRendererView) {
458
- return;
459
- }
460
- var fragmentLocalId = pmNode === null || pmNode === void 0 || (_pmNode$marks2 = pmNode.marks) === null || _pmNode$marks2 === void 0 || (_pmNode$marks2 = _pmNode$marks2.find(function (m) {
461
- return m.type.name === 'fragment';
462
- })) === null || _pmNode$marks2 === void 0 || (_pmNode$marks2 = _pmNode$marks2.attrs) === null || _pmNode$marks2 === void 0 ? void 0 : _pmNode$marks2.localId;
463
- var content = isBodiedExtension ? getBodiedExtensionContent(pmNode) : text;
464
- var node = {
465
- type: pmNode.type.name,
466
- extensionType: extensionType,
467
- extensionKey: extensionKey,
468
- parameters: parameters,
469
- content: content,
470
- localId: pmNode.attrs.localId,
471
- fragmentLocalId: fragmentLocalId
472
- };
473
- if (isBodiedExtension) {
474
- var rendererExtensionHandler = rendererExtensionHandlers === null || rendererExtensionHandlers === void 0 ? void 0 : rendererExtensionHandlers[extensionType];
475
- // Forge bodied extensions don't get rendererExtensionHandlers passed in and use extensionHandlerFromProvider from the below logic instead
476
- if (rendererExtensionHandler) {
477
- return (0, _utils.getExtensionRenderer)(rendererExtensionHandler)(node, (0, _utils.toJSON)(editorView.state.doc));
478
- }
479
- }
480
- var result;
481
- if (extensionHandlers && extensionHandlers[extensionType]) {
482
- var render = (0, _utils.getExtensionRenderer)(extensionHandlers[extensionType]);
483
- result = render(node, editorView.state.doc, actions);
484
- }
485
- if (!result) {
486
- var extensionHandlerFromProvider = _this2.props.extensionProvider && _this2.getNodeRenderer(_this2.props.extensionProvider, extensionType, extensionKey);
487
- if (extensionHandlerFromProvider) {
488
- var NodeRenderer = extensionHandlerFromProvider;
489
- if (node.type === 'multiBodiedExtension') {
490
- return /*#__PURE__*/_react.default.createElement(NodeRenderer, {
491
- node: node,
492
- references: _this2.props.references,
493
- actions: actions
494
- });
495
- } else {
496
- return /*#__PURE__*/_react.default.createElement(NodeRenderer, {
497
- node: node,
498
- references: _this2.props.references
499
- });
500
- }
501
- }
502
- }
503
- return result;
504
- });
505
- return _this2;
506
- }
507
- (0, _inherits2.default)(ExtensionComponentInner, _Component2);
215
+ (0, _inherits2.default)(ExtensionComponentInner, _Component);
508
216
  return (0, _createClass2.default)(ExtensionComponentInner, [{
509
217
  key: "componentDidUpdate",
510
218
  value: function componentDidUpdate() {
@@ -513,23 +221,23 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
513
221
  }, {
514
222
  key: "render",
515
223
  value: function render() {
516
- var _this$state$_privateP2;
517
- var _this$props4 = this.props,
518
- node = _this$props4.node,
519
- handleContentDOMRef = _this$props4.handleContentDOMRef,
520
- editorView = _this$props4.editorView,
521
- references = _this$props4.references,
522
- editorAppearance = _this$props4.editorAppearance,
523
- pluginInjectionApi = _this$props4.pluginInjectionApi,
524
- getPos = _this$props4.getPos,
525
- eventDispatcher = _this$props4.eventDispatcher,
526
- macroInteractionDesignFeatureFlags = _this$props4.macroInteractionDesignFeatureFlags,
527
- extensionProvider = _this$props4.extensionProvider,
528
- showLivePagesBodiedMacrosRendererView = _this$props4.showLivePagesBodiedMacrosRendererView,
529
- showUpdatedLivePages1PBodiedExtensionUI = _this$props4.showUpdatedLivePages1PBodiedExtensionUI,
530
- showBodiedExtensionRendererView = _this$props4.showBodiedExtensionRendererView,
531
- setShowBodiedExtensionRendererView = _this$props4.setShowBodiedExtensionRendererView,
532
- isLivePageViewMode = _this$props4.isLivePageViewMode;
224
+ var _this$state$_privateP;
225
+ var _this$props2 = this.props,
226
+ node = _this$props2.node,
227
+ handleContentDOMRef = _this$props2.handleContentDOMRef,
228
+ editorView = _this$props2.editorView,
229
+ references = _this$props2.references,
230
+ editorAppearance = _this$props2.editorAppearance,
231
+ pluginInjectionApi = _this$props2.pluginInjectionApi,
232
+ getPos = _this$props2.getPos,
233
+ eventDispatcher = _this$props2.eventDispatcher,
234
+ macroInteractionDesignFeatureFlags = _this$props2.macroInteractionDesignFeatureFlags,
235
+ extensionProvider = _this$props2.extensionProvider,
236
+ showLivePagesBodiedMacrosRendererView = _this$props2.showLivePagesBodiedMacrosRendererView,
237
+ showUpdatedLivePages1PBodiedExtensionUI = _this$props2.showUpdatedLivePages1PBodiedExtensionUI,
238
+ showBodiedExtensionRendererView = _this$props2.showBodiedExtensionRendererView,
239
+ setShowBodiedExtensionRendererView = _this$props2.setShowBodiedExtensionRendererView,
240
+ isLivePageViewMode = _this$props2.isLivePageViewMode;
533
241
  var selection = editorView.state.selection;
534
242
  var selectedNode = selection instanceof _state.NodeSelection && selection.node;
535
243
  var position = typeof getPos === 'function' && getPos();
@@ -565,7 +273,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
565
273
  handleContentDOMRef: handleContentDOMRef,
566
274
  view: editorView,
567
275
  editorAppearance: editorAppearance,
568
- hideFrame: (_this$state$_privateP2 = this.state._privateProps) === null || _this$state$_privateP2 === void 0 ? void 0 : _this$state$_privateP2.__hideFrame,
276
+ hideFrame: (_this$state$_privateP = this.state._privateProps) === null || _this$state$_privateP === void 0 ? void 0 : _this$state$_privateP.__hideFrame,
569
277
  pluginInjectionApi: pluginInjectionApi,
570
278
  macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
571
279
  isNodeSelected: selectedNode === node,
@@ -610,14 +318,4 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
610
318
  return null;
611
319
  }
612
320
  }]);
613
- }(_react.Component);
614
- var ExtensionComponent = exports.ExtensionComponent = function ExtensionComponent(props) {
615
- if ((0, _platformFeatureFlags.fg)('platform_editor_react18_extension_component_v2')) {
616
- // Ignored via go/ees005
617
- // eslint-disable-next-line react/jsx-props-no-spreading
618
- return /*#__PURE__*/_react.default.createElement(ExtensionComponentNew, props);
619
- }
620
- // Ignored via go/ees005
621
- // eslint-disable-next-line react/jsx-props-no-spreading
622
- return /*#__PURE__*/_react.default.createElement(ExtensionComponentOld, props);
623
- };
321
+ }(_react.Component);
@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
17
17
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
18
18
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
19
19
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
20
- var packageVersion = "100.1.0";
20
+ var packageVersion = "100.1.2";
21
21
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
22
22
  // Remove URL as it has UGC
23
23
  // TODO: Sanitise the URL instead of just removing it
@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
23
23
  * @jsx jsx
24
24
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
25
25
  var packageName = "@atlaskit/editor-common";
26
- var packageVersion = "100.1.0";
26
+ var packageVersion = "100.1.2";
27
27
  var halfFocusRing = 1;
28
28
  var dropOffset = '0, 8';
29
29
  // Ignored via go/ees005
@@ -13,7 +13,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
13
13
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
14
14
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
15
  var _react = _interopRequireWildcard(require("react"));
16
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
17
16
  var _providerFactory = require("../../provider-factory");
18
17
  var _mentionWithProviders = require("./mention-with-providers");
19
18
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -34,18 +33,7 @@ var Mention = exports.default = /*#__PURE__*/function (_PureComponent) {
34
33
  localId = _this$props.localId;
35
34
  var mentionProvider = providers.mentionProvider,
36
35
  profilecardProvider = providers.profilecardProvider;
37
- if ((0, _platformFeatureFlags.fg)('platform_editor_react18_mention_with_provider_fix')) {
38
- return /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MentionWithProviders, {
39
- id: id,
40
- text: text,
41
- accessLevel: accessLevel,
42
- localId: localId,
43
- eventHandlers: eventHandlers,
44
- mentionProvider: mentionProvider,
45
- profilecardProvider: profilecardProvider
46
- });
47
- }
48
- return /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MentionWithProvidersOld, {
36
+ return /*#__PURE__*/_react.default.createElement(_mentionWithProviders.MentionWithProviders, {
49
37
  id: id,
50
38
  text: text,
51
39
  accessLevel: accessLevel,