@atlaskit/editor-common 134.20.1 → 135.0.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 (38) hide show
  1. package/CHANGELOG.md +32 -0
  2. package/dist/cjs/element-browser/components/ElementBrowserLoader.js +25 -21
  3. package/dist/cjs/extensibility/ExtensionComponent.js +2 -1
  4. package/dist/cjs/extensions/extension-handlers.js +10 -44
  5. package/dist/cjs/monitoring/error.js +1 -1
  6. package/dist/cjs/numbered-headings/create-heading-numberer.js +37 -0
  7. package/dist/cjs/numbered-headings/index.js +5 -19
  8. package/dist/cjs/toolbar/EditorToolbarUIProvider.js +18 -0
  9. package/dist/cjs/ui/DropList/index.js +1 -1
  10. package/dist/cjs/ui/ErrorBoundary/index.js +6 -9
  11. package/dist/cjs/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
  12. package/dist/es2019/element-browser/components/ElementBrowserLoader.js +20 -14
  13. package/dist/es2019/extensibility/ExtensionComponent.js +2 -1
  14. package/dist/es2019/extensions/extension-handlers.js +6 -23
  15. package/dist/es2019/monitoring/error.js +1 -1
  16. package/dist/es2019/numbered-headings/create-heading-numberer.js +31 -0
  17. package/dist/es2019/numbered-headings/index.js +4 -19
  18. package/dist/es2019/toolbar/EditorToolbarUIProvider.js +16 -0
  19. package/dist/es2019/ui/DropList/index.js +1 -1
  20. package/dist/es2019/ui/ErrorBoundary/index.js +10 -7
  21. package/dist/es2019/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
  22. package/dist/esm/element-browser/components/ElementBrowserLoader.js +25 -19
  23. package/dist/esm/extensibility/ExtensionComponent.js +2 -1
  24. package/dist/esm/extensions/extension-handlers.js +8 -44
  25. package/dist/esm/monitoring/error.js +1 -1
  26. package/dist/esm/numbered-headings/create-heading-numberer.js +31 -0
  27. package/dist/esm/numbered-headings/index.js +5 -18
  28. package/dist/esm/toolbar/EditorToolbarUIProvider.js +18 -0
  29. package/dist/esm/ui/DropList/index.js +1 -1
  30. package/dist/esm/ui/ErrorBoundary/index.js +6 -9
  31. package/dist/esm/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
  32. package/dist/types/analytics/types/events.d.ts +1 -1
  33. package/dist/types/extensions/extension-handlers.d.ts +2 -1
  34. package/dist/types/numbered-headings/create-heading-numberer.d.ts +14 -0
  35. package/dist/types/numbered-headings/index.d.ts +1 -4
  36. package/dist/types/ui/ErrorBoundary/index.d.ts +3 -6
  37. package/numbered-headings/create-heading-numberer/package.json +10 -0
  38. package/package.json +2 -2
@@ -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,5 +1,6 @@
1
1
  import React, { useCallback } from 'react';
2
2
  import { ToolbarUIProvider } from '@atlaskit/editor-toolbar/ui-context';
3
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
3
4
  export const EditorToolbarUIProvider = ({
4
5
  children,
5
6
  api,
@@ -15,6 +16,21 @@ export const EditorToolbarUIProvider = ({
15
16
  isOpen,
16
17
  event
17
18
  }) => {
19
+ if (!isOpen && fg('platform-dst-top-layer')) {
20
+ // Escape, Tab and an outside press have no target, and the editor does not take focus.
21
+ // The browser moves focus on Escape and Tab. On an outside press, focus goes where the
22
+ // user pressed, for example the editor. After a toolbar action (an item pick, a trigger
23
+ // click, a close from code), the editor takes focus back.
24
+ if (event === null || event.target instanceof Element) {
25
+ // After the design system's focus return as the menu hides.
26
+ setTimeout(() => requestAnimationFrame(() => {
27
+ api === null || api === void 0 ? void 0 : api.core.actions.focus({
28
+ scrollIntoView: false
29
+ });
30
+ }), 1);
31
+ }
32
+ return;
33
+ }
18
34
  if (!isOpen) {
19
35
  // Only refocus the editor when the dropdown closes via mouse or programmatic close.
20
36
  // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
13
13
  import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
14
14
  import Layer from '../Layer';
15
15
  const packageName = "@atlaskit/editor-common";
16
- const packageVersion = "134.20.0";
16
+ const packageVersion = "134.20.1";
17
17
  const halfFocusRing = 1;
18
18
  const dropOffset = '0, 8';
19
19
  // Ignored via go/ees005
@@ -8,15 +8,12 @@ export class ErrorBoundary extends React.Component {
8
8
  constructor(...args) {
9
9
  super(...args);
10
10
  _defineProperty(this, "state", {
11
- errorCaptured: false
11
+ error: null
12
12
  });
13
13
  }
14
14
  hasFallback() {
15
15
  return typeof this.props.fallbackComponent !== 'undefined';
16
16
  }
17
- shouldRecover() {
18
- return this.hasFallback() && this.state.errorCaptured;
19
- }
20
17
  componentDidCatch(error, errorInfo) {
21
18
  if (this.props.dispatchAnalyticsEvent) {
22
19
  this.props.dispatchAnalyticsEvent({
@@ -36,13 +33,19 @@ export class ErrorBoundary extends React.Component {
36
33
  });
37
34
  if (this.hasFallback()) {
38
35
  this.setState({
39
- errorCaptured: true
36
+ error
40
37
  });
41
38
  }
42
39
  }
43
40
  render() {
44
- if (this.shouldRecover()) {
45
- return this.props.fallbackComponent;
41
+ const {
42
+ error
43
+ } = this.state;
44
+ if (error) {
45
+ const {
46
+ fallbackComponent
47
+ } = this.props;
48
+ return typeof fallbackComponent === 'function' ? fallbackComponent(error) : fallbackComponent !== null && fallbackComponent !== void 0 ? fallbackComponent : null;
46
49
  }
47
50
  return this.props.children;
48
51
  }
@@ -7,6 +7,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
7
7
 
8
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- Ignored via go/DSP-18766; jsx required at runtime for @jsxRuntime classic
9
9
  import { css, jsx } from '@emotion/react';
10
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
10
11
  import { ELEMENT_BROWSER_ID } from '../../element-browser';
11
12
  import { fullPageMessages } from '../../messages';
12
13
  import { mediaInsertMessages } from '../../messages/media-insert';
@@ -122,12 +123,24 @@ export const ToolbarArrowKeyNavigationProvider = ({
122
123
  * @param event
123
124
  */
124
125
  const handleKeyDown = event => {
125
- var _document$querySelect, _document$querySelect2, _wrapperRef$current, _wrapperRef$current2;
126
+ var _document$querySelect, _document$querySelect2, _wrapperRef$current2, _wrapperRef$current3;
126
127
  // To trap the focus inside the horizontal toolbar for left and right arrow keys
127
128
  const targetElement = event.target;
128
129
  if (targetElement instanceof HTMLElement && !targetElement.closest(`${childComponentSelector}`)) {
129
130
  return;
130
131
  }
132
+
133
+ // On the top layer, a menu or popup opened from the toolbar renders inside the toolbar, and
134
+ // it owns its keys: the arrow keys, Tab, and Escape (which closes it and returns focus to its
135
+ // opener). So the toolbar ignores keys from a layer inside it. A layer around the toolbar
136
+ // (for example a floating toolbar's popup) does not count.
137
+ if (fg('platform-dst-top-layer') && targetElement instanceof Element) {
138
+ var _wrapperRef$current;
139
+ const layer = targetElement.closest('[popover], dialog');
140
+ if (layer && (_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(layer)) {
141
+ return;
142
+ }
143
+ }
131
144
  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) {
132
145
  return;
133
146
  }
@@ -136,7 +149,7 @@ export const ToolbarArrowKeyNavigationProvider = ({
136
149
  // if menu wrapper exists, then a menu is open and arrow keys will be handled by MenuArrowKeyNavigationProvider
137
150
  return;
138
151
  }
139
- const elementBrowser = wrapperRef === null || wrapperRef === void 0 ? void 0 : (_wrapperRef$current = wrapperRef.current) === null || _wrapperRef$current === void 0 ? void 0 : _wrapperRef$current.querySelector(`#${ELEMENT_BROWSER_ID}`);
152
+ const elementBrowser = wrapperRef === null || wrapperRef === void 0 ? void 0 : (_wrapperRef$current2 = wrapperRef.current) === null || _wrapperRef$current2 === void 0 ? void 0 : _wrapperRef$current2.querySelector(`#${ELEMENT_BROWSER_ID}`);
140
153
  if (elementBrowser) {
141
154
  // if element browser is open, then arrow keys will be handled by MenuArrowKeyNavigationProvider
142
155
  return;
@@ -150,7 +163,7 @@ export const ToolbarArrowKeyNavigationProvider = ({
150
163
  if (targetElement instanceof HTMLElement && targetElement.closest(`[aria-label="${intl.formatMessage(mediaInsertMessages.mediaPickerPopupAriaLabel)}"]`)) {
151
164
  return;
152
165
  }
153
- if (targetElement instanceof HTMLElement && !((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
166
+ if (targetElement instanceof HTMLElement && !((_wrapperRef$current3 = wrapperRef.current) !== null && _wrapperRef$current3 !== void 0 && _wrapperRef$current3.contains(targetElement))) {
154
167
  selectedItemIndex.current = -1;
155
168
  } else {
156
169
  selectedItemIndex.current = targetElement instanceof HTMLElement && filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
@@ -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
  var spinnerContainer = css({
17
17
  display: 'flex',
18
18
  alignItems: 'center',
@@ -20,36 +20,42 @@ var spinnerContainer = css({
20
20
  height: '100%',
21
21
  width: '100%'
22
22
  });
23
+ var ElementBrowserLoading = function ElementBrowserLoading() {
24
+ return jsx("div", {
25
+ css: spinnerContainer
26
+ }, jsx(Spinner, {
27
+ size: "medium",
28
+ interactionName: "element-browser-spinner"
29
+ }));
30
+ };
23
31
  var loadElementBrowser = function loadElementBrowser() {
24
32
  return import( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser').then(function (module) {
25
33
  return module.default;
26
34
  });
27
35
  };
28
- var ElementBrowserLazy = lazy(function () {
29
- return import( /* webpackChunkName: "@atlaskit-internal_editor-element-browser" */'../ElementBrowser').then(function (module) {
30
- return module.default;
36
+ var loadElementBrowserModule = function loadElementBrowserModule() {
37
+ return loadElementBrowser().then(function (Component) {
38
+ return {
39
+ default: Component
40
+ };
31
41
  });
32
- });
33
- ElementBrowserLazy.displayName = 'lazy(ElementBrowser)';
42
+ };
43
+ var ElementBrowserLazy = /*#__PURE__*/React.lazy(loadElementBrowserModule);
34
44
  var ElementBrowserLoadable = Loadable({
35
45
  loader: loadElementBrowser,
36
- loading: function loading() {
37
- return jsx("div", {
38
- css: spinnerContainer
39
- }, jsx(Spinner, {
40
- size: "medium",
41
- interactionName: "element-browser-spinner"
42
- }));
43
- }
46
+ loading: ElementBrowserLoading
44
47
  });
45
48
  var ElementBrowserLoader = function ElementBrowserLoader(props) {
46
- return isExperimentEnabled('platform_editor_loosely_lazy_migration') ? jsx(LazySuspense, {
47
- fallback: null
48
- }, jsx(ElementBrowserLazy, props)) :
49
+ return isExperimentEnabled('platform_editor_loosely_lazy_migration') ? jsx(ErrorBoundary, {
50
+ component: ACTION_SUBJECT.EDITOR,
51
+ fallbackComponent: jsx(ElementBrowserLoading, null)
52
+ }, jsx(React.Suspense, {
53
+ fallback: jsx(ElementBrowserLoading, null)
54
+ }, jsx(ElementBrowserLazy, props))) :
49
55
  // eslint-disable-next-line react/jsx-props-no-spreading
50
56
  jsx(ElementBrowserLoadable, props);
51
57
  };
52
58
  ElementBrowserLoader.preload = function () {
53
- return isExperimentEnabled('platform_editor_loosely_lazy_migration') ? ElementBrowserLazy.preload() : ElementBrowserLoadable.preload();
59
+ return isExperimentEnabled('platform_editor_loosely_lazy_migration') ? loadElementBrowser() : ElementBrowserLoadable.preload();
54
60
  };
55
61
  export default ElementBrowserLoader;
@@ -19,6 +19,7 @@ import React, { Component, useEffect, useLayoutEffect, useRef, useState } from '
19
19
  import memoizeOne from 'memoize-one';
20
20
  import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
21
21
  import { fg } from '@atlaskit/platform-feature-flags/fg';
22
+ import { ACTION_SUBJECT } from '../analytics/types/enums';
22
23
  import { getExtensionModuleNode, getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
23
24
  import { getExtensionRenderer, nodeToJSON, toJSON } from '../utils';
24
25
  import Extension from './Extension/Extension';
@@ -273,7 +274,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component) {
273
274
  result = render(node, editorView.state.doc, actions);
274
275
  }
275
276
  if (!result) {
276
- var extensionHandlerFromProvider = _this.props.extensionProvider && _this.getNodeRenderer(_this.props.extensionProvider, extensionType, extensionKey);
277
+ var extensionHandlerFromProvider = _this.props.extensionProvider && _this.getNodeRenderer(_this.props.extensionProvider, extensionType, extensionKey, ACTION_SUBJECT.EDITOR);
277
278
  if (extensionHandlerFromProvider) {
278
279
  var NodeRenderer = extensionHandlerFromProvider;
279
280
  if (node.type === 'multiBodiedExtension') {
@@ -1,21 +1,14 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
- import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
3
- import _createClass from "@babel/runtime/helpers/createClass";
4
- import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
5
- import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
6
- import _inherits from "@babel/runtime/helpers/inherits";
7
- import _defineProperty from "@babel/runtime/helpers/defineProperty";
8
2
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
9
3
  import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
10
4
  import _regeneratorRuntime from "@babel/runtime/regenerator";
11
- function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
12
- function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
13
5
  import React from 'react';
14
6
  import { useIntl } from 'react-intl';
15
7
  import Loadable from 'react-loadable';
16
8
  // oxlint-disable-next-line @atlassian/no-restricted-imports
17
9
  import { lazy, LazySuspense } from 'react-loosely-lazy';
18
10
  import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
11
+ import { ErrorBoundary } from '../ui/ErrorBoundary';
19
12
  import { getExtensionKeyAndNodeKey, resolveImport } from './manifest-helpers';
20
13
  import { messages } from './messages';
21
14
  import { resolveImportSync } from './resolveImportSync';
@@ -117,39 +110,6 @@ function isUnknownConfluenceMacroWithBody(extensionNode) {
117
110
  var _extensionNode$parame;
118
111
  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);
119
112
  }
120
- // eslint-disable-next-line @repo/internal/react/no-class-components -- error boundaries require a class component
121
- var ExtensionRendererErrorBoundary = /*#__PURE__*/function (_React$Component) {
122
- function ExtensionRendererErrorBoundary() {
123
- var _this;
124
- _classCallCheck(this, ExtensionRendererErrorBoundary);
125
- for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
126
- args[_key] = arguments[_key];
127
- }
128
- _this = _callSuper(this, ExtensionRendererErrorBoundary, [].concat(args));
129
- _defineProperty(_this, "state", {});
130
- return _this;
131
- }
132
- _inherits(ExtensionRendererErrorBoundary, _React$Component);
133
- return _createClass(ExtensionRendererErrorBoundary, [{
134
- key: "componentDidCatch",
135
- value: function componentDidCatch(error) {
136
- // eslint-disable-next-line no-console
137
- console.error('Error rendering extension', error);
138
- }
139
- }, {
140
- key: "render",
141
- value: function render() {
142
- return this.state.error ? renderExtensionLoadingError(this.state.error, this.props.fallbackProps) : this.props.children;
143
- }
144
- }], [{
145
- key: "getDerivedStateFromError",
146
- value: function getDerivedStateFromError(error) {
147
- return {
148
- error: error
149
- };
150
- }
151
- }]);
152
- }(React.Component);
153
113
  var noop = function noop() {};
154
114
  function renderExtensionLoadingError(error, props) {
155
115
  // Needed because the old react-loadable (older code-splitting library) error handling behaviour might be relied on by extensions.
@@ -184,7 +144,7 @@ function ExtensionLoading(props) {
184
144
  }
185
145
 
186
146
  // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
187
- export function getNodeRenderer(extensionProvider, extensionType, extensionKey) {
147
+ export function getNodeRenderer(extensionProvider, extensionType, extensionKey, errorActionSubject) {
188
148
  // Async is needed to wrap the getExtensionModuleNodeMaybePreloaded call in a promise so that we can use the lazy() API
189
149
  var loadNodeRenderer = /*#__PURE__*/function () {
190
150
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -268,12 +228,16 @@ export function getNodeRenderer(extensionProvider, extensionType, extensionKey)
268
228
  var LoadableNodeRenderer = getNodeRenderer;
269
229
  var NodeRenderer = function NodeRenderer(props) {
270
230
  var _props$loadingFallbac;
231
+ var errorFallback = React.useCallback(function (error) {
232
+ return renderExtensionLoadingError(error, props);
233
+ }, [props]);
271
234
  if (!isExperimentEnabled('platform_editor_loosely_lazy_migration')) {
272
235
  // eslint-disable-next-line react/jsx-props-no-spreading
273
236
  return /*#__PURE__*/React.createElement(LoadableNodeRenderer, props);
274
237
  }
275
- return /*#__PURE__*/React.createElement(ExtensionRendererErrorBoundary, {
276
- fallbackProps: props
238
+ return /*#__PURE__*/React.createElement(ErrorBoundary, {
239
+ component: errorActionSubject,
240
+ fallbackComponent: errorFallback
277
241
  }, /*#__PURE__*/React.createElement(LazySuspense, {
278
242
  fallback: (_props$loadingFallbac = props.loadingFallback) !== null && _props$loadingFallbac !== void 0 ? _props$loadingFallbac : null
279
243
  }, /*#__PURE__*/React.createElement(LazyNodeRenderer, props)));
@@ -19,7 +19,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
19
19
  var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
20
20
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
21
21
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
22
- var packageVersion = "134.20.0";
22
+ var packageVersion = "134.20.1";
23
23
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
24
24
  // Remove URL as it has UGC
25
25
  // Ignored via go/ees007
@@ -0,0 +1,31 @@
1
+ var 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 var createHeadingNumberer = function createHeadingNumberer() {
17
+ var counters = new Array(MAX_HEADING_LEVEL).fill(0);
18
+ return function (rawLevel) {
19
+ var level = Math.min(Math.max(Math.trunc(rawLevel) || 1, 1), MAX_HEADING_LEVEL);
20
+ for (var index = 0; index < level - 1; index++) {
21
+ if (counters[index] === 0) {
22
+ counters[index] = 1;
23
+ }
24
+ }
25
+ counters[level - 1] += 1;
26
+ for (var _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
- var 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,13 @@ var MAX_HEADING_LEVEL = 6;
7
7
  export var 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 var getHeadingNumbers = function getHeadingNumbers(levels) {
18
- var counters = new Array(MAX_HEADING_LEVEL).fill(0);
19
- return levels.map(function (rawLevel) {
20
- var level = Math.min(Math.max(Math.trunc(rawLevel) || 1, 1), MAX_HEADING_LEVEL);
21
- for (var index = 0; index < level - 1; index++) {
22
- if (counters[index] === 0) {
23
- counters[index] = 1;
24
- }
25
- }
26
- counters[level - 1] += 1;
27
- for (var _index = level; _index < MAX_HEADING_LEVEL; _index++) {
28
- counters[_index] = 0;
29
- }
30
- return counters.slice(0, level).join('.');
15
+ var getNextHeadingNumber = createHeadingNumberer();
16
+ return levels.map(function (level) {
17
+ return getNextHeadingNumber(level);
31
18
  });
32
19
  };
@@ -1,5 +1,6 @@
1
1
  import React, { useCallback } from 'react';
2
2
  import { ToolbarUIProvider } from '@atlaskit/editor-toolbar/ui-context';
3
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
3
4
  export var EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
4
5
  var children = _ref.children,
5
6
  api = _ref.api,
@@ -13,6 +14,23 @@ export var EditorToolbarUIProvider = function EditorToolbarUIProvider(_ref) {
13
14
  var onDropdownOpenChanged = useCallback(function (_ref2) {
14
15
  var isOpen = _ref2.isOpen,
15
16
  event = _ref2.event;
17
+ if (!isOpen && fg('platform-dst-top-layer')) {
18
+ // Escape, Tab and an outside press have no target, and the editor does not take focus.
19
+ // The browser moves focus on Escape and Tab. On an outside press, focus goes where the
20
+ // user pressed, for example the editor. After a toolbar action (an item pick, a trigger
21
+ // click, a close from code), the editor takes focus back.
22
+ if (event === null || event.target instanceof Element) {
23
+ // After the design system's focus return as the menu hides.
24
+ setTimeout(function () {
25
+ return requestAnimationFrame(function () {
26
+ api === null || api === void 0 || api.core.actions.focus({
27
+ scrollIntoView: false
28
+ });
29
+ });
30
+ }, 1);
31
+ }
32
+ return;
33
+ }
16
34
  if (!isOpen) {
17
35
  // Only refocus the editor when the dropdown closes via mouse or programmatic close.
18
36
  // When closed via keyboard Escape, keep focus on the trigger for better keyboard UX.
@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
20
20
  import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
21
21
  import Layer from '../Layer';
22
22
  var packageName = "@atlaskit/editor-common";
23
- var packageVersion = "134.20.0";
23
+ var packageVersion = "134.20.1";
24
24
  var halfFocusRing = 1;
25
25
  var dropOffset = '0, 8';
26
26
  // Ignored via go/ees005
@@ -20,7 +20,7 @@ export var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
20
20
  }
21
21
  _this = _callSuper(this, ErrorBoundary, [].concat(args));
22
22
  _defineProperty(_this, "state", {
23
- errorCaptured: false
23
+ error: null
24
24
  });
25
25
  return _this;
26
26
  }
@@ -30,11 +30,6 @@ export var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
30
30
  value: function hasFallback() {
31
31
  return typeof this.props.fallbackComponent !== 'undefined';
32
32
  }
33
- }, {
34
- key: "shouldRecover",
35
- value: function shouldRecover() {
36
- return this.hasFallback() && this.state.errorCaptured;
37
- }
38
33
  }, {
39
34
  key: "componentDidCatch",
40
35
  value: function componentDidCatch(error, errorInfo) {
@@ -56,15 +51,17 @@ export var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
56
51
  });
57
52
  if (this.hasFallback()) {
58
53
  this.setState({
59
- errorCaptured: true
54
+ error: error
60
55
  });
61
56
  }
62
57
  }
63
58
  }, {
64
59
  key: "render",
65
60
  value: function render() {
66
- if (this.shouldRecover()) {
67
- return this.props.fallbackComponent;
61
+ var error = this.state.error;
62
+ if (error) {
63
+ var fallbackComponent = this.props.fallbackComponent;
64
+ return typeof fallbackComponent === 'function' ? fallbackComponent(error) : fallbackComponent !== null && fallbackComponent !== void 0 ? fallbackComponent : null;
68
65
  }
69
66
  return this.props.children;
70
67
  }
@@ -7,6 +7,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
7
7
 
8
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- Ignored via go/DSP-18766; jsx required at runtime for @jsxRuntime classic
9
9
  import { css, jsx } from '@emotion/react';
10
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
10
11
  import { ELEMENT_BROWSER_ID } from '../../element-browser';
11
12
  import { fullPageMessages } from '../../messages';
12
13
  import { mediaInsertMessages } from '../../messages/media-insert';
@@ -122,12 +123,24 @@ export var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigatio
122
123
  * @param event
123
124
  */
124
125
  var handleKeyDown = function handleKeyDown(event) {
125
- var _document$querySelect, _document$querySelect2, _wrapperRef$current, _wrapperRef$current2;
126
+ var _document$querySelect, _document$querySelect2, _wrapperRef$current2, _wrapperRef$current3;
126
127
  // To trap the focus inside the horizontal toolbar for left and right arrow keys
127
128
  var targetElement = event.target;
128
129
  if (targetElement instanceof HTMLElement && !targetElement.closest("".concat(childComponentSelector))) {
129
130
  return;
130
131
  }
132
+
133
+ // On the top layer, a menu or popup opened from the toolbar renders inside the toolbar, and
134
+ // it owns its keys: the arrow keys, Tab, and Escape (which closes it and returns focus to its
135
+ // opener). So the toolbar ignores keys from a layer inside it. A layer around the toolbar
136
+ // (for example a floating toolbar's popup) does not count.
137
+ if (fg('platform-dst-top-layer') && targetElement instanceof Element) {
138
+ var _wrapperRef$current;
139
+ var layer = targetElement.closest('[popover], dialog');
140
+ if (layer && (_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(layer)) {
141
+ return;
142
+ }
143
+ }
131
144
  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) {
132
145
  return;
133
146
  }
@@ -136,7 +149,7 @@ export var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigatio
136
149
  // if menu wrapper exists, then a menu is open and arrow keys will be handled by MenuArrowKeyNavigationProvider
137
150
  return;
138
151
  }
139
- var elementBrowser = wrapperRef === null || wrapperRef === void 0 || (_wrapperRef$current = wrapperRef.current) === null || _wrapperRef$current === void 0 ? void 0 : _wrapperRef$current.querySelector("#".concat(ELEMENT_BROWSER_ID));
152
+ var elementBrowser = wrapperRef === null || wrapperRef === void 0 || (_wrapperRef$current2 = wrapperRef.current) === null || _wrapperRef$current2 === void 0 ? void 0 : _wrapperRef$current2.querySelector("#".concat(ELEMENT_BROWSER_ID));
140
153
  if (elementBrowser) {
141
154
  // if element browser is open, then arrow keys will be handled by MenuArrowKeyNavigationProvider
142
155
  return;
@@ -150,7 +163,7 @@ export var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigatio
150
163
  if (targetElement instanceof HTMLElement && targetElement.closest("[aria-label=\"".concat(intl.formatMessage(mediaInsertMessages.mediaPickerPopupAriaLabel), "\"]"))) {
151
164
  return;
152
165
  }
153
- if (targetElement instanceof HTMLElement && !((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
166
+ if (targetElement instanceof HTMLElement && !((_wrapperRef$current3 = wrapperRef.current) !== null && _wrapperRef$current3 !== void 0 && _wrapperRef$current3.contains(targetElement))) {
154
167
  selectedItemIndex.current = -1;
155
168
  } else {
156
169
  selectedItemIndex.current = targetElement instanceof HTMLElement && filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
@@ -167,7 +167,7 @@ export type ErrorEventAttributes = {
167
167
  outdatedBrowser?: boolean;
168
168
  product?: string;
169
169
  };
170
- type ComponentCrashErrorAEP = OperationalAEP<ACTION.EDITOR_CRASHED, ACTION_SUBJECT.FLOATING_CONTEXTUAL_BUTTON | ACTION_SUBJECT.PLUGIN_SLOT | ACTION_SUBJECT.REACT_NODE_VIEW | ACTION_SUBJECT.TABLES_PLUGIN | ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN | ACTION_SUBJECT.EDITOR | ACTION_SUBJECT.BLOCK_MENU | ACTION_SUBJECT.SYNCED_BLOCK | ACTION_SUBJECT.TOOLBAR, ACTION_SUBJECT_ID | FLOATING_CONTROLS_TITLE, ErrorEventAttributes>;
170
+ type ComponentCrashErrorAEP = OperationalAEP<ACTION.EDITOR_CRASHED, ACTION_SUBJECT.FLOATING_CONTEXTUAL_BUTTON | ACTION_SUBJECT.PLUGIN_SLOT | ACTION_SUBJECT.REACT_NODE_VIEW | ACTION_SUBJECT.TABLES_PLUGIN | ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN | ACTION_SUBJECT.EDITOR | ACTION_SUBJECT.RENDERER | ACTION_SUBJECT.BLOCK_MENU | ACTION_SUBJECT.SYNCED_BLOCK | ACTION_SUBJECT.TOOLBAR, ACTION_SUBJECT_ID | FLOATING_CONTROLS_TITLE, ErrorEventAttributes>;
171
171
  type ComponentCrashAdditionalInfoErrorAEP = OperationalAEP<ACTION.EDITOR_CRASHED_ADDITIONAL_INFORMATION, ACTION_SUBJECT.EDITOR, undefined, {
172
172
  errorId: string;
173
173
  }>;
@@ -1,5 +1,6 @@
1
1
  import React from 'react';
2
2
  import Loadable from 'react-loadable';
3
+ import type { ACTION_SUBJECT } from '../analytics/types/enums';
3
4
  import type { ExtensionParams, MultiBodiedExtensionActions, ReferenceEntity } from './types/extension-handler';
4
5
  import type { ExtensionKey, ExtensionModuleNode, ExtensionType } from './types/extension-manifest';
5
6
  import type { Parameters } from './types/extension-parameters';
@@ -12,7 +13,7 @@ export declare function getExtensionModuleNodeMaybePreloaded(extensionProvider:
12
13
  export declare function getExtensionModuleNodePrivateProps(extensionProvider: ExtensionProvider, extensionType: ExtensionType, extensionKey: ExtensionKey): Promise<{
13
14
  [prop: string]: any;
14
15
  }>;
15
- export declare function getNodeRenderer<T extends Parameters>(extensionProvider: ExtensionProvider, extensionType: ExtensionType, extensionKey: ExtensionKey): React.ComponentType<{
16
+ export declare function getNodeRenderer<T extends Parameters>(extensionProvider: ExtensionProvider, extensionType: ExtensionType, extensionKey: ExtensionKey, errorActionSubject: ACTION_SUBJECT.EDITOR | ACTION_SUBJECT.RENDERER): React.ComponentType<{
16
17
  actions?: MultiBodiedExtensionActions;
17
18
  isSelected?: boolean;
18
19
  node: ExtensionParams<T>;