@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.
- package/CHANGELOG.md +54 -0
- package/dist/cjs/ai-messages/ai-suggestions.js +1 -1
- package/dist/cjs/credit-guard/CreditCheckedPopup.js +69 -15
- package/dist/cjs/element-browser/components/ElementBrowserLoader.js +25 -21
- package/dist/cjs/extensibility/ExtensionComponent.js +2 -1
- package/dist/cjs/extensions/extension-handlers.js +10 -44
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/numbered-headings/create-heading-numberer.js +37 -0
- package/dist/cjs/numbered-headings/index.js +5 -19
- package/dist/cjs/quick-insert/CompactQuickInsertMenuItem.js +16 -2
- package/dist/cjs/quick-insert/ElementBrowserQuickInsertMenuItem.js +15 -1
- package/dist/cjs/quick-insert/QuickInsertMenuItem.js +9 -0
- package/dist/cjs/quick-insert/quickInsertMenuItemUtils.js +6 -3
- package/dist/cjs/toolbar/EditorToolbarUIProvider.js +18 -0
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/cjs/ui/ErrorBoundary/index.js +6 -9
- package/dist/cjs/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
- package/dist/es2019/ai-messages/ai-suggestions.js +1 -1
- package/dist/es2019/credit-guard/CreditCheckedPopup.js +66 -16
- package/dist/es2019/element-browser/components/ElementBrowserLoader.js +20 -14
- package/dist/es2019/extensibility/ExtensionComponent.js +2 -1
- package/dist/es2019/extensions/extension-handlers.js +6 -23
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/numbered-headings/create-heading-numberer.js +31 -0
- package/dist/es2019/numbered-headings/index.js +4 -19
- package/dist/es2019/quick-insert/CompactQuickInsertMenuItem.js +17 -3
- package/dist/es2019/quick-insert/ElementBrowserQuickInsertMenuItem.js +16 -2
- package/dist/es2019/quick-insert/QuickInsertMenuItem.js +9 -0
- package/dist/es2019/quick-insert/quickInsertMenuItemUtils.js +11 -6
- package/dist/es2019/toolbar/EditorToolbarUIProvider.js +16 -0
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/es2019/ui/ErrorBoundary/index.js +10 -7
- package/dist/es2019/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
- package/dist/esm/ai-messages/ai-suggestions.js +1 -1
- package/dist/esm/credit-guard/CreditCheckedPopup.js +70 -16
- package/dist/esm/element-browser/components/ElementBrowserLoader.js +25 -19
- package/dist/esm/extensibility/ExtensionComponent.js +2 -1
- package/dist/esm/extensions/extension-handlers.js +8 -44
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/numbered-headings/create-heading-numberer.js +31 -0
- package/dist/esm/numbered-headings/index.js +5 -18
- package/dist/esm/quick-insert/CompactQuickInsertMenuItem.js +17 -3
- package/dist/esm/quick-insert/ElementBrowserQuickInsertMenuItem.js +16 -2
- package/dist/esm/quick-insert/QuickInsertMenuItem.js +9 -0
- package/dist/esm/quick-insert/quickInsertMenuItemUtils.js +6 -3
- package/dist/esm/toolbar/EditorToolbarUIProvider.js +18 -0
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/esm/ui/ErrorBoundary/index.js +6 -9
- package/dist/esm/ui-menu/ToolbarArrowKeyNavigationProvider/index.js +16 -3
- package/dist/types/analytics/types/events.d.ts +1 -1
- package/dist/types/extensions/extension-handlers.d.ts +2 -1
- package/dist/types/numbered-headings/create-heading-numberer.d.ts +14 -0
- package/dist/types/numbered-headings/index.d.ts +1 -4
- package/dist/types/quick-insert/CompactQuickInsertMenuItem.d.ts +1 -1
- package/dist/types/quick-insert/ElementBrowserQuickInsertMenuItem.d.ts +1 -1
- package/dist/types/quick-insert/QuickInsertMenuItem.d.ts +5 -1
- package/dist/types/quick-insert/quickInsertMenuItemUtils.d.ts +1 -1
- package/dist/types/ui/ErrorBoundary/index.d.ts +3 -6
- package/numbered-headings/create-heading-numberer/package.json +10 -0
- package/package.json +2 -2
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import { useCallback } from 'react';
|
|
2
2
|
import { useQuickInsertContext } from './useQuickInsertContext';
|
|
3
|
-
export const useQuickInsertMenuItemSelection = onSelect => {
|
|
3
|
+
export const useQuickInsertMenuItemSelection = (onSelect, onBeforeSelect) => {
|
|
4
4
|
const {
|
|
5
5
|
editorView,
|
|
6
6
|
select
|
|
7
7
|
} = useQuickInsertContext();
|
|
8
|
-
return useCallback(() =>
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
return useCallback(() => {
|
|
9
|
+
if ((onBeforeSelect === null || onBeforeSelect === void 0 ? void 0 : onBeforeSelect()) === false) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
select(selectionContext => onSelect({
|
|
13
|
+
editorView,
|
|
14
|
+
insert: selectionContext.insert,
|
|
15
|
+
source: selectionContext.source
|
|
16
|
+
}));
|
|
17
|
+
}, [editorView, onBeforeSelect, onSelect, select]);
|
|
13
18
|
};
|
|
@@ -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 = "
|
|
16
|
+
const packageVersion = "135.0.0";
|
|
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
|
-
|
|
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
|
-
|
|
36
|
+
error
|
|
40
37
|
});
|
|
41
38
|
}
|
|
42
39
|
}
|
|
43
40
|
render() {
|
|
44
|
-
|
|
45
|
-
|
|
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$
|
|
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$
|
|
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$
|
|
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;
|
|
@@ -13,7 +13,7 @@ export var 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
|
|
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',
|
|
@@ -5,7 +5,7 @@ import "./CreditCheckedPopup.compiled.css";
|
|
|
5
5
|
import { ax, ix } from "@compiled/react/runtime";
|
|
6
6
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
7
7
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
8
|
-
import React, { useCallback, useEffect, useId, useRef, useState } from 'react';
|
|
8
|
+
import React, { useCallback, useEffect, useId, useLayoutEffect, useRef, useState } from 'react';
|
|
9
9
|
import { bind } from 'bind-event-listener';
|
|
10
10
|
import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles/constants';
|
|
11
11
|
import { Popup } from '@atlaskit/popup/popup';
|
|
@@ -38,6 +38,13 @@ var styles = {
|
|
|
38
38
|
var stopPropagation = function stopPropagation(event) {
|
|
39
39
|
return event.stopPropagation();
|
|
40
40
|
};
|
|
41
|
+
var focusReturnTarget = function focusReturnTarget(preferredTarget, fallbackTarget) {
|
|
42
|
+
var isUsableTarget = function isUsableTarget(target) {
|
|
43
|
+
return Boolean((target === null || target === void 0 ? void 0 : target.isConnected) && target !== target.ownerDocument.body && target !== target.ownerDocument.documentElement);
|
|
44
|
+
};
|
|
45
|
+
var target = isUsableTarget(preferredTarget) ? preferredTarget : isUsableTarget(fallbackTarget) ? fallbackTarget : null;
|
|
46
|
+
target === null || target === void 0 || target.focus();
|
|
47
|
+
};
|
|
41
48
|
|
|
42
49
|
/** Editor owns popup behavior; products supply content through getAICreditStatus. */
|
|
43
50
|
var CreditPopup = function CreditPopup(_ref2) {
|
|
@@ -59,15 +66,60 @@ var CreditPopup = function CreditPopup(_ref2) {
|
|
|
59
66
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
60
67
|
triggerElement = _useState4[0],
|
|
61
68
|
setTriggerElement = _useState4[1];
|
|
69
|
+
// Menu search and editor inputs can keep focus when feedback opens.
|
|
70
|
+
// Remember that element so Escape returns focus there instead of to the trigger.
|
|
62
71
|
var returnFocus = useRef(null);
|
|
63
|
-
var
|
|
72
|
+
var isOpen = useRef(feedback !== null);
|
|
73
|
+
isOpen.current = feedback !== null;
|
|
74
|
+
var restoreFocusAfterClose = useRef(false);
|
|
75
|
+
useEffect(function () {
|
|
76
|
+
if (!triggerElement) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
var ownerDocument = triggerElement.ownerDocument;
|
|
80
|
+
var rememberFocus = function rememberFocus(target) {
|
|
81
|
+
if (!isOpen.current && !restoreFocusAfterClose.current && target instanceof HTMLElement && target !== ownerDocument.body && target !== ownerDocument.documentElement) {
|
|
82
|
+
returnFocus.current = target;
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
rememberFocus(ownerDocument.activeElement);
|
|
86
|
+
return bind(ownerDocument, {
|
|
87
|
+
type: 'focusin',
|
|
88
|
+
options: {
|
|
89
|
+
capture: true
|
|
90
|
+
},
|
|
91
|
+
listener: function listener(event) {
|
|
92
|
+
return rememberFocus(event.target);
|
|
93
|
+
}
|
|
94
|
+
});
|
|
95
|
+
}, [triggerElement]);
|
|
64
96
|
useEffect(function () {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
97
|
+
var _returnFocus$current;
|
|
98
|
+
if (feedback || contentElement || !restoreFocusAfterClose.current) {
|
|
99
|
+
return;
|
|
68
100
|
}
|
|
69
|
-
|
|
70
|
-
|
|
101
|
+
restoreFocusAfterClose.current = false;
|
|
102
|
+
var previousFocus = (_returnFocus$current = returnFocus.current) !== null && _returnFocus$current !== void 0 && _returnFocus$current.isConnected ? returnFocus.current : triggerElement;
|
|
103
|
+
focusReturnTarget(previousFocus, triggerElement);
|
|
104
|
+
}, [feedback, contentElement, triggerElement]);
|
|
105
|
+
useLayoutEffect(function () {
|
|
106
|
+
if (!feedback || !contentElement) return;
|
|
107
|
+
var ownerDocument = contentElement.ownerDocument;
|
|
108
|
+
return bind(ownerDocument, {
|
|
109
|
+
type: 'keydown',
|
|
110
|
+
options: {
|
|
111
|
+
capture: true
|
|
112
|
+
},
|
|
113
|
+
listener: function listener(event) {
|
|
114
|
+
if (event.key !== 'Escape') return;
|
|
115
|
+
// The popup can leave focus in the editor, whose Escape handler cancels its draft.
|
|
116
|
+
event.preventDefault();
|
|
117
|
+
event.stopPropagation();
|
|
118
|
+
restoreFocusAfterClose.current = true;
|
|
119
|
+
close();
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
}, [feedback, contentElement, close]);
|
|
71
123
|
useEffect(function () {
|
|
72
124
|
if (!feedback || !contentElement || !isNestedMenu) {
|
|
73
125
|
return;
|
|
@@ -89,13 +141,10 @@ var CreditPopup = function CreditPopup(_ref2) {
|
|
|
89
141
|
event.stopPropagation();
|
|
90
142
|
if (event.key === 'Escape') {
|
|
91
143
|
event.preventDefault();
|
|
144
|
+
restoreFocusAfterClose.current = true;
|
|
92
145
|
close();
|
|
93
|
-
if (isNestedMenu) {
|
|
94
|
-
var _returnFocus$current;
|
|
95
|
-
(_returnFocus$current = returnFocus.current) === null || _returnFocus$current === void 0 || _returnFocus$current.focus();
|
|
96
|
-
}
|
|
97
146
|
}
|
|
98
|
-
}, [close
|
|
147
|
+
}, [close]);
|
|
99
148
|
var content = useCallback(function () {
|
|
100
149
|
return /*#__PURE__*/React.createElement(Box, {
|
|
101
150
|
ref: setContentElement,
|
|
@@ -120,10 +169,15 @@ var CreditPopup = function CreditPopup(_ref2) {
|
|
|
120
169
|
titleId: (triggerElement === null || triggerElement === void 0 ? void 0 : triggerElement.id) || id,
|
|
121
170
|
placement: placement,
|
|
122
171
|
shouldFitViewport: true,
|
|
123
|
-
shouldRenderToParent: shouldRenderToParent !== null && shouldRenderToParent !== void 0 ? shouldRenderToParent : false
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
172
|
+
shouldRenderToParent: shouldRenderToParent !== null && shouldRenderToParent !== void 0 ? shouldRenderToParent : false
|
|
173
|
+
// Credit feedback must share the modal layer when opened from a modal editor surface.
|
|
174
|
+
,
|
|
175
|
+
zIndex: akEditorFloatingDialogZIndex,
|
|
176
|
+
strategy: isNestedMenu ? 'fixed' : undefined
|
|
177
|
+
// Our Escape handler restores focus after the popup unmounts.
|
|
178
|
+
// Disable automatic restoration so outside clicks keep focus on their target.
|
|
179
|
+
,
|
|
180
|
+
shouldReturnFocus: false,
|
|
127
181
|
shouldUseCaptureOnOutsideClick: true,
|
|
128
182
|
content: content,
|
|
129
183
|
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
|
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
|
|
29
|
-
return
|
|
30
|
-
return
|
|
36
|
+
var loadElementBrowserModule = function loadElementBrowserModule() {
|
|
37
|
+
return loadElementBrowser().then(function (Component) {
|
|
38
|
+
return {
|
|
39
|
+
default: Component
|
|
40
|
+
};
|
|
31
41
|
});
|
|
32
|
-
}
|
|
33
|
-
ElementBrowserLazy
|
|
42
|
+
};
|
|
43
|
+
var ElementBrowserLazy = /*#__PURE__*/React.lazy(loadElementBrowserModule);
|
|
34
44
|
var ElementBrowserLoadable = Loadable({
|
|
35
45
|
loader: loadElementBrowser,
|
|
36
|
-
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(
|
|
47
|
-
|
|
48
|
-
|
|
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') ?
|
|
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(
|
|
276
|
-
|
|
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 = "
|
|
22
|
+
var packageVersion = "135.0.0";
|
|
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
|
-
|
|
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
|
|
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
|
|
19
|
-
return levels.map(function (
|
|
20
|
-
|
|
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
|
};
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
3
3
|
import "./CompactQuickInsertMenuItem.compiled.css";
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
|
-
import React, { useId, useMemo, useState } from 'react';
|
|
5
|
+
import React, { useCallback, useId, useMemo, useState } from 'react';
|
|
6
6
|
import { Box } from '@atlaskit/primitives/compiled/box';
|
|
7
7
|
import { Inline } from '@atlaskit/primitives/compiled/inline';
|
|
8
8
|
import { Text } from '@atlaskit/primitives/compiled/text';
|
|
@@ -86,11 +86,14 @@ var disabledItemStyles = xcss({
|
|
|
86
86
|
export var CompactQuickInsertMenuItem = function CompactQuickInsertMenuItem(_ref) {
|
|
87
87
|
var _resolvedPreview$attr, _ref3, _resolvedPreview$imag, _resolvedPreview$imag2;
|
|
88
88
|
var ariaLabel = _ref.ariaLabel,
|
|
89
|
+
ariaControls = _ref['aria-controls'],
|
|
89
90
|
description = _ref.description,
|
|
90
91
|
iconBefore = _ref.iconBefore,
|
|
92
|
+
itemRef = _ref.itemRef,
|
|
91
93
|
isDisabled = _ref.isDisabled,
|
|
92
94
|
lozenge = _ref.lozenge,
|
|
93
95
|
onSelect = _ref.onSelect,
|
|
96
|
+
onBeforeSelect = _ref.onBeforeSelect,
|
|
94
97
|
preview = _ref.preview,
|
|
95
98
|
previewIcon = _ref.previewIcon,
|
|
96
99
|
previewImageUrls = _ref.previewImageUrls,
|
|
@@ -115,11 +118,21 @@ export var CompactQuickInsertMenuItem = function CompactQuickInsertMenuItem(_ref
|
|
|
115
118
|
isSelected = _ref2.isSelected;
|
|
116
119
|
var resolvedDescription = description !== null && description !== void 0 ? description : item === null || item === void 0 ? void 0 : item.description;
|
|
117
120
|
var previewId = useId();
|
|
118
|
-
var handleClick = useQuickInsertMenuItemSelection(onSelect);
|
|
121
|
+
var handleClick = useQuickInsertMenuItemSelection(onSelect, onBeforeSelect);
|
|
119
122
|
var _useState = useState(null),
|
|
120
123
|
_useState2 = _slicedToArray(_useState, 2),
|
|
121
124
|
referenceElement = _useState2[0],
|
|
122
125
|
setReferenceElement = _useState2[1];
|
|
126
|
+
var setItemElement = useCallback(function (element) {
|
|
127
|
+
setReferenceElement(element);
|
|
128
|
+
if (typeof itemRef === 'function') {
|
|
129
|
+
itemRef(element);
|
|
130
|
+
} else if (itemRef) {
|
|
131
|
+
Object.assign(itemRef, {
|
|
132
|
+
current: element
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
}, [itemRef]);
|
|
123
136
|
var resolvedPreview = useMemo(function () {
|
|
124
137
|
return preview !== null && preview !== void 0 ? preview : previewImageUrls ? {
|
|
125
138
|
image: previewImageUrls
|
|
@@ -136,8 +149,9 @@ export var CompactQuickInsertMenuItem = function CompactQuickInsertMenuItem(_ref
|
|
|
136
149
|
xcss: styles.iconLarge
|
|
137
150
|
}, iconBefore) : iconBefore;
|
|
138
151
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Pressable, {
|
|
139
|
-
ref:
|
|
152
|
+
ref: setItemElement,
|
|
140
153
|
"aria-label": ariaLabel,
|
|
154
|
+
"aria-controls": ariaControls,
|
|
141
155
|
"aria-describedby": shouldRenderPreview && hasAccessiblePreview ? previewId : undefined,
|
|
142
156
|
"aria-selected": isSelected,
|
|
143
157
|
id: id,
|