@atlaskit/editor-core 210.2.2 → 210.2.3
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 +12 -0
- package/dist/cjs/create-editor/ReactEditorView.js +3 -0
- package/dist/cjs/ui/Addon/click-area-helper.js +4 -2
- package/dist/cjs/ui/Appearance/FullPage/FullPage.js +2 -1
- package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.compiled.css +7 -1
- package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.js +49 -15
- package/dist/cjs/ui/ContentStyles/ai-panels.js +3 -3
- package/dist/cjs/ui/ContentStyles/layout.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/annotationStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/blockMarksStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/codeBlockStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/codeMarkStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/dateStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/embedCardStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/firstBlockNodeStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/gridStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/indentationStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/list.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/mediaStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/overflowShadowStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/paragraphStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/resizerStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/selectionStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/shadowStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/smartCardStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/tasksAndDecisionsStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/textColorStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/unsupportedStyles.js +1 -1
- package/dist/cjs/ui/EditorContentContainer/styles/whitespaceStyles.js +1 -1
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/create-editor/ReactEditorView.js +3 -0
- package/dist/es2019/ui/Addon/click-area-helper.js +4 -2
- package/dist/es2019/ui/Appearance/FullPage/FullPage.js +2 -1
- package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.compiled.css +7 -1
- package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js +41 -5
- package/dist/es2019/ui/ContentStyles/ai-panels.js +3 -3
- package/dist/es2019/ui/ContentStyles/layout.js +2 -1
- package/dist/es2019/ui/EditorContentContainer/styles/annotationStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/blockMarksStyles.js +2 -1
- package/dist/es2019/ui/EditorContentContainer/styles/codeBlockStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/codeMarkStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/dateStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/embedCardStyles.js +2 -1
- package/dist/es2019/ui/EditorContentContainer/styles/firstBlockNodeStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/gridStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/indentationStyles.js +2 -1
- package/dist/es2019/ui/EditorContentContainer/styles/list.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/mediaStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/overflowShadowStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/paragraphStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/resizerStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/selectionStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/shadowStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/smartCardStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/tasksAndDecisionsStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/textColorStyles.js +2 -1
- package/dist/es2019/ui/EditorContentContainer/styles/unsupportedStyles.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/styles/whitespaceStyles.js +2 -1
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/create-editor/ReactEditorView.js +3 -0
- package/dist/esm/ui/Addon/click-area-helper.js +4 -2
- package/dist/esm/ui/Appearance/FullPage/FullPage.js +2 -1
- package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.compiled.css +7 -1
- package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.js +49 -15
- package/dist/esm/ui/ContentStyles/ai-panels.js +3 -3
- package/dist/esm/ui/ContentStyles/layout.js +1 -1
- package/dist/esm/ui/EditorContentContainer/styles/annotationStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/blockMarksStyles.js +2 -1
- package/dist/esm/ui/EditorContentContainer/styles/codeBlockStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/codeMarkStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/dateStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/embedCardStyles.js +2 -1
- package/dist/esm/ui/EditorContentContainer/styles/firstBlockNodeStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/gridStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/indentationStyles.js +2 -1
- package/dist/esm/ui/EditorContentContainer/styles/list.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/mediaStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/overflowShadowStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/paragraphStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/resizerStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/selectionStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/shadowStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/smartCardStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/tasksAndDecisionsStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/textColorStyles.js +2 -1
- package/dist/esm/ui/EditorContentContainer/styles/unsupportedStyles.js +2 -2
- package/dist/esm/ui/EditorContentContainer/styles/whitespaceStyles.js +2 -1
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/composable-editor/editor-internal.d.ts +6 -2
- package/dist/types/create-editor/ReactEditorView.d.ts +2 -1
- package/dist/types/nodeviews/getInlineNodeViewProducer.styles.d.ts +2 -1
- package/dist/types/ui/Addon/Dropdown/styles.d.ts +2 -1
- package/dist/types/ui/Appearance/FullPage/FullPageToolbarNext.d.ts +4 -1
- package/dist/types/ui/Appearance/FullPage/MainToolbar.d.ts +7 -6
- package/dist/types/ui/Appearance/FullPage/StyledComponents.d.ts +6 -5
- package/dist/types/ui/ChromeCollapsed/styles.d.ts +2 -1
- package/dist/types/ui/ContentStyles/ai-panels.d.ts +2 -1
- package/dist/types/ui/ContentStyles/code-bidi-warning.d.ts +2 -1
- package/dist/types/ui/ContentStyles/code-block.d.ts +2 -1
- package/dist/types/ui/ContentStyles/date.d.ts +3 -2
- package/dist/types/ui/ContentStyles/expand.d.ts +2 -1
- package/dist/types/ui/ContentStyles/extension.d.ts +2 -1
- package/dist/types/ui/ContentStyles/layout.d.ts +2 -1
- package/dist/types/ui/ContentStyles/media.d.ts +2 -1
- package/dist/types/ui/ContentStyles/panel.d.ts +2 -1
- package/dist/types/ui/ContentStyles/status.d.ts +3 -2
- package/dist/types/ui/ContentStyles/tasks-and-decisions.d.ts +6 -5
- package/dist/types/ui/ContextPanel/index.d.ts +3 -3
- package/dist/types/ui/EditorContentContainer/styles/aiPanel.d.ts +5 -4
- package/dist/types/ui/EditorContentContainer/styles/annotationStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/backgroundColorStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/baseStyles.d.ts +5 -4
- package/dist/types/ui/EditorContentContainer/styles/blockMarksStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/blockTypeStyles.d.ts +5 -4
- package/dist/types/ui/EditorContentContainer/styles/codeBidiWarningStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/codeBlockStyles.d.ts +5 -4
- package/dist/types/ui/EditorContentContainer/styles/codeMarkStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/commentEditorStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/cursorStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/dateStyles.d.ts +4 -3
- package/dist/types/ui/EditorContentContainer/styles/editorUGCTokenStyles.d.ts +4 -3
- package/dist/types/ui/EditorContentContainer/styles/embedCardStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/emoji.d.ts +4 -3
- package/dist/types/ui/EditorContentContainer/styles/expandStyles.d.ts +5 -4
- package/dist/types/ui/EditorContentContainer/styles/extensionStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/findReplaceStyles.d.ts +3 -2
- package/dist/types/ui/EditorContentContainer/styles/firstBlockNodeStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/floatingToolbarStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/fullPageEditorStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/gapCursorStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/gridStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/indentationStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/inlineNodeViewSharedStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/layout.d.ts +18 -17
- package/dist/types/ui/EditorContentContainer/styles/link.d.ts +4 -3
- package/dist/types/ui/EditorContentContainer/styles/list.d.ts +3 -2
- package/dist/types/ui/EditorContentContainer/styles/mediaStyles.d.ts +5 -4
- package/dist/types/ui/EditorContentContainer/styles/mentions.d.ts +7 -6
- package/dist/types/ui/EditorContentContainer/styles/overflowShadowStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/panelStyles.d.ts +6 -5
- package/dist/types/ui/EditorContentContainer/styles/paragraphStyles.d.ts +4 -3
- package/dist/types/ui/EditorContentContainer/styles/placeholderStyles.d.ts +6 -5
- package/dist/types/ui/EditorContentContainer/styles/resizerStyles.d.ts +7 -6
- package/dist/types/ui/EditorContentContainer/styles/rule.d.ts +3 -2
- package/dist/types/ui/EditorContentContainer/styles/scrollbarStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/selectionStyles.d.ts +11 -10
- package/dist/types/ui/EditorContentContainer/styles/selectionToolbarStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/shadowStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/smartCardStyles.d.ts +8 -7
- package/dist/types/ui/EditorContentContainer/styles/statusStyles.d.ts +7 -6
- package/dist/types/ui/EditorContentContainer/styles/tableStyles.d.ts +4 -3
- package/dist/types/ui/EditorContentContainer/styles/tasksAndDecisionsStyles.d.ts +8 -7
- package/dist/types/ui/EditorContentContainer/styles/telepointerStyles.d.ts +3 -2
- package/dist/types/ui/EditorContentContainer/styles/textColorStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/textHighlightStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/unsupportedStyles.d.ts +2 -1
- package/dist/types/ui/EditorContentContainer/styles/whitespaceStyles.d.ts +2 -1
- package/dist/types/utils/action.d.ts +2 -1
- package/dist/types-ts4.5/composable-editor/editor-internal.d.ts +6 -2
- package/dist/types-ts4.5/create-editor/ReactEditorView.d.ts +2 -1
- package/dist/types-ts4.5/nodeviews/getInlineNodeViewProducer.styles.d.ts +2 -1
- package/dist/types-ts4.5/ui/Addon/Dropdown/styles.d.ts +2 -1
- package/dist/types-ts4.5/ui/Appearance/FullPage/FullPageToolbarNext.d.ts +4 -1
- package/dist/types-ts4.5/ui/Appearance/FullPage/MainToolbar.d.ts +7 -6
- package/dist/types-ts4.5/ui/Appearance/FullPage/StyledComponents.d.ts +6 -5
- package/dist/types-ts4.5/ui/ChromeCollapsed/styles.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/ai-panels.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/code-bidi-warning.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/code-block.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/date.d.ts +3 -2
- package/dist/types-ts4.5/ui/ContentStyles/expand.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/extension.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/layout.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/media.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/panel.d.ts +2 -1
- package/dist/types-ts4.5/ui/ContentStyles/status.d.ts +3 -2
- package/dist/types-ts4.5/ui/ContentStyles/tasks-and-decisions.d.ts +6 -5
- package/dist/types-ts4.5/ui/ContextPanel/index.d.ts +3 -3
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/aiPanel.d.ts +5 -4
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/annotationStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/backgroundColorStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/baseStyles.d.ts +5 -4
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/blockMarksStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/blockTypeStyles.d.ts +5 -4
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/codeBidiWarningStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/codeBlockStyles.d.ts +5 -4
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/codeMarkStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/commentEditorStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/cursorStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/dateStyles.d.ts +4 -3
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/editorUGCTokenStyles.d.ts +4 -3
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/embedCardStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/emoji.d.ts +4 -3
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/expandStyles.d.ts +5 -4
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/extensionStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/findReplaceStyles.d.ts +3 -2
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/firstBlockNodeStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/floatingToolbarStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/fullPageEditorStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/gapCursorStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/gridStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/indentationStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/inlineNodeViewSharedStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/layout.d.ts +18 -17
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/link.d.ts +4 -3
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/list.d.ts +3 -2
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/mediaStyles.d.ts +5 -4
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/mentions.d.ts +7 -6
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/overflowShadowStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/panelStyles.d.ts +6 -5
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/paragraphStyles.d.ts +4 -3
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/placeholderStyles.d.ts +6 -5
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/resizerStyles.d.ts +7 -6
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/rule.d.ts +3 -2
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/scrollbarStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/selectionStyles.d.ts +11 -10
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/selectionToolbarStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/shadowStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/smartCardStyles.d.ts +8 -7
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/statusStyles.d.ts +7 -6
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/tableStyles.d.ts +4 -3
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/tasksAndDecisionsStyles.d.ts +8 -7
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/telepointerStyles.d.ts +3 -2
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/textColorStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/textHighlightStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/unsupportedStyles.d.ts +2 -1
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/whitespaceStyles.d.ts +2 -1
- package/dist/types-ts4.5/utils/action.d.ts +2 -1
- package/package.json +7 -7
|
@@ -6,14 +6,21 @@ import { useIntl } from 'react-intl-next';
|
|
|
6
6
|
import { ContextPanelConsumer } from '@atlaskit/editor-common/context-panel';
|
|
7
7
|
import { TOOLBARS } from '@atlaskit/editor-common/toolbar';
|
|
8
8
|
import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
|
|
9
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
9
10
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
10
11
|
import { isToolbar } from '../../../utils/toolbar';
|
|
11
12
|
import { ToolbarNext } from '../../Toolbar/Toolbar';
|
|
12
13
|
import { useToolbarPortal } from '../../Toolbar/ToolbarPortal';
|
|
13
14
|
const styles = {
|
|
14
15
|
mainToolbarIconBefore: "_19pkpxbi _2hwxpxbi _otyrpxbi",
|
|
16
|
+
mainToolbarIconBeforeNew: "_4cvr1h6o _1e0c1txw",
|
|
15
17
|
mainToolbarWrapper: "_1rjc12x7 _18zrutpp _n7zl7r9e",
|
|
16
|
-
|
|
18
|
+
mainToolbarNew: "_1e0c1txw _4t3izwfg",
|
|
19
|
+
mainToolbarWithKeyline: "_16qs9g9j",
|
|
20
|
+
customToolbarWrapperStyle: "_4cvr1h6o _1e0c1txw",
|
|
21
|
+
firstChildWrapperOneLine: "_1e0c1txw _16jlkb7n",
|
|
22
|
+
secondChildWrapperOneLine: "_1e0c1txw _1ul91ns9 _4cvr1h6o",
|
|
23
|
+
beforePrimaryToolbarComponents: "_1e0c1txw _16jlkb7n _1bahesu3 _4cvr1h6o"
|
|
17
24
|
};
|
|
18
25
|
const MainToolbarWrapper = ({
|
|
19
26
|
children,
|
|
@@ -22,7 +29,23 @@ const MainToolbarWrapper = ({
|
|
|
22
29
|
}) => {
|
|
23
30
|
return /*#__PURE__*/React.createElement("div", {
|
|
24
31
|
"data-testid": testId,
|
|
25
|
-
className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline])
|
|
32
|
+
className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarNew])
|
|
33
|
+
}, children);
|
|
34
|
+
};
|
|
35
|
+
const FirstChildWrapper = ({
|
|
36
|
+
children
|
|
37
|
+
}) => {
|
|
38
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
39
|
+
"data-testid": "main-toolbar-first-child-wrapper",
|
|
40
|
+
className: ax([styles.firstChildWrapperOneLine])
|
|
41
|
+
}, children);
|
|
42
|
+
};
|
|
43
|
+
const SecondChildWrapper = ({
|
|
44
|
+
children
|
|
45
|
+
}) => {
|
|
46
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
47
|
+
"data-testid": "main-toolbar-second-child-wrapper",
|
|
48
|
+
className: ax([styles.secondChildWrapperOneLine])
|
|
26
49
|
}, children);
|
|
27
50
|
};
|
|
28
51
|
export const FullPageToolbarNext = ({
|
|
@@ -31,7 +54,8 @@ export const FullPageToolbarNext = ({
|
|
|
31
54
|
toolbarDockingPosition,
|
|
32
55
|
editorView,
|
|
33
56
|
popupsMountPoint,
|
|
34
|
-
showKeyline
|
|
57
|
+
showKeyline,
|
|
58
|
+
customPrimaryToolbarComponents
|
|
35
59
|
}) => {
|
|
36
60
|
var _editorAPI$toolbar, _useToolbarPortal;
|
|
37
61
|
const components = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
|
|
@@ -80,8 +104,20 @@ export const FullPageToolbarNext = ({
|
|
|
80
104
|
testId: "ak-editor-main-toolbar",
|
|
81
105
|
showKeyline: showKeyline || ContextPanelWidth > 0
|
|
82
106
|
}, beforeIcon && /*#__PURE__*/React.createElement("div", {
|
|
83
|
-
className: ax([styles.mainToolbarIconBefore])
|
|
84
|
-
}, beforeIcon), toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
107
|
+
className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
|
|
108
|
+
}, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
109
|
+
toolbar: toolbar,
|
|
110
|
+
components: components,
|
|
111
|
+
editorView: editorView,
|
|
112
|
+
editorAPI: editorAPI,
|
|
113
|
+
popupsMountPoint: mountPoint,
|
|
114
|
+
editorAppearance: "full-page"
|
|
115
|
+
})), /*#__PURE__*/React.createElement(SecondChildWrapper, null, /*#__PURE__*/React.createElement("div", {
|
|
116
|
+
className: ax([styles.customToolbarWrapperStyle])
|
|
117
|
+
}, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
|
|
118
|
+
"data-testid": 'before-primary-toolbar-components-plugin',
|
|
119
|
+
className: ax([styles.beforePrimaryToolbarComponents])
|
|
120
|
+
}, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents))) : toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
85
121
|
toolbar: toolbar,
|
|
86
122
|
components: components,
|
|
87
123
|
editorView: editorView,
|
|
@@ -100,9 +100,9 @@ const prismBorderStyles = (colorMode, hover) => css({
|
|
|
100
100
|
)`
|
|
101
101
|
})
|
|
102
102
|
});
|
|
103
|
-
|
|
104
|
-
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
|
|
105
|
-
|
|
103
|
+
export const aiPanelStyles = (colorMode
|
|
104
|
+
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
|
|
105
|
+
) => css`
|
|
106
106
|
@property --panel-gradient-angle {
|
|
107
107
|
syntax: '<angle>';
|
|
108
108
|
initial-value: 270deg;
|
|
@@ -282,7 +282,8 @@ export const layoutStyles = viewMode => css`
|
|
|
282
282
|
/* Ignored via go/ees007
|
|
283
283
|
TODO: Migrate away from gridSize
|
|
284
284
|
Recommendation: Replace directly with 7px */
|
|
285
|
-
margin: ${"var(--ds-space-100, 8px)"} -${akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? AK_NESTED_DND_GUTTER_OFFSET : 0)}px
|
|
285
|
+
margin: ${"var(--ds-space-100, 8px)"} -${akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? AK_NESTED_DND_GUTTER_OFFSET : 0)}px
|
|
286
|
+
0;
|
|
286
287
|
transition: border-color 0.3s ${akEditorSwoopCubicBezier};
|
|
287
288
|
cursor: ${viewMode === 'view' ? 'default' : 'pointer'};
|
|
288
289
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
|
|
4
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
5
5
|
export const annotationStyles = css({
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
2
3
|
|
|
3
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
4
5
|
export const blockMarksStyles = css({
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { overflowShadowStyles } from './overflowShadowStyles';
|
|
4
4
|
import { blanketSelectionStyles, boxShadowSelectionStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
5
5
|
export const CodeBlockSharedCssClassName = {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
4
4
|
export const codeMarkStyles = css({
|
|
5
5
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { boxShadowSelectionStyles, dangerBorderStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
4
4
|
export const DateSharedCssClassName = {
|
|
5
5
|
DATE_WRAPPER: `date-lozenger-container`,
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
2
3
|
|
|
3
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
4
5
|
export const embedCardStyles = css({
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
|
|
4
4
|
import { expandClassNames, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
|
|
5
5
|
import { CodeBlockSharedCssClassName } from './codeBlockStyles';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
4
4
|
export const gridStyles = css({
|
|
5
5
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
2
3
|
|
|
3
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
4
5
|
export const indentationStyles = css({
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
// copied from packages/editor/editor-shared-styles/src/consts/consts.ts
|
|
4
4
|
const akEditorLineHeight = 1.714;
|
|
5
5
|
// copied from packages/editor/editor-common/src/styles/shared/smart-card.ts
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { INLINE_IMAGE_WRAPPER_CLASS_NAME } from '@atlaskit/editor-common/media-inline';
|
|
4
4
|
import { MediaSharedClassNames, richMediaClassName } from '@atlaskit/editor-common/styles';
|
|
5
5
|
import { akEditorMediaResizeHandlerPadding, akEditorMediaResizeHandlerPaddingWide, akEditorSelectedBorderBoldSize, akEditorSelectedBoxShadow, akEditorSelectedNodeClassName, akEditorWrappedNodeZIndex } from '@atlaskit/editor-shared-styles';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
4
4
|
export const overflowShadowStyles = css({
|
|
5
5
|
backgroundImage: `
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
const blockNodesVerticalMargin = '0.75rem';
|
|
4
4
|
|
|
5
5
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
|
|
4
4
|
export const resizerItemClassName = 'resizer-item';
|
|
5
5
|
export const resizerHoverZoneClassName = 'resizer-hover-zone';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
// TODO: ED-28075 - refactor selection styles to unblock Compiled CSS migration
|
|
4
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
5
5
|
export const hideNativeBrowserTextSelectionStyles = css({
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
export const shadowClassNames = {
|
|
4
4
|
RIGHT_SHADOW: 'right-shadow',
|
|
5
5
|
LEFT_SHADOW: 'left-shadow'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
|
|
4
4
|
import { boxShadowSelectionStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
5
5
|
export const DATASOURCE_INNER_CONTAINER_CLASSNAME = 'datasourceView-content-inner-wrap';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { blanketSelectionStyles, boxShadowSelectionStyles, dangerBackgroundStyles, dangerBorderStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
4
4
|
const akEditorLineHeight = 1.714;
|
|
5
5
|
const akEditorSelectedNodeClassName = 'ak-editor-selected-node';
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
2
3
|
|
|
3
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
4
5
|
export const textColorStyles = css({
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
import { backgroundSelectionStyles, borderSelectionStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
4
4
|
export const UnsupportedSharedCssClassName = {
|
|
5
5
|
BLOCK_CONTAINER: 'unsupportedBlockView-content-wrap',
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
2
3
|
|
|
3
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
4
5
|
export const whitespaceStyles = css({
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "210.2.
|
|
2
|
+
export const version = "210.2.2";
|
|
@@ -775,4 +775,7 @@ export function ReactEditorView(props) {
|
|
|
775
775
|
editorAPI: editorAPI
|
|
776
776
|
})) !== null && _props$render !== void 0 ? _props$render : editor : editor);
|
|
777
777
|
}
|
|
778
|
+
|
|
779
|
+
// Preserving exact type generated by TypeScript
|
|
780
|
+
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
778
781
|
export default injectIntl(ReactEditorView);
|
|
@@ -3,6 +3,7 @@ import { addParagraphAtEnd } from '@atlaskit/editor-common/commands';
|
|
|
3
3
|
import { setSelectionTopLevelBlocks } from '@atlaskit/editor-common/selection';
|
|
4
4
|
import { closestElement } from '@atlaskit/editor-common/utils';
|
|
5
5
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
6
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
6
7
|
import { ignoreAttribute } from './ClickAreaBlock/contentComponentWrapper';
|
|
7
8
|
|
|
8
9
|
// we ignore all of the clicks made inside <div class="ak-editor-content-area" /> (but not clicks on the node itself)
|
|
@@ -41,7 +42,7 @@ export var checkForModal = function checkForModal(target) {
|
|
|
41
42
|
return true;
|
|
42
43
|
};
|
|
43
44
|
var clickAreaClickHandler = function clickAreaClickHandler(view, event) {
|
|
44
|
-
var _view$hasFocus, _target$parentElement, _event$currentTarget;
|
|
45
|
+
var _view$hasFocus, _target$parentElement, _event$currentTarget, _event$currentTarget2;
|
|
45
46
|
var isEditorFocused = !!(view !== null && view !== void 0 && (_view$hasFocus = view.hasFocus) !== null && _view$hasFocus !== void 0 && _view$hasFocus.call(view));
|
|
46
47
|
if (!(event.target instanceof HTMLElement)) {
|
|
47
48
|
return;
|
|
@@ -82,7 +83,8 @@ var clickAreaClickHandler = function clickAreaClickHandler(view, event) {
|
|
|
82
83
|
// This is a super workaround to find when events are coming from Confluence InlineComment modal
|
|
83
84
|
// We don't own those components, so we can't change them
|
|
84
85
|
var isEventComingFromInlineCommentPopup = Boolean(closestElement(event.currentTarget, 'div[offset]')) || Boolean(closestElement(target, 'div[offset]'));
|
|
85
|
-
var
|
|
86
|
+
var isAnchorButtonClicked = Boolean(closestElement(event.currentTarget, 'a')) || Boolean(closestElement(target, 'a')) || ((_event$currentTarget = event.currentTarget) === null || _event$currentTarget === void 0 ? void 0 : _event$currentTarget.nodeName) === 'A' || (target === null || target === void 0 ? void 0 : target.nodeName) === 'A';
|
|
87
|
+
var isButtonClicked = Boolean(closestElement(event.currentTarget, 'button')) || Boolean(closestElement(target, 'button')) || ((_event$currentTarget2 = event.currentTarget) === null || _event$currentTarget2 === void 0 ? void 0 : _event$currentTarget2.nodeName) === 'BUTTON' || (target === null || target === void 0 ? void 0 : target.nodeName) === 'BUTTON' || expValEquals('platform_editor_toolbar_migrate_loom', 'isEnabled', true) && isAnchorButtonClicked;
|
|
86
88
|
var isTargetInsideContentArea = Boolean(isTargetChildOfContentArea);
|
|
87
89
|
var isBetweenContentAreaAndEditableContent = isTargetInsideContentArea && !isTargetInsideEditableArea;
|
|
88
90
|
|
|
@@ -179,7 +179,8 @@ export var FullPageEditor = function FullPageEditor(props) {
|
|
|
179
179
|
popupsMountPoint: props.popupsMountPoint,
|
|
180
180
|
popupsBoundariesElement: props.popupsBoundariesElement,
|
|
181
181
|
popupsScrollableElement: props.popupsScrollableElement,
|
|
182
|
-
showKeyline: showKeyline
|
|
182
|
+
showKeyline: showKeyline,
|
|
183
|
+
customPrimaryToolbarComponents: props.customPrimaryToolbarComponents
|
|
183
184
|
})) : jsx(FullPageToolbar, {
|
|
184
185
|
appearance: props.appearance,
|
|
185
186
|
editorAPI: editorAPI,
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
|
|
2
2
|
._18zrutpp{padding-inline:var(--ds-space-150,9pt)}
|
|
3
3
|
._1rjc12x7{padding-block:var(--ds-space-075,6px)}
|
|
4
|
-
._n7zl7r9e{border-bottom:var(--ds-border-width,1px) solid var(--ds-border,#091e4224)}.
|
|
4
|
+
._n7zl7r9e{border-bottom:var(--ds-border-width,1px) solid var(--ds-border,#091e4224)}._16jlkb7n{flex-grow:1}
|
|
5
|
+
._16qs9g9j{box-shadow:var(--ds-shadow-overflow,0 0 8px #091e4228,0 0 1px #091e421e)}
|
|
5
6
|
._19pkpxbi{margin-top:var(--ds-space-200,1pc)}
|
|
7
|
+
._1bahesu3{justify-content:flex-end}
|
|
8
|
+
._1e0c1txw{display:flex}
|
|
9
|
+
._1ul91ns9{min-width:-moz-fit-content;min-width:fit-content}
|
|
6
10
|
._2hwxpxbi{margin-right:var(--ds-space-200,1pc)}
|
|
11
|
+
._4cvr1h6o{align-items:center}
|
|
12
|
+
._4t3izwfg{height:2pc}
|
|
7
13
|
._otyrpxbi{margin-bottom:var(--ds-space-200,1pc)}
|
|
@@ -6,14 +6,21 @@ import { useIntl } from 'react-intl-next';
|
|
|
6
6
|
import { ContextPanelConsumer } from '@atlaskit/editor-common/context-panel';
|
|
7
7
|
import { TOOLBARS } from '@atlaskit/editor-common/toolbar';
|
|
8
8
|
import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
|
|
9
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
9
10
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
10
11
|
import { isToolbar } from '../../../utils/toolbar';
|
|
11
12
|
import { ToolbarNext } from '../../Toolbar/Toolbar';
|
|
12
13
|
import { useToolbarPortal } from '../../Toolbar/ToolbarPortal';
|
|
13
14
|
var styles = {
|
|
14
15
|
mainToolbarIconBefore: "_19pkpxbi _2hwxpxbi _otyrpxbi",
|
|
16
|
+
mainToolbarIconBeforeNew: "_4cvr1h6o _1e0c1txw",
|
|
15
17
|
mainToolbarWrapper: "_1rjc12x7 _18zrutpp _n7zl7r9e",
|
|
16
|
-
|
|
18
|
+
mainToolbarNew: "_1e0c1txw _4t3izwfg",
|
|
19
|
+
mainToolbarWithKeyline: "_16qs9g9j",
|
|
20
|
+
customToolbarWrapperStyle: "_4cvr1h6o _1e0c1txw",
|
|
21
|
+
firstChildWrapperOneLine: "_1e0c1txw _16jlkb7n",
|
|
22
|
+
secondChildWrapperOneLine: "_1e0c1txw _1ul91ns9 _4cvr1h6o",
|
|
23
|
+
beforePrimaryToolbarComponents: "_1e0c1txw _16jlkb7n _1bahesu3 _4cvr1h6o"
|
|
17
24
|
};
|
|
18
25
|
var MainToolbarWrapper = function MainToolbarWrapper(_ref) {
|
|
19
26
|
var children = _ref.children,
|
|
@@ -21,17 +28,32 @@ var MainToolbarWrapper = function MainToolbarWrapper(_ref) {
|
|
|
21
28
|
showKeyline = _ref.showKeyline;
|
|
22
29
|
return /*#__PURE__*/React.createElement("div", {
|
|
23
30
|
"data-testid": testId,
|
|
24
|
-
className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline])
|
|
31
|
+
className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarNew])
|
|
25
32
|
}, children);
|
|
26
33
|
};
|
|
27
|
-
|
|
34
|
+
var FirstChildWrapper = function FirstChildWrapper(_ref2) {
|
|
35
|
+
var children = _ref2.children;
|
|
36
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
37
|
+
"data-testid": "main-toolbar-first-child-wrapper",
|
|
38
|
+
className: ax([styles.firstChildWrapperOneLine])
|
|
39
|
+
}, children);
|
|
40
|
+
};
|
|
41
|
+
var SecondChildWrapper = function SecondChildWrapper(_ref3) {
|
|
42
|
+
var children = _ref3.children;
|
|
43
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
44
|
+
"data-testid": "main-toolbar-second-child-wrapper",
|
|
45
|
+
className: ax([styles.secondChildWrapperOneLine])
|
|
46
|
+
}, children);
|
|
47
|
+
};
|
|
48
|
+
export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
|
|
28
49
|
var _editorAPI$toolbar, _useToolbarPortal;
|
|
29
|
-
var editorAPI =
|
|
30
|
-
beforeIcon =
|
|
31
|
-
toolbarDockingPosition =
|
|
32
|
-
editorView =
|
|
33
|
-
popupsMountPoint =
|
|
34
|
-
showKeyline =
|
|
50
|
+
var editorAPI = _ref4.editorAPI,
|
|
51
|
+
beforeIcon = _ref4.beforeIcon,
|
|
52
|
+
toolbarDockingPosition = _ref4.toolbarDockingPosition,
|
|
53
|
+
editorView = _ref4.editorView,
|
|
54
|
+
popupsMountPoint = _ref4.popupsMountPoint,
|
|
55
|
+
showKeyline = _ref4.showKeyline,
|
|
56
|
+
customPrimaryToolbarComponents = _ref4.customPrimaryToolbarComponents;
|
|
35
57
|
var components = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
|
|
36
58
|
var intl = useIntl();
|
|
37
59
|
var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
|
|
@@ -40,10 +62,10 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref2) {
|
|
|
40
62
|
|
|
41
63
|
// When a toolbar portal context is provided, render the toolbar inside a portal.
|
|
42
64
|
// Otherwise fall back to a fragment just to avoid forking rendering logic.
|
|
43
|
-
var
|
|
65
|
+
var _ref5 = (_useToolbarPortal = useToolbarPortal()) !== null && _useToolbarPortal !== void 0 ? _useToolbarPortal : {
|
|
44
66
|
Portal: React.Fragment
|
|
45
67
|
},
|
|
46
|
-
ToolbarPortal =
|
|
68
|
+
ToolbarPortal = _ref5.Portal;
|
|
47
69
|
var hasToolbarPortal = ToolbarPortal !== React.Fragment;
|
|
48
70
|
var mountPoint = hasToolbarPortal ? undefined : popupsMountPoint;
|
|
49
71
|
var isShortcutToFocusToolbarRaw = function isShortcutToFocusToolbarRaw(event) {
|
|
@@ -67,8 +89,8 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref2) {
|
|
|
67
89
|
event.stopPropagation();
|
|
68
90
|
}, [editorView]);
|
|
69
91
|
var handleEscape = expValEqualsNoExposure('platform_editor_toolbar_rerender_optimization_exp', 'isEnabled', true) ? handleEscapeMemoized : handleEscapeRaw;
|
|
70
|
-
return /*#__PURE__*/React.createElement(ContextPanelConsumer, null, function (
|
|
71
|
-
var ContextPanelWidth =
|
|
92
|
+
return /*#__PURE__*/React.createElement(ContextPanelConsumer, null, function (_ref6) {
|
|
93
|
+
var ContextPanelWidth = _ref6.width;
|
|
72
94
|
return /*#__PURE__*/React.createElement(ToolbarArrowKeyNavigationProvider, {
|
|
73
95
|
editorView: editorView,
|
|
74
96
|
childComponentSelector: "[data-testid='ak-editor-main-toolbar']",
|
|
@@ -79,8 +101,20 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref2) {
|
|
|
79
101
|
testId: "ak-editor-main-toolbar",
|
|
80
102
|
showKeyline: showKeyline || ContextPanelWidth > 0
|
|
81
103
|
}, beforeIcon && /*#__PURE__*/React.createElement("div", {
|
|
82
|
-
className: ax([styles.mainToolbarIconBefore])
|
|
83
|
-
}, beforeIcon), toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
104
|
+
className: ax([styles.mainToolbarIconBefore, expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) && styles.mainToolbarIconBeforeNew])
|
|
105
|
+
}, beforeIcon), expValEquals('platform_editor_toolbar_support_custom_components', 'isEnabled', true) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
106
|
+
toolbar: toolbar,
|
|
107
|
+
components: components,
|
|
108
|
+
editorView: editorView,
|
|
109
|
+
editorAPI: editorAPI,
|
|
110
|
+
popupsMountPoint: mountPoint,
|
|
111
|
+
editorAppearance: "full-page"
|
|
112
|
+
})), /*#__PURE__*/React.createElement(SecondChildWrapper, null, /*#__PURE__*/React.createElement("div", {
|
|
113
|
+
className: ax([styles.customToolbarWrapperStyle])
|
|
114
|
+
}, !!customPrimaryToolbarComponents && 'before' in customPrimaryToolbarComponents && /*#__PURE__*/React.createElement("div", {
|
|
115
|
+
"data-testid": 'before-primary-toolbar-components-plugin',
|
|
116
|
+
className: ax([styles.beforePrimaryToolbarComponents])
|
|
117
|
+
}, customPrimaryToolbarComponents.before), !!customPrimaryToolbarComponents && 'after' in customPrimaryToolbarComponents ? customPrimaryToolbarComponents.after : customPrimaryToolbarComponents))) : toolbarDockingPosition !== 'none' && components && isToolbar(toolbar) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
84
118
|
toolbar: toolbar,
|
|
85
119
|
components: components,
|
|
86
120
|
editorView: editorView,
|
|
@@ -80,8 +80,8 @@ var prismBorderStyles = function prismBorderStyles(colorMode, hover) {
|
|
|
80
80
|
background: "conic-gradient(\n\t\t\t\t\t\t\t\tfrom var(--panel-gradient-angle, 270deg),\n\t\t\t\t\t\t\t\t".concat(aiPrismColor['prism.border.step.1'][colorMode !== null && colorMode !== void 0 ? colorMode : 'light'], " 0%,\n\t\t\t\t\t\t\t\t").concat(aiPrismColor['prism.border.step.2'][colorMode !== null && colorMode !== void 0 ? colorMode : 'light'], " 20%,\n\t\t\t\t\t\t\t\t").concat(aiPrismColor['prism.border.step.3'][colorMode !== null && colorMode !== void 0 ? colorMode : 'light'], " 50%,\n\t\t\t\t\t\t\t\t").concat(aiPrismColor['prism.border.step.4'][colorMode !== null && colorMode !== void 0 ? colorMode : 'light'], " 56%,\n\t\t\t\t\t\t\t\t").concat(aiPrismColor['prism.border.step.1'][colorMode !== null && colorMode !== void 0 ? colorMode : 'light'], " 100%\n\t\t\t\t\t\t\t)")
|
|
81
81
|
}));
|
|
82
82
|
};
|
|
83
|
-
|
|
84
|
-
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
|
|
85
|
-
|
|
83
|
+
export var aiPanelStyles = function aiPanelStyles(colorMode
|
|
84
|
+
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
|
|
85
|
+
) {
|
|
86
86
|
return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t@property --panel-gradient-angle {\n\t\tsyntax: '<angle>';\n\t\tinitial-value: 270deg;\n\t\tinherits: false;\n\t}\n\n\tdiv[extensionType='com.atlassian.ai-blocks'] {\n\t\t/* This hides the label for the extension */\n\t\t.extension-label {\n\t\t\tdisplay: none;\n\t\t}\n\n\t\t/* This styles the ai panel correctly when its just sitting on the page and there\n\t\tis no user interaction */\n\t\t.extension-container {\n\t\t\tposition: relative;\n\t\t\tbox-shadow: none;\n\t\t\toverflow: unset;\n\t\t\tbackground-color: ", " !important;\n\t\t\t&::before,\n\t\t\t&::after {\n\t\t\t\t", "\n\t\t\t}\n\t\t\t&.with-hover-border {\n\t\t\t\t&::before,\n\t\t\t\t&::after {\n\t\t\t\t\t", "\n\t\t\t\t}\n\t\t\t}\n\t\t\t& .with-margin-styles {\n\t\t\t\tbackground-color: ", " !important;\n\t\t\t\tborder-radius: ", ";\n\t\t\t}\n\t\t}\n\t}\n\n\t/* This styles the ai panel correctly when its streaming */\n\tdiv[extensionType='com.atlassian.ai-blocks']:has(.streaming) {\n\t\t.extension-container {\n\t\t\tbox-shadow: none;\n\t\t\toverflow: unset;\n\t\t\t", "\n\t\t\t&::before,\n\t\t\t&::after {\n\t\t\t\t", "\n\t\t\t}\n\t\t}\n\t}\n\n\t/* This styles the ai panel correctly when a user is hovering over the delete button in the floating panel */\n\tdiv[extensionType='com.atlassian.ai-blocks'].danger {\n\t\t.extension-container {\n\t\t\tbox-shadow: 0 0 0 1px ", ";\n\t\t}\n\t}\n\n\t/* This removes the margin from the action list when inside an ai panel */\n\tdiv[extensiontype='com.atlassian.ai-blocks'][extensionkey='ai-action-items-block:aiActionItemsBodiedExtension'] {\n\t\tdiv[data-node-type='actionList'] {\n\t\t\tmargin: 0 !important;\n\t\t}\n\t}\n"])), "var(--ds-surface, #FFFFFF)", prismBorderStyles(colorMode), prismBorderStyles(colorMode, true), "var(--ds-surface, #FFFFFF)", "var(--ds-border-radius-100, 3px)", prismBorderAnimationStyles, prismBorderStyles(colorMode), "var(--ds-border-danger, #E2483D)");
|
|
87
87
|
};
|
|
@@ -70,5 +70,5 @@ var layoutResponsiveStyles = function layoutResponsiveStyles(viewMode) {
|
|
|
70
70
|
|
|
71
71
|
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
|
|
72
72
|
export var layoutStyles = function layoutStyles(viewMode) {
|
|
73
|
-
return css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", "\n\t\t[data-layout-section] {\n\t\t\t/* Ignored via go/ees007\n\t\t\tTODO: Migrate away from gridSize\n\t\t\tRecommendation: Replace directly with 7px */\n\t\t\tmargin: ", " -", "px
|
|
73
|
+
return css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", "\n\t\t[data-layout-section] {\n\t\t\t/* Ignored via go/ees007\n\t\t\tTODO: Migrate away from gridSize\n\t\t\tRecommendation: Replace directly with 7px */\n\t\t\tmargin: ", " -", "px\n\t\t\t\t0;\n\t\t\ttransition: border-color 0.3s ", ";\n\t\t\tcursor: ", ";\n\n\t\t\t/* Inner cursor located 26px from left */\n\t\t\t[data-layout-column] {\n\t\t\t\tflex: 1;\n\t\t\t\tposition: relative;\n\n\t\t\t\tmin-width: 0;\n\t\t\t\t/* disable 4 borders when in view mode and advanced layouts is on */\n\t\t\t\tborder: ", "px\n\t\t\t\t\tsolid ", ";\n\t\t\t\tborder-radius: 4px;\n\t\t\t\tpadding: ", "px\n\t\t\t\t\t", "px;\n\t\t\t\tbox-sizing: border-box;\n\n\t\t\t\t> div {\n\t\t\t\t\t", "\n\n\t\t\t\t\t> .embedCardView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-child\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor.-right\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-of-type\n\t\t\t\t\t\t+ .embedCardView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor:first-child\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t/* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n and shrinking layout's node selectable area (leniency margin) */\n\t\t\t\t\t> [data-node-type='decisionList'] {\n\t\t\t\t\t\tli:first-of-type [data-decision-wrapper] {\n\t\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t/* Make the 'content' fill the entire height of the layout column to allow click\n handler of layout section nodeview to target only data-layout-column */\n\t\t\t\t[data-layout-content] {\n\t\t\t\t\theight: 100%;\n\t\t\t\t\tcursor: text;\n\t\t\t\t\t.mediaGroupView-content-wrap {\n\t\t\t\t\t\tclear: both;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t", "\n\t\t}\n\n\t\t/* styles to support borders for layout */\n\t\t[data-layout-section],\n\t\t.layoutSectionView-content-wrap {\n\t\t\t", "\n\t\t}\n\t}\n\n\t", "\n\n\t/* hide separator when element is dragging on top of a layout column */\n\t[data-blocks-drop-target-container] ~ [data-layout-column] > [data-layout-content]::before {\n\t\tdisplay: none;\n\t}\n\n\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t[data-layout-section] {\n\t\t\t.", " {\n\t\t\t\tmargin: 0 ", "px;\n\t\t\t}\n\t\t}\n\t}\n\n\t", "\n"])), layoutSectionStyles(), "var(--ds-space-100, 8px)", akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? AK_NESTED_DND_GUTTER_OFFSET : 0), akEditorSwoopCubicBezier, viewMode === 'view' ? 'default' : 'pointer', viewMode === 'view' || editorExperiment('advanced_layouts', true) ? 0 : akEditorSelectedBorderSize, "var(--ds-border, #091E4224)", LAYOUT_COLUMN_PADDING, LAYOUT_COLUMN_PADDING + (fg('platform_editor_nested_dnd_styles_changes') ? 8 : 0), firstNodeWithNotMarginTop(), layoutColumnStyles(), editorExperiment('advanced_layouts', true) ? layoutWithSeparatorBorderStyles(viewMode) : layoutBorderStyles(viewMode), editorExperiment('advanced_layouts', true) && layoutResponsiveStyles(viewMode), TableCssClassName.TABLE_CONTAINER, "var(--ds-space-025, 2px)", editorExperiment('advanced_layouts', false) && fg('platform_editor_nested_dnd_styles_changes') && ".ak-editor-content-area.appearance-full-page .ProseMirror [data-layout-section] {\n\t\t\t\tmargin: ".concat("var(--ds-space-100, 8px)", " -", akLayoutGutterOffset + 8, "px 0;\n\t\t\t\t}"));
|
|
74
74
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
3
|
+
import { css } from '@emotion/react';
|
|
4
4
|
import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
|
|
5
5
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
6
6
|
export var annotationStyles = css({
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
2
3
|
|
|
3
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
4
5
|
export var blockMarksStyles = css({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
3
|
+
import { css } from '@emotion/react';
|
|
4
4
|
import { overflowShadowStyles } from './overflowShadowStyles';
|
|
5
5
|
import { blanketSelectionStyles, boxShadowSelectionStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
6
6
|
export var CodeBlockSharedCssClassName = {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
4
4
|
export var codeMarkStyles = css({
|
|
5
5
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
3
|
+
import { css } from '@emotion/react';
|
|
4
4
|
import { boxShadowSelectionStyles, dangerBorderStyles, hideNativeBrowserTextSelectionStyles } from './selectionStyles';
|
|
5
5
|
export var DateSharedCssClassName = {
|
|
6
6
|
DATE_WRAPPER: "date-lozenger-container",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
2
3
|
|
|
3
4
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
4
5
|
export var embedCardStyles = css({
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
3
|
+
import { css } from '@emotion/react';
|
|
4
4
|
import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
|
|
5
5
|
import { expandClassNames, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
|
|
6
6
|
import { CodeBlockSharedCssClassName } from './codeBlockStyles';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
|
+
import { css } from '@emotion/react';
|
|
3
3
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
4
4
|
export var gridStyles = css({
|
|
5
5
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|