@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
package/CHANGELOG.md CHANGED
@@ -1,5 +1,37 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 135.0.0
4
+
5
+ ### Major Changes
6
+
7
+ - [`c1ec527d3ad2f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c1ec527d3ad2f) -
8
+ Require the fourth errorActionSubject argument in getNodeRenderer. Pass ACTION_SUBJECT.EDITOR for
9
+ Editor callers or ACTION_SUBJECT.RENDERER for Renderer callers. Support Renderer attribution in
10
+ the shared error boundary under platform_editor_loosely_lazy_migration.
11
+
12
+ ### Minor Changes
13
+
14
+ - [`ba744a2a50a5b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ba744a2a50a5b) -
15
+ Add `createHeadingNumberer` at
16
+ `@atlaskit/editor-common/numbered-headings/create-heading-numberer`, which numbers headings one at
17
+ a time in document order. `getHeadingNumbers` now uses it and returns the same numbers.
18
+ - [`c1ec527d3ad2f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c1ec527d3ad2f) -
19
+ Allow error boundary fallbacks to receive the caught error.
20
+
21
+ ### Patch Changes
22
+
23
+ - [`2c0be8a7e39cf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2c0be8a7e39cf) -
24
+ Behind `platform-dst-top-layer`, the editor toolbar takes focus back only after a toolbar action
25
+ (an item pick, a trigger click or a close from code). On Escape and Tab, the browser moves focus.
26
+ On an outside press, focus goes where the user pressed, for example the editor. The toolbar's
27
+ keyboard navigation also ignores keys from a menu or popup inside the toolbar, so Escape closes
28
+ the menu and the arrow keys move inside it.
29
+ - [`c1ec527d3ad2f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c1ec527d3ad2f) -
30
+ Use React.lazy with explicit loading and error boundaries for extension Quick Insert icons and
31
+ Element Browser when platform_editor_loosely_lazy_migration is enabled. Keep react-loadable when
32
+ the experiment is disabled.
33
+ - Updated dependencies
34
+
3
35
  ## 134.20.1
4
36
 
5
37
  ### Patch Changes
@@ -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 = "134.20.1";
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
  };
@@ -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 = "134.20.1";
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;
@@ -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 = "134.20.1";
17
17
  const sanitiseSentryEvents = (data, _hint) => {
18
18
  // Remove URL as it has UGC
19
19
  // Ignored via go/ees007