@atlaskit/editor-common 134.20.1 → 135.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/CHANGELOG.md +54 -0
  2. package/dist/cjs/ai-messages/ai-suggestions.js +1 -1
  3. package/dist/cjs/credit-guard/CreditCheckedPopup.js +69 -15
  4. package/dist/cjs/element-browser/components/ElementBrowserLoader.js +25 -21
  5. package/dist/cjs/extensibility/ExtensionComponent.js +2 -1
  6. package/dist/cjs/extensions/extension-handlers.js +10 -44
  7. package/dist/cjs/monitoring/error.js +1 -1
  8. package/dist/cjs/numbered-headings/create-heading-numberer.js +37 -0
  9. package/dist/cjs/numbered-headings/index.js +5 -19
  10. package/dist/cjs/quick-insert/CompactQuickInsertMenuItem.js +16 -2
  11. package/dist/cjs/quick-insert/ElementBrowserQuickInsertMenuItem.js +15 -1
  12. package/dist/cjs/quick-insert/QuickInsertMenuItem.js +9 -0
  13. package/dist/cjs/quick-insert/quickInsertMenuItemUtils.js +6 -3
  14. package/dist/cjs/toolbar/EditorToolbarUIProvider.js +18 -0
  15. package/dist/cjs/ui/DropList/index.js +1 -1
  16. package/dist/cjs/ui/ErrorBoundary/index.js +6 -9
  17. package/dist/cjs/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
  18. package/dist/es2019/ai-messages/ai-suggestions.js +1 -1
  19. package/dist/es2019/credit-guard/CreditCheckedPopup.js +66 -16
  20. package/dist/es2019/element-browser/components/ElementBrowserLoader.js +20 -14
  21. package/dist/es2019/extensibility/ExtensionComponent.js +2 -1
  22. package/dist/es2019/extensions/extension-handlers.js +6 -23
  23. package/dist/es2019/monitoring/error.js +1 -1
  24. package/dist/es2019/numbered-headings/create-heading-numberer.js +31 -0
  25. package/dist/es2019/numbered-headings/index.js +4 -19
  26. package/dist/es2019/quick-insert/CompactQuickInsertMenuItem.js +17 -3
  27. package/dist/es2019/quick-insert/ElementBrowserQuickInsertMenuItem.js +16 -2
  28. package/dist/es2019/quick-insert/QuickInsertMenuItem.js +9 -0
  29. package/dist/es2019/quick-insert/quickInsertMenuItemUtils.js +11 -6
  30. package/dist/es2019/toolbar/EditorToolbarUIProvider.js +16 -0
  31. package/dist/es2019/ui/DropList/index.js +1 -1
  32. package/dist/es2019/ui/ErrorBoundary/index.js +10 -7
  33. package/dist/es2019/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
  34. package/dist/esm/ai-messages/ai-suggestions.js +1 -1
  35. package/dist/esm/credit-guard/CreditCheckedPopup.js +70 -16
  36. package/dist/esm/element-browser/components/ElementBrowserLoader.js +25 -19
  37. package/dist/esm/extensibility/ExtensionComponent.js +2 -1
  38. package/dist/esm/extensions/extension-handlers.js +8 -44
  39. package/dist/esm/monitoring/error.js +1 -1
  40. package/dist/esm/numbered-headings/create-heading-numberer.js +31 -0
  41. package/dist/esm/numbered-headings/index.js +5 -18
  42. package/dist/esm/quick-insert/CompactQuickInsertMenuItem.js +17 -3
  43. package/dist/esm/quick-insert/ElementBrowserQuickInsertMenuItem.js +16 -2
  44. package/dist/esm/quick-insert/QuickInsertMenuItem.js +9 -0
  45. package/dist/esm/quick-insert/quickInsertMenuItemUtils.js +6 -3
  46. package/dist/esm/toolbar/EditorToolbarUIProvider.js +18 -0
  47. package/dist/esm/ui/DropList/index.js +1 -1
  48. package/dist/esm/ui/ErrorBoundary/index.js +6 -9
  49. package/dist/esm/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
  50. package/dist/types/analytics/types/events.d.ts +1 -1
  51. package/dist/types/extensions/extension-handlers.d.ts +2 -1
  52. package/dist/types/numbered-headings/create-heading-numberer.d.ts +14 -0
  53. package/dist/types/numbered-headings/index.d.ts +1 -4
  54. package/dist/types/quick-insert/CompactQuickInsertMenuItem.d.ts +1 -1
  55. package/dist/types/quick-insert/ElementBrowserQuickInsertMenuItem.d.ts +1 -1
  56. package/dist/types/quick-insert/QuickInsertMenuItem.d.ts +5 -1
  57. package/dist/types/quick-insert/quickInsertMenuItemUtils.d.ts +1 -1
  58. package/dist/types/ui/ErrorBoundary/index.d.ts +3 -6
  59. package/numbered-headings/create-heading-numberer/package.json +10 -0
  60. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,59 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 135.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`381ba99e12072`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/381ba99e12072) -
8
+ Add selection-preflight, item-ref, and popup relationship props to the exported
9
+ QuickInsertMenuItem. Forward Jira's optional cached credit-status callback for
10
+ jira_ai_ubp_enforcement_messaging and block depleted Ask Rovo slash-menu selection before the host
11
+ closes the menu. Keep Escape dismissal of blocked feedback inside the popup, preserve the editor
12
+ draft, and restore focus to the control that had focus before the popup opened after popup content
13
+ exits. Keep owned credit popups inside the registered menu focus boundary. Keep credit feedback
14
+ above the containing modal. Guard Remix in the More Rovo options menu with the same cached
15
+ callback, keeping blocked feedback mounted and preserving the original action when credits are
16
+ available.
17
+
18
+ ### Patch Changes
19
+
20
+ - [`627dd84c1342a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/627dd84c1342a) -
21
+ Correct the review prompt localisation guidance to reference the current
22
+ add-suggestions-to-content skill.
23
+ - Updated dependencies
24
+
25
+ ## 135.0.0
26
+
27
+ ### Major Changes
28
+
29
+ - [`c1ec527d3ad2f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c1ec527d3ad2f) -
30
+ Require the fourth errorActionSubject argument in getNodeRenderer. Pass ACTION_SUBJECT.EDITOR for
31
+ Editor callers or ACTION_SUBJECT.RENDERER for Renderer callers. Support Renderer attribution in
32
+ the shared error boundary under platform_editor_loosely_lazy_migration.
33
+
34
+ ### Minor Changes
35
+
36
+ - [`ba744a2a50a5b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ba744a2a50a5b) -
37
+ Add `createHeadingNumberer` at
38
+ `@atlaskit/editor-common/numbered-headings/create-heading-numberer`, which numbers headings one at
39
+ a time in document order. `getHeadingNumbers` now uses it and returns the same numbers.
40
+ - [`c1ec527d3ad2f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c1ec527d3ad2f) -
41
+ Allow error boundary fallbacks to receive the caught error.
42
+
43
+ ### Patch Changes
44
+
45
+ - [`2c0be8a7e39cf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2c0be8a7e39cf) -
46
+ Behind `platform-dst-top-layer`, the editor toolbar takes focus back only after a toolbar action
47
+ (an item pick, a trigger click or a close from code). On Escape and Tab, the browser moves focus.
48
+ On an outside press, focus goes where the user pressed, for example the editor. The toolbar's
49
+ keyboard navigation also ignores keys from a menu or popup inside the toolbar, so Escape closes
50
+ the menu and the arrow keys move inside it.
51
+ - [`c1ec527d3ad2f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c1ec527d3ad2f) -
52
+ Use React.lazy with explicit loading and error boundaries for extension Quick Insert icons and
53
+ Element Browser when platform_editor_loosely_lazy_migration is enabled. Keep react-loadable when
54
+ the experiment is disabled.
55
+ - Updated dependencies
56
+
3
57
  ## 134.20.1
4
58
 
5
59
  ### Patch Changes
@@ -19,7 +19,7 @@ var aiSuggestionsMessages = exports.aiSuggestionsMessages = (0, _reactIntl.defin
19
19
  suggestEditsPromptPrefix: {
20
20
  id: 'fabric.editor.ai.suggestions.suggestEditsPromptPrefix.non-final',
21
21
  defaultMessage: 'Review my content with ',
22
- description: 'Localised text that precedes the suggest-edits skill tag in the prompt sent to the AI service. The trailing space is intentional — it separates this text from the skill tag that follows. Localise it in a way where the prompt ends with the skill tag. (With the skill tag it will look like e.g. "Review my content with /suggest-edits")'
22
+ description: 'Localised text that precedes the add-suggestions-to-content skill tag in the prompt sent to the AI service. The trailing space is intentional — it separates this text from the skill tag that follows. Localise it in a way where the prompt ends with the skill tag. (With the skill tag it will look like e.g. "Review my content with /add-suggestions-to-content")'
23
23
  },
24
24
  contentReviewAgentPrompt: {
25
25
  id: 'fabric.editor.ai.suggestions.contentReviewAgentPrompt.non-final',
@@ -47,6 +47,13 @@ var styles = {
47
47
  var stopPropagation = function stopPropagation(event) {
48
48
  return event.stopPropagation();
49
49
  };
50
+ var focusReturnTarget = function focusReturnTarget(preferredTarget, fallbackTarget) {
51
+ var isUsableTarget = function isUsableTarget(target) {
52
+ return Boolean((target === null || target === void 0 ? void 0 : target.isConnected) && target !== target.ownerDocument.body && target !== target.ownerDocument.documentElement);
53
+ };
54
+ var target = isUsableTarget(preferredTarget) ? preferredTarget : isUsableTarget(fallbackTarget) ? fallbackTarget : null;
55
+ target === null || target === void 0 || target.focus();
56
+ };
50
57
 
51
58
  /** Editor owns popup behavior; products supply content through getAICreditStatus. */
52
59
  var CreditPopup = function CreditPopup(_ref2) {
@@ -68,15 +75,60 @@ var CreditPopup = function CreditPopup(_ref2) {
68
75
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
69
76
  triggerElement = _useState4[0],
70
77
  setTriggerElement = _useState4[1];
78
+ // Menu search and editor inputs can keep focus when feedback opens.
79
+ // Remember that element so Escape returns focus there instead of to the trigger.
71
80
  var returnFocus = (0, _react.useRef)(null);
72
- var wasOpen = (0, _react.useRef)(false);
81
+ var isOpen = (0, _react.useRef)(feedback !== null);
82
+ isOpen.current = feedback !== null;
83
+ var restoreFocusAfterClose = (0, _react.useRef)(false);
84
+ (0, _react.useEffect)(function () {
85
+ if (!triggerElement) {
86
+ return;
87
+ }
88
+ var ownerDocument = triggerElement.ownerDocument;
89
+ var rememberFocus = function rememberFocus(target) {
90
+ if (!isOpen.current && !restoreFocusAfterClose.current && target instanceof HTMLElement && target !== ownerDocument.body && target !== ownerDocument.documentElement) {
91
+ returnFocus.current = target;
92
+ }
93
+ };
94
+ rememberFocus(ownerDocument.activeElement);
95
+ return (0, _bindEventListener.bind)(ownerDocument, {
96
+ type: 'focusin',
97
+ options: {
98
+ capture: true
99
+ },
100
+ listener: function listener(event) {
101
+ return rememberFocus(event.target);
102
+ }
103
+ });
104
+ }, [triggerElement]);
73
105
  (0, _react.useEffect)(function () {
74
- if (feedback && !wasOpen.current) {
75
- var active = triggerElement === null || triggerElement === void 0 ? void 0 : triggerElement.ownerDocument.activeElement;
76
- returnFocus.current = active instanceof HTMLElement ? active : null;
106
+ var _returnFocus$current;
107
+ if (feedback || contentElement || !restoreFocusAfterClose.current) {
108
+ return;
77
109
  }
78
- wasOpen.current = feedback !== null;
79
- }, [feedback, triggerElement]);
110
+ restoreFocusAfterClose.current = false;
111
+ var previousFocus = (_returnFocus$current = returnFocus.current) !== null && _returnFocus$current !== void 0 && _returnFocus$current.isConnected ? returnFocus.current : triggerElement;
112
+ focusReturnTarget(previousFocus, triggerElement);
113
+ }, [feedback, contentElement, triggerElement]);
114
+ (0, _react.useLayoutEffect)(function () {
115
+ if (!feedback || !contentElement) return;
116
+ var ownerDocument = contentElement.ownerDocument;
117
+ return (0, _bindEventListener.bind)(ownerDocument, {
118
+ type: 'keydown',
119
+ options: {
120
+ capture: true
121
+ },
122
+ listener: function listener(event) {
123
+ if (event.key !== 'Escape') return;
124
+ // The popup can leave focus in the editor, whose Escape handler cancels its draft.
125
+ event.preventDefault();
126
+ event.stopPropagation();
127
+ restoreFocusAfterClose.current = true;
128
+ close();
129
+ }
130
+ });
131
+ }, [feedback, contentElement, close]);
80
132
  (0, _react.useEffect)(function () {
81
133
  if (!feedback || !contentElement || !isNestedMenu) {
82
134
  return;
@@ -98,13 +150,10 @@ var CreditPopup = function CreditPopup(_ref2) {
98
150
  event.stopPropagation();
99
151
  if (event.key === 'Escape') {
100
152
  event.preventDefault();
153
+ restoreFocusAfterClose.current = true;
101
154
  close();
102
- if (isNestedMenu) {
103
- var _returnFocus$current;
104
- (_returnFocus$current = returnFocus.current) === null || _returnFocus$current === void 0 || _returnFocus$current.focus();
105
- }
106
155
  }
107
- }, [close, isNestedMenu]);
156
+ }, [close]);
108
157
  var content = (0, _react.useCallback)(function () {
109
158
  return /*#__PURE__*/_react.default.createElement(_box.Box, {
110
159
  ref: setContentElement,
@@ -129,10 +178,15 @@ var CreditPopup = function CreditPopup(_ref2) {
129
178
  titleId: (triggerElement === null || triggerElement === void 0 ? void 0 : triggerElement.id) || id,
130
179
  placement: placement,
131
180
  shouldFitViewport: true,
132
- shouldRenderToParent: shouldRenderToParent !== null && shouldRenderToParent !== void 0 ? shouldRenderToParent : false,
133
- zIndex: isNestedMenu ? _constants.akEditorFloatingDialogZIndex : undefined,
134
- strategy: isNestedMenu ? 'fixed' : undefined,
135
- shouldReturnFocus: !isNestedMenu,
181
+ shouldRenderToParent: shouldRenderToParent !== null && shouldRenderToParent !== void 0 ? shouldRenderToParent : false
182
+ // Credit feedback must share the modal layer when opened from a modal editor surface.
183
+ ,
184
+ zIndex: _constants.akEditorFloatingDialogZIndex,
185
+ strategy: isNestedMenu ? 'fixed' : undefined
186
+ // Our Escape handler restores focus after the popup unmounts.
187
+ // Disable automatic restoration so outside clicks keep focus on their target.
188
+ ,
189
+ shouldReturnFocus: false,
136
190
  shouldUseCaptureOnOutsideClick: true,
137
191
  content: content,
138
192
  trigger: trigger
@@ -9,15 +9,15 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
9
9
  var _react = _interopRequireDefault(require("react"));
10
10
  var _react2 = require("@emotion/react");
11
11
  var _reactLoadable = _interopRequireDefault(require("react-loadable"));
12
- var _reactLooselyLazy = require("react-loosely-lazy");
13
12
  var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
14
13
  var _spinner = _interopRequireDefault(require("@atlaskit/spinner/spinner"));
14
+ var _enums = require("../../analytics/types/enums");
15
+ var _ErrorBoundary = require("../../ui/ErrorBoundary");
15
16
  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" != (0, _typeof2.default)(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); } /**
16
17
  * @jsxRuntime classic
17
18
  * @jsx jsx
18
19
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
19
20
  // oxlint-disable-next-line @atlassian/no-restricted-imports
20
- // oxlint-disable-next-line @atlassian/no-restricted-imports
21
21
  var spinnerContainer = (0, _react2.css)({
22
22
  display: 'flex',
23
23
  alignItems: 'center',
@@ -25,6 +25,14 @@ var spinnerContainer = (0, _react2.css)({
25
25
  height: '100%',
26
26
  width: '100%'
27
27
  });
28
+ var ElementBrowserLoading = function ElementBrowserLoading() {
29
+ return (0, _react2.jsx)("div", {
30
+ css: spinnerContainer
31
+ }, (0, _react2.jsx)(_spinner.default, {
32
+ size: "medium",
33
+ interactionName: "element-browser-spinner"
34
+ }));
35
+ };
28
36
  var loadElementBrowser = function loadElementBrowser() {
29
37
  return Promise.resolve().then(function () {
30
38
  return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser'));
@@ -32,33 +40,29 @@ var loadElementBrowser = function loadElementBrowser() {
32
40
  return module.default;
33
41
  });
34
42
  };
35
- var ElementBrowserLazy = (0, _reactLooselyLazy.lazy)(function () {
36
- return Promise.resolve().then(function () {
37
- return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser'));
38
- }).then(function (module) {
39
- return module.default;
43
+ var loadElementBrowserModule = function loadElementBrowserModule() {
44
+ return loadElementBrowser().then(function (Component) {
45
+ return {
46
+ default: Component
47
+ };
40
48
  });
41
- });
42
- ElementBrowserLazy.displayName = 'lazy(ElementBrowser)';
49
+ };
50
+ var ElementBrowserLazy = /*#__PURE__*/_react.default.lazy(loadElementBrowserModule);
43
51
  var ElementBrowserLoadable = (0, _reactLoadable.default)({
44
52
  loader: loadElementBrowser,
45
- loading: function loading() {
46
- return (0, _react2.jsx)("div", {
47
- css: spinnerContainer
48
- }, (0, _react2.jsx)(_spinner.default, {
49
- size: "medium",
50
- interactionName: "element-browser-spinner"
51
- }));
52
- }
53
+ loading: ElementBrowserLoading
53
54
  });
54
55
  var ElementBrowserLoader = function ElementBrowserLoader(props) {
55
- return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_loosely_lazy_migration') ? (0, _react2.jsx)(_reactLooselyLazy.LazySuspense, {
56
- fallback: null
57
- }, (0, _react2.jsx)(ElementBrowserLazy, props)) :
56
+ return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_loosely_lazy_migration') ? (0, _react2.jsx)(_ErrorBoundary.ErrorBoundary, {
57
+ component: _enums.ACTION_SUBJECT.EDITOR,
58
+ fallbackComponent: (0, _react2.jsx)(ElementBrowserLoading, null)
59
+ }, (0, _react2.jsx)(_react.default.Suspense, {
60
+ fallback: (0, _react2.jsx)(ElementBrowserLoading, null)
61
+ }, (0, _react2.jsx)(ElementBrowserLazy, props))) :
58
62
  // eslint-disable-next-line react/jsx-props-no-spreading
59
63
  (0, _react2.jsx)(ElementBrowserLoadable, props);
60
64
  };
61
65
  ElementBrowserLoader.preload = function () {
62
- return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_loosely_lazy_migration') ? ElementBrowserLazy.preload() : ElementBrowserLoadable.preload();
66
+ return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_loosely_lazy_migration') ? loadElementBrowser() : ElementBrowserLoadable.preload();
63
67
  };
64
68
  var _default = exports.default = ElementBrowserLoader;
@@ -22,6 +22,7 @@ var _react = _interopRequireWildcard(require("react"));
22
22
  var _memoizeOne = _interopRequireDefault(require("memoize-one"));
23
23
  var _state = require("@atlaskit/editor-prosemirror/state");
24
24
  var _fg = require("@atlaskit/platform-feature-flags/fg");
25
+ var _enums = require("../analytics/types/enums");
25
26
  var _extensions = require("../extensions");
26
27
  var _utils = require("../utils");
27
28
  var _Extension = _interopRequireDefault(require("./Extension/Extension"));
@@ -281,7 +282,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
281
282
  result = render(node, editorView.state.doc, actions);
282
283
  }
283
284
  if (!result) {
284
- var extensionHandlerFromProvider = _this.props.extensionProvider && _this.getNodeRenderer(_this.props.extensionProvider, extensionType, extensionKey);
285
+ var extensionHandlerFromProvider = _this.props.extensionProvider && _this.getNodeRenderer(_this.props.extensionProvider, extensionType, extensionKey, _enums.ACTION_SUBJECT.EDITOR);
285
286
  if (extensionHandlerFromProvider) {
286
287
  var NodeRenderer = extensionHandlerFromProvider;
287
288
  if (node.type === 'multiBodiedExtension') {
@@ -16,12 +16,6 @@ exports.getExtensionModuleNodePrivateProps = getExtensionModuleNodePrivateProps;
16
16
  exports.getNodeRenderer = getNodeRenderer;
17
17
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
18
18
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
19
- var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
20
- var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
21
- var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
22
- var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
23
- var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
24
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
25
19
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
26
20
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
27
21
  var _react = _interopRequireDefault(require("react"));
@@ -29,13 +23,14 @@ var _reactIntl = require("react-intl");
29
23
  var _reactLoadable = _interopRequireDefault(require("react-loadable"));
30
24
  var _reactLooselyLazy = require("react-loosely-lazy");
31
25
  var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
26
+ var _ErrorBoundary = require("../ui/ErrorBoundary");
32
27
  var _manifestHelpers = require("./manifest-helpers");
33
28
  var _messages = require("./messages");
34
29
  var _resolveImportSync = require("./resolveImportSync");
35
30
  var _UnknownMacroPlaceholder = require("./UnknownMacroPlaceholder");
36
31
  var _getExtensionManifest = require("./getExtensionManifest");
37
- 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)); }
38
- function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } // oxlint-disable-next-line @atlassian/no-restricted-imports
32
+ // oxlint-disable-next-line @atlassian/no-restricted-imports
33
+
39
34
  function getNodeFromManifest(
40
35
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
41
36
  manifest, extKey, nodeKey, extensionType, extensionKey) {
@@ -131,39 +126,6 @@ function isUnknownConfluenceMacroWithBody(extensionNode) {
131
126
  var _extensionNode$parame;
132
127
  return extensionNode !== null && extensionNode.type === 'extension' && extensionNode.extensionType === 'com.atlassian.confluence.macro.core' && !!((_extensionNode$parame = extensionNode.parameters) !== null && _extensionNode$parame !== void 0 && (_extensionNode$parame = _extensionNode$parame.macroParams) !== null && _extensionNode$parame !== void 0 && (_extensionNode$parame = _extensionNode$parame.__bodyContent) !== null && _extensionNode$parame !== void 0 && _extensionNode$parame.value);
133
128
  }
134
- // eslint-disable-next-line @repo/internal/react/no-class-components -- error boundaries require a class component
135
- var ExtensionRendererErrorBoundary = /*#__PURE__*/function (_React$Component) {
136
- function ExtensionRendererErrorBoundary() {
137
- var _this;
138
- (0, _classCallCheck2.default)(this, ExtensionRendererErrorBoundary);
139
- for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
140
- args[_key] = arguments[_key];
141
- }
142
- _this = _callSuper(this, ExtensionRendererErrorBoundary, [].concat(args));
143
- (0, _defineProperty2.default)(_this, "state", {});
144
- return _this;
145
- }
146
- (0, _inherits2.default)(ExtensionRendererErrorBoundary, _React$Component);
147
- return (0, _createClass2.default)(ExtensionRendererErrorBoundary, [{
148
- key: "componentDidCatch",
149
- value: function componentDidCatch(error) {
150
- // eslint-disable-next-line no-console
151
- console.error('Error rendering extension', error);
152
- }
153
- }, {
154
- key: "render",
155
- value: function render() {
156
- return this.state.error ? renderExtensionLoadingError(this.state.error, this.props.fallbackProps) : this.props.children;
157
- }
158
- }], [{
159
- key: "getDerivedStateFromError",
160
- value: function getDerivedStateFromError(error) {
161
- return {
162
- error: error
163
- };
164
- }
165
- }]);
166
- }(_react.default.Component);
167
129
  var noop = function noop() {};
168
130
  function renderExtensionLoadingError(error, props) {
169
131
  // Needed because the old react-loadable (older code-splitting library) error handling behaviour might be relied on by extensions.
@@ -198,7 +160,7 @@ function ExtensionLoading(props) {
198
160
  }
199
161
 
200
162
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
201
- function getNodeRenderer(extensionProvider, extensionType, extensionKey) {
163
+ function getNodeRenderer(extensionProvider, extensionType, extensionKey, errorActionSubject) {
202
164
  // Async is needed to wrap the getExtensionModuleNodeMaybePreloaded call in a promise so that we can use the lazy() API
203
165
  var loadNodeRenderer = /*#__PURE__*/function () {
204
166
  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
@@ -282,12 +244,16 @@ function getNodeRenderer(extensionProvider, extensionType, extensionKey) {
282
244
  var LoadableNodeRenderer = getNodeRenderer;
283
245
  var NodeRenderer = function NodeRenderer(props) {
284
246
  var _props$loadingFallbac;
247
+ var errorFallback = _react.default.useCallback(function (error) {
248
+ return renderExtensionLoadingError(error, props);
249
+ }, [props]);
285
250
  if (!(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_loosely_lazy_migration')) {
286
251
  // eslint-disable-next-line react/jsx-props-no-spreading
287
252
  return /*#__PURE__*/_react.default.createElement(LoadableNodeRenderer, props);
288
253
  }
289
- return /*#__PURE__*/_react.default.createElement(ExtensionRendererErrorBoundary, {
290
- fallbackProps: props
254
+ return /*#__PURE__*/_react.default.createElement(_ErrorBoundary.ErrorBoundary, {
255
+ component: errorActionSubject,
256
+ fallbackComponent: errorFallback
291
257
  }, /*#__PURE__*/_react.default.createElement(_reactLooselyLazy.LazySuspense, {
292
258
  fallback: (_props$loadingFallbac = props.loadingFallback) !== null && _props$loadingFallbac !== void 0 ? _props$loadingFallbac : null
293
259
  }, /*#__PURE__*/_react.default.createElement(LazyNodeRenderer, props)));
@@ -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 = "134.20.0";
30
+ var packageVersion = "135.0.0";
31
31
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
32
32
  // Remove URL as it has UGC
33
33
  // Ignored via go/ees007
@@ -0,0 +1,37 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.createHeadingNumberer = void 0;
7
+ var MAX_HEADING_LEVEL = 6;
8
+
9
+ /**
10
+ * Creates a function that returns the decimal outline number (`1`, `1.1`, `1.1.1`) of each heading,
11
+ * called once per heading in document order. Use it when headings are visited one at a time.
12
+ *
13
+ * Each number has exactly `level` segments. Skipped levels are backfilled with `1` and count as
14
+ * real siblings, and a higher-level heading resets all deeper counters.
15
+ *
16
+ * @example
17
+ * const getNextHeadingNumber = createHeadingNumberer();
18
+ * getNextHeadingNumber(1); // '1'
19
+ * getNextHeadingNumber(3); // '1.1.1'
20
+ * getNextHeadingNumber(2); // '1.2'
21
+ */
22
+ var createHeadingNumberer = exports.createHeadingNumberer = function createHeadingNumberer() {
23
+ var counters = new Array(MAX_HEADING_LEVEL).fill(0);
24
+ return function (rawLevel) {
25
+ var level = Math.min(Math.max(Math.trunc(rawLevel) || 1, 1), MAX_HEADING_LEVEL);
26
+ for (var index = 0; index < level - 1; index++) {
27
+ if (counters[index] === 0) {
28
+ counters[index] = 1;
29
+ }
30
+ }
31
+ counters[level - 1] += 1;
32
+ for (var _index = level; _index < MAX_HEADING_LEVEL; _index++) {
33
+ counters[_index] = 0;
34
+ }
35
+ return counters.slice(0, level).join('.');
36
+ };
37
+ };
@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.getHeadingNumbers = exports.HEADING_NUMBER_ATTRIBUTE = void 0;
7
- var MAX_HEADING_LEVEL = 6;
8
-
7
+ var _createHeadingNumberer = require("./create-heading-numberer");
9
8
  /**
10
9
  * DOM attribute carrying a heading's computed number. Editor and renderer styles render it with
11
10
  * `[data-heading-number]::before { content: attr(data-heading-number) "." }`.
@@ -13,26 +12,13 @@ var MAX_HEADING_LEVEL = 6;
13
12
  var HEADING_NUMBER_ATTRIBUTE = exports.HEADING_NUMBER_ATTRIBUTE = 'data-heading-number';
14
13
 
15
14
  /**
16
- * Computes decimal outline numbers (`1`, `1.1`, `1.1.1`) for headings in document order.
17
- *
18
- * Each number has exactly `level` segments. Skipped levels are backfilled with `1` and count as
19
- * real siblings, and a higher-level heading resets all deeper counters.
15
+ * Computes decimal outline numbers for headings in document order. See `createHeadingNumberer`.
20
16
  *
21
17
  * @example getHeadingNumbers([1, 3, 2]) // ['1', '1.1.1', '1.2']
22
18
  */
23
19
  var getHeadingNumbers = exports.getHeadingNumbers = function getHeadingNumbers(levels) {
24
- var counters = new Array(MAX_HEADING_LEVEL).fill(0);
25
- return levels.map(function (rawLevel) {
26
- var level = Math.min(Math.max(Math.trunc(rawLevel) || 1, 1), MAX_HEADING_LEVEL);
27
- for (var index = 0; index < level - 1; index++) {
28
- if (counters[index] === 0) {
29
- counters[index] = 1;
30
- }
31
- }
32
- counters[level - 1] += 1;
33
- for (var _index = level; _index < MAX_HEADING_LEVEL; _index++) {
34
- counters[_index] = 0;
35
- }
36
- return counters.slice(0, level).join('.');
20
+ var getNextHeadingNumber = (0, _createHeadingNumberer.createHeadingNumberer)();
21
+ return levels.map(function (level) {
22
+ return getNextHeadingNumber(level);
37
23
  });
38
24
  };
@@ -95,11 +95,14 @@ var disabledItemStyles = (0, _xcss.xcss)({
95
95
  var CompactQuickInsertMenuItem = exports.CompactQuickInsertMenuItem = function CompactQuickInsertMenuItem(_ref) {
96
96
  var _resolvedPreview$attr, _ref3, _resolvedPreview$imag, _resolvedPreview$imag2;
97
97
  var ariaLabel = _ref.ariaLabel,
98
+ ariaControls = _ref['aria-controls'],
98
99
  description = _ref.description,
99
100
  iconBefore = _ref.iconBefore,
101
+ itemRef = _ref.itemRef,
100
102
  isDisabled = _ref.isDisabled,
101
103
  lozenge = _ref.lozenge,
102
104
  onSelect = _ref.onSelect,
105
+ onBeforeSelect = _ref.onBeforeSelect,
103
106
  preview = _ref.preview,
104
107
  previewIcon = _ref.previewIcon,
105
108
  previewImageUrls = _ref.previewImageUrls,
@@ -124,11 +127,21 @@ var CompactQuickInsertMenuItem = exports.CompactQuickInsertMenuItem = function C
124
127
  isSelected = _ref2.isSelected;
125
128
  var resolvedDescription = description !== null && description !== void 0 ? description : item === null || item === void 0 ? void 0 : item.description;
126
129
  var previewId = (0, _react.useId)();
127
- var handleClick = (0, _quickInsertMenuItemUtils.useQuickInsertMenuItemSelection)(onSelect);
130
+ var handleClick = (0, _quickInsertMenuItemUtils.useQuickInsertMenuItemSelection)(onSelect, onBeforeSelect);
128
131
  var _useState = (0, _react.useState)(null),
129
132
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
130
133
  referenceElement = _useState2[0],
131
134
  setReferenceElement = _useState2[1];
135
+ var setItemElement = (0, _react.useCallback)(function (element) {
136
+ setReferenceElement(element);
137
+ if (typeof itemRef === 'function') {
138
+ itemRef(element);
139
+ } else if (itemRef) {
140
+ Object.assign(itemRef, {
141
+ current: element
142
+ });
143
+ }
144
+ }, [itemRef]);
132
145
  var resolvedPreview = (0, _react.useMemo)(function () {
133
146
  return preview !== null && preview !== void 0 ? preview : previewImageUrls ? {
134
147
  image: previewImageUrls
@@ -145,8 +158,9 @@ var CompactQuickInsertMenuItem = exports.CompactQuickInsertMenuItem = function C
145
158
  xcss: styles.iconLarge
146
159
  }, iconBefore) : iconBefore;
147
160
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_pressable.Pressable, {
148
- ref: setReferenceElement,
161
+ ref: setItemElement,
149
162
  "aria-label": ariaLabel,
163
+ "aria-controls": ariaControls,
150
164
  "aria-describedby": shouldRenderPreview && hasAccessiblePreview ? previewId : undefined,
151
165
  "aria-selected": isSelected,
152
166
  id: id,
@@ -111,10 +111,13 @@ var pinnedIconColorResetStyles = null;
111
111
  */
112
112
  var ElementBrowserQuickInsertMenuItem = exports.ElementBrowserQuickInsertMenuItem = function ElementBrowserQuickInsertMenuItem(_ref) {
113
113
  var ariaLabel = _ref.ariaLabel,
114
+ ariaControls = _ref['aria-controls'],
115
+ itemRef = _ref.itemRef,
114
116
  description = _ref.description,
115
117
  iconBefore = _ref.iconBefore,
116
118
  _ref$isDisabled = _ref.isDisabled,
117
119
  isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
120
+ onBeforeSelect = _ref.onBeforeSelect,
118
121
  lozenge = _ref.lozenge,
119
122
  onSelect = _ref.onSelect,
120
123
  preview = _ref.preview,
@@ -131,7 +134,16 @@ var ElementBrowserQuickInsertMenuItem = exports.ElementBrowserQuickInsertMenuIte
131
134
  id = _ref2.id,
132
135
  isSelected = _ref2.isSelected;
133
136
  var itemDescription = description !== null && description !== void 0 ? description : item === null || item === void 0 ? void 0 : item.description;
134
- var handleClick = (0, _quickInsertMenuItemUtils.useQuickInsertMenuItemSelection)(onSelect);
137
+ var handleClick = (0, _quickInsertMenuItemUtils.useQuickInsertMenuItemSelection)(onSelect, onBeforeSelect);
138
+ var setItemElement = (0, _react.useCallback)(function (element) {
139
+ if (typeof itemRef === 'function') {
140
+ itemRef(element);
141
+ } else if (itemRef) {
142
+ Object.assign(itemRef, {
143
+ current: element
144
+ });
145
+ }
146
+ }, [itemRef]);
135
147
  var descriptionId = (0, _react.useId)();
136
148
  var resolvedPreview = (0, _react.useMemo)(function () {
137
149
  return preview !== null && preview !== void 0 ? preview : previewImageUrls ? {
@@ -143,6 +155,8 @@ var ElementBrowserQuickInsertMenuItem = exports.ElementBrowserQuickInsertMenuIte
143
155
  className: (0, _runtime.ax)(["_rpzpjdj5 _1pgcjdj5", !isDisabled && "_syaz1q3r"])
144
156
  }, iconBefore) : undefined;
145
157
  return /*#__PURE__*/_react.default.createElement(_pressable.Pressable, {
158
+ ref: setItemElement,
159
+ "aria-controls": ariaControls,
146
160
  "aria-describedby": hasDescription ? descriptionId : undefined,
147
161
  "aria-label": ariaLabel !== null && ariaLabel !== void 0 ? ariaLabel : title,
148
162
  "aria-selected": isSelected,
@@ -13,9 +13,12 @@ var _useQuickInsertContext = require("./useQuickInsertContext");
13
13
  var QuickInsertMenuItem = exports.QuickInsertMenuItem = function QuickInsertMenuItem(_ref) {
14
14
  var _surfaceContext$get;
15
15
  var ariaLabel = _ref.ariaLabel,
16
+ ariaControls = _ref['aria-controls'],
17
+ itemRef = _ref.itemRef,
16
18
  description = _ref.description,
17
19
  iconBefore = _ref.iconBefore,
18
20
  isDisabled = _ref.isDisabled,
21
+ onBeforeSelect = _ref.onBeforeSelect,
19
22
  lozenge = _ref.lozenge,
20
23
  onSelect = _ref.onSelect,
21
24
  preview = _ref.preview,
@@ -32,9 +35,12 @@ var QuickInsertMenuItem = exports.QuickInsertMenuItem = function QuickInsertMenu
32
35
  var surface = surfaceContext === null || surfaceContext === void 0 || (_surfaceContext$get = surfaceContext.get(_RegisteredMenuSurfaceContext.REGISTERED_MENU_SURFACE_CONTEXT)) === null || _surfaceContext$get === void 0 ? void 0 : _surfaceContext$get.surface;
33
36
  return surface === 'element-browser' ? /*#__PURE__*/_react.default.createElement(_ElementBrowserQuickInsertMenuItem.ElementBrowserQuickInsertMenuItem, {
34
37
  ariaLabel: ariaLabel,
38
+ "aria-controls": ariaControls,
39
+ itemRef: itemRef,
35
40
  description: description,
36
41
  iconBefore: iconBefore,
37
42
  isDisabled: isDisabled,
43
+ onBeforeSelect: onBeforeSelect,
38
44
  lozenge: lozenge,
39
45
  onSelect: onSelect,
40
46
  preview: preview,
@@ -44,9 +50,12 @@ var QuickInsertMenuItem = exports.QuickInsertMenuItem = function QuickInsertMenu
44
50
  title: title
45
51
  }) : /*#__PURE__*/_react.default.createElement(_CompactQuickInsertMenuItem.CompactQuickInsertMenuItem, {
46
52
  ariaLabel: ariaLabel,
53
+ "aria-controls": ariaControls,
54
+ itemRef: itemRef,
47
55
  description: description,
48
56
  iconBefore: iconBefore,
49
57
  isDisabled: isDisabled,
58
+ onBeforeSelect: onBeforeSelect,
50
59
  lozenge: lozenge,
51
60
  onSelect: onSelect,
52
61
  preview: preview,
@@ -6,17 +6,20 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.useQuickInsertMenuItemSelection = void 0;
7
7
  var _react = require("react");
8
8
  var _useQuickInsertContext = require("./useQuickInsertContext");
9
- var useQuickInsertMenuItemSelection = exports.useQuickInsertMenuItemSelection = function useQuickInsertMenuItemSelection(onSelect) {
9
+ var useQuickInsertMenuItemSelection = exports.useQuickInsertMenuItemSelection = function useQuickInsertMenuItemSelection(onSelect, onBeforeSelect) {
10
10
  var _useQuickInsertContex = (0, _useQuickInsertContext.useQuickInsertContext)(),
11
11
  editorView = _useQuickInsertContex.editorView,
12
12
  select = _useQuickInsertContex.select;
13
13
  return (0, _react.useCallback)(function () {
14
- return select(function (selectionContext) {
14
+ if ((onBeforeSelect === null || onBeforeSelect === void 0 ? void 0 : onBeforeSelect()) === false) {
15
+ return;
16
+ }
17
+ select(function (selectionContext) {
15
18
  return onSelect({
16
19
  editorView: editorView,
17
20
  insert: selectionContext.insert,
18
21
  source: selectionContext.source
19
22
  });
20
23
  });
21
- }, [editorView, onSelect, select]);
24
+ }, [editorView, onBeforeSelect, onSelect, select]);
22
25
  };