@atlaskit/editor-core 213.5.6 → 213.6.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 +18 -0
- package/dist/cjs/ui/Appearance/Comment/Comment.js +5 -12
- package/dist/cjs/ui/Appearance/Comment/Toolbar.js +5 -24
- package/dist/cjs/ui/Appearance/FullPage/CustomToolbarWrapper.js +5 -42
- package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +5 -136
- package/dist/cjs/ui/Appearance/FullPage/MainToolbar.js +1 -55
- package/dist/cjs/ui/Appearance/FullPage/MainToolbarWrapper.js +2 -31
- package/dist/cjs/ui/Appearance/FullPage/StyledComponents.js +1 -25
- package/dist/cjs/ui/Toolbar/ToolbarWithSizeDetector.js +4 -70
- package/dist/cjs/utils/validateNodes.js +1 -46
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/ui/Appearance/Comment/Comment.js +1 -23
- package/dist/es2019/ui/Appearance/Comment/Toolbar.js +2 -72
- package/dist/es2019/ui/Appearance/FullPage/CustomToolbarWrapper.js +3 -34
- package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +7 -134
- package/dist/es2019/ui/Appearance/FullPage/MainToolbar.js +1 -58
- package/dist/es2019/ui/Appearance/FullPage/MainToolbarWrapper.js +3 -31
- package/dist/es2019/ui/Appearance/FullPage/StyledComponents.js +0 -24
- package/dist/es2019/ui/Toolbar/ToolbarWithSizeDetector.js +3 -65
- package/dist/es2019/utils/validateNodes.js +1 -43
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/ui/Appearance/Comment/Comment.js +1 -11
- package/dist/esm/ui/Appearance/Comment/Toolbar.js +2 -23
- package/dist/esm/ui/Appearance/FullPage/CustomToolbarWrapper.js +5 -42
- package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +7 -138
- package/dist/esm/ui/Appearance/FullPage/MainToolbar.js +1 -55
- package/dist/esm/ui/Appearance/FullPage/MainToolbarWrapper.js +3 -32
- package/dist/esm/ui/Appearance/FullPage/StyledComponents.js +0 -24
- package/dist/esm/ui/Toolbar/ToolbarWithSizeDetector.js +4 -70
- package/dist/esm/utils/validateNodes.js +1 -47
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/ui/Appearance/FullPage/CustomToolbarWrapper.d.ts +3 -2
- package/dist/types/ui/Appearance/FullPage/MainToolbar.d.ts +0 -1
- package/dist/types/ui/Appearance/FullPage/MainToolbarWrapper.d.ts +2 -8
- package/dist/types/ui/Appearance/FullPage/StyledComponents.d.ts +0 -1
- package/dist/types/ui/Toolbar/ToolbarWithSizeDetector.d.ts +2 -6
- package/dist/types-ts4.5/ui/Appearance/FullPage/CustomToolbarWrapper.d.ts +3 -2
- package/dist/types-ts4.5/ui/Appearance/FullPage/MainToolbar.d.ts +0 -1
- package/dist/types-ts4.5/ui/Appearance/FullPage/MainToolbarWrapper.d.ts +2 -8
- package/dist/types-ts4.5/ui/Appearance/FullPage/StyledComponents.d.ts +0 -1
- package/dist/types-ts4.5/ui/Toolbar/ToolbarWithSizeDetector.d.ts +2 -6
- package/package.json +11 -27
|
@@ -6,16 +6,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.ToolbarWithSizeDetector = void 0;
|
|
9
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
10
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
11
|
var _react2 = require("@emotion/react");
|
|
14
12
|
var _coreUtils = require("@atlaskit/editor-common/core-utils");
|
|
15
13
|
var _types = require("@atlaskit/editor-common/types");
|
|
16
|
-
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
17
|
-
var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
|
|
18
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
19
14
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
20
15
|
var _widthDetector = require("@atlaskit/width-detector");
|
|
21
16
|
var _isFullPage = require("../../utils/is-full-page");
|
|
@@ -30,30 +25,11 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
30
25
|
|
|
31
26
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
32
27
|
|
|
33
|
-
|
|
34
|
-
var toolbar = (0, _react2.css)((0, _defineProperty2.default)({
|
|
28
|
+
var toolbar = (0, _react2.css)({
|
|
35
29
|
width: '100%',
|
|
36
30
|
position: 'relative'
|
|
37
|
-
}, "@media (max-width: ".concat(_editorSharedStyles.akEditorMobileMaxWidth, "px)"), {
|
|
38
|
-
gridColumn: '1 / 2',
|
|
39
|
-
gridRow: 2,
|
|
40
|
-
width: 'calc(100% - 30px)',
|
|
41
|
-
margin: "0 ".concat("var(--ds-space-200, 16px)")
|
|
42
|
-
}));
|
|
43
|
-
|
|
44
|
-
// Rename to toolbar when platform_editor_core_static_emotion_non_central is cleaned up
|
|
45
|
-
var staticToolbar = (0, _react2.css)({
|
|
46
|
-
width: '100%',
|
|
47
|
-
position: 'relative'
|
|
48
|
-
// The media query below has been commented out as akEditorMobileMaxWidth is 0px and thus the styles are never applied.
|
|
49
|
-
// [`@media (max-width: ${akEditorMobileMaxWidth}px)`]: {
|
|
50
|
-
// gridColumn: '1 / 2',
|
|
51
|
-
// gridRow: 2,
|
|
52
|
-
// width: 'calc(100% - 30px)',
|
|
53
|
-
// margin: `0 ${token('space.200', '16px')}`,
|
|
54
|
-
// },
|
|
55
31
|
});
|
|
56
|
-
var
|
|
32
|
+
var ToolbarWithSizeDetector = exports.ToolbarWithSizeDetector = function ToolbarWithSizeDetector(props) {
|
|
57
33
|
var ref = _react.default.useRef(null);
|
|
58
34
|
var _React$useState = _react.default.useState(undefined),
|
|
59
35
|
_React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
|
|
@@ -67,45 +43,6 @@ var DynamicStyleToolbarWithSizeDetector = function DynamicStyleToolbarWithSizeDe
|
|
|
67
43
|
// Ignored via go/ees005
|
|
68
44
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
69
45
|
(0, _toolbarSize.widthToToolbarSize)(width || elementWidth, props.appearance);
|
|
70
|
-
var toolbarStyle = (0, _react.useMemo)(function () {
|
|
71
|
-
var toolbarWidth = (0, _isFullPage.isFullPage)(props.appearance) && props.twoLineEditorToolbar ? _types.ToolbarSize.S : _types.ToolbarSize.M;
|
|
72
|
-
var toolbarMinWidth = (0, _toolbarSize.toolbarSizeToWidth)(toolbarWidth, props.appearance);
|
|
73
|
-
var isPreviewPanelResponsivenessEnabled = (0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true, {
|
|
74
|
-
exposure: true
|
|
75
|
-
});
|
|
76
|
-
var minWidth = "min-width: ".concat(props.hasMinWidth ? "".concat(toolbarMinWidth, "px") : isPreviewPanelResponsivenessEnabled ? 'fit-content' : '254px');
|
|
77
|
-
return [toolbar, minWidth];
|
|
78
|
-
}, [props.appearance, props.hasMinWidth, props.twoLineEditorToolbar]);
|
|
79
|
-
return (
|
|
80
|
-
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
81
|
-
(0, _react2.jsx)("div", {
|
|
82
|
-
css: toolbarStyle
|
|
83
|
-
}, (0, _react2.jsx)(_widthDetector.WidthObserver, {
|
|
84
|
-
setWidth: setWidth
|
|
85
|
-
}), props.editorView && toolbarSize ?
|
|
86
|
-
// Ignored via go/ees005
|
|
87
|
-
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
88
|
-
(0, _react2.jsx)(_Toolbar.Toolbar, (0, _extends2.default)({}, props, {
|
|
89
|
-
toolbarSize: toolbarSize
|
|
90
|
-
})) : (0, _react2.jsx)("div", {
|
|
91
|
-
ref: ref
|
|
92
|
-
}))
|
|
93
|
-
);
|
|
94
|
-
};
|
|
95
|
-
var StaticStyleToolbarWithSizeDetector = function StaticStyleToolbarWithSizeDetector(props) {
|
|
96
|
-
var ref = _react.default.useRef(null);
|
|
97
|
-
var _React$useState3 = _react.default.useState(undefined),
|
|
98
|
-
_React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
|
|
99
|
-
width = _React$useState4[0],
|
|
100
|
-
setWidth = _React$useState4[1];
|
|
101
|
-
var elementWidth = (0, _hooks.useElementWidth)(ref, {
|
|
102
|
-
skip: typeof width !== 'undefined'
|
|
103
|
-
});
|
|
104
|
-
var defaultToolbarSize = (0, _coreUtils.isSSR)() && (0, _isFullPage.isFullPage)(props.appearance) ? _types.ToolbarSize.XXL : undefined;
|
|
105
|
-
var toolbarSize = typeof width === 'undefined' && typeof elementWidth === 'undefined' ? defaultToolbarSize :
|
|
106
|
-
// Ignored via go/ees005
|
|
107
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
108
|
-
(0, _toolbarSize.widthToToolbarSize)(width || elementWidth, props.appearance);
|
|
109
46
|
var minWidthValue = (0, _react.useMemo)(function () {
|
|
110
47
|
if (props.hasMinWidth) {
|
|
111
48
|
var toolbarWidth = (0, _isFullPage.isFullPage)(props.appearance) && props.twoLineEditorToolbar ? _types.ToolbarSize.S : _types.ToolbarSize.M;
|
|
@@ -118,7 +55,7 @@ var StaticStyleToolbarWithSizeDetector = function StaticStyleToolbarWithSizeDete
|
|
|
118
55
|
}
|
|
119
56
|
}, [props.appearance, props.hasMinWidth, props.twoLineEditorToolbar]);
|
|
120
57
|
return (0, _react2.jsx)("div", {
|
|
121
|
-
css:
|
|
58
|
+
css: toolbar,
|
|
122
59
|
style: {
|
|
123
60
|
minWidth: minWidthValue
|
|
124
61
|
}
|
|
@@ -143,7 +80,4 @@ var StaticStyleToolbarWithSizeDetector = function StaticStyleToolbarWithSizeDete
|
|
|
143
80
|
}) : (0, _react2.jsx)("div", {
|
|
144
81
|
ref: ref
|
|
145
82
|
}));
|
|
146
|
-
};
|
|
147
|
-
var ToolbarWithSizeDetector = exports.ToolbarWithSizeDetector = (0, _platformFeatureFlagsReact.componentWithCondition)(function () {
|
|
148
|
-
return (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true);
|
|
149
|
-
}, StaticStyleToolbarWithSizeDetector, DynamicStyleToolbarWithSizeDetector);
|
|
83
|
+
};
|
|
@@ -4,54 +4,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.validateNodes = exports.validNode = void 0;
|
|
7
|
-
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
8
|
-
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
9
|
-
// We don't want to use memoize from lodash, because we need to use WeakMap or WeakSet
|
|
10
|
-
// to avoid memory leaks, but lodash allow to change the cache type only globally
|
|
11
|
-
// like `memoize.Cache = WeakMap`, and we don't want to do that.
|
|
12
|
-
// So we use our own cache implementation.
|
|
13
|
-
var cache = new WeakSet();
|
|
14
|
-
|
|
15
|
-
// See https://github.com/ProseMirror/prosemirror-model/blob/20d26c9843d6a69a1d417d937c401537ee0b2342/src/node.ts#L303
|
|
16
|
-
function checkNode(node) {
|
|
17
|
-
if (cache.has(node)) {
|
|
18
|
-
return;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
// @ts-expect-error - This is internal ProseMirror API, but we okay with it
|
|
22
|
-
node.type.checkContent(node.content);
|
|
23
|
-
// @ts-expect-error - This is internal ProseMirror API, but we okay with it
|
|
24
|
-
node.type.checkAttrs(node.attrs);
|
|
25
|
-
var copy = _model.Mark.none;
|
|
26
|
-
for (var i = 0; i < node.marks.length; i++) {
|
|
27
|
-
var mark = node.marks[i];
|
|
28
|
-
// @ts-expect-error - This is internal ProseMirror API, but we okay with it
|
|
29
|
-
mark.type.checkAttrs(mark.attrs);
|
|
30
|
-
copy = mark.addToSet(copy);
|
|
31
|
-
}
|
|
32
|
-
if (!_model.Mark.sameSet(copy, node.marks)) {
|
|
33
|
-
throw new RangeError("Invalid collection of marks for node ".concat(node.type.name, ": ").concat(node.marks.map(function (m) {
|
|
34
|
-
return m.type.name;
|
|
35
|
-
})));
|
|
36
|
-
}
|
|
37
|
-
node.content.forEach(function (node) {
|
|
38
|
-
return checkNode(node);
|
|
39
|
-
});
|
|
40
|
-
|
|
41
|
-
// The set value should be added in the end of the function,
|
|
42
|
-
// because any previous check can throw an error,
|
|
43
|
-
// and we don't want to add invalid node to the cache.
|
|
44
|
-
cache.add(node);
|
|
45
|
-
}
|
|
46
7
|
var validNode = exports.validNode = function validNode(node) {
|
|
47
8
|
try {
|
|
48
|
-
|
|
49
|
-
exposure: true
|
|
50
|
-
})) {
|
|
51
|
-
checkNode(node);
|
|
52
|
-
} else {
|
|
53
|
-
node.check();
|
|
54
|
-
}
|
|
9
|
+
node.check();
|
|
55
10
|
} catch (error) {
|
|
56
11
|
return false;
|
|
57
12
|
}
|
|
@@ -15,7 +15,6 @@ import messages from '@atlaskit/editor-common/messages';
|
|
|
15
15
|
import { WidthConsumer, WidthProvider } from '@atlaskit/editor-common/ui';
|
|
16
16
|
import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
|
|
17
17
|
import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
|
|
18
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
19
18
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
20
19
|
// Ignored via go/ees005
|
|
21
20
|
// eslint-disable-next-line import/no-named-as-default
|
|
@@ -53,26 +52,6 @@ const secondaryToolbarStyles = css({
|
|
|
53
52
|
display: 'flex',
|
|
54
53
|
padding: `${"var(--ds-space-150, 12px)"} ${"var(--ds-space-025, 2px)"}`
|
|
55
54
|
});
|
|
56
|
-
const mainToolbarCustomComponentsSlotStyle = (isTwoLineEditorToolbar = false) =>
|
|
57
|
-
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
|
|
58
|
-
css`
|
|
59
|
-
display: flex;
|
|
60
|
-
justify-content: flex-end;
|
|
61
|
-
align-items: center;
|
|
62
|
-
flex-grow: 1;
|
|
63
|
-
padding-right: ${"var(--ds-space-250, 20px)"};
|
|
64
|
-
> div {
|
|
65
|
-
display: flex;
|
|
66
|
-
flex-shrink: 0;
|
|
67
|
-
}
|
|
68
|
-
${isTwoLineEditorToolbar && `
|
|
69
|
-
@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px) {
|
|
70
|
-
{
|
|
71
|
-
padding-right: 0;
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
`}
|
|
75
|
-
`;
|
|
76
55
|
const mainToolbarCustomComponentsSlotStyleNew = css({
|
|
77
56
|
display: 'flex',
|
|
78
57
|
justifyContent: 'flex-end',
|
|
@@ -179,8 +158,7 @@ export const CommentEditorWithIntl = props => {
|
|
|
179
158
|
primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
|
|
180
159
|
}
|
|
181
160
|
const customToolbarSlot = jsx("div", {
|
|
182
|
-
css:
|
|
183
|
-
mainToolbarCustomComponentsSlotStyle(isTwoLineToolbarEnabled)
|
|
161
|
+
css: [mainToolbarCustomComponentsSlotStyleNew, isTwoLineToolbarEnabled && mainToolbarCustomComponentsSlotStyleTwoLineToolbarNew]
|
|
184
162
|
}, customPrimaryToolbarComponents);
|
|
185
163
|
const isToolbarAIFCEnabled = Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true);
|
|
186
164
|
return jsx(WithFlash, {
|
|
@@ -9,54 +9,9 @@ import React, { useEffect, useState } from 'react';
|
|
|
9
9
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
10
10
|
import { css, jsx } from '@emotion/react';
|
|
11
11
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
12
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
13
12
|
const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 490;
|
|
14
13
|
const akEditorMenuZIndex = 500;
|
|
15
14
|
const akEditorToolbarKeylineHeight = 2;
|
|
16
|
-
const mainToolbarWrapperStyle = (isTwoLineEditorToolbar = false, isToolbarAifcEnabled = false
|
|
17
|
-
/* eslint-disable @atlaskit/platform/ensure-feature-flag-registration */
|
|
18
|
-
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
|
|
19
|
-
) => css`
|
|
20
|
-
position: relative;
|
|
21
|
-
align-items: center;
|
|
22
|
-
padding: ${"var(--ds-space-100, 8px)"} ${"var(--ds-space-100, 8px)"} 0;
|
|
23
|
-
display: flex;
|
|
24
|
-
height: auto;
|
|
25
|
-
background-color: ${"var(--ds-surface, white)"};
|
|
26
|
-
box-shadow: none;
|
|
27
|
-
${isToolbarAifcEnabled ? '' : `padding-left: ${"var(--ds-space-250, 20px)"};`}
|
|
28
|
-
|
|
29
|
-
& > div {
|
|
30
|
-
> :first-child:not(style),
|
|
31
|
-
> style:first-child + * {
|
|
32
|
-
margin-left: 0;
|
|
33
|
-
}
|
|
34
|
-
${isTwoLineEditorToolbar && `
|
|
35
|
-
@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px) {
|
|
36
|
-
flex-direction: column-reverse;
|
|
37
|
-
align-items: end;
|
|
38
|
-
display: flex;
|
|
39
|
-
justify-content: flex-end;
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
/* make this more explicit for a toolbar */
|
|
43
|
-
> *:nth-child(1) {
|
|
44
|
-
@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px) {
|
|
45
|
-
> div:nth-child(2) {
|
|
46
|
-
justify-content: flex-end;
|
|
47
|
-
display: flex;
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
`}
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
.block-type-btn {
|
|
55
|
-
padding-left: 0;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
${fg('platform-visual-refresh-icons') && 'span svg { max-width: 100%; }'}
|
|
59
|
-
`;
|
|
60
15
|
const mainToolbarWrapperStyleNew = css({
|
|
61
16
|
position: 'relative',
|
|
62
17
|
alignItems: 'center',
|
|
@@ -113,23 +68,6 @@ const mainToolbarWrapperStylesVisualRefresh = css({
|
|
|
113
68
|
maxWidth: '100%'
|
|
114
69
|
}
|
|
115
70
|
});
|
|
116
|
-
|
|
117
|
-
/* eslint-enable @atlaskit/platform/ensure-feature-flag-registration */
|
|
118
|
-
|
|
119
|
-
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
120
|
-
const stickyToolbarWrapperStyle = css`
|
|
121
|
-
/* stylelint-disable declaration-block-no-duplicate-properties */
|
|
122
|
-
position: relative;
|
|
123
|
-
position: sticky;
|
|
124
|
-
/* stylelint-enable declaration-block-no-duplicate-properties */
|
|
125
|
-
padding-bottom: ${"var(--ds-space-100, 8px)"};
|
|
126
|
-
z-index: ${akEditorMenuZIndex};
|
|
127
|
-
transition: box-shadow ease-in-out 0.2s;
|
|
128
|
-
&.show-keyline {
|
|
129
|
-
box-shadow: 0 ${akEditorToolbarKeylineHeight}px 0 0
|
|
130
|
-
${"var(--ds-background-accent-gray-subtlest, #F1F2F4)"};
|
|
131
|
-
}
|
|
132
|
-
`;
|
|
133
71
|
const stickyToolbarWrapperStyleNew = css({
|
|
134
72
|
position: 'sticky',
|
|
135
73
|
paddingBottom: "var(--ds-space-100, 8px)",
|
|
@@ -157,11 +95,7 @@ const StickyToolbar = props => {
|
|
|
157
95
|
return (
|
|
158
96
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
159
97
|
jsx("div", {
|
|
160
|
-
css:
|
|
161
|
-
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
162
|
-
mainToolbarWrapperStyle(props.twoLineEditorToolbar,
|
|
163
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
164
|
-
props.isNewToolbarEnabled), stickyToolbarWrapperStyle]
|
|
98
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, stickyToolbarWrapperStyleNew, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding]
|
|
165
99
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
|
|
166
100
|
,
|
|
167
101
|
style: {
|
|
@@ -177,11 +111,7 @@ const StickyToolbar = props => {
|
|
|
177
111
|
const FixedToolbar = props =>
|
|
178
112
|
// eslint-disable-next-line @atlaskit/design-system/prefer-primitives
|
|
179
113
|
jsx("div", {
|
|
180
|
-
css:
|
|
181
|
-
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
182
|
-
mainToolbarWrapperStyle(props.twoLineEditorToolbar,
|
|
183
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
184
|
-
props.isNewToolbarEnabled),
|
|
114
|
+
css: [mainToolbarWrapperStyleNew, props.twoLineEditorToolbar && mainToolbarTwoLineStylesNew, fg('platform-visual-refresh-icons') && mainToolbarWrapperStylesVisualRefresh, props.isNewToolbarEnabled && mainToolbarWithoutLeftPadding],
|
|
185
115
|
"data-testid": "ak-editor-main-toolbar"
|
|
186
116
|
}, props.children);
|
|
187
117
|
|
|
@@ -6,9 +6,6 @@ import React from 'react';
|
|
|
6
6
|
|
|
7
7
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
8
8
|
import { css, jsx } from '@emotion/react';
|
|
9
|
-
import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
|
|
10
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
11
|
-
import { mainToolbarFirstChildStyle, mainToolbarSecondChildStyle } from './MainToolbar';
|
|
12
9
|
// Pre-computed static styles for first- and second-child wrappers.
|
|
13
10
|
// These contain no runtime logic and are safe for static-emotion mode.
|
|
14
11
|
|
|
@@ -47,7 +44,7 @@ const secondChildStaticTwoLine = css({
|
|
|
47
44
|
});
|
|
48
45
|
|
|
49
46
|
// ---------------- First child wrapper ----------------
|
|
50
|
-
const
|
|
47
|
+
export const MainToolbarForFirstChildWrapper = ({
|
|
51
48
|
twoLineEditorToolbar,
|
|
52
49
|
children,
|
|
53
50
|
role,
|
|
@@ -59,23 +56,9 @@ const FirstChildWrapperStatic = ({
|
|
|
59
56
|
"aria-label": ariaLabel,
|
|
60
57
|
"data-testid": testId
|
|
61
58
|
}, children);
|
|
62
|
-
const FirstChildWrapperDynamic = ({
|
|
63
|
-
twoLineEditorToolbar,
|
|
64
|
-
children,
|
|
65
|
-
role,
|
|
66
|
-
'aria-label': ariaLabel,
|
|
67
|
-
'data-testid': testId
|
|
68
|
-
}) => jsx("div", {
|
|
69
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/design-system/consistent-css-prop-usage
|
|
70
|
-
css: mainToolbarFirstChildStyle(twoLineEditorToolbar),
|
|
71
|
-
role: role,
|
|
72
|
-
"aria-label": ariaLabel,
|
|
73
|
-
"data-testid": testId
|
|
74
|
-
}, children);
|
|
75
|
-
export const MainToolbarForFirstChildWrapper = componentWithCondition(() => expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true), FirstChildWrapperStatic, FirstChildWrapperDynamic);
|
|
76
59
|
|
|
77
60
|
// ---------------- Second child wrapper ----------------
|
|
78
|
-
const
|
|
61
|
+
export const MainToolbarForSecondChildWrapper = ({
|
|
79
62
|
twoLineEditorToolbar,
|
|
80
63
|
children,
|
|
81
64
|
role,
|
|
@@ -86,18 +69,4 @@ const SecondChildWrapperStatic = ({
|
|
|
86
69
|
role: role,
|
|
87
70
|
"aria-label": ariaLabel,
|
|
88
71
|
"data-testid": testId
|
|
89
|
-
}, children);
|
|
90
|
-
const SecondChildWrapperDynamic = ({
|
|
91
|
-
twoLineEditorToolbar,
|
|
92
|
-
children,
|
|
93
|
-
role,
|
|
94
|
-
'aria-label': ariaLabel,
|
|
95
|
-
'data-testid': testId
|
|
96
|
-
}) => jsx("div", {
|
|
97
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/design-system/consistent-css-prop-usage
|
|
98
|
-
css: mainToolbarSecondChildStyle(twoLineEditorToolbar),
|
|
99
|
-
role: role,
|
|
100
|
-
"aria-label": ariaLabel,
|
|
101
|
-
"data-testid": testId
|
|
102
|
-
}, children);
|
|
103
|
-
export const MainToolbarForSecondChildWrapper = componentWithCondition(() => expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true), SecondChildWrapperStatic, SecondChildWrapperDynamic);
|
|
72
|
+
}, children);
|
|
@@ -11,10 +11,8 @@ import classnames from 'classnames';
|
|
|
11
11
|
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
|
-
import {
|
|
15
|
-
import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
|
|
14
|
+
import { akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
|
|
16
15
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
17
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
18
16
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
19
17
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
20
18
|
import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
|
|
@@ -25,7 +23,7 @@ import { contentComponentClickWrapper } from '../../Addon/ClickAreaBlock/content
|
|
|
25
23
|
import { ContextPanel } from '../../ContextPanel';
|
|
26
24
|
import EditorContentContainer from '../../EditorContentContainer/EditorContentContainer';
|
|
27
25
|
import PluginSlot from '../../PluginSlot';
|
|
28
|
-
import {
|
|
26
|
+
import { contentAreaWrapper, sidebarArea } from './StyledComponents';
|
|
29
27
|
const akEditorFullWidthLayoutWidth = 1800;
|
|
30
28
|
const akEditorSwoopCubicBezier = `cubic-bezier(0.15, 1, 0.3, 1)`;
|
|
31
29
|
const tableMarginFullWidthMode = 2;
|
|
@@ -33,97 +31,6 @@ const akLayoutGutterOffset = 12;
|
|
|
33
31
|
const SWOOP_ANIMATION = `0.5s ${akEditorSwoopCubicBezier}`;
|
|
34
32
|
const AK_NESTED_DND_GUTTER_OFFSET = 8;
|
|
35
33
|
const getTotalPadding = () => akEditorGutterPaddingDynamic() * 2;
|
|
36
|
-
|
|
37
|
-
// old styles - to be deleted when cleaning up experiment `platform_editor_core_static_emotion_non_central`
|
|
38
|
-
const editorContentAreaStyle = ({
|
|
39
|
-
layoutMaxWidth,
|
|
40
|
-
fullWidthMode,
|
|
41
|
-
isEditorToolbarHidden
|
|
42
|
-
}) => [editorContentArea, editorContentAreaProsemirrorStyle, fullWidthNonChromelessBreakoutBlockTableStyle, !fullWidthMode && editorContentAreaWithLayoutWith(layoutMaxWidth),
|
|
43
|
-
// for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
|
|
44
|
-
expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlock() : editorContentAreaContainerStyle(), ...(fg('platform_editor_controls_no_toolbar_space') ? [] : [editorExperiment('platform_editor_controls', 'variant1') &&
|
|
45
|
-
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
|
|
46
|
-
contentAreaReducedHeaderSpace, isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') &&
|
|
47
|
-
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
|
|
48
|
-
contentAreaReservedPrimaryToolbarSpace])];
|
|
49
|
-
const editorContentAreaWithLayoutWith = layoutMaxWidth => css({
|
|
50
|
-
// this restricts max width
|
|
51
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
52
|
-
maxWidth: `${layoutMaxWidth + getTotalPadding()}px`
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
/* Prevent horizontal scroll on page in full width mode */
|
|
56
|
-
const editorContentAreaContainerStyleExcludeCodeBlock = () => css({
|
|
57
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
58
|
-
'.fabric-editor--full-width-mode': {
|
|
59
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
60
|
-
'.extension-container, .multiBodiedExtension--container': {
|
|
61
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
62
|
-
maxWidth: `calc(100% - ${tableMarginFullWidthMode * 2}px)`
|
|
63
|
-
},
|
|
64
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
65
|
-
'.extension-container.inline': {
|
|
66
|
-
maxWidth: '100%'
|
|
67
|
-
},
|
|
68
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
69
|
-
'td .extension-container.inline': {
|
|
70
|
-
maxWidth: 'inherit'
|
|
71
|
-
},
|
|
72
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
73
|
-
'[data-layout-section]': {
|
|
74
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
75
|
-
maxWidth: `calc(100% + ${(akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? AK_NESTED_DND_GUTTER_OFFSET : 0)) * 2}px)`
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
});
|
|
79
|
-
|
|
80
|
-
/* Prevent horizontal scroll on page in full width mode */
|
|
81
|
-
const editorContentAreaContainerStyle = () => css({
|
|
82
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
83
|
-
'.fabric-editor--full-width-mode': {
|
|
84
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
85
|
-
'.code-block, .extension-container, .multiBodiedExtension--container': {
|
|
86
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
87
|
-
maxWidth: `calc(100% - ${tableMarginFullWidthMode * 2}px)`
|
|
88
|
-
},
|
|
89
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
90
|
-
'.extension-container.inline': {
|
|
91
|
-
maxWidth: '100%'
|
|
92
|
-
},
|
|
93
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
94
|
-
'td .extension-container.inline': {
|
|
95
|
-
maxWidth: 'inherit'
|
|
96
|
-
},
|
|
97
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
98
|
-
'[data-layout-section]': {
|
|
99
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
100
|
-
maxWidth: `calc(100% + ${(akLayoutGutterOffset + (fg('platform_editor_nested_dnd_styles_changes') ? AK_NESTED_DND_GUTTER_OFFSET : 0)) * 2}px)`
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
});
|
|
104
|
-
const editorContentArea = css({
|
|
105
|
-
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
106
|
-
lineHeight: '24px',
|
|
107
|
-
paddingTop: "var(--ds-space-600, 48px)",
|
|
108
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
109
|
-
'.ak-editor-content-area-no-toolbar &': {
|
|
110
|
-
// When the toolbar is hidden, we don't want content to jump up
|
|
111
|
-
// the extra 1px is to account for the border on the toolbar
|
|
112
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
113
|
-
paddingTop: `calc(${"var(--ds-space-600, 48px)"} + ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()} + 1px)`
|
|
114
|
-
},
|
|
115
|
-
paddingBottom: "var(--ds-space-600, 48px)",
|
|
116
|
-
height: 'calc( 100% - 105px )',
|
|
117
|
-
width: '100%',
|
|
118
|
-
margin: 'auto',
|
|
119
|
-
flexDirection: 'column',
|
|
120
|
-
flexGrow: 1,
|
|
121
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
122
|
-
maxWidth: `${akEditorFullWidthLayoutWidth + getTotalPadding()}px`,
|
|
123
|
-
transition: `max-width ${SWOOP_ANIMATION}`
|
|
124
|
-
},
|
|
125
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
126
|
-
tableFullPageEditorStyles);
|
|
127
34
|
const editorContentAreaProsemirrorStyle = css({
|
|
128
35
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
129
36
|
'& .ProseMirror': {
|
|
@@ -173,28 +80,6 @@ const contentAreaReservedPrimaryToolbarSpace = css({
|
|
|
173
80
|
const contentAreaReducedHeaderSpace = css({
|
|
174
81
|
paddingTop: "var(--ds-space-400, 32px)"
|
|
175
82
|
});
|
|
176
|
-
const editorContentGutterStyle = () => {
|
|
177
|
-
if (editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
178
|
-
exposure: true
|
|
179
|
-
})) {
|
|
180
|
-
return css({
|
|
181
|
-
boxSizing: 'border-box',
|
|
182
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
183
|
-
padding: `0 ${akEditorGutterPaddingDynamic()}px`,
|
|
184
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-container-queries, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
185
|
-
[`@container editor-area (max-width: ${akEditorFullPageNarrowBreakout}px)`]: {
|
|
186
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
187
|
-
padding: `0 ${akEditorGutterPaddingReduced}px`
|
|
188
|
-
}
|
|
189
|
-
});
|
|
190
|
-
} else {
|
|
191
|
-
return css({
|
|
192
|
-
boxSizing: 'border-box',
|
|
193
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
194
|
-
padding: `0 ${akEditorGutterPaddingDynamic()}px`
|
|
195
|
-
});
|
|
196
|
-
}
|
|
197
|
-
};
|
|
198
83
|
|
|
199
84
|
// new styles
|
|
200
85
|
const editorContentAreaNew = css({
|
|
@@ -352,11 +237,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
352
237
|
return editorExperiment('platform_editor_controls', 'variant1');
|
|
353
238
|
};
|
|
354
239
|
return jsx("div", {
|
|
355
|
-
css:
|
|
356
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
357
|
-
contentArea,
|
|
358
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
359
|
-
props.isEditorToolbarHidden && contentAreaHeightNoToolbar],
|
|
240
|
+
css: [contentAreaNew, props.isEditorToolbarHidden && contentAreaHeightNoToolbar],
|
|
360
241
|
"data-testid": CONTENT_AREA_TEST_ID,
|
|
361
242
|
ref: containerRef
|
|
362
243
|
}, jsx("div", {
|
|
@@ -378,15 +259,9 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
378
259
|
editorView: props.editorView,
|
|
379
260
|
editorDisabled: props.disabled
|
|
380
261
|
}, jsx("div", {
|
|
381
|
-
css:
|
|
262
|
+
css: [editorContentAreaNew, editorContentAreaProsemirrorStyle, tableFullPageEditorStylesNew, fullWidthNonChromelessBreakoutBlockTableStyle,
|
|
382
263
|
// for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
|
|
383
|
-
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]
|
|
384
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
385
|
-
...editorContentAreaStyle({
|
|
386
|
-
fullWidthMode,
|
|
387
|
-
layoutMaxWidth: theme.layoutMaxWidth,
|
|
388
|
-
isEditorToolbarHidden: props.isEditorToolbarHidden
|
|
389
|
-
})],
|
|
264
|
+
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],
|
|
390
265
|
style: {
|
|
391
266
|
'--ak-editor-content-area-max-width': !fullWidthMode ? `${theme.layoutMaxWidth + getTotalPadding()}px` : `${akEditorFullWidthLayoutWidth + getTotalPadding()}px`
|
|
392
267
|
}
|
|
@@ -399,13 +274,11 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
399
274
|
"aria-label": props.intl.formatMessage(messages.editableContentLabel),
|
|
400
275
|
ref: contentAreaRef
|
|
401
276
|
}, jsx("div", {
|
|
402
|
-
css:
|
|
277
|
+
css: [editorContentGutterStyles,
|
|
403
278
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
404
279
|
fg('platform_editor_controls_increase_full_page_gutter') && editorExperiment('platform_editor_controls', 'variant1') && editorContentGutterStyleFG, editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
405
280
|
exposure: true
|
|
406
|
-
}) && editorContentReducedGutterStyles]
|
|
407
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
408
|
-
editorContentGutterStyle()]
|
|
281
|
+
}) && editorContentReducedGutterStyles]
|
|
409
282
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
410
283
|
,
|
|
411
284
|
className: classnames('ak-editor-content-area', 'appearance-full-page', {
|
|
@@ -1,65 +1,8 @@
|
|
|
1
1
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
2
2
|
import { css } from '@emotion/react';
|
|
3
|
-
import {
|
|
4
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
3
|
+
import { akEditorMobileMaxWidth, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
|
|
5
4
|
export const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
|
|
6
5
|
|
|
7
|
-
// box-shadow is overriden by the mainToolbar
|
|
8
|
-
const mainToolbarWithKeyline = css({
|
|
9
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
10
|
-
boxShadow: `${"var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)"}`
|
|
11
|
-
});
|
|
12
|
-
const mainToolbarTwoLineStyle = () => {
|
|
13
|
-
const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
|
|
14
|
-
return css({
|
|
15
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
16
|
-
[`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
|
|
17
|
-
flexWrap: 'wrap',
|
|
18
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
19
|
-
height: `calc(${editorToolbarHeight} * 2)`
|
|
20
|
-
}
|
|
21
|
-
});
|
|
22
|
-
};
|
|
23
|
-
const flexibleIconSize = css({
|
|
24
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
25
|
-
'& span svg': {
|
|
26
|
-
maxWidth: '100%'
|
|
27
|
-
}
|
|
28
|
-
});
|
|
29
|
-
const mainToolbar = () => {
|
|
30
|
-
const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
|
|
31
|
-
return css({
|
|
32
|
-
position: 'relative',
|
|
33
|
-
alignItems: 'center',
|
|
34
|
-
boxShadow: 'none',
|
|
35
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
36
|
-
borderBottom: `${"var(--ds-border-width, 1px)"} solid ${"var(--ds-border, #091E4224)"}`,
|
|
37
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
38
|
-
transition: `box-shadow 200ms ${akEditorSwoopCubicBezier}`,
|
|
39
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
40
|
-
zIndex: akEditorFloatingDialogZIndex,
|
|
41
|
-
display: 'flex',
|
|
42
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
43
|
-
height: editorToolbarHeight,
|
|
44
|
-
flexShrink: 0,
|
|
45
|
-
backgroundColor: "var(--ds-surface, white)",
|
|
46
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
47
|
-
'& object': {
|
|
48
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
|
|
49
|
-
height: '0 !important'
|
|
50
|
-
},
|
|
51
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
52
|
-
[`@media (max-width: ${akEditorMobileMaxWidth}px)`]: {
|
|
53
|
-
display: 'grid',
|
|
54
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
55
|
-
height: `calc(${editorToolbarHeight} * 2)`
|
|
56
|
-
}
|
|
57
|
-
},
|
|
58
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/platform/ensure-feature-flag-registration, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
59
|
-
fg('platform-visual-refresh-icons') && flexibleIconSize);
|
|
60
|
-
};
|
|
61
|
-
export const mainToolbarStyle = (showKeyline, twoLineEditorToolbar) => [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];
|
|
62
|
-
|
|
63
6
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
64
7
|
export const mainToolbarIconBeforeStyle = css({
|
|
65
8
|
margin: "var(--ds-space-200, 16px)",
|