@atlaskit/editor-core 226.5.0 → 226.6.2
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 +37 -0
- package/afm-cc/tsconfig.json +0 -3
- package/afm-products/tsconfig.json +0 -3
- package/dist/cjs/presets/universal.js +7 -5
- package/dist/cjs/ui/Appearance/Comment/Comment-compiled.compiled.css +0 -1
- package/dist/cjs/ui/Appearance/Comment/Comment-compiled.js +1 -3
- package/dist/cjs/ui/Appearance/Comment/Comment-emotion.js +1 -21
- package/dist/cjs/ui/Appearance/Comment/FixedToolbar-compiled.compiled.css +1 -2
- package/dist/cjs/ui/Appearance/Comment/FixedToolbar-compiled.js +1 -4
- package/dist/cjs/ui/Appearance/Comment/FixedToolbar-emotion.js +1 -6
- package/dist/cjs/ui/Appearance/Comment/StickyToolbar-compiled.compiled.css +0 -1
- package/dist/cjs/ui/Appearance/Comment/StickyToolbar-compiled.js +1 -4
- package/dist/cjs/ui/Appearance/Comment/StickyToolbar-emotion.js +1 -6
- package/dist/cjs/ui/quick-insert/getExtensionQuickInsertComponents.js +39 -12
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/presets/universal.js +10 -4
- package/dist/es2019/ui/Appearance/Comment/Comment-compiled.compiled.css +0 -1
- package/dist/es2019/ui/Appearance/Comment/Comment-compiled.js +1 -3
- package/dist/es2019/ui/Appearance/Comment/Comment-emotion.js +1 -21
- package/dist/es2019/ui/Appearance/Comment/FixedToolbar-compiled.compiled.css +1 -2
- package/dist/es2019/ui/Appearance/Comment/FixedToolbar-compiled.js +1 -4
- package/dist/es2019/ui/Appearance/Comment/FixedToolbar-emotion.js +1 -6
- package/dist/es2019/ui/Appearance/Comment/StickyToolbar-compiled.compiled.css +0 -1
- package/dist/es2019/ui/Appearance/Comment/StickyToolbar-compiled.js +1 -4
- package/dist/es2019/ui/Appearance/Comment/StickyToolbar-emotion.js +1 -6
- package/dist/es2019/ui/quick-insert/getExtensionQuickInsertComponents.js +23 -3
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/presets/universal.js +7 -5
- package/dist/esm/ui/Appearance/Comment/Comment-compiled.compiled.css +0 -1
- package/dist/esm/ui/Appearance/Comment/Comment-compiled.js +1 -3
- package/dist/esm/ui/Appearance/Comment/Comment-emotion.js +1 -21
- package/dist/esm/ui/Appearance/Comment/FixedToolbar-compiled.compiled.css +1 -2
- package/dist/esm/ui/Appearance/Comment/FixedToolbar-compiled.js +1 -4
- package/dist/esm/ui/Appearance/Comment/FixedToolbar-emotion.js +1 -6
- package/dist/esm/ui/Appearance/Comment/StickyToolbar-compiled.compiled.css +0 -1
- package/dist/esm/ui/Appearance/Comment/StickyToolbar-compiled.js +1 -4
- package/dist/esm/ui/Appearance/Comment/StickyToolbar-emotion.js +1 -6
- package/dist/esm/ui/quick-insert/getExtensionQuickInsertComponents.js +39 -12
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/presets/universal.d.ts +4 -0
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,42 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 226.6.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`c12860a41f49d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c12860a41f49d) -
|
|
8
|
+
Order the Data and charts slash-command menu, including Bitbucket Snippet and GitHub Gist after
|
|
9
|
+
Questions List, when platform_editor_slash_command is enabled.
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 226.6.1
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
|
|
18
|
+
## 226.6.0
|
|
19
|
+
|
|
20
|
+
### Minor Changes
|
|
21
|
+
|
|
22
|
+
- [`6d830aac99d6d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6d830aac99d6d) -
|
|
23
|
+
Add deprecation tag to blockControlsPlugin quickInsertButtonEnabled property - this has been
|
|
24
|
+
replaced with a new `blockControlButtonEnabled` plugin config in the quickInsertPlugin, which is
|
|
25
|
+
currently gated under `platform_editor_block_control_migration` and will be removed in future
|
|
26
|
+
update.
|
|
27
|
+
|
|
28
|
+
### Patch Changes
|
|
29
|
+
|
|
30
|
+
- Updated dependencies
|
|
31
|
+
|
|
32
|
+
## 226.5.1
|
|
33
|
+
|
|
34
|
+
### Patch Changes
|
|
35
|
+
|
|
36
|
+
- [`c1a25d416f137`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c1a25d416f137) -
|
|
37
|
+
Clean up experiment `platform_editor_comment_editor_border_radius`.
|
|
38
|
+
- Updated dependencies
|
|
39
|
+
|
|
3
40
|
## 226.5.0
|
|
4
41
|
|
|
5
42
|
### Minor Changes
|
package/afm-cc/tsconfig.json
CHANGED
|
@@ -83,7 +83,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
83
83
|
* @returns a full featured preset configured according to the provided props - basis for create-plugins-list
|
|
84
84
|
*/
|
|
85
85
|
function createUniversalPresetInternal(_ref) {
|
|
86
|
-
var _initialPluginConfigu, _initialPluginConfigu2, _initialPluginConfigu3, _initialPluginConfigu4, _initialPluginConfigu5, _initialPluginConfigu6, _featureFlags$lpLinkP, _initialPluginConfigu7, _initialPluginConfigu8, _initialPluginConfigu9, _initialPluginConfigu0, _initialPluginConfigu1,
|
|
86
|
+
var _initialPluginConfigu, _initialPluginConfigu2, _initialPluginConfigu3, _initialPluginConfigu4, _initialPluginConfigu5, _initialPluginConfigu6, _featureFlags$lpLinkP, _initialPluginConfigu7, _initialPluginConfigu8, _initialPluginConfigu9, _initialPluginConfigu0, _initialPluginConfigu1, _props$media, _props$media2, _props$media3, _props$media4, _props$media5, _props$media6, _props$media7, _props$mention$insert, _props$mention, _props$mention2, _props$mention3, _props$collabEdit$EXP, _props$collabEdit, _props$linking, _props$linking2, _featureFlags$lpLinkP2, _props$linking3, _props$primaryToolbar;
|
|
87
87
|
var appearance = _ref.appearance,
|
|
88
88
|
props = _ref.props,
|
|
89
89
|
featureFlags = _ref.featureFlags,
|
|
@@ -110,6 +110,7 @@ function createUniversalPresetInternal(_ref) {
|
|
|
110
110
|
lpLinkPicker: (_featureFlags$lpLinkP = featureFlags.lpLinkPicker) !== null && _featureFlags$lpLinkP !== void 0 ? _featureFlags$lpLinkP : false
|
|
111
111
|
}, props.hyperlinkOptions),
|
|
112
112
|
__livePage: props.__livePage,
|
|
113
|
+
quickInsert: _objectSpread(_objectSpread({}, props.quickInsert), initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.quickInsertPlugin),
|
|
113
114
|
toolbar: initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.toolbarPlugin
|
|
114
115
|
}));
|
|
115
116
|
var statusMenuDisabled = !props.allowStatus ? true : (0, _typeof2.default)(props.allowStatus) === 'object' ? Boolean(props.allowStatus.menuDisabled) : false;
|
|
@@ -119,10 +120,11 @@ function createUniversalPresetInternal(_ref) {
|
|
|
119
120
|
}
|
|
120
121
|
return false;
|
|
121
122
|
};
|
|
122
|
-
var finalPreset = defaultPreset.add(_ufo.ufoPlugin).add(_dataConsumer.dataConsumerPlugin).add(_accessibilityUtils.accessibilityUtilsPlugin).add(_contentInsertion.contentInsertionPlugin).add(_batchAttributeUpdates.batchAttributeUpdatesPlugin).maybeAdd([_blockControls.blockControlsPlugin, {
|
|
123
|
-
quickInsertButtonEnabled:
|
|
124
|
-
|
|
125
|
-
|
|
123
|
+
var finalPreset = defaultPreset.add(_ufo.ufoPlugin).add(_dataConsumer.dataConsumerPlugin).add(_accessibilityUtils.accessibilityUtilsPlugin).add(_contentInsertion.contentInsertionPlugin).add(_batchAttributeUpdates.batchAttributeUpdatesPlugin).maybeAdd([_blockControls.blockControlsPlugin, _objectSpread(_objectSpread({}, (initialPluginConfiguration === null || initialPluginConfiguration === void 0 || (_initialPluginConfigu7 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu7 === void 0 ? void 0 : _initialPluginConfigu7.quickInsertButtonEnabled) !== undefined ? {
|
|
124
|
+
quickInsertButtonEnabled: initialPluginConfiguration.blockControlsPlugin.quickInsertButtonEnabled
|
|
125
|
+
} : {}), {}, {
|
|
126
|
+
rightSideControlsEnabled: (_initialPluginConfigu8 = initialPluginConfiguration === null || initialPluginConfiguration === void 0 || (_initialPluginConfigu9 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu9 === void 0 ? void 0 : _initialPluginConfigu9.rightSideControlsEnabled) !== null && _initialPluginConfigu8 !== void 0 ? _initialPluginConfigu8 : false
|
|
127
|
+
})], Boolean((_initialPluginConfigu0 = initialPluginConfiguration === null || initialPluginConfiguration === void 0 || (_initialPluginConfigu1 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu1 === void 0 ? void 0 : _initialPluginConfigu1.enabled) !== null && _initialPluginConfigu0 !== void 0 ? _initialPluginConfigu0 : false)).maybeAdd([_breakout.breakoutPlugin, {
|
|
126
128
|
allowBreakoutButton: appearance === 'full-page',
|
|
127
129
|
appearance: appearance
|
|
128
130
|
}], Boolean(props.allowBreakout && (isFullPage || appearance === 'max' && ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_max_width_content_appearance', 'isEnabled', true))))).maybeAdd(_alignment.alignmentPlugin, Boolean(props.allowTextAlignment)).maybeAdd([_textColor.textColorPlugin, props.allowTextColor], Boolean(props.allowTextColor)).add(_list.listPlugin).maybeAdd(_rule.rulePlugin, Boolean(props.allowRule)).maybeAdd([_expand.expandPlugin, {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._19itno8c{border:var(--ds-border-width,1px) solid var(--ds-border-input,#8c8f97)}
|
|
2
2
|
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}
|
|
3
|
-
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
4
3
|
._2rkopb1k{border-radius:var(--ds-radius-xlarge,9pt)}._13dfutpp .less-margin>.ProseMirror{margin-top:var(--ds-space-150,9pt)}
|
|
5
4
|
._16jlkb7n{flex-grow:1}
|
|
6
5
|
._18m91wug{overflow-y:auto}
|
|
@@ -21,7 +21,6 @@ var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages
|
|
|
21
21
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
22
22
|
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
23
23
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
24
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
25
24
|
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
26
25
|
var _ClickAreaBlock = _interopRequireDefault(require("../../Addon/ClickAreaBlock"));
|
|
27
26
|
var _contentComponentWrapper = require("../../Addon/ClickAreaBlock/contentComponentWrapper");
|
|
@@ -42,7 +41,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
42
41
|
*/ // Ignored via go/ees005
|
|
43
42
|
// eslint-disable-next-line import/no-named-as-default
|
|
44
43
|
var commentEditorCompiledStyles = {
|
|
45
|
-
commentEditorOld: "_19itno8c _2rkofajl _1e0c1txw _2lx21bp4 _1ul9clpc _4t3i1wug _bfhk1j9a _vchhusvi _p12f1kw7 _slp31hna _13dfutpp _gzr8u2gc _ghozu2gc _oafwu2gc",
|
|
46
44
|
commentEditor: "_19itno8c _2rko1qi0 _1e0c1txw _2lx21bp4 _1ul9clpc _4t3i1wug _bfhk1j9a _vchhusvi _p12f1kw7 _slp31hna _13dfutpp _gzr8u2gc _ghozu2gc _oafwu2gc",
|
|
47
45
|
modernisedEditor: "_2rkopb1k",
|
|
48
46
|
secondaryToolbar: "_vchhusvi _1bahesu3 _4cvr1h6o _1e0c1txw _ca0qutpp _u5f3v77o _n3tdutpp _19bvv77o",
|
|
@@ -164,7 +162,7 @@ var CommentEditorWithIntlCompiled = exports.CommentEditorWithIntlCompiled = func
|
|
|
164
162
|
style: wrapperStyle
|
|
165
163
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
166
164
|
,
|
|
167
|
-
className: (0, _runtime.ax)([
|
|
165
|
+
className: (0, _runtime.ax)([commentEditorCompiledStyles.commentEditor, isEditorModernisationEnabled && commentEditorCompiledStyles.modernisedEditor, "akEditor"]),
|
|
168
166
|
ref: wrapperElementRef
|
|
169
167
|
}, /*#__PURE__*/_react.default.createElement(_Toolbar.MainToolbar, {
|
|
170
168
|
isEditorModernisationEnabled: isEditorModernisationEnabled,
|
|
@@ -20,7 +20,6 @@ var _ui = require("@atlaskit/editor-common/ui");
|
|
|
20
20
|
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
21
21
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
22
22
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
23
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
24
23
|
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
25
24
|
var _ClickAreaBlock = _interopRequireDefault(require("../../Addon/ClickAreaBlock"));
|
|
26
25
|
var _contentComponentWrapper = require("../../Addon/ClickAreaBlock/contentComponentWrapper");
|
|
@@ -49,25 +48,6 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
49
48
|
// eslint-disable-next-line import/no-named-as-default
|
|
50
49
|
|
|
51
50
|
var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
52
|
-
|
|
53
|
-
// Remove when platform_editor_comment_editor_border_radius is cleaned up
|
|
54
|
-
var commentEditorStylesOld = (0, _react2.css)({
|
|
55
|
-
display: 'flex',
|
|
56
|
-
flexDirection: 'column',
|
|
57
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
58
|
-
'.less-margin > .ProseMirror': {
|
|
59
|
-
margin: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
|
|
60
|
-
},
|
|
61
|
-
minWidth: '272px',
|
|
62
|
-
height: 'auto',
|
|
63
|
-
backgroundColor: "var(--ds-background-input, #FFFFFF)",
|
|
64
|
-
border: "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border-input, #8C8F97)"),
|
|
65
|
-
boxSizing: 'border-box',
|
|
66
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
67
|
-
borderRadius: "var(--ds-radius-small, 3px)",
|
|
68
|
-
maxWidth: 'inherit',
|
|
69
|
-
wordWrap: 'break-word'
|
|
70
|
-
});
|
|
71
51
|
var commentEditorStyles = (0, _react2.css)({
|
|
72
52
|
display: 'flex',
|
|
73
53
|
flexDirection: 'column',
|
|
@@ -239,7 +219,7 @@ var CommentEditorWithIntlEmotion = exports.CommentEditorWithIntlEmotion = functi
|
|
|
239
219
|
return (0, _react2.jsx)(_WithFlash.default, {
|
|
240
220
|
animate: maxContentSizeReached
|
|
241
221
|
}, (0, _react2.jsx)(_ui.WidthProvider, null, (0, _react2.jsx)("div", {
|
|
242
|
-
css: [
|
|
222
|
+
css: [commentEditorStyles, isEditorModernisationEnabled && modernisedEditorStyles,
|
|
243
223
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
244
224
|
(0, _react2.css)({
|
|
245
225
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._2rko12c2{border-radius:var(--ds-radius-medium,6px) var(--ds-radius-medium,6px) 0 0}
|
|
2
|
-
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}
|
|
3
|
-
._2rko1cku{border-radius:var(--ds-radius-small,3px) var(--ds-radius-small,3px) 0 0}._10ytglyw.show-keyline{box-shadow:none}
|
|
2
|
+
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}._10ytglyw.show-keyline{box-shadow:none}
|
|
4
3
|
._16qsglyw{box-shadow:none}
|
|
5
4
|
._19bvu2gc{padding-left:var(--ds-space-100,8px)}
|
|
6
5
|
._19bvv47k{padding-left:var(--ds-space-250,20px)}
|
|
@@ -15,21 +15,18 @@ exports.FixedToolbarCompiled = void 0;
|
|
|
15
15
|
require("./FixedToolbar-compiled.compiled.css");
|
|
16
16
|
var _runtime = require("@compiled/react/runtime");
|
|
17
17
|
var _react = _interopRequireDefault(require("react"));
|
|
18
|
-
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
19
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
20
18
|
var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
21
19
|
var fixedToolbarCompiledStyles = {
|
|
22
20
|
mainToolbarWrapper: "_kqswh2mm _4cvr1h6o _ca0qu2gc _u5f3u2gc _n3tdidpf _19bvv47k _1e0c1txw _4t3i1wug _bfhkvuon _16qsglyw _1khpidpf _lg5oidpf _1cuzidpf",
|
|
23
21
|
mainToolbarWithoutLeftPadding: "_ca0qu2gc _u5f3u2gc _n3tdidpf _19bvu2gc",
|
|
24
22
|
mainToolbarTwoLine: "_1uq61sxn _cnpmh9n0 _1djy1txw _17mgesu3 _1q27esu3 _16ec1txw",
|
|
25
23
|
mainToolbarWrapperVisualRefresh: "_3pwj1osq",
|
|
26
|
-
mainToolbarWithRadius: "_2rko1cku",
|
|
27
24
|
mainToolbarRadius: "_2rko12c2",
|
|
28
25
|
editorModernisationToolbar: "_2rko15b0 _10ytglyw"
|
|
29
26
|
};
|
|
30
27
|
var FixedToolbarCompiled = exports.FixedToolbarCompiled = function FixedToolbarCompiled(props) {
|
|
31
28
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
32
29
|
"data-testid": "ak-editor-main-toolbar",
|
|
33
|
-
className: (0, _runtime.ax)([fixedToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && fixedToolbarCompiledStyles.mainToolbarTwoLine, fixedToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, props.isNewToolbarEnabled && fixedToolbarCompiledStyles.mainToolbarWithoutLeftPadding,
|
|
30
|
+
className: (0, _runtime.ax)([fixedToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && fixedToolbarCompiledStyles.mainToolbarTwoLine, fixedToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, props.isNewToolbarEnabled && fixedToolbarCompiledStyles.mainToolbarWithoutLeftPadding, fixedToolbarCompiledStyles.mainToolbarRadius, props.isEditorModernisationEnabled && fixedToolbarCompiledStyles.editorModernisationToolbar])
|
|
34
31
|
}, props.children);
|
|
35
32
|
};
|
|
@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.FixedToolbarEmotion = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _react = require("@emotion/react");
|
|
10
|
-
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
11
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
12
10
|
/**
|
|
13
11
|
* @jsxRuntime classic
|
|
14
12
|
* @jsx jsx
|
|
@@ -70,9 +68,6 @@ var mainToolbarWrapperStylesVisualRefresh = (0, _react.css)({
|
|
|
70
68
|
maxWidth: '100%'
|
|
71
69
|
}
|
|
72
70
|
});
|
|
73
|
-
var mainToolbarWithRadiusStyle = (0, _react.css)({
|
|
74
|
-
borderRadius: "var(--ds-radius-small, 3px)".concat(" ", "var(--ds-radius-small, 3px)", " 0 0")
|
|
75
|
-
});
|
|
76
71
|
var mainToolbarRadius = (0, _react.css)({
|
|
77
72
|
borderRadius: "var(--ds-radius-medium, 6px)".concat(" ", "var(--ds-radius-medium, 6px)", " 0 0")
|
|
78
73
|
});
|
|
@@ -87,7 +82,7 @@ var FixedToolbarEmotion = exports.FixedToolbarEmotion = function FixedToolbarEmo
|
|
|
87
82
|
return (
|
|
88
83
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
89
84
|
(0, _react.jsx)("div", {
|
|
90
|
-
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding,
|
|
85
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle],
|
|
91
86
|
"data-testid": "ak-editor-main-toolbar"
|
|
92
87
|
}, props.children)
|
|
93
88
|
);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._2rko12c2{border-radius:var(--ds-radius-medium,6px) var(--ds-radius-medium,6px) 0 0}
|
|
2
2
|
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}
|
|
3
|
-
._2rko1cku{border-radius:var(--ds-radius-small,3px) var(--ds-radius-small,3px) 0 0}
|
|
4
3
|
._v56416gf{transition:box-shadow .2s ease-in-out}._10ytglyw.show-keyline{box-shadow:none}
|
|
5
4
|
._10ytl2q5.show-keyline{box-shadow:0 2px 0 0 var(--ds-background-accent-gray-subtlest,#f0f1f2)}
|
|
6
5
|
._16qsglyw{box-shadow:none}
|
|
@@ -11,8 +11,6 @@ require("./StickyToolbar-compiled.compiled.css");
|
|
|
11
11
|
var _runtime = require("@compiled/react/runtime");
|
|
12
12
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
13
13
|
var _react = _interopRequireWildcard(require("react"));
|
|
14
|
-
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
15
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
16
14
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
17
15
|
/**
|
|
18
16
|
* Compiled branch of the `platform_editor_core_non_ecc_static_css` experiment.
|
|
@@ -28,7 +26,6 @@ var stickyToolbarCompiledStyles = {
|
|
|
28
26
|
mainToolbarWithPadding: "_ca0qu2gc _u5f3u2gc _n3tdu2gc _19bvu2gc",
|
|
29
27
|
mainToolbarTwoLine: "_1uq61sxn _cnpmh9n0 _1djy1txw _17mgesu3 _1q27esu3 _16ec1txw",
|
|
30
28
|
mainToolbarWrapperVisualRefresh: "_3pwj1osq",
|
|
31
|
-
mainToolbarWithRadius: "_2rko1cku",
|
|
32
29
|
mainToolbarRadius: "_2rko12c2",
|
|
33
30
|
editorModernisationToolbar: "_2rko15b0 _10ytglyw",
|
|
34
31
|
stickyToolbarWrapper: "_v56416gf _kqsw1if8 _n3tdu2gc _1pbybfng _10ytl2q5"
|
|
@@ -61,6 +58,6 @@ var StickyToolbarCompiled = exports.StickyToolbarCompiled = function StickyToolb
|
|
|
61
58
|
"data-testid": "ak-editor-main-toolbar"
|
|
62
59
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
63
60
|
,
|
|
64
|
-
className: (0, _runtime.ax)([stickyToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && stickyToolbarCompiledStyles.mainToolbarTwoLine, stickyToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, stickyToolbarCompiledStyles.stickyToolbarWrapper, props.isNewToolbarEnabled && stickyToolbarCompiledStyles.mainToolbarWithPadding,
|
|
61
|
+
className: (0, _runtime.ax)([stickyToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && stickyToolbarCompiledStyles.mainToolbarTwoLine, stickyToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, stickyToolbarCompiledStyles.stickyToolbarWrapper, props.isNewToolbarEnabled && stickyToolbarCompiledStyles.mainToolbarWithPadding, stickyToolbarCompiledStyles.mainToolbarRadius, props.isEditorModernisationEnabled && stickyToolbarCompiledStyles.editorModernisationToolbar, 'show-keyline'])
|
|
65
62
|
}, props.children);
|
|
66
63
|
};
|
|
@@ -9,8 +9,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
9
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
10
|
var _react = require("react");
|
|
11
11
|
var _react2 = require("@emotion/react");
|
|
12
|
-
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
13
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
14
12
|
/**
|
|
15
13
|
* @jsxRuntime classic
|
|
16
14
|
* @jsx jsx
|
|
@@ -72,9 +70,6 @@ var mainToolbarWrapperStylesVisualRefresh = (0, _react2.css)({
|
|
|
72
70
|
maxWidth: '100%'
|
|
73
71
|
}
|
|
74
72
|
});
|
|
75
|
-
var mainToolbarWithRadiusStyle = (0, _react2.css)({
|
|
76
|
-
borderRadius: "var(--ds-radius-small, 3px)".concat(" ", "var(--ds-radius-small, 3px)", " 0 0")
|
|
77
|
-
});
|
|
78
73
|
var mainToolbarRadius = (0, _react2.css)({
|
|
79
74
|
borderRadius: "var(--ds-radius-medium, 6px)".concat(" ", "var(--ds-radius-medium, 6px)", " 0 0")
|
|
80
75
|
});
|
|
@@ -118,7 +113,7 @@ var StickyToolbarEmotion = exports.StickyToolbarEmotion = function StickyToolbar
|
|
|
118
113
|
return (
|
|
119
114
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
120
115
|
(0, _react2.jsx)("div", {
|
|
121
|
-
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding,
|
|
116
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle]
|
|
122
117
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/enforce-style-prop -- top is computed dynamically from externalToolbarRef height / offsetTop and cannot be a static css value
|
|
123
118
|
,
|
|
124
119
|
style: wrapperStyle,
|
|
@@ -10,6 +10,7 @@ var _createQuickInsertMatcher = require("@atlaskit/editor-common/quick-insert/cr
|
|
|
10
10
|
var _getMenuItemParents = require("@atlaskit/editor-common/quick-insert/get-menu-item-parents");
|
|
11
11
|
var _keys = require("@atlaskit/editor-common/quick-insert/keys");
|
|
12
12
|
var _rank = require("@atlaskit/editor-common/quick-insert/rank");
|
|
13
|
+
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
13
14
|
var _ExtensionQuickInsertMenuItem = require("./ExtensionQuickInsertMenuItem");
|
|
14
15
|
var structureExtensionItemKeyRanks = {
|
|
15
16
|
'toc:toc': 600,
|
|
@@ -24,6 +25,7 @@ var structureExtensionItemKeyRanks = {
|
|
|
24
25
|
'smart-button:quick-insert': 3000
|
|
25
26
|
};
|
|
26
27
|
var UNRECOGNIZED_STRUCTURE_EXTENSION_ITEM_RANK = 3100;
|
|
28
|
+
var APP_DATA_AND_CHARTS_ITEM_RANK = 2700;
|
|
27
29
|
var getStructureExtensionItemRank = function getStructureExtensionItemRank(item) {
|
|
28
30
|
return structureExtensionItemKeyRanks[item.key];
|
|
29
31
|
};
|
|
@@ -36,23 +38,48 @@ var isStructureExtensionItem = function isStructureExtensionItem(item) {
|
|
|
36
38
|
return parent.key === _keys.STRUCTURE_SECTION.key;
|
|
37
39
|
});
|
|
38
40
|
};
|
|
39
|
-
var
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
return
|
|
45
|
-
}).sort(function (firstItem, secondItem) {
|
|
46
|
-
return firstItem.title.localeCompare(secondItem.title) || firstItem.key.localeCompare(secondItem.key);
|
|
47
|
-
}).map(function (item, index) {
|
|
48
|
-
return [item, UNRECOGNIZED_STRUCTURE_EXTENSION_ITEM_RANK + index];
|
|
41
|
+
var compareMenuItemsByTitleAndKey = function compareMenuItemsByTitleAndKey(firstItem, secondItem) {
|
|
42
|
+
return firstItem.title.localeCompare(secondItem.title) || firstItem.key.localeCompare(secondItem.key);
|
|
43
|
+
};
|
|
44
|
+
var getAlphabeticalItemRanks = function getAlphabeticalItemRanks(items, isRankedItem, firstRank) {
|
|
45
|
+
return new Map(items.filter(isRankedItem).sort(compareMenuItemsByTitleAndKey).map(function (item, index) {
|
|
46
|
+
return [item, firstRank + index];
|
|
49
47
|
}));
|
|
48
|
+
};
|
|
49
|
+
var getUnrecognizedStructureItemRanks = function getUnrecognizedStructureItemRanks(items) {
|
|
50
|
+
return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command') ? getAlphabeticalItemRanks(items, function (item) {
|
|
51
|
+
return isStructureExtensionItem(item) && getStructureExtensionItemRank(item) === undefined;
|
|
52
|
+
}, UNRECOGNIZED_STRUCTURE_EXTENSION_ITEM_RANK) : new Map();
|
|
53
|
+
};
|
|
54
|
+
var getUnrecognizedDataAndChartsItemRanks = function getUnrecognizedDataAndChartsItemRanks(items) {
|
|
55
|
+
return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command') ? getAlphabeticalItemRanks(items, function (item) {
|
|
56
|
+
return item.category === 'data-and-charts' && item.priority === undefined;
|
|
57
|
+
}, APP_DATA_AND_CHARTS_ITEM_RANK) : new Map();
|
|
58
|
+
};
|
|
59
|
+
var getFallbackRank = function getFallbackRank(_ref) {
|
|
60
|
+
var _ref2, _unrecognizedStructur, _item$priority;
|
|
61
|
+
var index = _ref.index,
|
|
62
|
+
item = _ref.item,
|
|
63
|
+
unrecognizedDataAndChartsItemRanks = _ref.unrecognizedDataAndChartsItemRanks,
|
|
64
|
+
unrecognizedStructureItemRanks = _ref.unrecognizedStructureItemRanks;
|
|
65
|
+
return (_ref2 = (_unrecognizedStructur = unrecognizedStructureItemRanks.get(item)) !== null && _unrecognizedStructur !== void 0 ? _unrecognizedStructur : unrecognizedDataAndChartsItemRanks.get(item)) !== null && _ref2 !== void 0 ? _ref2 : _rank.EXTENSION_ITEM_RANK + ((_item$priority = item.priority) !== null && _item$priority !== void 0 ? _item$priority : index);
|
|
66
|
+
};
|
|
67
|
+
var getExtensionQuickInsertComponents = exports.getExtensionQuickInsertComponents = function getExtensionQuickInsertComponents(_ref3) {
|
|
68
|
+
var apiRef = _ref3.apiRef,
|
|
69
|
+
createAnalyticsEvent = _ref3.createAnalyticsEvent,
|
|
70
|
+
items = _ref3.items;
|
|
71
|
+
var unrecognizedStructureItemRanks = getUnrecognizedStructureItemRanks(items);
|
|
72
|
+
var unrecognizedDataAndChartsItemRanks = getUnrecognizedDataAndChartsItemRanks(items);
|
|
50
73
|
return items.map(function (item, index) {
|
|
51
|
-
var _unrecognizedStructur, _item$priority;
|
|
52
74
|
var structureRank = getStructureExtensionItemRank(item);
|
|
53
75
|
var isStructureItem = structureRank !== undefined;
|
|
54
76
|
var categories = isStructureItem ? ['structure'] : item.categories;
|
|
55
|
-
var fallbackRank = (
|
|
77
|
+
var fallbackRank = getFallbackRank({
|
|
78
|
+
index: index,
|
|
79
|
+
item: item,
|
|
80
|
+
unrecognizedDataAndChartsItemRanks: unrecognizedDataAndChartsItemRanks,
|
|
81
|
+
unrecognizedStructureItemRanks: unrecognizedStructureItemRanks
|
|
82
|
+
});
|
|
56
83
|
return {
|
|
57
84
|
type: 'menu-item',
|
|
58
85
|
key: item.key,
|
|
@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.version = exports.name = void 0;
|
|
7
7
|
var name = exports.name = "@atlaskit/editor-core";
|
|
8
8
|
// eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
|
|
9
|
-
var version = exports.version = "226.
|
|
9
|
+
var version = exports.version = "226.6.1";
|
|
@@ -79,7 +79,7 @@ export default function createUniversalPresetInternal({
|
|
|
79
79
|
prevAppearance,
|
|
80
80
|
createAnalyticsEvent
|
|
81
81
|
}) {
|
|
82
|
-
var _initialPluginConfigu, _initialPluginConfigu2, _initialPluginConfigu3, _initialPluginConfigu4, _initialPluginConfigu5, _initialPluginConfigu6, _featureFlags$lpLinkP, _initialPluginConfigu7, _initialPluginConfigu8, _initialPluginConfigu9, _initialPluginConfigu0, _initialPluginConfigu1,
|
|
82
|
+
var _initialPluginConfigu, _initialPluginConfigu2, _initialPluginConfigu3, _initialPluginConfigu4, _initialPluginConfigu5, _initialPluginConfigu6, _featureFlags$lpLinkP, _initialPluginConfigu7, _initialPluginConfigu8, _initialPluginConfigu9, _initialPluginConfigu0, _initialPluginConfigu1, _props$media, _props$media2, _props$media3, _props$media4, _props$media5, _props$media6, _props$media7, _props$mention$insert, _props$mention, _props$mention2, _props$mention3, _props$collabEdit$EXP, _props$collabEdit, _props$linking, _props$linking2, _featureFlags$lpLinkP2, _props$linking3, _props$primaryToolbar;
|
|
83
83
|
const isComment = appearance === 'comment';
|
|
84
84
|
const isChromeless = appearance === 'chromeless';
|
|
85
85
|
const isFullPage = fullPageCheck(appearance);
|
|
@@ -103,6 +103,10 @@ export default function createUniversalPresetInternal({
|
|
|
103
103
|
...props.hyperlinkOptions
|
|
104
104
|
},
|
|
105
105
|
__livePage: props.__livePage,
|
|
106
|
+
quickInsert: {
|
|
107
|
+
...props.quickInsert,
|
|
108
|
+
...(initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.quickInsertPlugin)
|
|
109
|
+
},
|
|
106
110
|
toolbar: initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.toolbarPlugin
|
|
107
111
|
});
|
|
108
112
|
const statusMenuDisabled = !props.allowStatus ? true : typeof props.allowStatus === 'object' ? Boolean(props.allowStatus.menuDisabled) : false;
|
|
@@ -113,9 +117,11 @@ export default function createUniversalPresetInternal({
|
|
|
113
117
|
return false;
|
|
114
118
|
};
|
|
115
119
|
const finalPreset = defaultPreset.add(ufoPlugin).add(dataConsumerPlugin).add(accessibilityUtilsPlugin).add(contentInsertionPlugin).add(batchAttributeUpdatesPlugin).maybeAdd([blockControlsPlugin, {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
120
|
+
...((initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : (_initialPluginConfigu7 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu7 === void 0 ? void 0 : _initialPluginConfigu7.quickInsertButtonEnabled) !== undefined ? {
|
|
121
|
+
quickInsertButtonEnabled: initialPluginConfiguration.blockControlsPlugin.quickInsertButtonEnabled
|
|
122
|
+
} : {}),
|
|
123
|
+
rightSideControlsEnabled: (_initialPluginConfigu8 = initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : (_initialPluginConfigu9 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu9 === void 0 ? void 0 : _initialPluginConfigu9.rightSideControlsEnabled) !== null && _initialPluginConfigu8 !== void 0 ? _initialPluginConfigu8 : false
|
|
124
|
+
}], Boolean((_initialPluginConfigu0 = initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : (_initialPluginConfigu1 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu1 === void 0 ? void 0 : _initialPluginConfigu1.enabled) !== null && _initialPluginConfigu0 !== void 0 ? _initialPluginConfigu0 : false)).maybeAdd([breakoutPlugin, {
|
|
119
125
|
allowBreakoutButton: appearance === 'full-page',
|
|
120
126
|
appearance: appearance
|
|
121
127
|
}], Boolean(props.allowBreakout && (isFullPage || appearance === 'max' && (expValEqualsNoExposure('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEqualsNoExposure('confluence_max_width_content_appearance', 'isEnabled', true))))).maybeAdd(alignmentPlugin, Boolean(props.allowTextAlignment)).maybeAdd([textColorPlugin, props.allowTextColor], Boolean(props.allowTextColor)).add(listPlugin).maybeAdd(rulePlugin, Boolean(props.allowRule)).maybeAdd([expandPlugin, {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._19itno8c{border:var(--ds-border-width,1px) solid var(--ds-border-input,#8c8f97)}
|
|
2
2
|
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}
|
|
3
|
-
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
4
3
|
._2rkopb1k{border-radius:var(--ds-radius-xlarge,9pt)}._13dfutpp .less-margin>.ProseMirror{margin-top:var(--ds-space-150,9pt)}
|
|
5
4
|
._16jlkb7n{flex-grow:1}
|
|
6
5
|
._18m91wug{overflow-y:auto}
|
|
@@ -17,7 +17,6 @@ import messages from '@atlaskit/editor-common/messages';
|
|
|
17
17
|
import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
|
|
18
18
|
import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
|
|
19
19
|
import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
|
|
20
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
21
20
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
22
21
|
// Ignored via go/ees005
|
|
23
22
|
// eslint-disable-next-line import/no-named-as-default
|
|
@@ -31,7 +30,6 @@ import WithFlash from '../../WithFlash';
|
|
|
31
30
|
import { CommentToolbar } from './CommentToolbar';
|
|
32
31
|
import { MainToolbar } from './Toolbar';
|
|
33
32
|
const commentEditorCompiledStyles = {
|
|
34
|
-
commentEditorOld: "_19itno8c _2rkofajl _1e0c1txw _2lx21bp4 _1ul9clpc _4t3i1wug _bfhk1j9a _vchhusvi _p12f1kw7 _slp31hna _13dfutpp _gzr8u2gc _ghozu2gc _oafwu2gc",
|
|
35
33
|
commentEditor: "_19itno8c _2rko1qi0 _1e0c1txw _2lx21bp4 _1ul9clpc _4t3i1wug _bfhk1j9a _vchhusvi _p12f1kw7 _slp31hna _13dfutpp _gzr8u2gc _ghozu2gc _oafwu2gc",
|
|
36
34
|
modernisedEditor: "_2rkopb1k",
|
|
37
35
|
secondaryToolbar: "_vchhusvi _1bahesu3 _4cvr1h6o _1e0c1txw _ca0qutpp _u5f3v77o _n3tdutpp _19bvv77o",
|
|
@@ -150,7 +148,7 @@ export const CommentEditorWithIntlCompiled = props => {
|
|
|
150
148
|
style: wrapperStyle
|
|
151
149
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
152
150
|
,
|
|
153
|
-
className: ax([
|
|
151
|
+
className: ax([commentEditorCompiledStyles.commentEditor, isEditorModernisationEnabled && commentEditorCompiledStyles.modernisedEditor, "akEditor"]),
|
|
154
152
|
ref: wrapperElementRef
|
|
155
153
|
}, /*#__PURE__*/React.createElement(MainToolbar, {
|
|
156
154
|
isEditorModernisationEnabled: isEditorModernisationEnabled,
|
|
@@ -22,7 +22,6 @@ import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
|
|
|
22
22
|
import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
|
|
23
23
|
import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
|
|
24
24
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
25
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
26
25
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
27
26
|
// Ignored via go/ees005
|
|
28
27
|
// eslint-disable-next-line import/no-named-as-default
|
|
@@ -36,25 +35,6 @@ import WithFlash from '../../WithFlash';
|
|
|
36
35
|
import { CommentToolbar } from './CommentToolbar';
|
|
37
36
|
import { MainToolbar } from './Toolbar';
|
|
38
37
|
const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
39
|
-
|
|
40
|
-
// Remove when platform_editor_comment_editor_border_radius is cleaned up
|
|
41
|
-
const commentEditorStylesOld = css({
|
|
42
|
-
display: 'flex',
|
|
43
|
-
flexDirection: 'column',
|
|
44
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
45
|
-
'.less-margin > .ProseMirror': {
|
|
46
|
-
margin: `${"var(--ds-space-150, 12px)"} ${"var(--ds-space-100, 8px)"} ${"var(--ds-space-100, 8px)"}`
|
|
47
|
-
},
|
|
48
|
-
minWidth: '272px',
|
|
49
|
-
height: 'auto',
|
|
50
|
-
backgroundColor: "var(--ds-background-input, #FFFFFF)",
|
|
51
|
-
border: `${"var(--ds-border-width, 1px)"} solid ${"var(--ds-border-input, #8C8F97)"}`,
|
|
52
|
-
boxSizing: 'border-box',
|
|
53
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
54
|
-
borderRadius: "var(--ds-radius-small, 3px)",
|
|
55
|
-
maxWidth: 'inherit',
|
|
56
|
-
wordWrap: 'break-word'
|
|
57
|
-
});
|
|
58
38
|
const commentEditorStyles = css({
|
|
59
39
|
display: 'flex',
|
|
60
40
|
flexDirection: 'column',
|
|
@@ -225,7 +205,7 @@ export const CommentEditorWithIntlEmotion = props => {
|
|
|
225
205
|
return jsx(WithFlash, {
|
|
226
206
|
animate: maxContentSizeReached
|
|
227
207
|
}, jsx(WidthProvider, null, jsx("div", {
|
|
228
|
-
css: [
|
|
208
|
+
css: [commentEditorStyles, isEditorModernisationEnabled && modernisedEditorStyles,
|
|
229
209
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
230
210
|
css({
|
|
231
211
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._2rko12c2{border-radius:var(--ds-radius-medium,6px) var(--ds-radius-medium,6px) 0 0}
|
|
2
|
-
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}
|
|
3
|
-
._2rko1cku{border-radius:var(--ds-radius-small,3px) var(--ds-radius-small,3px) 0 0}._10ytglyw.show-keyline{box-shadow:none}
|
|
2
|
+
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}._10ytglyw.show-keyline{box-shadow:none}
|
|
4
3
|
._16qsglyw{box-shadow:none}
|
|
5
4
|
._19bvu2gc{padding-left:var(--ds-space-100,8px)}
|
|
6
5
|
._19bvv47k{padding-left:var(--ds-space-250,20px)}
|
|
@@ -8,19 +8,16 @@
|
|
|
8
8
|
import "./FixedToolbar-compiled.compiled.css";
|
|
9
9
|
import { ax, ix } from "@compiled/react/runtime";
|
|
10
10
|
import React from 'react';
|
|
11
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
12
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
13
11
|
const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
14
12
|
const fixedToolbarCompiledStyles = {
|
|
15
13
|
mainToolbarWrapper: "_kqswh2mm _4cvr1h6o _ca0qu2gc _u5f3u2gc _n3tdidpf _19bvv47k _1e0c1txw _4t3i1wug _bfhkvuon _16qsglyw _1khpidpf _lg5oidpf _1cuzidpf",
|
|
16
14
|
mainToolbarWithoutLeftPadding: "_ca0qu2gc _u5f3u2gc _n3tdidpf _19bvu2gc",
|
|
17
15
|
mainToolbarTwoLine: "_1uq61sxn _cnpmh9n0 _1djy1txw _17mgesu3 _1q27esu3 _16ec1txw",
|
|
18
16
|
mainToolbarWrapperVisualRefresh: "_3pwj1osq",
|
|
19
|
-
mainToolbarWithRadius: "_2rko1cku",
|
|
20
17
|
mainToolbarRadius: "_2rko12c2",
|
|
21
18
|
editorModernisationToolbar: "_2rko15b0 _10ytglyw"
|
|
22
19
|
};
|
|
23
20
|
export const FixedToolbarCompiled = props => /*#__PURE__*/React.createElement("div", {
|
|
24
21
|
"data-testid": "ak-editor-main-toolbar",
|
|
25
|
-
className: ax([fixedToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && fixedToolbarCompiledStyles.mainToolbarTwoLine, fixedToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, props.isNewToolbarEnabled && fixedToolbarCompiledStyles.mainToolbarWithoutLeftPadding,
|
|
22
|
+
className: ax([fixedToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && fixedToolbarCompiledStyles.mainToolbarTwoLine, fixedToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, props.isNewToolbarEnabled && fixedToolbarCompiledStyles.mainToolbarWithoutLeftPadding, fixedToolbarCompiledStyles.mainToolbarRadius, props.isEditorModernisationEnabled && fixedToolbarCompiledStyles.editorModernisationToolbar])
|
|
26
23
|
}, props.children);
|
|
@@ -11,8 +11,6 @@
|
|
|
11
11
|
|
|
12
12
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- intentional: emotion fallback for compiled migration
|
|
13
13
|
import { css, jsx } from '@emotion/react';
|
|
14
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
15
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
16
14
|
const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
17
15
|
const mainToolbarWrapperStyleNew = css({
|
|
18
16
|
position: 'relative',
|
|
@@ -70,9 +68,6 @@ const mainToolbarWrapperStylesVisualRefresh = css({
|
|
|
70
68
|
maxWidth: '100%'
|
|
71
69
|
}
|
|
72
70
|
});
|
|
73
|
-
const mainToolbarWithRadiusStyle = css({
|
|
74
|
-
borderRadius: `${"var(--ds-radius-small, 3px)"} ${"var(--ds-radius-small, 3px)"} 0 0`
|
|
75
|
-
});
|
|
76
71
|
const mainToolbarRadius = css({
|
|
77
72
|
borderRadius: `${"var(--ds-radius-medium, 6px)"} ${"var(--ds-radius-medium, 6px)"} 0 0`
|
|
78
73
|
});
|
|
@@ -86,6 +81,6 @@ const editorModernisationToolbarStyle = css({
|
|
|
86
81
|
export const FixedToolbarEmotion = props =>
|
|
87
82
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
88
83
|
jsx("div", {
|
|
89
|
-
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding,
|
|
84
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle],
|
|
90
85
|
"data-testid": "ak-editor-main-toolbar"
|
|
91
86
|
}, props.children);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._2rko12c2{border-radius:var(--ds-radius-medium,6px) var(--ds-radius-medium,6px) 0 0}
|
|
2
2
|
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}
|
|
3
|
-
._2rko1cku{border-radius:var(--ds-radius-small,3px) var(--ds-radius-small,3px) 0 0}
|
|
4
3
|
._v56416gf{transition:box-shadow .2s ease-in-out}._10ytglyw.show-keyline{box-shadow:none}
|
|
5
4
|
._10ytl2q5.show-keyline{box-shadow:0 2px 0 0 var(--ds-background-accent-gray-subtlest,#f0f1f2)}
|
|
6
5
|
._16qsglyw{box-shadow:none}
|
|
@@ -8,8 +8,6 @@
|
|
|
8
8
|
import "./StickyToolbar-compiled.compiled.css";
|
|
9
9
|
import { ax, ix } from "@compiled/react/runtime";
|
|
10
10
|
import React, { useEffect, useMemo, useState } from 'react';
|
|
11
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
12
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
13
11
|
const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
14
12
|
const akEditorMenuZIndex = 500;
|
|
15
13
|
const akEditorToolbarKeylineHeight = 2;
|
|
@@ -18,7 +16,6 @@ const stickyToolbarCompiledStyles = {
|
|
|
18
16
|
mainToolbarWithPadding: "_ca0qu2gc _u5f3u2gc _n3tdu2gc _19bvu2gc",
|
|
19
17
|
mainToolbarTwoLine: "_1uq61sxn _cnpmh9n0 _1djy1txw _17mgesu3 _1q27esu3 _16ec1txw",
|
|
20
18
|
mainToolbarWrapperVisualRefresh: "_3pwj1osq",
|
|
21
|
-
mainToolbarWithRadius: "_2rko1cku",
|
|
22
19
|
mainToolbarRadius: "_2rko12c2",
|
|
23
20
|
editorModernisationToolbar: "_2rko15b0 _10ytglyw",
|
|
24
21
|
stickyToolbarWrapper: "_v56416gf _kqsw1if8 _n3tdu2gc _1pbybfng _10ytl2q5"
|
|
@@ -46,6 +43,6 @@ export const StickyToolbarCompiled = props => {
|
|
|
46
43
|
"data-testid": "ak-editor-main-toolbar"
|
|
47
44
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
48
45
|
,
|
|
49
|
-
className: ax([stickyToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && stickyToolbarCompiledStyles.mainToolbarTwoLine, stickyToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, stickyToolbarCompiledStyles.stickyToolbarWrapper, props.isNewToolbarEnabled && stickyToolbarCompiledStyles.mainToolbarWithPadding,
|
|
46
|
+
className: ax([stickyToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && stickyToolbarCompiledStyles.mainToolbarTwoLine, stickyToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, stickyToolbarCompiledStyles.stickyToolbarWrapper, props.isNewToolbarEnabled && stickyToolbarCompiledStyles.mainToolbarWithPadding, stickyToolbarCompiledStyles.mainToolbarRadius, props.isEditorModernisationEnabled && stickyToolbarCompiledStyles.editorModernisationToolbar, 'show-keyline'])
|
|
50
47
|
}, props.children);
|
|
51
48
|
};
|
|
@@ -13,8 +13,6 @@ import { useEffect, useState } from 'react';
|
|
|
13
13
|
|
|
14
14
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- intentional: emotion fallback for compiled migration
|
|
15
15
|
import { css, jsx } from '@emotion/react';
|
|
16
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
17
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
18
16
|
const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
19
17
|
const akEditorMenuZIndex = 500;
|
|
20
18
|
const akEditorToolbarKeylineHeight = 2;
|
|
@@ -72,9 +70,6 @@ const mainToolbarWrapperStylesVisualRefresh = css({
|
|
|
72
70
|
maxWidth: '100%'
|
|
73
71
|
}
|
|
74
72
|
});
|
|
75
|
-
const mainToolbarWithRadiusStyle = css({
|
|
76
|
-
borderRadius: `${"var(--ds-radius-small, 3px)"} ${"var(--ds-radius-small, 3px)"} 0 0`
|
|
77
|
-
});
|
|
78
73
|
const mainToolbarRadius = css({
|
|
79
74
|
borderRadius: `${"var(--ds-radius-medium, 6px)"} ${"var(--ds-radius-medium, 6px)"} 0 0`
|
|
80
75
|
});
|
|
@@ -115,7 +110,7 @@ export const StickyToolbarEmotion = props => {
|
|
|
115
110
|
return (
|
|
116
111
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
117
112
|
jsx("div", {
|
|
118
|
-
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding,
|
|
113
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle]
|
|
119
114
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/enforce-style-prop -- top is computed dynamically from externalToolbarRef height / offsetTop and cannot be a static css value
|
|
120
115
|
,
|
|
121
116
|
style: wrapperStyle,
|
|
@@ -3,6 +3,7 @@ import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/c
|
|
|
3
3
|
import { getQuickInsertMenuItemParents } from '@atlaskit/editor-common/quick-insert/get-menu-item-parents';
|
|
4
4
|
import { STRUCTURE_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
|
|
5
5
|
import { EXTENSION_ITEM_RANK } from '@atlaskit/editor-common/quick-insert/rank';
|
|
6
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
6
7
|
import { ExtensionQuickInsertMenuItem } from './ExtensionQuickInsertMenuItem';
|
|
7
8
|
const structureExtensionItemKeyRanks = {
|
|
8
9
|
'toc:toc': 600,
|
|
@@ -17,24 +18,43 @@ const structureExtensionItemKeyRanks = {
|
|
|
17
18
|
'smart-button:quick-insert': 3000
|
|
18
19
|
};
|
|
19
20
|
const UNRECOGNIZED_STRUCTURE_EXTENSION_ITEM_RANK = 3100;
|
|
21
|
+
const APP_DATA_AND_CHARTS_ITEM_RANK = 2700;
|
|
20
22
|
const getStructureExtensionItemRank = item => structureExtensionItemKeyRanks[item.key];
|
|
21
23
|
const isStructureExtensionItem = item => getQuickInsertMenuItemParents({
|
|
22
24
|
category: item.category,
|
|
23
25
|
legacyCategories: item.categories,
|
|
24
26
|
rank: 0
|
|
25
27
|
}).some(parent => parent.key === STRUCTURE_SECTION.key);
|
|
28
|
+
const compareMenuItemsByTitleAndKey = (firstItem, secondItem) => firstItem.title.localeCompare(secondItem.title) || firstItem.key.localeCompare(secondItem.key);
|
|
29
|
+
const getAlphabeticalItemRanks = (items, isRankedItem, firstRank) => new Map(items.filter(isRankedItem).sort(compareMenuItemsByTitleAndKey).map((item, index) => [item, firstRank + index]));
|
|
30
|
+
const getUnrecognizedStructureItemRanks = items => isExperimentEnabled('platform_editor_slash_command') ? getAlphabeticalItemRanks(items, item => isStructureExtensionItem(item) && getStructureExtensionItemRank(item) === undefined, UNRECOGNIZED_STRUCTURE_EXTENSION_ITEM_RANK) : new Map();
|
|
31
|
+
const getUnrecognizedDataAndChartsItemRanks = items => isExperimentEnabled('platform_editor_slash_command') ? getAlphabeticalItemRanks(items, item => item.category === 'data-and-charts' && item.priority === undefined, APP_DATA_AND_CHARTS_ITEM_RANK) : new Map();
|
|
32
|
+
const getFallbackRank = ({
|
|
33
|
+
index,
|
|
34
|
+
item,
|
|
35
|
+
unrecognizedDataAndChartsItemRanks,
|
|
36
|
+
unrecognizedStructureItemRanks
|
|
37
|
+
}) => {
|
|
38
|
+
var _ref, _unrecognizedStructur, _item$priority;
|
|
39
|
+
return (_ref = (_unrecognizedStructur = unrecognizedStructureItemRanks.get(item)) !== null && _unrecognizedStructur !== void 0 ? _unrecognizedStructur : unrecognizedDataAndChartsItemRanks.get(item)) !== null && _ref !== void 0 ? _ref : EXTENSION_ITEM_RANK + ((_item$priority = item.priority) !== null && _item$priority !== void 0 ? _item$priority : index);
|
|
40
|
+
};
|
|
26
41
|
export const getExtensionQuickInsertComponents = ({
|
|
27
42
|
apiRef,
|
|
28
43
|
createAnalyticsEvent,
|
|
29
44
|
items
|
|
30
45
|
}) => {
|
|
31
|
-
const unrecognizedStructureItemRanks =
|
|
46
|
+
const unrecognizedStructureItemRanks = getUnrecognizedStructureItemRanks(items);
|
|
47
|
+
const unrecognizedDataAndChartsItemRanks = getUnrecognizedDataAndChartsItemRanks(items);
|
|
32
48
|
return items.map((item, index) => {
|
|
33
|
-
var _unrecognizedStructur, _item$priority;
|
|
34
49
|
const structureRank = getStructureExtensionItemRank(item);
|
|
35
50
|
const isStructureItem = structureRank !== undefined;
|
|
36
51
|
const categories = isStructureItem ? ['structure'] : item.categories;
|
|
37
|
-
const fallbackRank = (
|
|
52
|
+
const fallbackRank = getFallbackRank({
|
|
53
|
+
index,
|
|
54
|
+
item,
|
|
55
|
+
unrecognizedDataAndChartsItemRanks,
|
|
56
|
+
unrecognizedStructureItemRanks
|
|
57
|
+
});
|
|
38
58
|
return {
|
|
39
59
|
type: 'menu-item',
|
|
40
60
|
key: item.key,
|
|
@@ -76,7 +76,7 @@ import { createDefaultPreset } from './default';
|
|
|
76
76
|
* @returns a full featured preset configured according to the provided props - basis for create-plugins-list
|
|
77
77
|
*/
|
|
78
78
|
export default function createUniversalPresetInternal(_ref) {
|
|
79
|
-
var _initialPluginConfigu, _initialPluginConfigu2, _initialPluginConfigu3, _initialPluginConfigu4, _initialPluginConfigu5, _initialPluginConfigu6, _featureFlags$lpLinkP, _initialPluginConfigu7, _initialPluginConfigu8, _initialPluginConfigu9, _initialPluginConfigu0, _initialPluginConfigu1,
|
|
79
|
+
var _initialPluginConfigu, _initialPluginConfigu2, _initialPluginConfigu3, _initialPluginConfigu4, _initialPluginConfigu5, _initialPluginConfigu6, _featureFlags$lpLinkP, _initialPluginConfigu7, _initialPluginConfigu8, _initialPluginConfigu9, _initialPluginConfigu0, _initialPluginConfigu1, _props$media, _props$media2, _props$media3, _props$media4, _props$media5, _props$media6, _props$media7, _props$mention$insert, _props$mention, _props$mention2, _props$mention3, _props$collabEdit$EXP, _props$collabEdit, _props$linking, _props$linking2, _featureFlags$lpLinkP2, _props$linking3, _props$primaryToolbar;
|
|
80
80
|
var appearance = _ref.appearance,
|
|
81
81
|
props = _ref.props,
|
|
82
82
|
featureFlags = _ref.featureFlags,
|
|
@@ -103,6 +103,7 @@ export default function createUniversalPresetInternal(_ref) {
|
|
|
103
103
|
lpLinkPicker: (_featureFlags$lpLinkP = featureFlags.lpLinkPicker) !== null && _featureFlags$lpLinkP !== void 0 ? _featureFlags$lpLinkP : false
|
|
104
104
|
}, props.hyperlinkOptions),
|
|
105
105
|
__livePage: props.__livePage,
|
|
106
|
+
quickInsert: _objectSpread(_objectSpread({}, props.quickInsert), initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.quickInsertPlugin),
|
|
106
107
|
toolbar: initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.toolbarPlugin
|
|
107
108
|
}));
|
|
108
109
|
var statusMenuDisabled = !props.allowStatus ? true : _typeof(props.allowStatus) === 'object' ? Boolean(props.allowStatus.menuDisabled) : false;
|
|
@@ -112,10 +113,11 @@ export default function createUniversalPresetInternal(_ref) {
|
|
|
112
113
|
}
|
|
113
114
|
return false;
|
|
114
115
|
};
|
|
115
|
-
var finalPreset = defaultPreset.add(ufoPlugin).add(dataConsumerPlugin).add(accessibilityUtilsPlugin).add(contentInsertionPlugin).add(batchAttributeUpdatesPlugin).maybeAdd([blockControlsPlugin, {
|
|
116
|
-
quickInsertButtonEnabled:
|
|
117
|
-
|
|
118
|
-
|
|
116
|
+
var finalPreset = defaultPreset.add(ufoPlugin).add(dataConsumerPlugin).add(accessibilityUtilsPlugin).add(contentInsertionPlugin).add(batchAttributeUpdatesPlugin).maybeAdd([blockControlsPlugin, _objectSpread(_objectSpread({}, (initialPluginConfiguration === null || initialPluginConfiguration === void 0 || (_initialPluginConfigu7 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu7 === void 0 ? void 0 : _initialPluginConfigu7.quickInsertButtonEnabled) !== undefined ? {
|
|
117
|
+
quickInsertButtonEnabled: initialPluginConfiguration.blockControlsPlugin.quickInsertButtonEnabled
|
|
118
|
+
} : {}), {}, {
|
|
119
|
+
rightSideControlsEnabled: (_initialPluginConfigu8 = initialPluginConfiguration === null || initialPluginConfiguration === void 0 || (_initialPluginConfigu9 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu9 === void 0 ? void 0 : _initialPluginConfigu9.rightSideControlsEnabled) !== null && _initialPluginConfigu8 !== void 0 ? _initialPluginConfigu8 : false
|
|
120
|
+
})], Boolean((_initialPluginConfigu0 = initialPluginConfiguration === null || initialPluginConfiguration === void 0 || (_initialPluginConfigu1 = initialPluginConfiguration.blockControlsPlugin) === null || _initialPluginConfigu1 === void 0 ? void 0 : _initialPluginConfigu1.enabled) !== null && _initialPluginConfigu0 !== void 0 ? _initialPluginConfigu0 : false)).maybeAdd([breakoutPlugin, {
|
|
119
121
|
allowBreakoutButton: appearance === 'full-page',
|
|
120
122
|
appearance: appearance
|
|
121
123
|
}], Boolean(props.allowBreakout && (isFullPage || appearance === 'max' && (expValEqualsNoExposure('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEqualsNoExposure('confluence_max_width_content_appearance', 'isEnabled', true))))).maybeAdd(alignmentPlugin, Boolean(props.allowTextAlignment)).maybeAdd([textColorPlugin, props.allowTextColor], Boolean(props.allowTextColor)).add(listPlugin).maybeAdd(rulePlugin, Boolean(props.allowRule)).maybeAdd([expandPlugin, {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._19itno8c{border:var(--ds-border-width,1px) solid var(--ds-border-input,#8c8f97)}
|
|
2
2
|
._2rko1qi0{border-radius:var(--ds-radius-medium,6px)}
|
|
3
|
-
._2rkofajl{border-radius:var(--ds-radius-small,3px)}
|
|
4
3
|
._2rkopb1k{border-radius:var(--ds-radius-xlarge,9pt)}._13dfutpp .less-margin>.ProseMirror{margin-top:var(--ds-space-150,9pt)}
|
|
5
4
|
._16jlkb7n{flex-grow:1}
|
|
6
5
|
._18m91wug{overflow-y:auto}
|
|
@@ -21,7 +21,6 @@ import messages from '@atlaskit/editor-common/messages';
|
|
|
21
21
|
import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
|
|
22
22
|
import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
|
|
23
23
|
import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
|
|
24
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
25
24
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
26
25
|
// Ignored via go/ees005
|
|
27
26
|
// eslint-disable-next-line import/no-named-as-default
|
|
@@ -35,7 +34,6 @@ import WithFlash from '../../WithFlash';
|
|
|
35
34
|
import { CommentToolbar } from './CommentToolbar';
|
|
36
35
|
import { MainToolbar } from './Toolbar';
|
|
37
36
|
var commentEditorCompiledStyles = {
|
|
38
|
-
commentEditorOld: "_19itno8c _2rkofajl _1e0c1txw _2lx21bp4 _1ul9clpc _4t3i1wug _bfhk1j9a _vchhusvi _p12f1kw7 _slp31hna _13dfutpp _gzr8u2gc _ghozu2gc _oafwu2gc",
|
|
39
37
|
commentEditor: "_19itno8c _2rko1qi0 _1e0c1txw _2lx21bp4 _1ul9clpc _4t3i1wug _bfhk1j9a _vchhusvi _p12f1kw7 _slp31hna _13dfutpp _gzr8u2gc _ghozu2gc _oafwu2gc",
|
|
40
38
|
modernisedEditor: "_2rkopb1k",
|
|
41
39
|
secondaryToolbar: "_vchhusvi _1bahesu3 _4cvr1h6o _1e0c1txw _ca0qutpp _u5f3v77o _n3tdutpp _19bvv77o",
|
|
@@ -157,7 +155,7 @@ export var CommentEditorWithIntlCompiled = function CommentEditorWithIntlCompile
|
|
|
157
155
|
style: wrapperStyle
|
|
158
156
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
159
157
|
,
|
|
160
|
-
className: ax([
|
|
158
|
+
className: ax([commentEditorCompiledStyles.commentEditor, isEditorModernisationEnabled && commentEditorCompiledStyles.modernisedEditor, "akEditor"]),
|
|
161
159
|
ref: wrapperElementRef
|
|
162
160
|
}, /*#__PURE__*/React.createElement(MainToolbar, {
|
|
163
161
|
isEditorModernisationEnabled: isEditorModernisationEnabled,
|
|
@@ -24,7 +24,6 @@ import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
|
|
|
24
24
|
import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
|
|
25
25
|
import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
|
|
26
26
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
27
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
28
27
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
29
28
|
// Ignored via go/ees005
|
|
30
29
|
// eslint-disable-next-line import/no-named-as-default
|
|
@@ -38,25 +37,6 @@ import WithFlash from '../../WithFlash';
|
|
|
38
37
|
import { CommentToolbar } from './CommentToolbar';
|
|
39
38
|
import { MainToolbar } from './Toolbar';
|
|
40
39
|
var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
41
|
-
|
|
42
|
-
// Remove when platform_editor_comment_editor_border_radius is cleaned up
|
|
43
|
-
var commentEditorStylesOld = css({
|
|
44
|
-
display: 'flex',
|
|
45
|
-
flexDirection: 'column',
|
|
46
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
47
|
-
'.less-margin > .ProseMirror': {
|
|
48
|
-
margin: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-100, 8px)", " ", "var(--ds-space-100, 8px)")
|
|
49
|
-
},
|
|
50
|
-
minWidth: '272px',
|
|
51
|
-
height: 'auto',
|
|
52
|
-
backgroundColor: "var(--ds-background-input, #FFFFFF)",
|
|
53
|
-
border: "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border-input, #8C8F97)"),
|
|
54
|
-
boxSizing: 'border-box',
|
|
55
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
56
|
-
borderRadius: "var(--ds-radius-small, 3px)",
|
|
57
|
-
maxWidth: 'inherit',
|
|
58
|
-
wordWrap: 'break-word'
|
|
59
|
-
});
|
|
60
40
|
var commentEditorStyles = css({
|
|
61
41
|
display: 'flex',
|
|
62
42
|
flexDirection: 'column',
|
|
@@ -228,7 +208,7 @@ export var CommentEditorWithIntlEmotion = function CommentEditorWithIntlEmotion(
|
|
|
228
208
|
return jsx(WithFlash, {
|
|
229
209
|
animate: maxContentSizeReached
|
|
230
210
|
}, jsx(WidthProvider, null, jsx("div", {
|
|
231
|
-
css: [
|
|
211
|
+
css: [commentEditorStyles, isEditorModernisationEnabled && modernisedEditorStyles,
|
|
232
212
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
233
213
|
css({
|
|
234
214
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._2rko12c2{border-radius:var(--ds-radius-medium,6px) var(--ds-radius-medium,6px) 0 0}
|
|
2
|
-
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}
|
|
3
|
-
._2rko1cku{border-radius:var(--ds-radius-small,3px) var(--ds-radius-small,3px) 0 0}._10ytglyw.show-keyline{box-shadow:none}
|
|
2
|
+
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}._10ytglyw.show-keyline{box-shadow:none}
|
|
4
3
|
._16qsglyw{box-shadow:none}
|
|
5
4
|
._19bvu2gc{padding-left:var(--ds-space-100,8px)}
|
|
6
5
|
._19bvv47k{padding-left:var(--ds-space-250,20px)}
|
|
@@ -8,21 +8,18 @@
|
|
|
8
8
|
import "./FixedToolbar-compiled.compiled.css";
|
|
9
9
|
import { ax, ix } from "@compiled/react/runtime";
|
|
10
10
|
import React from 'react';
|
|
11
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
12
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
13
11
|
var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
14
12
|
var fixedToolbarCompiledStyles = {
|
|
15
13
|
mainToolbarWrapper: "_kqswh2mm _4cvr1h6o _ca0qu2gc _u5f3u2gc _n3tdidpf _19bvv47k _1e0c1txw _4t3i1wug _bfhkvuon _16qsglyw _1khpidpf _lg5oidpf _1cuzidpf",
|
|
16
14
|
mainToolbarWithoutLeftPadding: "_ca0qu2gc _u5f3u2gc _n3tdidpf _19bvu2gc",
|
|
17
15
|
mainToolbarTwoLine: "_1uq61sxn _cnpmh9n0 _1djy1txw _17mgesu3 _1q27esu3 _16ec1txw",
|
|
18
16
|
mainToolbarWrapperVisualRefresh: "_3pwj1osq",
|
|
19
|
-
mainToolbarWithRadius: "_2rko1cku",
|
|
20
17
|
mainToolbarRadius: "_2rko12c2",
|
|
21
18
|
editorModernisationToolbar: "_2rko15b0 _10ytglyw"
|
|
22
19
|
};
|
|
23
20
|
export var FixedToolbarCompiled = function FixedToolbarCompiled(props) {
|
|
24
21
|
return /*#__PURE__*/React.createElement("div", {
|
|
25
22
|
"data-testid": "ak-editor-main-toolbar",
|
|
26
|
-
className: ax([fixedToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && fixedToolbarCompiledStyles.mainToolbarTwoLine, fixedToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, props.isNewToolbarEnabled && fixedToolbarCompiledStyles.mainToolbarWithoutLeftPadding,
|
|
23
|
+
className: ax([fixedToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && fixedToolbarCompiledStyles.mainToolbarTwoLine, fixedToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, props.isNewToolbarEnabled && fixedToolbarCompiledStyles.mainToolbarWithoutLeftPadding, fixedToolbarCompiledStyles.mainToolbarRadius, props.isEditorModernisationEnabled && fixedToolbarCompiledStyles.editorModernisationToolbar])
|
|
27
24
|
}, props.children);
|
|
28
25
|
};
|
|
@@ -12,8 +12,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
|
12
12
|
|
|
13
13
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- intentional: emotion fallback for compiled migration
|
|
14
14
|
import { css, jsx } from '@emotion/react';
|
|
15
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
16
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
17
15
|
var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
18
16
|
var mainToolbarWrapperStyleNew = css({
|
|
19
17
|
position: 'relative',
|
|
@@ -62,9 +60,6 @@ var mainToolbarWrapperStylesVisualRefresh = css({
|
|
|
62
60
|
maxWidth: '100%'
|
|
63
61
|
}
|
|
64
62
|
});
|
|
65
|
-
var mainToolbarWithRadiusStyle = css({
|
|
66
|
-
borderRadius: "var(--ds-radius-small, 3px)".concat(" ", "var(--ds-radius-small, 3px)", " 0 0")
|
|
67
|
-
});
|
|
68
63
|
var mainToolbarRadius = css({
|
|
69
64
|
borderRadius: "var(--ds-radius-medium, 6px)".concat(" ", "var(--ds-radius-medium, 6px)", " 0 0")
|
|
70
65
|
});
|
|
@@ -79,7 +74,7 @@ export var FixedToolbarEmotion = function FixedToolbarEmotion(props) {
|
|
|
79
74
|
return (
|
|
80
75
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
81
76
|
jsx("div", {
|
|
82
|
-
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding,
|
|
77
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding, mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle],
|
|
83
78
|
"data-testid": "ak-editor-main-toolbar"
|
|
84
79
|
}, props.children)
|
|
85
80
|
);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
._2rko12c2{border-radius:var(--ds-radius-medium,6px) var(--ds-radius-medium,6px) 0 0}
|
|
2
2
|
._2rko15b0{border-radius:var(--ds-radius-xlarge,9pt) var(--ds-radius-xlarge,9pt) 0 0}
|
|
3
|
-
._2rko1cku{border-radius:var(--ds-radius-small,3px) var(--ds-radius-small,3px) 0 0}
|
|
4
3
|
._v56416gf{transition:box-shadow .2s ease-in-out}._10ytglyw.show-keyline{box-shadow:none}
|
|
5
4
|
._10ytl2q5.show-keyline{box-shadow:0 2px 0 0 var(--ds-background-accent-gray-subtlest,#f0f1f2)}
|
|
6
5
|
._16qsglyw{box-shadow:none}
|
|
@@ -10,8 +10,6 @@ import { ax, ix } from "@compiled/react/runtime";
|
|
|
10
10
|
*/
|
|
11
11
|
|
|
12
12
|
import React, { useEffect, useMemo, useState } from 'react';
|
|
13
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
14
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
15
13
|
var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
16
14
|
var akEditorMenuZIndex = 500;
|
|
17
15
|
var akEditorToolbarKeylineHeight = 2;
|
|
@@ -20,7 +18,6 @@ var stickyToolbarCompiledStyles = {
|
|
|
20
18
|
mainToolbarWithPadding: "_ca0qu2gc _u5f3u2gc _n3tdu2gc _19bvu2gc",
|
|
21
19
|
mainToolbarTwoLine: "_1uq61sxn _cnpmh9n0 _1djy1txw _17mgesu3 _1q27esu3 _16ec1txw",
|
|
22
20
|
mainToolbarWrapperVisualRefresh: "_3pwj1osq",
|
|
23
|
-
mainToolbarWithRadius: "_2rko1cku",
|
|
24
21
|
mainToolbarRadius: "_2rko12c2",
|
|
25
22
|
editorModernisationToolbar: "_2rko15b0 _10ytglyw",
|
|
26
23
|
stickyToolbarWrapper: "_v56416gf _kqsw1if8 _n3tdu2gc _1pbybfng _10ytl2q5"
|
|
@@ -53,6 +50,6 @@ export var StickyToolbarCompiled = function StickyToolbarCompiled(props) {
|
|
|
53
50
|
"data-testid": "ak-editor-main-toolbar"
|
|
54
51
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
55
52
|
,
|
|
56
|
-
className: ax([stickyToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && stickyToolbarCompiledStyles.mainToolbarTwoLine, stickyToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, stickyToolbarCompiledStyles.stickyToolbarWrapper, props.isNewToolbarEnabled && stickyToolbarCompiledStyles.mainToolbarWithPadding,
|
|
53
|
+
className: ax([stickyToolbarCompiledStyles.mainToolbarWrapper, props.twoLineEditorToolbar && stickyToolbarCompiledStyles.mainToolbarTwoLine, stickyToolbarCompiledStyles.mainToolbarWrapperVisualRefresh, stickyToolbarCompiledStyles.stickyToolbarWrapper, props.isNewToolbarEnabled && stickyToolbarCompiledStyles.mainToolbarWithPadding, stickyToolbarCompiledStyles.mainToolbarRadius, props.isEditorModernisationEnabled && stickyToolbarCompiledStyles.editorModernisationToolbar, 'show-keyline'])
|
|
57
54
|
}, props.children);
|
|
58
55
|
};
|
|
@@ -15,8 +15,6 @@ import { useEffect, useState } from 'react';
|
|
|
15
15
|
|
|
16
16
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- intentional: emotion fallback for compiled migration
|
|
17
17
|
import { css, jsx } from '@emotion/react';
|
|
18
|
-
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
19
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
20
18
|
var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
21
19
|
var akEditorMenuZIndex = 500;
|
|
22
20
|
var akEditorToolbarKeylineHeight = 2;
|
|
@@ -65,9 +63,6 @@ var mainToolbarWrapperStylesVisualRefresh = css({
|
|
|
65
63
|
maxWidth: '100%'
|
|
66
64
|
}
|
|
67
65
|
});
|
|
68
|
-
var mainToolbarWithRadiusStyle = css({
|
|
69
|
-
borderRadius: "var(--ds-radius-small, 3px)".concat(" ", "var(--ds-radius-small, 3px)", " 0 0")
|
|
70
|
-
});
|
|
71
66
|
var mainToolbarRadius = css({
|
|
72
67
|
borderRadius: "var(--ds-radius-medium, 6px)".concat(" ", "var(--ds-radius-medium, 6px)", " 0 0")
|
|
73
68
|
});
|
|
@@ -111,7 +106,7 @@ export var StickyToolbarEmotion = function StickyToolbarEmotion(props) {
|
|
|
111
106
|
return (
|
|
112
107
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
113
108
|
jsx("div", {
|
|
114
|
-
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding,
|
|
109
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithPadding, mainToolbarRadius, props.isEditorModernisationEnabled && editorModernisationToolbarStyle]
|
|
115
110
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/enforce-style-prop -- top is computed dynamically from externalToolbarRef height / offsetTop and cannot be a static css value
|
|
116
111
|
,
|
|
117
112
|
style: wrapperStyle,
|
|
@@ -3,6 +3,7 @@ import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/c
|
|
|
3
3
|
import { getQuickInsertMenuItemParents } from '@atlaskit/editor-common/quick-insert/get-menu-item-parents';
|
|
4
4
|
import { STRUCTURE_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
|
|
5
5
|
import { EXTENSION_ITEM_RANK } from '@atlaskit/editor-common/quick-insert/rank';
|
|
6
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
6
7
|
import { ExtensionQuickInsertMenuItem } from './ExtensionQuickInsertMenuItem';
|
|
7
8
|
var structureExtensionItemKeyRanks = {
|
|
8
9
|
'toc:toc': 600,
|
|
@@ -17,6 +18,7 @@ var structureExtensionItemKeyRanks = {
|
|
|
17
18
|
'smart-button:quick-insert': 3000
|
|
18
19
|
};
|
|
19
20
|
var UNRECOGNIZED_STRUCTURE_EXTENSION_ITEM_RANK = 3100;
|
|
21
|
+
var APP_DATA_AND_CHARTS_ITEM_RANK = 2700;
|
|
20
22
|
var getStructureExtensionItemRank = function getStructureExtensionItemRank(item) {
|
|
21
23
|
return structureExtensionItemKeyRanks[item.key];
|
|
22
24
|
};
|
|
@@ -29,23 +31,48 @@ var isStructureExtensionItem = function isStructureExtensionItem(item) {
|
|
|
29
31
|
return parent.key === STRUCTURE_SECTION.key;
|
|
30
32
|
});
|
|
31
33
|
};
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
return
|
|
38
|
-
}).sort(function (firstItem, secondItem) {
|
|
39
|
-
return firstItem.title.localeCompare(secondItem.title) || firstItem.key.localeCompare(secondItem.key);
|
|
40
|
-
}).map(function (item, index) {
|
|
41
|
-
return [item, UNRECOGNIZED_STRUCTURE_EXTENSION_ITEM_RANK + index];
|
|
34
|
+
var compareMenuItemsByTitleAndKey = function compareMenuItemsByTitleAndKey(firstItem, secondItem) {
|
|
35
|
+
return firstItem.title.localeCompare(secondItem.title) || firstItem.key.localeCompare(secondItem.key);
|
|
36
|
+
};
|
|
37
|
+
var getAlphabeticalItemRanks = function getAlphabeticalItemRanks(items, isRankedItem, firstRank) {
|
|
38
|
+
return new Map(items.filter(isRankedItem).sort(compareMenuItemsByTitleAndKey).map(function (item, index) {
|
|
39
|
+
return [item, firstRank + index];
|
|
42
40
|
}));
|
|
41
|
+
};
|
|
42
|
+
var getUnrecognizedStructureItemRanks = function getUnrecognizedStructureItemRanks(items) {
|
|
43
|
+
return isExperimentEnabled('platform_editor_slash_command') ? getAlphabeticalItemRanks(items, function (item) {
|
|
44
|
+
return isStructureExtensionItem(item) && getStructureExtensionItemRank(item) === undefined;
|
|
45
|
+
}, UNRECOGNIZED_STRUCTURE_EXTENSION_ITEM_RANK) : new Map();
|
|
46
|
+
};
|
|
47
|
+
var getUnrecognizedDataAndChartsItemRanks = function getUnrecognizedDataAndChartsItemRanks(items) {
|
|
48
|
+
return isExperimentEnabled('platform_editor_slash_command') ? getAlphabeticalItemRanks(items, function (item) {
|
|
49
|
+
return item.category === 'data-and-charts' && item.priority === undefined;
|
|
50
|
+
}, APP_DATA_AND_CHARTS_ITEM_RANK) : new Map();
|
|
51
|
+
};
|
|
52
|
+
var getFallbackRank = function getFallbackRank(_ref) {
|
|
53
|
+
var _ref2, _unrecognizedStructur, _item$priority;
|
|
54
|
+
var index = _ref.index,
|
|
55
|
+
item = _ref.item,
|
|
56
|
+
unrecognizedDataAndChartsItemRanks = _ref.unrecognizedDataAndChartsItemRanks,
|
|
57
|
+
unrecognizedStructureItemRanks = _ref.unrecognizedStructureItemRanks;
|
|
58
|
+
return (_ref2 = (_unrecognizedStructur = unrecognizedStructureItemRanks.get(item)) !== null && _unrecognizedStructur !== void 0 ? _unrecognizedStructur : unrecognizedDataAndChartsItemRanks.get(item)) !== null && _ref2 !== void 0 ? _ref2 : EXTENSION_ITEM_RANK + ((_item$priority = item.priority) !== null && _item$priority !== void 0 ? _item$priority : index);
|
|
59
|
+
};
|
|
60
|
+
export var getExtensionQuickInsertComponents = function getExtensionQuickInsertComponents(_ref3) {
|
|
61
|
+
var apiRef = _ref3.apiRef,
|
|
62
|
+
createAnalyticsEvent = _ref3.createAnalyticsEvent,
|
|
63
|
+
items = _ref3.items;
|
|
64
|
+
var unrecognizedStructureItemRanks = getUnrecognizedStructureItemRanks(items);
|
|
65
|
+
var unrecognizedDataAndChartsItemRanks = getUnrecognizedDataAndChartsItemRanks(items);
|
|
43
66
|
return items.map(function (item, index) {
|
|
44
|
-
var _unrecognizedStructur, _item$priority;
|
|
45
67
|
var structureRank = getStructureExtensionItemRank(item);
|
|
46
68
|
var isStructureItem = structureRank !== undefined;
|
|
47
69
|
var categories = isStructureItem ? ['structure'] : item.categories;
|
|
48
|
-
var fallbackRank = (
|
|
70
|
+
var fallbackRank = getFallbackRank({
|
|
71
|
+
index: index,
|
|
72
|
+
item: item,
|
|
73
|
+
unrecognizedDataAndChartsItemRanks: unrecognizedDataAndChartsItemRanks,
|
|
74
|
+
unrecognizedStructureItemRanks: unrecognizedStructureItemRanks
|
|
75
|
+
});
|
|
49
76
|
return {
|
|
50
77
|
type: 'menu-item',
|
|
51
78
|
key: item.key,
|
|
@@ -16,6 +16,7 @@ export type UniversalPresetProps = DefaultPresetPluginOptions & EditorSharedProp
|
|
|
16
16
|
export type InitialPluginConfiguration = {
|
|
17
17
|
blockControlsPlugin?: {
|
|
18
18
|
enabled?: boolean;
|
|
19
|
+
/** @deprecated Use `quickInsertPlugin.blockControlButtonEnabled` instead. */
|
|
19
20
|
quickInsertButtonEnabled?: boolean;
|
|
20
21
|
rightSideControlsEnabled?: boolean;
|
|
21
22
|
};
|
|
@@ -46,6 +47,9 @@ export type InitialPluginConfiguration = {
|
|
|
46
47
|
type: 'added' | 'deleted';
|
|
47
48
|
}[]) => void;
|
|
48
49
|
};
|
|
50
|
+
quickInsertPlugin?: {
|
|
51
|
+
blockControlButtonEnabled?: boolean;
|
|
52
|
+
};
|
|
49
53
|
tasksAndDecisionsPlugin?: {
|
|
50
54
|
allowBlockTaskItem?: boolean;
|
|
51
55
|
hasEditPermission?: boolean;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "226.
|
|
3
|
+
"version": "226.6.2",
|
|
4
4
|
"description": "A package contains Atlassian editor core functionality",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@atlaskit/editor-json-transformer": "^9.8.0",
|
|
49
49
|
"@atlaskit/editor-plugin-block-menu": "^15.1.0",
|
|
50
50
|
"@atlaskit/editor-plugin-connectivity": "^16.0.0",
|
|
51
|
-
"@atlaskit/editor-plugin-quick-insert": "^16.
|
|
51
|
+
"@atlaskit/editor-plugin-quick-insert": "^16.3.0",
|
|
52
52
|
"@atlaskit/editor-plugin-selection-extension": "^19.1.0",
|
|
53
53
|
"@atlaskit/editor-plugin-user-preferences": "^14.0.0",
|
|
54
54
|
"@atlaskit/editor-plugins": "^16.1.0",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"@atlaskit/editor-ssr-renderer": "^11.0.0",
|
|
58
58
|
"@atlaskit/editor-toolbar": "^2.6.0",
|
|
59
59
|
"@atlaskit/editor-toolbar-model": "^1.2.0",
|
|
60
|
-
"@atlaskit/emoji": "^72.
|
|
60
|
+
"@atlaskit/emoji": "^72.3.0",
|
|
61
61
|
"@atlaskit/feature-gate-js-client": "^6.0.0",
|
|
62
62
|
"@atlaskit/heading": "^7.2.0",
|
|
63
63
|
"@atlaskit/icon": "^37.6.0",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"@atlaskit/react-compiler-gating": "^0.2.0",
|
|
74
74
|
"@atlaskit/react-ufo": "^7.8.0",
|
|
75
75
|
"@atlaskit/task-decision": "^21.9.0",
|
|
76
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
76
|
+
"@atlaskit/tmp-editor-statsig": "^177.0.0",
|
|
77
77
|
"@atlaskit/tokens": "^16.11.0",
|
|
78
78
|
"@atlaskit/tooltip": "^24.3.0",
|
|
79
79
|
"@atlaskit/width-detector": "^7.2.0",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"uuid": "^11.1.1"
|
|
92
92
|
},
|
|
93
93
|
"peerDependencies": {
|
|
94
|
-
"@atlaskit/editor-common": "^120.
|
|
94
|
+
"@atlaskit/editor-common": "^120.16.0",
|
|
95
95
|
"@atlaskit/link-provider": "^5.5.0",
|
|
96
96
|
"@atlaskit/media-core": "^38.2.0",
|
|
97
97
|
"react": "^18.2.0",
|