@atlaskit/editor-core 208.3.6 → 208.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +4 -28
- package/dist/cjs/ui/EditorContentContainer/styles/findReplaceStyles.js +44 -5
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +6 -30
- package/dist/es2019/ui/EditorContentContainer/styles/findReplaceStyles.js +44 -5
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +6 -30
- package/dist/esm/ui/EditorContentContainer/styles/findReplaceStyles.js +44 -5
- package/dist/esm/version-wrapper.js +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 208.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#177117](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/177117)
|
|
8
|
+
[`49ae44aea25fc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/49ae44aea25fc) -
|
|
9
|
+
Add new styles for inline nodes for find and replace, include these in block node checks
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [#177523](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/177523)
|
|
14
|
+
[`1faed88065ff6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1faed88065ff6) -
|
|
15
|
+
refactor editor fullpage toolbar height in FullPageContentArea
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
|
|
3
18
|
## 208.3.6
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
|
@@ -46,8 +46,6 @@ var tableMarginFullWidthMode = 2;
|
|
|
46
46
|
var akLayoutGutterOffset = 12;
|
|
47
47
|
var SWOOP_ANIMATION = "0.5s ".concat(akEditorSwoopCubicBezier);
|
|
48
48
|
var AK_NESTED_DND_GUTTER_OFFSET = 8;
|
|
49
|
-
var FULL_PAGE_EDITOR_TOOLBAR_HEIGHT = "var(--ds-space-500, 40px)";
|
|
50
|
-
var FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE = '2.188rem';
|
|
51
49
|
var getTotalPadding = function getTotalPadding() {
|
|
52
50
|
return (0, _editorSharedStyles.akEditorGutterPaddingDynamic)() * 2;
|
|
53
51
|
};
|
|
@@ -220,18 +218,6 @@ var editorContentGutterStyle = function editorContentGutterStyle() {
|
|
|
220
218
|
};
|
|
221
219
|
|
|
222
220
|
// new styles
|
|
223
|
-
var editorContentAreaNoToolbarLivePageJumpMitigation = (0, _react2.css)({
|
|
224
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
225
|
-
'.ak-editor-content-area-no-toolbar &': {
|
|
226
|
-
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " + ", FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE, " + 1px)")
|
|
227
|
-
}
|
|
228
|
-
});
|
|
229
|
-
var editorContentAreaNoToolbarControls = (0, _react2.css)({
|
|
230
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
231
|
-
'.ak-editor-content-area-no-toolbar &': {
|
|
232
|
-
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " + ", FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, " + 1px)")
|
|
233
|
-
}
|
|
234
|
-
});
|
|
235
221
|
var editorContentAreaNew = (0, _react2.css)({
|
|
236
222
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
237
223
|
lineHeight: '24px',
|
|
@@ -240,7 +226,7 @@ var editorContentAreaNew = (0, _react2.css)({
|
|
|
240
226
|
'.ak-editor-content-area-no-toolbar &': {
|
|
241
227
|
// When the toolbar is hidden, we don't want content to jump up
|
|
242
228
|
// the extra 1px is to account for the border on the toolbar
|
|
243
|
-
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " +
|
|
229
|
+
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " + var(--ak-editor-fullpage-toolbar-height) + 1px)")
|
|
244
230
|
},
|
|
245
231
|
paddingBottom: "var(--ds-space-600, 48px)",
|
|
246
232
|
height: 'calc( 100% - 105px )',
|
|
@@ -330,7 +316,7 @@ var editorContentGutterStyles = (0, _react2.css)({
|
|
|
330
316
|
var contentAreaNew = (0, _react2.css)({
|
|
331
317
|
display: 'flex',
|
|
332
318
|
flexDirection: 'row',
|
|
333
|
-
height: "calc(100% -
|
|
319
|
+
height: "calc(100% - var(--ak-editor-fullpage-toolbar-height))",
|
|
334
320
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
335
321
|
'&.ak-editor-content-area-no-toolbar': {
|
|
336
322
|
// The editor toolbar height is 1px off (from the border) -- so we need to add 1px to the height
|
|
@@ -342,12 +328,6 @@ var contentAreaNew = (0, _react2.css)({
|
|
|
342
328
|
padding: 0,
|
|
343
329
|
transition: "padding 0ms ".concat(akEditorSwoopCubicBezier)
|
|
344
330
|
});
|
|
345
|
-
var contentAreaHeightLivePageJumpMitigation = (0, _react2.css)({
|
|
346
|
-
height: "calc(100% - ".concat(FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE, ")")
|
|
347
|
-
});
|
|
348
|
-
var contentAreaHeightControls = (0, _react2.css)({
|
|
349
|
-
height: "calc(100% - ".concat(FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, ")")
|
|
350
|
-
});
|
|
351
331
|
var contentAreaHeightNoToolbar = (0, _react2.css)({
|
|
352
332
|
height: '100%'
|
|
353
333
|
});
|
|
@@ -404,9 +384,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
404
384
|
return (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1');
|
|
405
385
|
};
|
|
406
386
|
return (0, _react2.jsx)("div", {
|
|
407
|
-
css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [contentAreaNew,
|
|
408
|
-
exposure: true
|
|
409
|
-
}) && contentAreaHeightControls, props.isEditorToolbarHidden && contentAreaHeightNoToolbar] : [
|
|
387
|
+
css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [contentAreaNew, props.isEditorToolbarHidden && contentAreaHeightNoToolbar] : [
|
|
410
388
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
411
389
|
_StyledComponents.contentArea,
|
|
412
390
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -432,9 +410,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
432
410
|
editorView: props.editorView,
|
|
433
411
|
editorDisabled: props.disabled
|
|
434
412
|
}, (0, _react2.jsx)("div", {
|
|
435
|
-
css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, (0, _platformFeatureFlags.fg)('
|
|
436
|
-
exposure: true
|
|
437
|
-
}) && editorContentAreaNoToolbarControls, (0, _platformFeatureFlags.fg)('platform_editor_fix_table_width_inline_comment') ? fullWidthNonChromelessBreakoutBlockTableStyle : fullWidthModeBreakoutBlockTableStyle,
|
|
413
|
+
css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, (0, _platformFeatureFlags.fg)('platform_editor_fix_table_width_inline_comment') ? fullWidthNonChromelessBreakoutBlockTableStyle : fullWidthModeBreakoutBlockTableStyle,
|
|
438
414
|
// for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
|
|
439
415
|
(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !(0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !(0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace] : (0, _toConsumableArray2.default)(editorContentAreaStyle({
|
|
440
416
|
fullWidthMode: fullWidthMode,
|
|
@@ -44,13 +44,23 @@ var findReplaceStylesNew = exports.findReplaceStylesNew = (0, _react.css)({
|
|
|
44
44
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
45
45
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
46
46
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-subtler, #F8E6A0)", "\n\t\t\t")
|
|
47
|
+
},
|
|
48
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
49
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
50
|
+
boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-yellow-subtler, #F8E6A0)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"),
|
|
51
|
+
borderRadius: '3px'
|
|
47
52
|
}
|
|
48
53
|
},
|
|
49
54
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
50
|
-
'.search-match-
|
|
55
|
+
'.search-match-block.search-match-block-selected': {
|
|
51
56
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
52
57
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
53
58
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", "\n\t\t\t")
|
|
59
|
+
},
|
|
60
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
61
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
62
|
+
boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"),
|
|
63
|
+
borderRadius: '3px'
|
|
54
64
|
}
|
|
55
65
|
},
|
|
56
66
|
/** With node selection */
|
|
@@ -59,30 +69,49 @@ var findReplaceStylesNew = exports.findReplaceStylesNew = (0, _react.css)({
|
|
|
59
69
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
60
70
|
'.loader-wrapper>div::after': {
|
|
61
71
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-subtler, #F8E6A0)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
|
|
72
|
+
},
|
|
73
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
74
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
75
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
76
|
+
boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #0C66E4)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-yellow-subtler, #F8E6A0)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", " !important")
|
|
62
77
|
}
|
|
63
78
|
},
|
|
64
79
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
65
|
-
'.search-match-
|
|
80
|
+
'.search-match-block.search-match-block-selected.ak-editor-selected-node': {
|
|
66
81
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
67
82
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
68
83
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
|
|
84
|
+
},
|
|
85
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
86
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
87
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
88
|
+
boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #0C66E4)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", " !important")
|
|
69
89
|
}
|
|
70
90
|
},
|
|
71
91
|
/** Dark mode */
|
|
72
|
-
|
|
73
92
|
/** Without node selection */
|
|
74
93
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
75
94
|
'.search-match-block.search-match-dark': {
|
|
76
95
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
77
96
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
78
97
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-bolder-pressed, #533F04)", "\n\t\t\t")
|
|
98
|
+
},
|
|
99
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
100
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
101
|
+
boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-yellow-bolder-pressed, #533F04)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-bolder, #946F00)"),
|
|
102
|
+
borderRadius: '3px'
|
|
79
103
|
}
|
|
80
104
|
},
|
|
81
105
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
82
|
-
'.search-match-
|
|
106
|
+
'.search-match-block.search-match-block-selected.search-match-dark': {
|
|
83
107
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
84
108
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
85
109
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", "\n\t\t\t")
|
|
110
|
+
},
|
|
111
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
112
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
113
|
+
boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-bolder, #946F00)"),
|
|
114
|
+
borderRadius: '3px'
|
|
86
115
|
}
|
|
87
116
|
},
|
|
88
117
|
/** With node selection */
|
|
@@ -91,13 +120,23 @@ var findReplaceStylesNew = exports.findReplaceStylesNew = (0, _react.css)({
|
|
|
91
120
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
92
121
|
'.loader-wrapper>div::after': {
|
|
93
122
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-bolder-pressed, #533F04)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
|
|
123
|
+
},
|
|
124
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
125
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
126
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
127
|
+
boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #0C66E4)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-yellow-bolder-pressed, #533F04)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-bolder, #946F00)", " !important")
|
|
94
128
|
}
|
|
95
129
|
},
|
|
96
130
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
97
|
-
'.search-match-
|
|
131
|
+
'.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
|
|
98
132
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
99
133
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
100
134
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
|
|
135
|
+
},
|
|
136
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
137
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
138
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
139
|
+
boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #0C66E4)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-bolder, #946F00)", " !important")
|
|
101
140
|
}
|
|
102
141
|
}
|
|
103
142
|
});
|
|
@@ -12,7 +12,7 @@ import { injectIntl } from 'react-intl-next';
|
|
|
12
12
|
import { decisionListSelector, taskListSelector } from '@atlaskit/adf-schema';
|
|
13
13
|
import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
|
|
14
14
|
import { tableFullPageEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
|
|
15
|
-
import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT
|
|
15
|
+
import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
|
|
16
16
|
import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
|
|
17
17
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
18
18
|
import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
|
|
@@ -34,8 +34,6 @@ const tableMarginFullWidthMode = 2;
|
|
|
34
34
|
const akLayoutGutterOffset = 12;
|
|
35
35
|
const SWOOP_ANIMATION = `0.5s ${akEditorSwoopCubicBezier}`;
|
|
36
36
|
const AK_NESTED_DND_GUTTER_OFFSET = 8;
|
|
37
|
-
const FULL_PAGE_EDITOR_TOOLBAR_HEIGHT = "var(--ds-space-500, 40px)";
|
|
38
|
-
const FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE = '2.188rem';
|
|
39
37
|
const getTotalPadding = () => akEditorGutterPaddingDynamic() * 2;
|
|
40
38
|
|
|
41
39
|
// old styles - to be deleted when cleaning up experiment `platform_editor_core_static_emotion_non_central`
|
|
@@ -114,7 +112,7 @@ const editorContentArea = css({
|
|
|
114
112
|
// When the toolbar is hidden, we don't want content to jump up
|
|
115
113
|
// the extra 1px is to account for the border on the toolbar
|
|
116
114
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
117
|
-
paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${
|
|
115
|
+
paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()} + 1px)`
|
|
118
116
|
},
|
|
119
117
|
paddingBottom: "var(--ds-space-600, 48px)",
|
|
120
118
|
height: 'calc( 100% - 105px )',
|
|
@@ -203,18 +201,6 @@ const editorContentGutterStyle = () => {
|
|
|
203
201
|
};
|
|
204
202
|
|
|
205
203
|
// new styles
|
|
206
|
-
const editorContentAreaNoToolbarLivePageJumpMitigation = css({
|
|
207
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
208
|
-
'.ak-editor-content-area-no-toolbar &': {
|
|
209
|
-
paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE} + 1px)`
|
|
210
|
-
}
|
|
211
|
-
});
|
|
212
|
-
const editorContentAreaNoToolbarControls = css({
|
|
213
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
214
|
-
'.ak-editor-content-area-no-toolbar &': {
|
|
215
|
-
paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT} + 1px)`
|
|
216
|
-
}
|
|
217
|
-
});
|
|
218
204
|
const editorContentAreaNew = css({
|
|
219
205
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
220
206
|
lineHeight: '24px',
|
|
@@ -223,7 +209,7 @@ const editorContentAreaNew = css({
|
|
|
223
209
|
'.ak-editor-content-area-no-toolbar &': {
|
|
224
210
|
// When the toolbar is hidden, we don't want content to jump up
|
|
225
211
|
// the extra 1px is to account for the border on the toolbar
|
|
226
|
-
paddingTop: `calc(${"var(--ds-space-600, 48px)"} +
|
|
212
|
+
paddingTop: `calc(${"var(--ds-space-600, 48px)"} + var(--ak-editor-fullpage-toolbar-height) + 1px)`
|
|
227
213
|
},
|
|
228
214
|
paddingBottom: "var(--ds-space-600, 48px)",
|
|
229
215
|
height: 'calc( 100% - 105px )',
|
|
@@ -313,7 +299,7 @@ const editorContentGutterStyles = css({
|
|
|
313
299
|
const contentAreaNew = css({
|
|
314
300
|
display: 'flex',
|
|
315
301
|
flexDirection: 'row',
|
|
316
|
-
height: `calc(100% -
|
|
302
|
+
height: `calc(100% - var(--ak-editor-fullpage-toolbar-height))`,
|
|
317
303
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
318
304
|
'&.ak-editor-content-area-no-toolbar': {
|
|
319
305
|
// The editor toolbar height is 1px off (from the border) -- so we need to add 1px to the height
|
|
@@ -325,12 +311,6 @@ const contentAreaNew = css({
|
|
|
325
311
|
padding: 0,
|
|
326
312
|
transition: `padding 0ms ${akEditorSwoopCubicBezier}`
|
|
327
313
|
});
|
|
328
|
-
const contentAreaHeightLivePageJumpMitigation = css({
|
|
329
|
-
height: `calc(100% - ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE})`
|
|
330
|
-
});
|
|
331
|
-
const contentAreaHeightControls = css({
|
|
332
|
-
height: `calc(100% - ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT})`
|
|
333
|
-
});
|
|
334
314
|
const contentAreaHeightNoToolbar = css({
|
|
335
315
|
height: '100%'
|
|
336
316
|
});
|
|
@@ -383,9 +363,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
383
363
|
return editorExperiment('platform_editor_controls', 'variant1');
|
|
384
364
|
};
|
|
385
365
|
return jsx("div", {
|
|
386
|
-
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [contentAreaNew,
|
|
387
|
-
exposure: true
|
|
388
|
-
}) && contentAreaHeightControls, props.isEditorToolbarHidden && contentAreaHeightNoToolbar] : [
|
|
366
|
+
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [contentAreaNew, props.isEditorToolbarHidden && contentAreaHeightNoToolbar] : [
|
|
389
367
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
390
368
|
contentArea,
|
|
391
369
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -411,9 +389,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
411
389
|
editorView: props.editorView,
|
|
412
390
|
editorDisabled: props.disabled
|
|
413
391
|
}, jsx("div", {
|
|
414
|
-
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, fg('
|
|
415
|
-
exposure: true
|
|
416
|
-
}) && editorContentAreaNoToolbarControls, fg('platform_editor_fix_table_width_inline_comment') ? fullWidthNonChromelessBreakoutBlockTableStyle : fullWidthModeBreakoutBlockTableStyle,
|
|
392
|
+
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, fg('platform_editor_fix_table_width_inline_comment') ? fullWidthNonChromelessBreakoutBlockTableStyle : fullWidthModeBreakoutBlockTableStyle,
|
|
417
393
|
// for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
|
|
418
394
|
expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace] : [
|
|
419
395
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
@@ -40,16 +40,26 @@ export const findReplaceStylesNew = css({
|
|
|
40
40
|
inset 0 0 0 1px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"},
|
|
41
41
|
inset 0 0 0 5px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"}
|
|
42
42
|
`
|
|
43
|
+
},
|
|
44
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
45
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
46
|
+
boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"}`,
|
|
47
|
+
borderRadius: '3px'
|
|
43
48
|
}
|
|
44
49
|
},
|
|
45
50
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
46
|
-
'.search-match-
|
|
51
|
+
'.search-match-block.search-match-block-selected': {
|
|
47
52
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
48
53
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
49
54
|
boxShadow: `
|
|
50
55
|
inset 0 0 0 1px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"},
|
|
51
56
|
inset 0 0 0 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"}
|
|
52
57
|
`
|
|
58
|
+
},
|
|
59
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
60
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
61
|
+
boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"}`,
|
|
62
|
+
borderRadius: '3px'
|
|
53
63
|
}
|
|
54
64
|
},
|
|
55
65
|
/** With node selection */
|
|
@@ -62,10 +72,15 @@ export const findReplaceStylesNew = css({
|
|
|
62
72
|
inset 0 0 0 5px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"},
|
|
63
73
|
0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
|
|
64
74
|
`
|
|
75
|
+
},
|
|
76
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
77
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
78
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
79
|
+
boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-yellow-subtler, #F8E6A0)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"} !important`
|
|
65
80
|
}
|
|
66
81
|
},
|
|
67
82
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
68
|
-
'.search-match-
|
|
83
|
+
'.search-match-block.search-match-block-selected.ak-editor-selected-node': {
|
|
69
84
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
70
85
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
71
86
|
boxShadow: `
|
|
@@ -73,10 +88,14 @@ export const findReplaceStylesNew = css({
|
|
|
73
88
|
inset 0 0 0 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"},
|
|
74
89
|
0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
|
|
75
90
|
`
|
|
91
|
+
},
|
|
92
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
93
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
94
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
95
|
+
boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"} !important`
|
|
76
96
|
}
|
|
77
97
|
},
|
|
78
98
|
/** Dark mode */
|
|
79
|
-
|
|
80
99
|
/** Without node selection */
|
|
81
100
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
82
101
|
'.search-match-block.search-match-dark': {
|
|
@@ -86,16 +105,26 @@ export const findReplaceStylesNew = css({
|
|
|
86
105
|
inset 0 0 0 1px ${"var(--ds-background-accent-yellow-bolder, #946F00)"},
|
|
87
106
|
inset 0 0 0 5px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"}
|
|
88
107
|
`
|
|
108
|
+
},
|
|
109
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
110
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
111
|
+
boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-bolder, #946F00)"}`,
|
|
112
|
+
borderRadius: '3px'
|
|
89
113
|
}
|
|
90
114
|
},
|
|
91
115
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
92
|
-
'.search-match-
|
|
116
|
+
'.search-match-block.search-match-block-selected.search-match-dark': {
|
|
93
117
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
94
118
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
95
119
|
boxShadow: `
|
|
96
120
|
inset 0 0 0 1px ${"var(--ds-background-accent-yellow-bolder, #946F00)"},
|
|
97
121
|
inset 0 0 0 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"}
|
|
98
122
|
`
|
|
123
|
+
},
|
|
124
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
125
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
126
|
+
boxShadow: `0px 0px 0px 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-bolder, #946F00)"}`,
|
|
127
|
+
borderRadius: '3px'
|
|
99
128
|
}
|
|
100
129
|
},
|
|
101
130
|
/** With node selection */
|
|
@@ -108,10 +137,15 @@ export const findReplaceStylesNew = css({
|
|
|
108
137
|
inset 0 0 0 5px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"},
|
|
109
138
|
0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
|
|
110
139
|
`
|
|
140
|
+
},
|
|
141
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
142
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
143
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
144
|
+
boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-yellow-bolder-pressed, #533F04)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-bolder, #946F00)"} !important`
|
|
111
145
|
}
|
|
112
146
|
},
|
|
113
147
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
114
|
-
'.search-match-
|
|
148
|
+
'.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
|
|
115
149
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
116
150
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
117
151
|
boxShadow: `
|
|
@@ -119,6 +153,11 @@ export const findReplaceStylesNew = css({
|
|
|
119
153
|
inset 0 0 0 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"},
|
|
120
154
|
0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}
|
|
121
155
|
`
|
|
156
|
+
},
|
|
157
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
158
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
159
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
160
|
+
boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #0C66E4)"}, 0px 0px 0px 4px ${"var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)"}, 0px 0px 0px 5px ${"var(--ds-background-accent-yellow-bolder, #946F00)"} !important`
|
|
122
161
|
}
|
|
123
162
|
}
|
|
124
163
|
});
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "208.3.
|
|
2
|
+
export const version = "208.3.6";
|
|
@@ -14,7 +14,7 @@ import { injectIntl } from 'react-intl-next';
|
|
|
14
14
|
import { decisionListSelector, taskListSelector } from '@atlaskit/adf-schema';
|
|
15
15
|
import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
|
|
16
16
|
import { tableFullPageEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
|
|
17
|
-
import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT
|
|
17
|
+
import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
|
|
18
18
|
import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
|
|
19
19
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
20
20
|
import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
|
|
@@ -36,8 +36,6 @@ var tableMarginFullWidthMode = 2;
|
|
|
36
36
|
var akLayoutGutterOffset = 12;
|
|
37
37
|
var SWOOP_ANIMATION = "0.5s ".concat(akEditorSwoopCubicBezier);
|
|
38
38
|
var AK_NESTED_DND_GUTTER_OFFSET = 8;
|
|
39
|
-
var FULL_PAGE_EDITOR_TOOLBAR_HEIGHT = "var(--ds-space-500, 40px)";
|
|
40
|
-
var FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE = '2.188rem';
|
|
41
39
|
var getTotalPadding = function getTotalPadding() {
|
|
42
40
|
return akEditorGutterPaddingDynamic() * 2;
|
|
43
41
|
};
|
|
@@ -125,7 +123,7 @@ var editorContentArea = css({
|
|
|
125
123
|
// When the toolbar is hidden, we don't want content to jump up
|
|
126
124
|
// the extra 1px is to account for the border on the toolbar
|
|
127
125
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
128
|
-
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " + ",
|
|
126
|
+
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " + ", FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(), " + 1px)")
|
|
129
127
|
},
|
|
130
128
|
paddingBottom: "var(--ds-space-600, 48px)",
|
|
131
129
|
height: 'calc( 100% - 105px )',
|
|
@@ -210,18 +208,6 @@ var editorContentGutterStyle = function editorContentGutterStyle() {
|
|
|
210
208
|
};
|
|
211
209
|
|
|
212
210
|
// new styles
|
|
213
|
-
var editorContentAreaNoToolbarLivePageJumpMitigation = css({
|
|
214
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
215
|
-
'.ak-editor-content-area-no-toolbar &': {
|
|
216
|
-
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " + ", FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE, " + 1px)")
|
|
217
|
-
}
|
|
218
|
-
});
|
|
219
|
-
var editorContentAreaNoToolbarControls = css({
|
|
220
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
221
|
-
'.ak-editor-content-area-no-toolbar &': {
|
|
222
|
-
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " + ", FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, " + 1px)")
|
|
223
|
-
}
|
|
224
|
-
});
|
|
225
211
|
var editorContentAreaNew = css({
|
|
226
212
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
227
213
|
lineHeight: '24px',
|
|
@@ -230,7 +216,7 @@ var editorContentAreaNew = css({
|
|
|
230
216
|
'.ak-editor-content-area-no-toolbar &': {
|
|
231
217
|
// When the toolbar is hidden, we don't want content to jump up
|
|
232
218
|
// the extra 1px is to account for the border on the toolbar
|
|
233
|
-
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " +
|
|
219
|
+
paddingTop: "calc(".concat("var(--ds-space-600, 48px)", " + var(--ak-editor-fullpage-toolbar-height) + 1px)")
|
|
234
220
|
},
|
|
235
221
|
paddingBottom: "var(--ds-space-600, 48px)",
|
|
236
222
|
height: 'calc( 100% - 105px )',
|
|
@@ -320,7 +306,7 @@ var editorContentGutterStyles = css({
|
|
|
320
306
|
var contentAreaNew = css({
|
|
321
307
|
display: 'flex',
|
|
322
308
|
flexDirection: 'row',
|
|
323
|
-
height: "calc(100% -
|
|
309
|
+
height: "calc(100% - var(--ak-editor-fullpage-toolbar-height))",
|
|
324
310
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
325
311
|
'&.ak-editor-content-area-no-toolbar': {
|
|
326
312
|
// The editor toolbar height is 1px off (from the border) -- so we need to add 1px to the height
|
|
@@ -332,12 +318,6 @@ var contentAreaNew = css({
|
|
|
332
318
|
padding: 0,
|
|
333
319
|
transition: "padding 0ms ".concat(akEditorSwoopCubicBezier)
|
|
334
320
|
});
|
|
335
|
-
var contentAreaHeightLivePageJumpMitigation = css({
|
|
336
|
-
height: "calc(100% - ".concat(FULL_PAGE_EDITOR_TOOLBAR_HEIGHT_LIVE_PAGE, ")")
|
|
337
|
-
});
|
|
338
|
-
var contentAreaHeightControls = css({
|
|
339
|
-
height: "calc(100% - ".concat(FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, ")")
|
|
340
|
-
});
|
|
341
321
|
var contentAreaHeightNoToolbar = css({
|
|
342
322
|
height: '100%'
|
|
343
323
|
});
|
|
@@ -394,9 +374,7 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
394
374
|
return editorExperiment('platform_editor_controls', 'variant1');
|
|
395
375
|
};
|
|
396
376
|
return jsx("div", {
|
|
397
|
-
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [contentAreaNew,
|
|
398
|
-
exposure: true
|
|
399
|
-
}) && contentAreaHeightControls, props.isEditorToolbarHidden && contentAreaHeightNoToolbar] : [
|
|
377
|
+
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [contentAreaNew, props.isEditorToolbarHidden && contentAreaHeightNoToolbar] : [
|
|
400
378
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
401
379
|
contentArea,
|
|
402
380
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -422,9 +400,7 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
422
400
|
editorView: props.editorView,
|
|
423
401
|
editorDisabled: props.disabled
|
|
424
402
|
}, jsx("div", {
|
|
425
|
-
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, fg('
|
|
426
|
-
exposure: true
|
|
427
|
-
}) && editorContentAreaNoToolbarControls, fg('platform_editor_fix_table_width_inline_comment') ? fullWidthNonChromelessBreakoutBlockTableStyle : fullWidthModeBreakoutBlockTableStyle,
|
|
403
|
+
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, fg('platform_editor_fix_table_width_inline_comment') ? fullWidthNonChromelessBreakoutBlockTableStyle : fullWidthModeBreakoutBlockTableStyle,
|
|
428
404
|
// for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
|
|
429
405
|
expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace] : _toConsumableArray(editorContentAreaStyle({
|
|
430
406
|
fullWidthMode: fullWidthMode,
|
|
@@ -37,13 +37,23 @@ export var findReplaceStylesNew = css({
|
|
|
37
37
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
38
38
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
39
39
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-subtler, #F8E6A0)", "\n\t\t\t")
|
|
40
|
+
},
|
|
41
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
42
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
43
|
+
boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-yellow-subtler, #F8E6A0)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"),
|
|
44
|
+
borderRadius: '3px'
|
|
40
45
|
}
|
|
41
46
|
},
|
|
42
47
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
43
|
-
'.search-match-
|
|
48
|
+
'.search-match-block.search-match-block-selected': {
|
|
44
49
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
45
50
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
46
51
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", "\n\t\t\t")
|
|
52
|
+
},
|
|
53
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
54
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
55
|
+
boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-subtler-pressed, #E2B203)"),
|
|
56
|
+
borderRadius: '3px'
|
|
47
57
|
}
|
|
48
58
|
},
|
|
49
59
|
/** With node selection */
|
|
@@ -52,30 +62,49 @@ export var findReplaceStylesNew = css({
|
|
|
52
62
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
53
63
|
'.loader-wrapper>div::after': {
|
|
54
64
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-subtler, #F8E6A0)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
|
|
65
|
+
},
|
|
66
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
67
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
68
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
69
|
+
boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #0C66E4)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-yellow-subtler, #F8E6A0)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", " !important")
|
|
55
70
|
}
|
|
56
71
|
},
|
|
57
72
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
58
|
-
'.search-match-
|
|
73
|
+
'.search-match-block.search-match-block-selected.ak-editor-selected-node': {
|
|
59
74
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
60
75
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
61
76
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
|
|
77
|
+
},
|
|
78
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
79
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
80
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
81
|
+
boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #0C66E4)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-subtler-pressed, #E2B203)", " !important")
|
|
62
82
|
}
|
|
63
83
|
},
|
|
64
84
|
/** Dark mode */
|
|
65
|
-
|
|
66
85
|
/** Without node selection */
|
|
67
86
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
68
87
|
'.search-match-block.search-match-dark': {
|
|
69
88
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
70
89
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
71
90
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-bolder-pressed, #533F04)", "\n\t\t\t")
|
|
91
|
+
},
|
|
92
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
93
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
94
|
+
boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-yellow-bolder-pressed, #533F04)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-bolder, #946F00)"),
|
|
95
|
+
borderRadius: '3px'
|
|
72
96
|
}
|
|
73
97
|
},
|
|
74
98
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
75
|
-
'.search-match-
|
|
99
|
+
'.search-match-block.search-match-block-selected.search-match-dark': {
|
|
76
100
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
77
101
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
78
102
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", "\n\t\t\t")
|
|
103
|
+
},
|
|
104
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
105
|
+
'.loader-wrapper>a, .lozenge-wrapper, .editor-mention-primitive, .date-lozenger-container': {
|
|
106
|
+
boxShadow: "0px 0px 0px 4px ".concat("var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-bolder, #946F00)"),
|
|
107
|
+
borderRadius: '3px'
|
|
79
108
|
}
|
|
80
109
|
},
|
|
81
110
|
/** With node selection */
|
|
@@ -84,13 +113,23 @@ export var findReplaceStylesNew = css({
|
|
|
84
113
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
85
114
|
'.loader-wrapper>div::after': {
|
|
86
115
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 5px ", "var(--ds-background-accent-yellow-bolder-pressed, #533F04)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
|
|
116
|
+
},
|
|
117
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
118
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
119
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
120
|
+
boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #0C66E4)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-yellow-bolder-pressed, #533F04)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-bolder, #946F00)", " !important")
|
|
87
121
|
}
|
|
88
122
|
},
|
|
89
123
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
90
|
-
'.search-match-
|
|
124
|
+
'.search-match-block.search-match-block-selected.search-match-dark.ak-editor-selected-node': {
|
|
91
125
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
92
126
|
'[data-smart-link-container="true"], .loader-wrapper>div::after': {
|
|
93
127
|
boxShadow: "\n\t\t\tinset 0 0 0 1px ".concat("var(--ds-background-accent-yellow-bolder, #946F00)", ",\n\t\t\tinset 0 0 0 4px ", "var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", ",\n\t\t\t0 0 0 1px ", "var(--ds-border-selected, #0C66E4)", "\n\t\t\t")
|
|
128
|
+
},
|
|
129
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
130
|
+
'.loader-wrapper>a, .lozenge-wrapper': {
|
|
131
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
132
|
+
boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #0C66E4)", ", 0px 0px 0px 4px ", "var(--ds-background-accent-yellow-bolder-hovered, #7F5F01)", ", 0px 0px 0px 5px ", "var(--ds-background-accent-yellow-bolder, #946F00)", " !important")
|
|
94
133
|
}
|
|
95
134
|
}
|
|
96
135
|
});
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "208.3.
|
|
2
|
+
export var version = "208.3.6";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "208.
|
|
3
|
+
"version": "208.4.0",
|
|
4
4
|
"description": "A package contains Atlassian editor core functionality",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@atlaskit/editor-performance-metrics": "^2.1.0",
|
|
52
52
|
"@atlaskit/editor-plugin-quick-insert": "^2.6.0",
|
|
53
53
|
"@atlaskit/editor-plugin-user-preferences": "^0.2.0",
|
|
54
|
-
"@atlaskit/editor-plugins": "^9.
|
|
54
|
+
"@atlaskit/editor-plugins": "^9.3.0",
|
|
55
55
|
"@atlaskit/editor-prosemirror": "7.0.0",
|
|
56
56
|
"@atlaskit/editor-shared-styles": "^3.4.0",
|
|
57
57
|
"@atlaskit/emoji": "^69.3.0",
|
|
@@ -105,7 +105,7 @@
|
|
|
105
105
|
"@atlaskit/primitives": "^14.9.0",
|
|
106
106
|
"@atlaskit/renderer": "^119.0.0",
|
|
107
107
|
"@atlaskit/section-message": "^8.2.0",
|
|
108
|
-
"@atlaskit/smart-card": "^38.
|
|
108
|
+
"@atlaskit/smart-card": "^38.16.0",
|
|
109
109
|
"@atlaskit/synchrony-test-helpers": "workspace:^",
|
|
110
110
|
"@atlaskit/toggle": "^15.0.0",
|
|
111
111
|
"@atlaskit/util-data-test": "^18.0.0",
|