@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
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.EditorToolbarUIProvider = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _uiContext = require("@atlaskit/editor-toolbar/ui-context");
10
+ var _fg = require("@atlaskit/platform-feature-flags/fg");
10
11
  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); }
11
12
  var EditorToolbarUIProvider = exports.EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
12
13
  var children = _ref.children,
@@ -21,6 +22,23 @@ var EditorToolbarUIProvider = exports.EditorToolbarUIProvider = function EditorT
21
22
  var onDropdownOpenChanged = (0, _react.useCallback)(function (_ref2) {
22
23
  var isOpen = _ref2.isOpen,
23
24
  event = _ref2.event;
25
+ if (!isOpen && (0, _fg.fg)('platform-dst-top-layer')) {
26
+ // Escape, Tab and an outside press have no target, and the editor does not take focus.
27
+ // The browser moves focus on Escape and Tab. On an outside press, focus goes where the
28
+ // user pressed, for example the editor. After a toolbar action (an item pick, a trigger
29
+ // click, a close from code), the editor takes focus back.
30
+ if (event === null || event.target instanceof Element) {
31
+ // After the design system's focus return as the menu hides.
32
+ setTimeout(function () {
33
+ return requestAnimationFrame(function () {
34
+ api === null || api === void 0 || api.core.actions.focus({
35
+ scrollIntoView: false
36
+ });
37
+ });
38
+ }, 1);
39
+ }
40
+ return;
41
+ }
24
42
  if (!isOpen) {
25
43
  // Only refocus the editor when the dropdown closes via mouse or programmatic close.
26
44
  // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
@@ -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 = "134.20.0";
26
+ var packageVersion = "135.0.0";
27
27
  var halfFocusRing = 1;
28
28
  var dropOffset = '0, 8';
29
29
  // Ignored via go/ees005
@@ -27,7 +27,7 @@ var ErrorBoundary = exports.ErrorBoundary = /*#__PURE__*/function (_React$Compon
27
27
  }
28
28
  _this = _callSuper(this, ErrorBoundary, [].concat(args));
29
29
  (0, _defineProperty2.default)(_this, "state", {
30
- errorCaptured: false
30
+ error: null
31
31
  });
32
32
  return _this;
33
33
  }
@@ -37,11 +37,6 @@ var ErrorBoundary = exports.ErrorBoundary = /*#__PURE__*/function (_React$Compon
37
37
  value: function hasFallback() {
38
38
  return typeof this.props.fallbackComponent !== 'undefined';
39
39
  }
40
- }, {
41
- key: "shouldRecover",
42
- value: function shouldRecover() {
43
- return this.hasFallback() && this.state.errorCaptured;
44
- }
45
40
  }, {
46
41
  key: "componentDidCatch",
47
42
  value: function componentDidCatch(error, errorInfo) {
@@ -63,15 +58,17 @@ var ErrorBoundary = exports.ErrorBoundary = /*#__PURE__*/function (_React$Compon
63
58
  });
64
59
  if (this.hasFallback()) {
65
60
  this.setState({
66
- errorCaptured: true
61
+ error: error
67
62
  });
68
63
  }
69
64
  }
70
65
  }, {
71
66
  key: "render",
72
67
  value: function render() {
73
- if (this.shouldRecover()) {
74
- return this.props.fallbackComponent;
68
+ var error = this.state.error;
69
+ if (error) {
70
+ var fallbackComponent = this.props.fallbackComponent;
71
+ return typeof fallbackComponent === 'function' ? fallbackComponent(error) : fallbackComponent !== null && fallbackComponent !== void 0 ? fallbackComponent : null;
75
72
  }
76
73
  return this.props.children;
77
74
  }
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.ToolbarArrowKeyNavigationProvider = exports.KeyDownHandlerContext = void 0;
8
8
  var _react = _interopRequireWildcard(require("react"));
9
9
  var _react2 = require("@emotion/react");
10
+ var _fg = require("@atlaskit/platform-feature-flags/fg");
10
11
  var _elementBrowser = require("../../element-browser");
11
12
  var _messages = require("../../messages");
12
13
  var _mediaInsert = require("../../messages/media-insert");
@@ -129,12 +130,24 @@ var ToolbarArrowKeyNavigationProvider = exports.ToolbarArrowKeyNavigationProvide
129
130
  * @param event
130
131
  */
131
132
  var handleKeyDown = function handleKeyDown(event) {
132
- var _document$querySelect, _document$querySelect2, _wrapperRef$current, _wrapperRef$current2;
133
+ var _document$querySelect, _document$querySelect2, _wrapperRef$current2, _wrapperRef$current3;
133
134
  // To trap the focus inside the horizontal toolbar for left and right arrow keys
134
135
  var targetElement = event.target;
135
136
  if (targetElement instanceof HTMLElement && !targetElement.closest("".concat(childComponentSelector))) {
136
137
  return;
137
138
  }
139
+
140
+ // On the top layer, a menu or popup opened from the toolbar renders inside the toolbar, and
141
+ // it owns its keys: the arrow keys, Tab, and Escape (which closes it and returns focus to its
142
+ // opener). So the toolbar ignores keys from a layer inside it. A layer around the toolbar
143
+ // (for example a floating toolbar's popup) does not count.
144
+ if ((0, _fg.fg)('platform-dst-top-layer') && targetElement instanceof Element) {
145
+ var _wrapperRef$current;
146
+ var layer = targetElement.closest('[popover], dialog');
147
+ if (layer && (_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(layer)) {
148
+ return;
149
+ }
150
+ }
138
151
  if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || targetElement instanceof HTMLElement && targetElement.closest('[data-keyboard-navigation-independent]') || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
139
152
  return;
140
153
  }
@@ -143,7 +156,7 @@ var ToolbarArrowKeyNavigationProvider = exports.ToolbarArrowKeyNavigationProvide
143
156
  // if menu wrapper exists, then a menu is open and arrow keys will be handled by MenuArrowKeyNavigationProvider
144
157
  return;
145
158
  }
146
- var elementBrowser = wrapperRef === null || wrapperRef === void 0 || (_wrapperRef$current = wrapperRef.current) === null || _wrapperRef$current === void 0 ? void 0 : _wrapperRef$current.querySelector("#".concat(_elementBrowser.ELEMENT_BROWSER_ID));
159
+ var elementBrowser = wrapperRef === null || wrapperRef === void 0 || (_wrapperRef$current2 = wrapperRef.current) === null || _wrapperRef$current2 === void 0 ? void 0 : _wrapperRef$current2.querySelector("#".concat(_elementBrowser.ELEMENT_BROWSER_ID));
147
160
  if (elementBrowser) {
148
161
  // if element browser is open, then arrow keys will be handled by MenuArrowKeyNavigationProvider
149
162
  return;
@@ -157,7 +170,7 @@ var ToolbarArrowKeyNavigationProvider = exports.ToolbarArrowKeyNavigationProvide
157
170
  if (targetElement instanceof HTMLElement && targetElement.closest("[aria-label=\"".concat(intl.formatMessage(_mediaInsert.mediaInsertMessages.mediaPickerPopupAriaLabel), "\"]"))) {
158
171
  return;
159
172
  }
160
- if (targetElement instanceof HTMLElement && !((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
173
+ if (targetElement instanceof HTMLElement && !((_wrapperRef$current3 = wrapperRef.current) !== null && _wrapperRef$current3 !== void 0 && _wrapperRef$current3.contains(targetElement))) {
161
174
  selectedItemIndex.current = -1;
162
175
  } else {
163
176
  selectedItemIndex.current = targetElement instanceof HTMLElement && filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
@@ -13,7 +13,7 @@ export const aiSuggestionsMessages = defineMessages({
13
13
  suggestEditsPromptPrefix: {
14
14
  id: 'fabric.editor.ai.suggestions.suggestEditsPromptPrefix.non-final',
15
15
  defaultMessage: 'Review my content with ',
16
- 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")'
16
+ 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")'
17
17
  },
18
18
  contentReviewAgentPrompt: {
19
19
  id: 'fabric.editor.ai.suggestions.contentReviewAgentPrompt.non-final',
@@ -1,7 +1,7 @@
1
1
  /* CreditCheckedPopup.tsx generated by @compiled/babel-plugin v3.0.4 */
2
2
  import "./CreditCheckedPopup.compiled.css";
3
3
  import { ax, ix } from "@compiled/react/runtime";
4
- import React, { useCallback, useEffect, useId, useRef, useState } from 'react';
4
+ import React, { useCallback, useEffect, useId, useLayoutEffect, useRef, useState } from 'react';
5
5
  import { bind } from 'bind-event-listener';
6
6
  import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles/constants';
7
7
  import { Popup } from '@atlaskit/popup/popup';
@@ -34,6 +34,11 @@ const styles = {
34
34
  content: "_1bsb5jys _p12f1osq _vchhusvi _ca0qpxbi _u5f3pxbi _n3tdpxbi _19bvpxbi"
35
35
  };
36
36
  const stopPropagation = event => event.stopPropagation();
37
+ const focusReturnTarget = (preferredTarget, fallbackTarget) => {
38
+ const isUsableTarget = target => Boolean((target === null || target === void 0 ? void 0 : target.isConnected) && target !== target.ownerDocument.body && target !== target.ownerDocument.documentElement);
39
+ const target = isUsableTarget(preferredTarget) ? preferredTarget : isUsableTarget(fallbackTarget) ? fallbackTarget : null;
40
+ target === null || target === void 0 ? void 0 : target.focus();
41
+ };
37
42
 
38
43
  /** Editor owns popup behavior; products supply content through getAICreditStatus. */
39
44
  const CreditPopup = ({
@@ -49,15 +54,58 @@ const CreditPopup = ({
49
54
  const id = useId();
50
55
  const [contentElement, setContentElement] = useState(null);
51
56
  const [triggerElement, setTriggerElement] = useState(null);
57
+ // Menu search and editor inputs can keep focus when feedback opens.
58
+ // Remember that element so Escape returns focus there instead of to the trigger.
52
59
  const returnFocus = useRef(null);
53
- const wasOpen = useRef(false);
60
+ const isOpen = useRef(feedback !== null);
61
+ isOpen.current = feedback !== null;
62
+ const restoreFocusAfterClose = useRef(false);
63
+ useEffect(() => {
64
+ if (!triggerElement) {
65
+ return;
66
+ }
67
+ const ownerDocument = triggerElement.ownerDocument;
68
+ const rememberFocus = target => {
69
+ if (!isOpen.current && !restoreFocusAfterClose.current && target instanceof HTMLElement && target !== ownerDocument.body && target !== ownerDocument.documentElement) {
70
+ returnFocus.current = target;
71
+ }
72
+ };
73
+ rememberFocus(ownerDocument.activeElement);
74
+ return bind(ownerDocument, {
75
+ type: 'focusin',
76
+ options: {
77
+ capture: true
78
+ },
79
+ listener: event => rememberFocus(event.target)
80
+ });
81
+ }, [triggerElement]);
54
82
  useEffect(() => {
55
- if (feedback && !wasOpen.current) {
56
- const active = triggerElement === null || triggerElement === void 0 ? void 0 : triggerElement.ownerDocument.activeElement;
57
- returnFocus.current = active instanceof HTMLElement ? active : null;
83
+ var _returnFocus$current;
84
+ if (feedback || contentElement || !restoreFocusAfterClose.current) {
85
+ return;
58
86
  }
59
- wasOpen.current = feedback !== null;
60
- }, [feedback, triggerElement]);
87
+ restoreFocusAfterClose.current = false;
88
+ const previousFocus = (_returnFocus$current = returnFocus.current) !== null && _returnFocus$current !== void 0 && _returnFocus$current.isConnected ? returnFocus.current : triggerElement;
89
+ focusReturnTarget(previousFocus, triggerElement);
90
+ }, [feedback, contentElement, triggerElement]);
91
+ useLayoutEffect(() => {
92
+ if (!feedback || !contentElement) return;
93
+ const ownerDocument = contentElement.ownerDocument;
94
+ return bind(ownerDocument, {
95
+ type: 'keydown',
96
+ options: {
97
+ capture: true
98
+ },
99
+ listener: event => {
100
+ if (event.key !== 'Escape') return;
101
+ // The popup can leave focus in the editor, whose Escape handler cancels its draft.
102
+ event.preventDefault();
103
+ event.stopPropagation();
104
+ restoreFocusAfterClose.current = true;
105
+ close();
106
+ }
107
+ });
108
+ }, [feedback, contentElement, close]);
61
109
  useEffect(() => {
62
110
  if (!feedback || !contentElement || !isNestedMenu) {
63
111
  return;
@@ -79,13 +127,10 @@ const CreditPopup = ({
79
127
  event.stopPropagation();
80
128
  if (event.key === 'Escape') {
81
129
  event.preventDefault();
130
+ restoreFocusAfterClose.current = true;
82
131
  close();
83
- if (isNestedMenu) {
84
- var _returnFocus$current;
85
- (_returnFocus$current = returnFocus.current) === null || _returnFocus$current === void 0 ? void 0 : _returnFocus$current.focus();
86
- }
87
132
  }
88
- }, [close, isNestedMenu]);
133
+ }, [close]);
89
134
  const content = useCallback(() => /*#__PURE__*/React.createElement(Box, {
90
135
  ref: setContentElement,
91
136
  xcss: styles.content,
@@ -106,10 +151,15 @@ const CreditPopup = ({
106
151
  titleId: (triggerElement === null || triggerElement === void 0 ? void 0 : triggerElement.id) || id,
107
152
  placement: placement,
108
153
  shouldFitViewport: true,
109
- shouldRenderToParent: shouldRenderToParent !== null && shouldRenderToParent !== void 0 ? shouldRenderToParent : false,
110
- zIndex: isNestedMenu ? akEditorFloatingDialogZIndex : undefined,
111
- strategy: isNestedMenu ? 'fixed' : undefined,
112
- shouldReturnFocus: !isNestedMenu,
154
+ shouldRenderToParent: shouldRenderToParent !== null && shouldRenderToParent !== void 0 ? shouldRenderToParent : false
155
+ // Credit feedback must share the modal layer when opened from a modal editor surface.
156
+ ,
157
+ zIndex: akEditorFloatingDialogZIndex,
158
+ strategy: isNestedMenu ? 'fixed' : undefined
159
+ // Our Escape handler restores focus after the popup unmounts.
160
+ // Disable automatic restoration so outside clicks keep focus on their target.
161
+ ,
162
+ shouldReturnFocus: false,
113
163
  shouldUseCaptureOnOutsideClick: true,
114
164
  content: content,
115
165
  trigger: trigger
@@ -7,12 +7,12 @@ import React from 'react';
7
7
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
8
8
  import { css, jsx } from '@emotion/react';
9
9
  import Loadable from 'react-loadable';
10
- // oxlint-disable-next-line @atlassian/no-restricted-imports
11
- import { lazy, LazySuspense } from 'react-loosely-lazy';
12
10
 
13
11
  // oxlint-disable-next-line @atlassian/no-restricted-imports
14
12
  import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
15
13
  import Spinner from '@atlaskit/spinner/spinner';
14
+ import { ACTION_SUBJECT } from '../../analytics/types/enums';
15
+ import { ErrorBoundary } from '../../ui/ErrorBoundary';
16
16
  const spinnerContainer = css({
17
17
  display: 'flex',
18
18
  alignItems: 'center',
@@ -20,22 +20,28 @@ const spinnerContainer = css({
20
20
  height: '100%',
21
21
  width: '100%'
22
22
  });
23
+ const ElementBrowserLoading = () => jsx("div", {
24
+ css: spinnerContainer
25
+ }, jsx(Spinner, {
26
+ size: "medium",
27
+ interactionName: "element-browser-spinner"
28
+ }));
23
29
  const loadElementBrowser = () => import( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser').then(module => module.default);
24
- const ElementBrowserLazy = lazy(() => import( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser').then(module => module.default));
25
- ElementBrowserLazy.displayName = 'lazy(ElementBrowser)';
30
+ const loadElementBrowserModule = () => loadElementBrowser().then(Component => ({
31
+ default: Component
32
+ }));
33
+ const ElementBrowserLazy = /*#__PURE__*/React.lazy(loadElementBrowserModule);
26
34
  const ElementBrowserLoadable = Loadable({
27
35
  loader: loadElementBrowser,
28
- loading: () => jsx("div", {
29
- css: spinnerContainer
30
- }, jsx(Spinner, {
31
- size: "medium",
32
- interactionName: "element-browser-spinner"
33
- }))
36
+ loading: ElementBrowserLoading
34
37
  });
35
- const ElementBrowserLoader = props => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? jsx(LazySuspense, {
36
- fallback: null
37
- }, jsx(ElementBrowserLazy, props)) :
38
+ const ElementBrowserLoader = props => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? jsx(ErrorBoundary, {
39
+ component: ACTION_SUBJECT.EDITOR,
40
+ fallbackComponent: jsx(ElementBrowserLoading, null)
41
+ }, jsx(React.Suspense, {
42
+ fallback: jsx(ElementBrowserLoading, null)
43
+ }, jsx(ElementBrowserLazy, props))) :
38
44
  // eslint-disable-next-line react/jsx-props-no-spreading
39
45
  jsx(ElementBrowserLoadable, props);
40
- ElementBrowserLoader.preload = () => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? ElementBrowserLazy.preload() : ElementBrowserLoadable.preload();
46
+ ElementBrowserLoader.preload = () => isExperimentEnabled('platform_editor_loosely_lazy_migration') ? loadElementBrowser() : ElementBrowserLoadable.preload();
41
47
  export default ElementBrowserLoader;
@@ -6,6 +6,7 @@ import React, { Component, useEffect, useLayoutEffect, useRef, useState } from '
6
6
  import memoizeOne from 'memoize-one';
7
7
  import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
8
8
  import { fg } from '@atlaskit/platform-feature-flags/fg';
9
+ import { ACTION_SUBJECT } from '../analytics/types/enums';
9
10
  import { getExtensionModuleNode, getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
10
11
  import { getExtensionRenderer, nodeToJSON, toJSON } from '../utils';
11
12
  import Extension from './Extension/Extension';
@@ -223,7 +224,7 @@ class ExtensionComponentInner extends Component {
223
224
  result = render(node, editorView.state.doc, actions);
224
225
  }
225
226
  if (!result) {
226
- const extensionHandlerFromProvider = this.props.extensionProvider && this.getNodeRenderer(this.props.extensionProvider, extensionType, extensionKey);
227
+ const extensionHandlerFromProvider = this.props.extensionProvider && this.getNodeRenderer(this.props.extensionProvider, extensionType, extensionKey, ACTION_SUBJECT.EDITOR);
227
228
  if (extensionHandlerFromProvider) {
228
229
  const NodeRenderer = extensionHandlerFromProvider;
229
230
  if (node.type === 'multiBodiedExtension') {
@@ -1,11 +1,11 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
- import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
2
  import React from 'react';
4
3
  import { useIntl } from 'react-intl';
5
4
  import Loadable from 'react-loadable';
6
5
  // oxlint-disable-next-line @atlassian/no-restricted-imports
7
6
  import { lazy, LazySuspense } from 'react-loosely-lazy';
8
7
  import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
8
+ import { ErrorBoundary } from '../ui/ErrorBoundary';
9
9
  import { getExtensionKeyAndNodeKey, resolveImport } from './manifest-helpers';
10
10
  import { messages } from './messages';
11
11
  import { resolveImportSync } from './resolveImportSync';
@@ -64,25 +64,6 @@ function isUnknownConfluenceMacroWithBody(extensionNode) {
64
64
  var _extensionNode$parame, _extensionNode$parame2, _extensionNode$parame3;
65
65
  return extensionNode !== null && extensionNode.type === 'extension' && extensionNode.extensionType === 'com.atlassian.confluence.macro.core' && !!((_extensionNode$parame = extensionNode.parameters) !== null && _extensionNode$parame !== void 0 && (_extensionNode$parame2 = _extensionNode$parame.macroParams) !== null && _extensionNode$parame2 !== void 0 && (_extensionNode$parame3 = _extensionNode$parame2.__bodyContent) !== null && _extensionNode$parame3 !== void 0 && _extensionNode$parame3.value);
66
66
  }
67
- // eslint-disable-next-line @repo/internal/react/no-class-components -- error boundaries require a class component
68
- class ExtensionRendererErrorBoundary extends React.Component {
69
- constructor(...args) {
70
- super(...args);
71
- _defineProperty(this, "state", {});
72
- }
73
- static getDerivedStateFromError(error) {
74
- return {
75
- error
76
- };
77
- }
78
- componentDidCatch(error) {
79
- // eslint-disable-next-line no-console
80
- console.error('Error rendering extension', error);
81
- }
82
- render() {
83
- return this.state.error ? renderExtensionLoadingError(this.state.error, this.props.fallbackProps) : this.props.children;
84
- }
85
- }
86
67
  const noop = () => {};
87
68
  function renderExtensionLoadingError(error, props) {
88
69
  // Needed because the old react-loadable (older code-splitting library) error handling behaviour might be relied on by extensions.
@@ -117,7 +98,7 @@ function ExtensionLoading(props) {
117
98
  }
118
99
 
119
100
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
120
- export function getNodeRenderer(extensionProvider, extensionType, extensionKey) {
101
+ export function getNodeRenderer(extensionProvider, extensionType, extensionKey, errorActionSubject) {
121
102
  // Async is needed to wrap the getExtensionModuleNodeMaybePreloaded call in a promise so that we can use the lazy() API
122
103
  const loadNodeRenderer = async () => {
123
104
  var _renderSync, _ref;
@@ -163,12 +144,14 @@ export function getNodeRenderer(extensionProvider, extensionType, extensionKey)
163
144
  const LoadableNodeRenderer = getNodeRenderer;
164
145
  const NodeRenderer = props => {
165
146
  var _props$loadingFallbac;
147
+ const errorFallback = React.useCallback(error => renderExtensionLoadingError(error, props), [props]);
166
148
  if (!isExperimentEnabled('platform_editor_loosely_lazy_migration')) {
167
149
  // eslint-disable-next-line react/jsx-props-no-spreading
168
150
  return /*#__PURE__*/React.createElement(LoadableNodeRenderer, props);
169
151
  }
170
- return /*#__PURE__*/React.createElement(ExtensionRendererErrorBoundary, {
171
- fallbackProps: props
152
+ return /*#__PURE__*/React.createElement(ErrorBoundary, {
153
+ component: errorActionSubject,
154
+ fallbackComponent: errorFallback
172
155
  }, /*#__PURE__*/React.createElement(LazySuspense, {
173
156
  fallback: (_props$loadingFallbac = props.loadingFallback) !== null && _props$loadingFallbac !== void 0 ? _props$loadingFallbac : null
174
157
  }, /*#__PURE__*/React.createElement(LazyNodeRenderer, props)));
@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
13
13
  const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
14
14
  const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
15
15
  const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
16
- const packageVersion = "134.20.0";
16
+ const packageVersion = "135.0.0";
17
17
  const sanitiseSentryEvents = (data, _hint) => {
18
18
  // Remove URL as it has UGC
19
19
  // Ignored via go/ees007
@@ -0,0 +1,31 @@
1
+ const MAX_HEADING_LEVEL = 6;
2
+
3
+ /**
4
+ * Creates a function that returns the decimal outline number (`1`, `1.1`, `1.1.1`) of each heading,
5
+ * called once per heading in document order. Use it when headings are visited one at a time.
6
+ *
7
+ * Each number has exactly `level` segments. Skipped levels are backfilled with `1` and count as
8
+ * real siblings, and a higher-level heading resets all deeper counters.
9
+ *
10
+ * @example
11
+ * const getNextHeadingNumber = createHeadingNumberer();
12
+ * getNextHeadingNumber(1); // '1'
13
+ * getNextHeadingNumber(3); // '1.1.1'
14
+ * getNextHeadingNumber(2); // '1.2'
15
+ */
16
+ export const createHeadingNumberer = () => {
17
+ const counters = new Array(MAX_HEADING_LEVEL).fill(0);
18
+ return rawLevel => {
19
+ const level = Math.min(Math.max(Math.trunc(rawLevel) || 1, 1), MAX_HEADING_LEVEL);
20
+ for (let index = 0; index < level - 1; index++) {
21
+ if (counters[index] === 0) {
22
+ counters[index] = 1;
23
+ }
24
+ }
25
+ counters[level - 1] += 1;
26
+ for (let index = level; index < MAX_HEADING_LEVEL; index++) {
27
+ counters[index] = 0;
28
+ }
29
+ return counters.slice(0, level).join('.');
30
+ };
31
+ };
@@ -1,4 +1,4 @@
1
- const MAX_HEADING_LEVEL = 6;
1
+ import { createHeadingNumberer } from './create-heading-numberer';
2
2
 
3
3
  /**
4
4
  * DOM attribute carrying a heading's computed number. Editor and renderer styles render it with
@@ -7,26 +7,11 @@ const MAX_HEADING_LEVEL = 6;
7
7
  export const HEADING_NUMBER_ATTRIBUTE = 'data-heading-number';
8
8
 
9
9
  /**
10
- * Computes decimal outline numbers (`1`, `1.1`, `1.1.1`) for headings in document order.
11
- *
12
- * Each number has exactly `level` segments. Skipped levels are backfilled with `1` and count as
13
- * real siblings, and a higher-level heading resets all deeper counters.
10
+ * Computes decimal outline numbers for headings in document order. See `createHeadingNumberer`.
14
11
  *
15
12
  * @example getHeadingNumbers([1, 3, 2]) // ['1', '1.1.1', '1.2']
16
13
  */
17
14
  export const getHeadingNumbers = levels => {
18
- const counters = new Array(MAX_HEADING_LEVEL).fill(0);
19
- return levels.map(rawLevel => {
20
- const level = Math.min(Math.max(Math.trunc(rawLevel) || 1, 1), MAX_HEADING_LEVEL);
21
- for (let index = 0; index < level - 1; index++) {
22
- if (counters[index] === 0) {
23
- counters[index] = 1;
24
- }
25
- }
26
- counters[level - 1] += 1;
27
- for (let index = level; index < MAX_HEADING_LEVEL; index++) {
28
- counters[index] = 0;
29
- }
30
- return counters.slice(0, level).join('.');
31
- });
15
+ const getNextHeadingNumber = createHeadingNumberer();
16
+ return levels.map(level => getNextHeadingNumber(level));
32
17
  };
@@ -1,7 +1,7 @@
1
1
  /* CompactQuickInsertMenuItem.tsx generated by @compiled/babel-plugin v3.0.4 */
2
2
  import "./CompactQuickInsertMenuItem.compiled.css";
3
3
  import { ax, ix } from "@compiled/react/runtime";
4
- import React, { useId, useMemo, useState } from 'react';
4
+ import React, { useCallback, useId, useMemo, useState } from 'react';
5
5
  import { Box } from '@atlaskit/primitives/compiled/box';
6
6
  import { Inline } from '@atlaskit/primitives/compiled/inline';
7
7
  import { Text } from '@atlaskit/primitives/compiled/text';
@@ -84,11 +84,14 @@ const disabledItemStyles = xcss({
84
84
  });
85
85
  export const CompactQuickInsertMenuItem = ({
86
86
  ariaLabel,
87
+ 'aria-controls': ariaControls,
87
88
  description,
88
89
  iconBefore,
90
+ itemRef,
89
91
  isDisabled,
90
92
  lozenge,
91
93
  onSelect,
94
+ onBeforeSelect,
92
95
  preview,
93
96
  previewIcon,
94
97
  previewImageUrls,
@@ -115,8 +118,18 @@ export const CompactQuickInsertMenuItem = ({
115
118
  };
116
119
  const resolvedDescription = description !== null && description !== void 0 ? description : item === null || item === void 0 ? void 0 : item.description;
117
120
  const previewId = useId();
118
- const handleClick = useQuickInsertMenuItemSelection(onSelect);
121
+ const handleClick = useQuickInsertMenuItemSelection(onSelect, onBeforeSelect);
119
122
  const [referenceElement, setReferenceElement] = useState(null);
123
+ const setItemElement = useCallback(element => {
124
+ setReferenceElement(element);
125
+ if (typeof itemRef === 'function') {
126
+ itemRef(element);
127
+ } else if (itemRef) {
128
+ Object.assign(itemRef, {
129
+ current: element
130
+ });
131
+ }
132
+ }, [itemRef]);
120
133
  const resolvedPreview = useMemo(() => preview !== null && preview !== void 0 ? preview : previewImageUrls ? {
121
134
  image: previewImageUrls
122
135
  } : {}, [preview, previewImageUrls]);
@@ -131,8 +144,9 @@ export const CompactQuickInsertMenuItem = ({
131
144
  xcss: styles.iconLarge
132
145
  }, iconBefore) : iconBefore;
133
146
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Pressable, {
134
- ref: setReferenceElement,
147
+ ref: setItemElement,
135
148
  "aria-label": ariaLabel,
149
+ "aria-controls": ariaControls,
136
150
  "aria-describedby": shouldRenderPreview && hasAccessiblePreview ? previewId : undefined,
137
151
  "aria-selected": isSelected,
138
152
  id: id,
@@ -1,7 +1,7 @@
1
1
  /* ElementBrowserQuickInsertMenuItem.tsx generated by @compiled/babel-plugin v3.0.4 */
2
2
  import "./ElementBrowserQuickInsertMenuItem.compiled.css";
3
3
  import { ax, ix } from "@compiled/react/runtime";
4
- import React, { useId, useMemo } from 'react';
4
+ import React, { useCallback, useId, useMemo } from 'react';
5
5
  /* eslint-disable @atlaskit/design-system/no-emotion-primitives -- Compiled primitives do not provide Pressable. */
6
6
  import { Box } from '@atlaskit/primitives/box';
7
7
  import { Pressable } from '@atlaskit/primitives/pressable';
@@ -103,9 +103,12 @@ const pinnedIconColorResetStyles = null;
103
103
  */
104
104
  export const ElementBrowserQuickInsertMenuItem = ({
105
105
  ariaLabel,
106
+ 'aria-controls': ariaControls,
107
+ itemRef,
106
108
  description,
107
109
  iconBefore,
108
110
  isDisabled = false,
111
+ onBeforeSelect,
109
112
  lozenge,
110
113
  onSelect,
111
114
  preview,
@@ -125,7 +128,16 @@ export const ElementBrowserQuickInsertMenuItem = ({
125
128
  isSelected: false
126
129
  };
127
130
  const itemDescription = description !== null && description !== void 0 ? description : item === null || item === void 0 ? void 0 : item.description;
128
- const handleClick = useQuickInsertMenuItemSelection(onSelect);
131
+ const handleClick = useQuickInsertMenuItemSelection(onSelect, onBeforeSelect);
132
+ const setItemElement = useCallback(element => {
133
+ if (typeof itemRef === 'function') {
134
+ itemRef(element);
135
+ } else if (itemRef) {
136
+ Object.assign(itemRef, {
137
+ current: element
138
+ });
139
+ }
140
+ }, [itemRef]);
129
141
  const descriptionId = useId();
130
142
  const resolvedPreview = useMemo(() => preview !== null && preview !== void 0 ? preview : previewImageUrls ? {
131
143
  image: previewImageUrls
@@ -135,6 +147,8 @@ export const ElementBrowserQuickInsertMenuItem = ({
135
147
  className: ax(["_rpzpjdj5 _1pgcjdj5", !isDisabled && "_syaz1q3r"])
136
148
  }, iconBefore) : undefined;
137
149
  return /*#__PURE__*/React.createElement(Pressable, {
150
+ ref: setItemElement,
151
+ "aria-controls": ariaControls,
138
152
  "aria-describedby": hasDescription ? descriptionId : undefined,
139
153
  "aria-label": ariaLabel !== null && ariaLabel !== void 0 ? ariaLabel : title,
140
154
  "aria-selected": isSelected,
@@ -5,9 +5,12 @@ import { ElementBrowserQuickInsertMenuItem } from './ElementBrowserQuickInsertMe
5
5
  import { useQuickInsertContext } from './useQuickInsertContext';
6
6
  export const QuickInsertMenuItem = ({
7
7
  ariaLabel,
8
+ 'aria-controls': ariaControls,
9
+ itemRef,
8
10
  description,
9
11
  iconBefore,
10
12
  isDisabled,
13
+ onBeforeSelect,
11
14
  lozenge,
12
15
  onSelect,
13
16
  preview,
@@ -27,9 +30,12 @@ export const QuickInsertMenuItem = ({
27
30
  const surface = surfaceContext === null || surfaceContext === void 0 ? void 0 : (_surfaceContext$get = surfaceContext.get(REGISTERED_MENU_SURFACE_CONTEXT)) === null || _surfaceContext$get === void 0 ? void 0 : _surfaceContext$get.surface;
28
31
  return surface === 'element-browser' ? /*#__PURE__*/React.createElement(ElementBrowserQuickInsertMenuItem, {
29
32
  ariaLabel: ariaLabel,
33
+ "aria-controls": ariaControls,
34
+ itemRef: itemRef,
30
35
  description: description,
31
36
  iconBefore: iconBefore,
32
37
  isDisabled: isDisabled,
38
+ onBeforeSelect: onBeforeSelect,
33
39
  lozenge: lozenge,
34
40
  onSelect: onSelect,
35
41
  preview: preview,
@@ -39,9 +45,12 @@ export const QuickInsertMenuItem = ({
39
45
  title: title
40
46
  }) : /*#__PURE__*/React.createElement(CompactQuickInsertMenuItem, {
41
47
  ariaLabel: ariaLabel,
48
+ "aria-controls": ariaControls,
49
+ itemRef: itemRef,
42
50
  description: description,
43
51
  iconBefore: iconBefore,
44
52
  isDisabled: isDisabled,
53
+ onBeforeSelect: onBeforeSelect,
45
54
  lozenge: lozenge,
46
55
  onSelect: onSelect,
47
56
  preview: preview,