@atlaskit/editor-core 209.1.7 → 209.1.9
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 +22 -0
- package/afm-rovo-extension/tsconfig.json +103 -0
- package/dist/cjs/ui/Appearance/FullPage/FullPage.js +2 -10
- package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +21 -6
- package/dist/cjs/ui/ContentStyles/index.js +3 -3
- package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +25 -9
- package/dist/cjs/ui/EditorContentContainer/styles/baseStyles.js +20 -1
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/ui/Appearance/FullPage/FullPage.js +2 -10
- package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +27 -7
- package/dist/es2019/ui/ContentStyles/index.js +8 -1
- package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +26 -10
- package/dist/es2019/ui/EditorContentContainer/styles/baseStyles.js +22 -0
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/ui/Appearance/FullPage/FullPage.js +2 -10
- package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +22 -7
- package/dist/esm/ui/ContentStyles/index.js +4 -4
- package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +26 -10
- package/dist/esm/ui/EditorContentContainer/styles/baseStyles.js +19 -0
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/ui/EditorContentContainer/styles/baseStyles.d.ts +3 -0
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/baseStyles.d.ts +3 -0
- package/package.json +4 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 209.1.9
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#185940](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/185940)
|
|
8
|
+
[`456bee393c4d3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/456bee393c4d3) -
|
|
9
|
+
[ux] When editor-area is less than 768px wide, we reduce editor gutters to 24px in Full-page
|
|
10
|
+
editor.
|
|
11
|
+
- [#177925](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/177925)
|
|
12
|
+
[`4f971def5d8fd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4f971def5d8fd) -
|
|
13
|
+
[ux] ED-28293: clean up platform_editor_controls_toolbar_ssr_fix
|
|
14
|
+
- Updated dependencies
|
|
15
|
+
|
|
16
|
+
## 209.1.8
|
|
17
|
+
|
|
18
|
+
### Patch Changes
|
|
19
|
+
|
|
20
|
+
- [#187144](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/187144)
|
|
21
|
+
[`a16147d8fbdfe`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a16147d8fbdfe) -
|
|
22
|
+
Bump @atlaskit/adf-schema to v49.0.5
|
|
23
|
+
- Updated dependencies
|
|
24
|
+
|
|
3
25
|
## 209.1.7
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
{
|
|
2
|
+
"extends": "../../../../tsconfig.entry-points.rovo-extension.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"declaration": true,
|
|
5
|
+
"target": "es5",
|
|
6
|
+
"outDir": "../../../../../rovo-extension/tsDist/@atlaskit__editor-core/app",
|
|
7
|
+
"rootDir": "../",
|
|
8
|
+
"composite": true
|
|
9
|
+
},
|
|
10
|
+
"include": [
|
|
11
|
+
"../src/**/*.ts",
|
|
12
|
+
"../src/**/*.tsx"
|
|
13
|
+
],
|
|
14
|
+
"exclude": [
|
|
15
|
+
"../src/**/__tests__/*",
|
|
16
|
+
"../src/**/*.test.*",
|
|
17
|
+
"../src/**/test.*",
|
|
18
|
+
"../src/stories/*"
|
|
19
|
+
],
|
|
20
|
+
"references": [
|
|
21
|
+
{
|
|
22
|
+
"path": "../../activity-provider/afm-rovo-extension/tsconfig.json"
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
"path": "../../../analytics/analytics-namespaced-context/afm-rovo-extension/tsconfig.json"
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
"path": "../../../analytics/analytics-next/afm-rovo-extension/tsconfig.json"
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
"path": "../../../design-system/button/afm-rovo-extension/tsconfig.json"
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
"path": "../../../design-system/css/afm-rovo-extension/tsconfig.json"
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
"path": "../../editor-json-transformer/afm-rovo-extension/tsconfig.json"
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
"path": "../../editor-performance-metrics/afm-rovo-extension/tsconfig.json"
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
"path": "../../editor-plugin-quick-insert/afm-rovo-extension/tsconfig.json"
|
|
44
|
+
},
|
|
45
|
+
{
|
|
46
|
+
"path": "../../editor-plugin-user-preferences/afm-rovo-extension/tsconfig.json"
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
"path": "../../editor-plugins/afm-rovo-extension/tsconfig.json"
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
"path": "../../editor-shared-styles/afm-rovo-extension/tsconfig.json"
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
"path": "../../../elements/emoji/afm-rovo-extension/tsconfig.json"
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
"path": "../../../design-system/icon/afm-rovo-extension/tsconfig.json"
|
|
59
|
+
},
|
|
60
|
+
{
|
|
61
|
+
"path": "../../../design-system/link/afm-rovo-extension/tsconfig.json"
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
"path": "../../../media/media-card/afm-rovo-extension/tsconfig.json"
|
|
65
|
+
},
|
|
66
|
+
{
|
|
67
|
+
"path": "../../../elements/mention/afm-rovo-extension/tsconfig.json"
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
"path": "../../../platform/feature-flags/afm-rovo-extension/tsconfig.json"
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
"path": "../../../platform/feature-flags-react/afm-rovo-extension/tsconfig.json"
|
|
74
|
+
},
|
|
75
|
+
{
|
|
76
|
+
"path": "../../../react-ufo/atlaskit/afm-rovo-extension/tsconfig.json"
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
"path": "../../../elements/task-decision/afm-rovo-extension/tsconfig.json"
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
"path": "../../tmp-editor-statsig/afm-rovo-extension/tsconfig.json"
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
"path": "../../../design-system/tokens/afm-rovo-extension/tsconfig.json"
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
"path": "../../../design-system/tooltip/afm-rovo-extension/tsconfig.json"
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
"path": "../../../design-system/width-detector/afm-rovo-extension/tsconfig.json"
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
"path": "../../editor-common/afm-rovo-extension/tsconfig.json"
|
|
95
|
+
},
|
|
96
|
+
{
|
|
97
|
+
"path": "../../../linking-platform/link-provider/afm-rovo-extension/tsconfig.json"
|
|
98
|
+
},
|
|
99
|
+
{
|
|
100
|
+
"path": "../../../media/media-core/afm-rovo-extension/tsconfig.json"
|
|
101
|
+
}
|
|
102
|
+
]
|
|
103
|
+
}
|
|
@@ -112,7 +112,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
|
|
|
112
112
|
}) || {},
|
|
113
113
|
toolbarDockingPosition = _ref3.toolbarDockingPosition;
|
|
114
114
|
if (!(0, _platformFeatureFlags.fg)('platform_editor_use_preferences_plugin')) {
|
|
115
|
-
if (!toolbarDocking
|
|
115
|
+
if (!toolbarDocking) {
|
|
116
116
|
var _editorAPI$selectionT, _editorAPI$selectionT2;
|
|
117
117
|
// This is a workaround for the rendering issue with the selection toolbar
|
|
118
118
|
// where using useSharedPluginStateSelector or useSharedPluginState the state are not
|
|
@@ -138,21 +138,13 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
|
|
|
138
138
|
isEditorToolbarHidden = true;
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
|
-
} else
|
|
141
|
+
} else {
|
|
142
142
|
if (toolbarDocking === 'none') {
|
|
143
143
|
primaryToolbarComponents = [];
|
|
144
144
|
if (!hasCustomComponents(customPrimaryToolbarComponents)) {
|
|
145
145
|
isEditorToolbarHidden = true;
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
|
-
} else {
|
|
149
|
-
var _primaryToolbarCompon;
|
|
150
|
-
if (toolbarDocking !== 'top') {
|
|
151
|
-
primaryToolbarComponents = [];
|
|
152
|
-
}
|
|
153
|
-
if (!((_primaryToolbarCompon = primaryToolbarComponents) !== null && _primaryToolbarCompon !== void 0 && _primaryToolbarCompon.length) && !hasCustomComponents(customPrimaryToolbarComponents)) {
|
|
154
|
-
isEditorToolbarHidden = true;
|
|
155
|
-
}
|
|
156
148
|
}
|
|
157
149
|
}
|
|
158
150
|
var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.containerArea) || undefined;
|
|
@@ -193,11 +193,22 @@ var contentAreaReducedHeaderSpace = (0, _react2.css)({
|
|
|
193
193
|
paddingTop: "var(--ds-space-400, 32px)"
|
|
194
194
|
});
|
|
195
195
|
var editorContentGutterStyle = function editorContentGutterStyle() {
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
196
|
+
if ((0, _expValEquals.expValEquals)('platform_editor_preview_panel_responsiveness', 'isEnabled', true)) {
|
|
197
|
+
return (0, _react2.css)((0, _defineProperty2.default)({
|
|
198
|
+
boxSizing: 'border-box',
|
|
199
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
200
|
+
padding: "0 ".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px")
|
|
201
|
+
}, "@container editor-area (max-width: ".concat(_editorSharedStyles.akEditorFullPageNarrowBreakout, "px)"), {
|
|
202
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
203
|
+
padding: "0 ".concat(_editorSharedStyles.akEditorGutterPaddingReduced, "px")
|
|
204
|
+
}));
|
|
205
|
+
} else {
|
|
206
|
+
return (0, _react2.css)({
|
|
207
|
+
boxSizing: 'border-box',
|
|
208
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
209
|
+
padding: "0 ".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px")
|
|
210
|
+
});
|
|
211
|
+
}
|
|
201
212
|
};
|
|
202
213
|
|
|
203
214
|
// new styles
|
|
@@ -296,6 +307,10 @@ var editorContentGutterStyles = (0, _react2.css)({
|
|
|
296
307
|
boxSizing: 'border-box',
|
|
297
308
|
padding: '0 52px'
|
|
298
309
|
});
|
|
310
|
+
var editorContentReducedGutterStyles = (0, _react2.css)((0, _defineProperty2.default)({}, "@container editor-area (max-width: ".concat(_editorSharedStyles.akEditorFullPageNarrowBreakout, "px)"), {
|
|
311
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
312
|
+
padding: "0 ".concat(_editorSharedStyles.akEditorGutterPaddingReduced, "px")
|
|
313
|
+
}));
|
|
299
314
|
var contentAreaNew = (0, _react2.css)({
|
|
300
315
|
display: 'flex',
|
|
301
316
|
flexDirection: 'row',
|
|
@@ -414,7 +429,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
414
429
|
}, (0, _react2.jsx)("div", {
|
|
415
430
|
css: (0, _expValEquals.expValEquals)('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentGutterStyles,
|
|
416
431
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
417
|
-
(0, _platformFeatureFlags.fg)('platform_editor_controls_increase_full_page_gutter') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && editorContentGutterStyleFG] : [
|
|
432
|
+
(0, _platformFeatureFlags.fg)('platform_editor_controls_increase_full_page_gutter') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && editorContentGutterStyleFG, (0, _expValEquals.expValEquals)('platform_editor_preview_panel_responsiveness', 'isEnabled', true) && editorContentReducedGutterStyles] : [
|
|
418
433
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
419
434
|
editorContentGutterStyle()]
|
|
420
435
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -37,7 +37,7 @@ var _media = require("./media");
|
|
|
37
37
|
var _panel2 = require("./panel");
|
|
38
38
|
var _status = require("./status");
|
|
39
39
|
var _tasksAndDecisions = require("./tasks-and-decisions");
|
|
40
|
-
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject0, _templateObject1, _templateObject10;
|
|
40
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject0, _templateObject1, _templateObject10, _templateObject11;
|
|
41
41
|
/* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
|
|
42
42
|
/* eslint-disable react-hooks/rules-of-hooks */
|
|
43
43
|
/* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- Requires manual remediation over time due to use of unsafe nested mixins */
|
|
@@ -168,9 +168,9 @@ var akEditorBreakpointForSmallDevice = "1266px";
|
|
|
168
168
|
// Under editor experiment platform_editor_core_static_emotion
|
|
169
169
|
// If you are making changes to this file, please make sure to update in EditorContentContainer.tsx as well
|
|
170
170
|
var legacyContentStyles = function legacyContentStyles(props) {
|
|
171
|
-
return (0, _react2.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: ", "px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t--ak-editor--breakout-fallback-width: calc(\n\t\t100cqw - var(--ak-editor--breakout-full-page-guttering-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\n\t\t/* in full width appearances it's not possible to rely on cqw because it doesn't account for the page scrollbar, which depends on users system settings */\n\t\t--ak-editor--breakout-fallback-width: 100%;\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: ", "px;\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t}\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t/**\n\t * This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24\n\t *\n\t * 1. Merge and Release platform_editor_hide_cursor_when_pm_hideselection\n\t * 2. Cleanup duplicated style from platform_editor_advanced_code_blocks\n\t * https://product-fabric.atlassian.net/browse/ED-26331\n\t */\n\t", "\n\n\t/* This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24 */\n\t", "\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\tcaret-color: transparent;\n\t}\n\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\tdisplay: none;\n\t}\n\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n\n ", "\n\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", ";\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n /* Switch between the two icons based on the visual refresh feature gate */\n\t", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n\n .panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t/* For FullPage only when inside a table\n\tRelated code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\tIn the \"editorContentAreaContainerStyle\" function */\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar,\n\t.", " {\n\t\tpadding: 0;\n\t}\n\n\t/* Legacy Link icon in the Atlaskit package\n is bigger than the others, new ADS icon does not have this issue\n */\n\t", "\n"])), _editorSharedStyles.akEditorGutterPadding, (0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), _editorSharedStyles.akEditorDefaultLayoutWidth, _editorSharedStyles.akEditorFullWidthLayoutWidth, _editorSharedStyles.akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, _editorSharedStyles.akEditorCalculatedWideLayoutWidth, (0, _editorSharedStyles.editorFontSize)({
|
|
171
|
+
return (0, _react2.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: ", "px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t--ak-editor--breakout-fallback-width: calc(\n\t\t100cqw - var(--ak-editor--breakout-full-page-guttering-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\n\t\t/* in full width appearances it's not possible to rely on cqw because it doesn't account for the page scrollbar, which depends on users system settings */\n\t\t--ak-editor--breakout-fallback-width: 100%;\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t", "\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: ", "px;\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t}\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t/**\n\t * This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24\n\t *\n\t * 1. Merge and Release platform_editor_hide_cursor_when_pm_hideselection\n\t * 2. Cleanup duplicated style from platform_editor_advanced_code_blocks\n\t * https://product-fabric.atlassian.net/browse/ED-26331\n\t */\n\t", "\n\n\t/* This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24 */\n\t", "\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\tcaret-color: transparent;\n\t}\n\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\tdisplay: none;\n\t}\n\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n\n ", "\n\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", ";\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n /* Switch between the two icons based on the visual refresh feature gate */\n\t", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n\n .panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t/* For FullPage only when inside a table\n\tRelated code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\tIn the \"editorContentAreaContainerStyle\" function */\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar,\n\t.", " {\n\t\tpadding: 0;\n\t}\n\n\t/* Legacy Link icon in the Atlaskit package\n is bigger than the others, new ADS icon does not have this issue\n */\n\t", "\n"])), _editorSharedStyles.akEditorGutterPadding, (0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), _editorSharedStyles.akEditorDefaultLayoutWidth, _editorSharedStyles.akEditorFullWidthLayoutWidth, _editorSharedStyles.akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, _editorSharedStyles.akEditorCalculatedWideLayoutWidth, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? (0, _react2.css)(_templateObject0 || (_templateObject0 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t\t\t\t@container editor-area (max-width: ", "px) {\n\t\t\t\t\t--ak-editor--large-gutter-padding: ", "px;\n\t\t\t\t}\n\t\t\t"])), _editorSharedStyles.akEditorFullPageNarrowBreakout, _editorSharedStyles.akEditorGutterPaddingReduced) : null, (0, _editorSharedStyles.editorFontSize)({
|
|
172
172
|
theme: props.theme
|
|
173
|
-
}), _styles.whitespaceSharedStyles, (0, _styles.paragraphSharedStyles)(props.typographyTheme), _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor_hide_cursor_when_pm_hideselection') ? (0, _react2.css)(
|
|
173
|
+
}), _styles.whitespaceSharedStyles, (0, _styles.paragraphSharedStyles)(props.typographyTheme), _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.shadowSharedStyle, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor_hide_cursor_when_pm_hideselection') ? (0, _react2.css)(_templateObject1 || (_templateObject1 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, (0, _experiments.editorExperiment)('platform_editor_advanced_code_blocks', true) ? (0, _react2.css)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, "var(--ds-border-focused, #8cf)", firstFloatingToolbarButtonStyles, _styles5.placeholderTextStyles, (0, _platformFeatureFlags.fg)('platform_editor_system_fake_text_highlight_colour') && _styles5.placeholderTextStyles_fg_platform_editor_system_fake_text_highlight_colour, placeholderStyles, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_quick_insert_placeholder') ? placeholderWrapStyles : null, (0, _codeBlock.codeBlockStyles)(), (0, _styles2.blocktypeStyles)(props.typographyTheme), (0, _styles.codeMarkSharedStyles)(), _styles.textColorStyles, (0, _styles.backgroundColorStyles)(), listsStyles, ruleStyles(), (0, _media.mediaStyles)(), (0, _layout.layoutStyles)(props.viewMode), (0, _platformFeatureFlags.fg)('confluence_team_presence_scroll_to_pointer') ? _collab.telepointerStyle : _collab.telepointerStyleWithInitialOnly, _selection.gapCursorStyles, (0, _panel2.panelStyles)(), mentionsStyles, mentionNodeStyles, (0, _platformFeatureFlags.fg)('platform_editor_centre_mention_padding') && mentionNodeStylesMixin_fg_platform_editor_centre_mention_padding, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_find_and_replace_improvements', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_improvements_1') ? mentionsSelectionStylesWithSearchMatch : mentionSelectionStyles, emojiStyles, _styles.tasksAndDecisionsStyles, _styles.gridStyles, linkStyles, _styles.blockMarksSharedStyles, _styles.dateSharedStyle, _extension.extensionStyles, (0, _expand.expandStyles)(), (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_improvements_1') ? _styles3.findReplaceStylesNewNoImportant : _styles3.findReplaceStylesNew : _styles3.findReplaceStyles, _styles4.textHighlightStyle, _tasksAndDecisions.taskDecisionStyles, _tasksAndDecisions.taskItemStyles, (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && _tasksAndDecisions.taskDecisionIconWithVisualRefresh, !(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') && _tasksAndDecisions.taskDecisionIconWithoutVisualRefresh, (0, _status.statusStyles)(), (0, _status.statusNodeStyles)(), (0, _styles.annotationSharedStyles)(), (0, _styles.smartCardStyles)(), (0, _styles.getSmartCardSharedStyles)(), _date.dateStyles, _date.dateNodeStyles, (0, _styles.embedCardStyles)(), _styles.unsupportedStyles, _styles.resizerStyles, (0, _styles.pragmaticResizerStyles)(), (0, _styles.pragmaticStylesLayoutFirstNodeResizeHandleFix)(), (0, _styles.pragmaticResizerStylesForTooltip)(), (0, _aiPanels.aiPanelStyles)(props.colorMode), firstBlockNodeStylesNew, (0, _platformFeatureFlags.fg)('platform_editor_vanilla_codebidi_warning') && _codeBidiWarning.codeBidiWarningStyles, _styles.MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT, !(0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') ? (0, _react2.css)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.hyperlink-open-link {\n\t\t\t\t\tmin-width: 24px;\n\t\t\t\t\tsvg {\n\t\t\t\t\t\tmax-width: 18px;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t"]))) : null);
|
|
174
174
|
};
|
|
175
175
|
var createEditorContentStyle = exports.createEditorContentStyle = function createEditorContentStyle(styles) {
|
|
176
176
|
return /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
@@ -90,6 +90,19 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
90
90
|
colorMode = _useThemeObserver.colorMode;
|
|
91
91
|
var isFullPage = appearance === 'full-page' || appearance === 'full-width';
|
|
92
92
|
var isComment = appearance === 'comment';
|
|
93
|
+
var style = (0, _expValEquals.expValEquals)('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? {
|
|
94
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
95
|
+
'--ak-editor-base-font-size': "".concat((0, _editorSharedStyles.editorFontSize)({
|
|
96
|
+
theme: theme
|
|
97
|
+
}), "px")
|
|
98
|
+
} : {
|
|
99
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
100
|
+
'--ak-editor-base-font-size': "".concat((0, _editorSharedStyles.editorFontSize)({
|
|
101
|
+
theme: theme
|
|
102
|
+
}), "px"),
|
|
103
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
104
|
+
'--ak-editor--large-gutter-padding': "".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px")
|
|
105
|
+
};
|
|
93
106
|
return (0, _react2.jsx)("div", {
|
|
94
107
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
95
108
|
className: className,
|
|
@@ -97,6 +110,14 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
97
110
|
css: [
|
|
98
111
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
99
112
|
_baseStyles.baseStyles,
|
|
113
|
+
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
114
|
+
(0, _platformFeatureFlags.fg)('platform_editor_controls_increase_full_page_gutter') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ?
|
|
115
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
116
|
+
_baseStyles.editorLargeGutterPuddingBaseStylesEditorControls :
|
|
117
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
118
|
+
_baseStyles.editorLargeGutterPuddingBaseStyles, (0, _expValEquals.expValEquals)('platform_editor_preview_panel_responsiveness', 'isEnabled', true) &&
|
|
119
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
120
|
+
_baseStyles.editorLargeGutterPuddingReducedBaseStyles,
|
|
100
121
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
101
122
|
_whitespaceStyles.whitespaceStyles,
|
|
102
123
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -342,15 +363,10 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
342
363
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
343
364
|
(0, _platformFeatureFlags.fg)('platform_editor_vanilla_codebidi_warning') && _codeBidiWarningStyles.codeBidiWarningStyles],
|
|
344
365
|
"data-editor-scroll-container": isScrollable ? 'true' : undefined,
|
|
345
|
-
"data-testid": "editor-content-container"
|
|
346
|
-
style
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
theme: theme
|
|
350
|
-
}), "px"),
|
|
351
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
352
|
-
'--ak-editor--large-gutter-padding': "".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px")
|
|
353
|
-
}
|
|
366
|
+
"data-testid": "editor-content-container"
|
|
367
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
368
|
+
,
|
|
369
|
+
style: style
|
|
354
370
|
}, children);
|
|
355
371
|
});
|
|
356
372
|
var _default = exports.default = EditorContentContainer;
|
|
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.baseStyles = void 0;
|
|
7
|
+
exports.editorLargeGutterPuddingReducedBaseStyles = exports.editorLargeGutterPuddingBaseStylesEditorControls = exports.editorLargeGutterPuddingBaseStyles = exports.baseStyles = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _react = require("@emotion/react");
|
|
10
10
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
@@ -18,6 +18,8 @@ var akEditorDefaultLayoutWidth = 760;
|
|
|
18
18
|
var akEditorFullWidthLayoutWidth = 1800;
|
|
19
19
|
// The breakpoint for small devices is 1266px, copied from getBreakpoint in platform/packages/editor/editor-common/src/ui/WidthProvider/index.tsx
|
|
20
20
|
var akEditorBreakpointForSmallDevice = "1266px";
|
|
21
|
+
var akEditorGutterPaddingReduced = 24;
|
|
22
|
+
var akEditorFullPageNarrowBreakout = 768;
|
|
21
23
|
|
|
22
24
|
// jest warning: JSDOM version (22) doesn't support the new @container CSS rule
|
|
23
25
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -53,4 +55,21 @@ var baseStyles = exports.baseStyles = (0, _react.css)((0, _defineProperty2.defau
|
|
|
53
55
|
'.ProseMirror': {
|
|
54
56
|
'--ak-editor--breakout-wide-layout-width': "".concat(akEditorCalculatedWideLayoutWidth, "px")
|
|
55
57
|
}
|
|
58
|
+
}));
|
|
59
|
+
|
|
60
|
+
// This is to avoid using akEditorGutterPaddingDynamic()
|
|
61
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
62
|
+
var editorLargeGutterPuddingBaseStyles = exports.editorLargeGutterPuddingBaseStyles = (0, _react.css)({
|
|
63
|
+
'--ak-editor--large-gutter-padding': '52px'
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
// This is to avoid using akEditorGutterPaddingDynamic
|
|
67
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
68
|
+
var editorLargeGutterPuddingBaseStylesEditorControls = exports.editorLargeGutterPuddingBaseStylesEditorControls = (0, _react.css)({
|
|
69
|
+
'--ak-editor--large-gutter-padding': '72px'
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
73
|
+
var editorLargeGutterPuddingReducedBaseStyles = exports.editorLargeGutterPuddingReducedBaseStyles = (0, _react.css)((0, _defineProperty2.default)({}, "@container editor-area (max-width: ".concat(akEditorFullPageNarrowBreakout, "px)"), {
|
|
74
|
+
'--ak-editor--large-gutter-padding': "".concat(akEditorGutterPaddingReduced, "px")
|
|
56
75
|
}));
|
|
@@ -96,7 +96,7 @@ export const FullPageEditor = props => {
|
|
|
96
96
|
disabled: !fg('platform_editor_use_preferences_plugin')
|
|
97
97
|
}) || {};
|
|
98
98
|
if (!fg('platform_editor_use_preferences_plugin')) {
|
|
99
|
-
if (!toolbarDocking
|
|
99
|
+
if (!toolbarDocking) {
|
|
100
100
|
var _editorAPI$selectionT, _editorAPI$selectionT2, _editorAPI$selectionT3;
|
|
101
101
|
// This is a workaround for the rendering issue with the selection toolbar
|
|
102
102
|
// where using useSharedPluginStateSelector or useSharedPluginState the state are not
|
|
@@ -124,21 +124,13 @@ export const FullPageEditor = props => {
|
|
|
124
124
|
isEditorToolbarHidden = true;
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
|
-
} else
|
|
127
|
+
} else {
|
|
128
128
|
if (toolbarDocking === 'none') {
|
|
129
129
|
primaryToolbarComponents = [];
|
|
130
130
|
if (!hasCustomComponents(customPrimaryToolbarComponents)) {
|
|
131
131
|
isEditorToolbarHidden = true;
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
|
-
} else {
|
|
135
|
-
var _primaryToolbarCompon;
|
|
136
|
-
if (toolbarDocking !== 'top') {
|
|
137
|
-
primaryToolbarComponents = [];
|
|
138
|
-
}
|
|
139
|
-
if (!((_primaryToolbarCompon = primaryToolbarComponents) !== null && _primaryToolbarCompon !== void 0 && _primaryToolbarCompon.length) && !hasCustomComponents(customPrimaryToolbarComponents)) {
|
|
140
|
-
isEditorToolbarHidden = true;
|
|
141
|
-
}
|
|
142
134
|
}
|
|
143
135
|
}
|
|
144
136
|
const popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 ? void 0 : (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.containerArea) || undefined;
|
|
@@ -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, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
|
|
15
|
+
import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout } 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';
|
|
@@ -176,11 +176,24 @@ const contentAreaReducedHeaderSpace = css({
|
|
|
176
176
|
paddingTop: "var(--ds-space-400, 32px)"
|
|
177
177
|
});
|
|
178
178
|
const editorContentGutterStyle = () => {
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
179
|
+
if (expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true)) {
|
|
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
|
+
}
|
|
184
197
|
};
|
|
185
198
|
|
|
186
199
|
// new styles
|
|
@@ -279,6 +292,13 @@ const editorContentGutterStyles = css({
|
|
|
279
292
|
boxSizing: 'border-box',
|
|
280
293
|
padding: '0 52px'
|
|
281
294
|
});
|
|
295
|
+
const editorContentReducedGutterStyles = css({
|
|
296
|
+
// 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
|
|
297
|
+
[`@container editor-area (max-width: ${akEditorFullPageNarrowBreakout}px)`]: {
|
|
298
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
299
|
+
padding: `0 ${akEditorGutterPaddingReduced}px`
|
|
300
|
+
}
|
|
301
|
+
});
|
|
282
302
|
const contentAreaNew = css({
|
|
283
303
|
display: 'flex',
|
|
284
304
|
flexDirection: 'row',
|
|
@@ -395,7 +415,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
395
415
|
}, jsx("div", {
|
|
396
416
|
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentGutterStyles,
|
|
397
417
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
398
|
-
fg('platform_editor_controls_increase_full_page_gutter') && editorExperiment('platform_editor_controls', 'variant1') && editorContentGutterStyleFG] : [
|
|
418
|
+
fg('platform_editor_controls_increase_full_page_gutter') && editorExperiment('platform_editor_controls', 'variant1') && editorContentGutterStyleFG, expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) && editorContentReducedGutterStyles] : [
|
|
399
419
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
400
420
|
editorContentGutterStyle()]
|
|
401
421
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -22,7 +22,7 @@ import { blocktypeStyles } from '@atlaskit/editor-plugins/block-type/styles';
|
|
|
22
22
|
import { findReplaceStyles, findReplaceStylesNew, findReplaceStylesNewNoImportant } from '@atlaskit/editor-plugins/find-replace/styles';
|
|
23
23
|
import { textHighlightStyle } from '@atlaskit/editor-plugins/paste-options-toolbar/styles';
|
|
24
24
|
import { placeholderTextStyles, placeholderTextStyles_fg_platform_editor_system_fake_text_highlight_colour } from '@atlaskit/editor-plugins/placeholder-text/styles';
|
|
25
|
-
import { SelectionStyle, akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorDefaultLayoutWidth, akEditorDeleteBackgroundWithOpacity, akEditorDeleteBorder, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic, akEditorSelectedBorderColor, akEditorSelectedBorderSize, akEditorSelectedNodeClassName, blockNodesVerticalMargin, editorFontSize, getSelectionStyles } from '@atlaskit/editor-shared-styles';
|
|
25
|
+
import { SelectionStyle, akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorDefaultLayoutWidth, akEditorDeleteBackgroundWithOpacity, akEditorDeleteBorder, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout, akEditorSelectedBorderColor, akEditorSelectedBorderSize, akEditorSelectedNodeClassName, blockNodesVerticalMargin, editorFontSize, getSelectionStyles } from '@atlaskit/editor-shared-styles';
|
|
26
26
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
27
27
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
28
28
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
@@ -353,6 +353,13 @@ const legacyContentStyles = props => css`
|
|
|
353
353
|
}
|
|
354
354
|
}
|
|
355
355
|
|
|
356
|
+
${expValEqualsNoExposure('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? css`
|
|
357
|
+
/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */
|
|
358
|
+
@container editor-area (max-width: ${akEditorFullPageNarrowBreakout}px) {
|
|
359
|
+
--ak-editor--large-gutter-padding: ${akEditorGutterPaddingReduced}px;
|
|
360
|
+
}
|
|
361
|
+
` : null}
|
|
362
|
+
|
|
356
363
|
.ProseMirror {
|
|
357
364
|
outline: none;
|
|
358
365
|
font-size: ${editorFontSize({
|
|
@@ -18,7 +18,7 @@ import { useThemeObserver } from '@atlaskit/tokens';
|
|
|
18
18
|
import { aiPanelBaseFirefoxStyles, aiPanelBaseStyles, aiPanelDarkFirefoxStyles, aiPanelDarkStyles } from './styles/aiPanel';
|
|
19
19
|
import { annotationStyles } from './styles/annotationStyles';
|
|
20
20
|
import { backgroundColorStyles } from './styles/backgroundColorStyles';
|
|
21
|
-
import { baseStyles } from './styles/baseStyles';
|
|
21
|
+
import { baseStyles, editorLargeGutterPuddingBaseStyles, editorLargeGutterPuddingBaseStylesEditorControls, editorLargeGutterPuddingReducedBaseStyles } from './styles/baseStyles';
|
|
22
22
|
import { blockMarksStyles } from './styles/blockMarksStyles';
|
|
23
23
|
import { blocktypeStyles, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
|
|
24
24
|
import { codeBidiWarningStyles } from './styles/codeBidiWarningStyles';
|
|
@@ -85,6 +85,19 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
85
85
|
} = useThemeObserver();
|
|
86
86
|
const isFullPage = appearance === 'full-page' || appearance === 'full-width';
|
|
87
87
|
const isComment = appearance === 'comment';
|
|
88
|
+
const style = expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? {
|
|
89
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
90
|
+
'--ak-editor-base-font-size': `${editorFontSize({
|
|
91
|
+
theme
|
|
92
|
+
})}px`
|
|
93
|
+
} : {
|
|
94
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
95
|
+
'--ak-editor-base-font-size': `${editorFontSize({
|
|
96
|
+
theme
|
|
97
|
+
})}px`,
|
|
98
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
99
|
+
'--ak-editor--large-gutter-padding': `${akEditorGutterPaddingDynamic()}px`
|
|
100
|
+
};
|
|
88
101
|
return jsx("div", {
|
|
89
102
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
90
103
|
className: className,
|
|
@@ -92,6 +105,14 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
92
105
|
css: [
|
|
93
106
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
94
107
|
baseStyles,
|
|
108
|
+
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
109
|
+
fg('platform_editor_controls_increase_full_page_gutter') && editorExperiment('platform_editor_controls', 'variant1') ?
|
|
110
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
111
|
+
editorLargeGutterPuddingBaseStylesEditorControls :
|
|
112
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
113
|
+
editorLargeGutterPuddingBaseStyles, expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) &&
|
|
114
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
115
|
+
editorLargeGutterPuddingReducedBaseStyles,
|
|
95
116
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
96
117
|
whitespaceStyles,
|
|
97
118
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -337,15 +358,10 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
337
358
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
338
359
|
fg('platform_editor_vanilla_codebidi_warning') && codeBidiWarningStyles],
|
|
339
360
|
"data-editor-scroll-container": isScrollable ? 'true' : undefined,
|
|
340
|
-
"data-testid": "editor-content-container"
|
|
341
|
-
style
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
theme
|
|
345
|
-
})}px`,
|
|
346
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
347
|
-
'--ak-editor--large-gutter-padding': `${akEditorGutterPaddingDynamic()}px`
|
|
348
|
-
}
|
|
361
|
+
"data-testid": "editor-content-container"
|
|
362
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
363
|
+
,
|
|
364
|
+
style: style
|
|
349
365
|
}, children);
|
|
350
366
|
});
|
|
351
367
|
export default EditorContentContainer;
|
|
@@ -10,6 +10,8 @@ const akEditorDefaultLayoutWidth = 760;
|
|
|
10
10
|
const akEditorFullWidthLayoutWidth = 1800;
|
|
11
11
|
// The breakpoint for small devices is 1266px, copied from getBreakpoint in platform/packages/editor/editor-common/src/ui/WidthProvider/index.tsx
|
|
12
12
|
const akEditorBreakpointForSmallDevice = `1266px`;
|
|
13
|
+
const akEditorGutterPaddingReduced = 24;
|
|
14
|
+
const akEditorFullPageNarrowBreakout = 768;
|
|
13
15
|
|
|
14
16
|
// jest warning: JSDOM version (22) doesn't support the new @container CSS rule
|
|
15
17
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -48,4 +50,24 @@ export const baseStyles = css({
|
|
|
48
50
|
'--ak-editor--breakout-wide-layout-width': `${akEditorCalculatedWideLayoutWidth}px`
|
|
49
51
|
}
|
|
50
52
|
}
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
// This is to avoid using akEditorGutterPaddingDynamic()
|
|
56
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
57
|
+
export const editorLargeGutterPuddingBaseStyles = css({
|
|
58
|
+
'--ak-editor--large-gutter-padding': '52px'
|
|
59
|
+
});
|
|
60
|
+
|
|
61
|
+
// This is to avoid using akEditorGutterPaddingDynamic
|
|
62
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
63
|
+
export const editorLargeGutterPuddingBaseStylesEditorControls = css({
|
|
64
|
+
'--ak-editor--large-gutter-padding': '72px'
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
68
|
+
export const editorLargeGutterPuddingReducedBaseStyles = css({
|
|
69
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-container-queries, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
70
|
+
[`@container editor-area (max-width: ${akEditorFullPageNarrowBreakout}px)`]: {
|
|
71
|
+
'--ak-editor--large-gutter-padding': `${akEditorGutterPaddingReduced}px`
|
|
72
|
+
}
|
|
51
73
|
});
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "209.1.
|
|
2
|
+
export const version = "209.1.8";
|
|
@@ -102,7 +102,7 @@ export var FullPageEditor = function FullPageEditor(props) {
|
|
|
102
102
|
}) || {},
|
|
103
103
|
toolbarDockingPosition = _ref3.toolbarDockingPosition;
|
|
104
104
|
if (!fg('platform_editor_use_preferences_plugin')) {
|
|
105
|
-
if (!toolbarDocking
|
|
105
|
+
if (!toolbarDocking) {
|
|
106
106
|
var _editorAPI$selectionT, _editorAPI$selectionT2;
|
|
107
107
|
// This is a workaround for the rendering issue with the selection toolbar
|
|
108
108
|
// where using useSharedPluginStateSelector or useSharedPluginState the state are not
|
|
@@ -128,21 +128,13 @@ export var FullPageEditor = function FullPageEditor(props) {
|
|
|
128
128
|
isEditorToolbarHidden = true;
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
|
-
} else
|
|
131
|
+
} else {
|
|
132
132
|
if (toolbarDocking === 'none') {
|
|
133
133
|
primaryToolbarComponents = [];
|
|
134
134
|
if (!hasCustomComponents(customPrimaryToolbarComponents)) {
|
|
135
135
|
isEditorToolbarHidden = true;
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
|
-
} else {
|
|
139
|
-
var _primaryToolbarCompon;
|
|
140
|
-
if (toolbarDocking !== 'top') {
|
|
141
|
-
primaryToolbarComponents = [];
|
|
142
|
-
}
|
|
143
|
-
if (!((_primaryToolbarCompon = primaryToolbarComponents) !== null && _primaryToolbarCompon !== void 0 && _primaryToolbarCompon.length) && !hasCustomComponents(customPrimaryToolbarComponents)) {
|
|
144
|
-
isEditorToolbarHidden = true;
|
|
145
|
-
}
|
|
146
138
|
}
|
|
147
139
|
}
|
|
148
140
|
var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.containerArea) || undefined;
|
|
@@ -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, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
|
|
17
|
+
import { FULL_PAGE_EDITOR_TOOLBAR_HEIGHT, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout } 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';
|
|
@@ -183,11 +183,22 @@ var contentAreaReducedHeaderSpace = css({
|
|
|
183
183
|
paddingTop: "var(--ds-space-400, 32px)"
|
|
184
184
|
});
|
|
185
185
|
var editorContentGutterStyle = function editorContentGutterStyle() {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
186
|
+
if (expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true)) {
|
|
187
|
+
return css(_defineProperty({
|
|
188
|
+
boxSizing: 'border-box',
|
|
189
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
190
|
+
padding: "0 ".concat(akEditorGutterPaddingDynamic(), "px")
|
|
191
|
+
}, "@container editor-area (max-width: ".concat(akEditorFullPageNarrowBreakout, "px)"), {
|
|
192
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
193
|
+
padding: "0 ".concat(akEditorGutterPaddingReduced, "px")
|
|
194
|
+
}));
|
|
195
|
+
} else {
|
|
196
|
+
return css({
|
|
197
|
+
boxSizing: 'border-box',
|
|
198
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
199
|
+
padding: "0 ".concat(akEditorGutterPaddingDynamic(), "px")
|
|
200
|
+
});
|
|
201
|
+
}
|
|
191
202
|
};
|
|
192
203
|
|
|
193
204
|
// new styles
|
|
@@ -286,6 +297,10 @@ var editorContentGutterStyles = css({
|
|
|
286
297
|
boxSizing: 'border-box',
|
|
287
298
|
padding: '0 52px'
|
|
288
299
|
});
|
|
300
|
+
var editorContentReducedGutterStyles = css(_defineProperty({}, "@container editor-area (max-width: ".concat(akEditorFullPageNarrowBreakout, "px)"), {
|
|
301
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
302
|
+
padding: "0 ".concat(akEditorGutterPaddingReduced, "px")
|
|
303
|
+
}));
|
|
289
304
|
var contentAreaNew = css({
|
|
290
305
|
display: 'flex',
|
|
291
306
|
flexDirection: 'row',
|
|
@@ -404,7 +419,7 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
404
419
|
}, jsx("div", {
|
|
405
420
|
css: expValEquals('platform_editor_core_static_emotion_non_central', 'isEnabled', true) ? [editorContentGutterStyles,
|
|
406
421
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
407
|
-
fg('platform_editor_controls_increase_full_page_gutter') && editorExperiment('platform_editor_controls', 'variant1') && editorContentGutterStyleFG] : [
|
|
422
|
+
fg('platform_editor_controls_increase_full_page_gutter') && editorExperiment('platform_editor_controls', 'variant1') && editorContentGutterStyleFG, expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) && editorContentReducedGutterStyles] : [
|
|
408
423
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
409
424
|
editorContentGutterStyle()]
|
|
410
425
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
|
|
2
|
-
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject0, _templateObject1, _templateObject10;
|
|
2
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject0, _templateObject1, _templateObject10, _templateObject11;
|
|
3
3
|
/* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
|
|
4
4
|
/* eslint-disable react-hooks/rules-of-hooks */
|
|
5
5
|
/* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- Requires manual remediation over time due to use of unsafe nested mixins */
|
|
@@ -24,7 +24,7 @@ import { blocktypeStyles } from '@atlaskit/editor-plugins/block-type/styles';
|
|
|
24
24
|
import { findReplaceStyles, findReplaceStylesNew, findReplaceStylesNewNoImportant } from '@atlaskit/editor-plugins/find-replace/styles';
|
|
25
25
|
import { textHighlightStyle } from '@atlaskit/editor-plugins/paste-options-toolbar/styles';
|
|
26
26
|
import { placeholderTextStyles, placeholderTextStyles_fg_platform_editor_system_fake_text_highlight_colour } from '@atlaskit/editor-plugins/placeholder-text/styles';
|
|
27
|
-
import { SelectionStyle, akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorDefaultLayoutWidth, akEditorDeleteBackgroundWithOpacity, akEditorDeleteBorder, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic, akEditorSelectedBorderColor, akEditorSelectedBorderSize, akEditorSelectedNodeClassName, blockNodesVerticalMargin, editorFontSize, getSelectionStyles } from '@atlaskit/editor-shared-styles';
|
|
27
|
+
import { SelectionStyle, akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorDefaultLayoutWidth, akEditorDeleteBackgroundWithOpacity, akEditorDeleteBorder, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout, akEditorSelectedBorderColor, akEditorSelectedBorderSize, akEditorSelectedNodeClassName, blockNodesVerticalMargin, editorFontSize, getSelectionStyles } from '@atlaskit/editor-shared-styles';
|
|
28
28
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
29
29
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
30
30
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
@@ -162,9 +162,9 @@ var akEditorBreakpointForSmallDevice = "1266px";
|
|
|
162
162
|
// Under editor experiment platform_editor_core_static_emotion
|
|
163
163
|
// If you are making changes to this file, please make sure to update in EditorContentContainer.tsx as well
|
|
164
164
|
var legacyContentStyles = function legacyContentStyles(props) {
|
|
165
|
-
return css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: ", "px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t--ak-editor--breakout-fallback-width: calc(\n\t\t100cqw - var(--ak-editor--breakout-full-page-guttering-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\n\t\t/* in full width appearances it's not possible to rely on cqw because it doesn't account for the page scrollbar, which depends on users system settings */\n\t\t--ak-editor--breakout-fallback-width: 100%;\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: ", "px;\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t}\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t/**\n\t * This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24\n\t *\n\t * 1. Merge and Release platform_editor_hide_cursor_when_pm_hideselection\n\t * 2. Cleanup duplicated style from platform_editor_advanced_code_blocks\n\t * https://product-fabric.atlassian.net/browse/ED-26331\n\t */\n\t", "\n\n\t/* This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24 */\n\t", "\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\tcaret-color: transparent;\n\t}\n\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\tdisplay: none;\n\t}\n\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n\n ", "\n\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", ";\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n /* Switch between the two icons based on the visual refresh feature gate */\n\t", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n\n .panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t/* For FullPage only when inside a table\n\tRelated code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\tIn the \"editorContentAreaContainerStyle\" function */\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar,\n\t.", " {\n\t\tpadding: 0;\n\t}\n\n\t/* Legacy Link icon in the Atlaskit package\n is bigger than the others, new ADS icon does not have this issue\n */\n\t", "\n"])), akEditorGutterPadding, akEditorGutterPaddingDynamic(), akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, akEditorCalculatedWideLayoutWidth, editorFontSize({
|
|
165
|
+
return css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: ", "px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t--ak-editor--breakout-fallback-width: calc(\n\t\t100cqw - var(--ak-editor--breakout-full-page-guttering-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\n\t\t/* in full width appearances it's not possible to rely on cqw because it doesn't account for the page scrollbar, which depends on users system settings */\n\t\t--ak-editor--breakout-fallback-width: 100%;\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t", "\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: ", "px;\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t}\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t/**\n\t * This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24\n\t *\n\t * 1. Merge and Release platform_editor_hide_cursor_when_pm_hideselection\n\t * 2. Cleanup duplicated style from platform_editor_advanced_code_blocks\n\t * https://product-fabric.atlassian.net/browse/ED-26331\n\t */\n\t", "\n\n\t/* This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24 */\n\t", "\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\tcaret-color: transparent;\n\t}\n\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\tdisplay: none;\n\t}\n\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n\n ", "\n\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", ";\n\t", "\n\t", "\n\t", "\n\t", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n /* Switch between the two icons based on the visual refresh feature gate */\n\t", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n ", "\n\t", "\n\n .panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t/* For FullPage only when inside a table\n\tRelated code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\tIn the \"editorContentAreaContainerStyle\" function */\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar,\n\t.", " {\n\t\tpadding: 0;\n\t}\n\n\t/* Legacy Link icon in the Atlaskit package\n is bigger than the others, new ADS icon does not have this issue\n */\n\t", "\n"])), akEditorGutterPadding, akEditorGutterPaddingDynamic(), akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, akEditorCalculatedWideLayoutWidth, expValEqualsNoExposure('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? css(_templateObject0 || (_templateObject0 = _taggedTemplateLiteral(["\n\t\t\t\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t\t\t\t@container editor-area (max-width: ", "px) {\n\t\t\t\t\t--ak-editor--large-gutter-padding: ", "px;\n\t\t\t\t}\n\t\t\t"])), akEditorFullPageNarrowBreakout, akEditorGutterPaddingReduced) : null, editorFontSize({
|
|
166
166
|
theme: props.theme
|
|
167
|
-
}), whitespaceSharedStyles, paragraphSharedStyles(props.typographyTheme), listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, fg('platform_editor_hide_cursor_when_pm_hideselection') ? css(
|
|
167
|
+
}), whitespaceSharedStyles, paragraphSharedStyles(props.typographyTheme), listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, fg('platform_editor_hide_cursor_when_pm_hideselection') ? css(_templateObject1 || (_templateObject1 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, editorExperiment('platform_editor_advanced_code_blocks', true) ? css(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, "var(--ds-border-focused, #8cf)", firstFloatingToolbarButtonStyles, placeholderTextStyles, fg('platform_editor_system_fake_text_highlight_colour') && placeholderTextStyles_fg_platform_editor_system_fake_text_highlight_colour, placeholderStyles, editorExperiment('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null, editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_quick_insert_placeholder') ? placeholderWrapStyles : null, codeBlockStyles(), blocktypeStyles(props.typographyTheme), codeMarkSharedStyles(), textColorStyles, backgroundColorStyles(), listsStyles, ruleStyles(), mediaStyles(), layoutStyles(props.viewMode), fg('confluence_team_presence_scroll_to_pointer') ? telepointerStyle : telepointerStyleWithInitialOnly, gapCursorStyles, panelStyles(), mentionsStyles, mentionNodeStyles, fg('platform_editor_centre_mention_padding') && mentionNodeStylesMixin_fg_platform_editor_centre_mention_padding, expValEqualsNoExposure('platform_editor_find_and_replace_improvements', 'isEnabled', true) && fg('platform_editor_find_and_replace_improvements_1') ? mentionsSelectionStylesWithSearchMatch : mentionSelectionStyles, emojiStyles, tasksAndDecisionsStyles, gridStyles, linkStyles, blockMarksSharedStyles, dateSharedStyle, extensionStyles, expandStyles(), expValEqualsNoExposure('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? fg('platform_editor_find_and_replace_improvements_1') ? findReplaceStylesNewNoImportant : findReplaceStylesNew : findReplaceStyles, textHighlightStyle, taskDecisionStyles, taskItemStyles, fg('platform-visual-refresh-icons') && decisionIconWithVisualRefresh, !fg('platform-visual-refresh-icons') && decisionIconWithoutVisualRefresh, statusStyles(), statusNodeStyles(), annotationSharedStyles(), smartCardStyles(), getSmartCardSharedStyles(), dateStyles, dateNodeStyles, embedCardStyles(), unsupportedStyles, resizerStyles, pragmaticResizerStyles(), pragmaticStylesLayoutFirstNodeResizeHandleFix(), pragmaticResizerStylesForTooltip(), aiPanelStyles(props.colorMode), firstBlockNodeStylesNew, fg('platform_editor_vanilla_codebidi_warning') && codeBidiWarningStyles, MediaSharedClassNames.FLOATING_TOOLBAR_COMPONENT, !fg('platform-visual-refresh-icons') ? css(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n\t\t\t\t.hyperlink-open-link {\n\t\t\t\t\tmin-width: 24px;\n\t\t\t\t\tsvg {\n\t\t\t\t\t\tmax-width: 18px;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t"]))) : null);
|
|
168
168
|
};
|
|
169
169
|
export var createEditorContentStyle = function createEditorContentStyle(styles) {
|
|
170
170
|
return /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
@@ -18,7 +18,7 @@ import { useThemeObserver } from '@atlaskit/tokens';
|
|
|
18
18
|
import { aiPanelBaseFirefoxStyles, aiPanelBaseStyles, aiPanelDarkFirefoxStyles, aiPanelDarkStyles } from './styles/aiPanel';
|
|
19
19
|
import { annotationStyles } from './styles/annotationStyles';
|
|
20
20
|
import { backgroundColorStyles } from './styles/backgroundColorStyles';
|
|
21
|
-
import { baseStyles } from './styles/baseStyles';
|
|
21
|
+
import { baseStyles, editorLargeGutterPuddingBaseStyles, editorLargeGutterPuddingBaseStylesEditorControls, editorLargeGutterPuddingReducedBaseStyles } from './styles/baseStyles';
|
|
22
22
|
import { blockMarksStyles } from './styles/blockMarksStyles';
|
|
23
23
|
import { blocktypeStyles, blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, blocktypeStyles_fg_platform_editor_typography_ugc, blocktypeStyles_without_fg_platform_editor_typography_ugc } from './styles/blockTypeStyles';
|
|
24
24
|
import { codeBidiWarningStyles } from './styles/codeBidiWarningStyles';
|
|
@@ -82,6 +82,19 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
82
82
|
colorMode = _useThemeObserver.colorMode;
|
|
83
83
|
var isFullPage = appearance === 'full-page' || appearance === 'full-width';
|
|
84
84
|
var isComment = appearance === 'comment';
|
|
85
|
+
var style = expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) ? {
|
|
86
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
87
|
+
'--ak-editor-base-font-size': "".concat(editorFontSize({
|
|
88
|
+
theme: theme
|
|
89
|
+
}), "px")
|
|
90
|
+
} : {
|
|
91
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
92
|
+
'--ak-editor-base-font-size': "".concat(editorFontSize({
|
|
93
|
+
theme: theme
|
|
94
|
+
}), "px"),
|
|
95
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
96
|
+
'--ak-editor--large-gutter-padding': "".concat(akEditorGutterPaddingDynamic(), "px")
|
|
97
|
+
};
|
|
85
98
|
return jsx("div", {
|
|
86
99
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
87
100
|
className: className,
|
|
@@ -89,6 +102,14 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
89
102
|
css: [
|
|
90
103
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
91
104
|
baseStyles,
|
|
105
|
+
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
106
|
+
fg('platform_editor_controls_increase_full_page_gutter') && editorExperiment('platform_editor_controls', 'variant1') ?
|
|
107
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
108
|
+
editorLargeGutterPuddingBaseStylesEditorControls :
|
|
109
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
110
|
+
editorLargeGutterPuddingBaseStyles, expValEquals('platform_editor_preview_panel_responsiveness', 'isEnabled', true) &&
|
|
111
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
112
|
+
editorLargeGutterPuddingReducedBaseStyles,
|
|
92
113
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
93
114
|
whitespaceStyles,
|
|
94
115
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -334,15 +355,10 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
334
355
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
335
356
|
fg('platform_editor_vanilla_codebidi_warning') && codeBidiWarningStyles],
|
|
336
357
|
"data-editor-scroll-container": isScrollable ? 'true' : undefined,
|
|
337
|
-
"data-testid": "editor-content-container"
|
|
338
|
-
style
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
theme: theme
|
|
342
|
-
}), "px"),
|
|
343
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
344
|
-
'--ak-editor--large-gutter-padding': "".concat(akEditorGutterPaddingDynamic(), "px")
|
|
345
|
-
}
|
|
358
|
+
"data-testid": "editor-content-container"
|
|
359
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
360
|
+
,
|
|
361
|
+
style: style
|
|
346
362
|
}, children);
|
|
347
363
|
});
|
|
348
364
|
export default EditorContentContainer;
|
|
@@ -11,6 +11,8 @@ var akEditorDefaultLayoutWidth = 760;
|
|
|
11
11
|
var akEditorFullWidthLayoutWidth = 1800;
|
|
12
12
|
// The breakpoint for small devices is 1266px, copied from getBreakpoint in platform/packages/editor/editor-common/src/ui/WidthProvider/index.tsx
|
|
13
13
|
var akEditorBreakpointForSmallDevice = "1266px";
|
|
14
|
+
var akEditorGutterPaddingReduced = 24;
|
|
15
|
+
var akEditorFullPageNarrowBreakout = 768;
|
|
14
16
|
|
|
15
17
|
// jest warning: JSDOM version (22) doesn't support the new @container CSS rule
|
|
16
18
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -46,4 +48,21 @@ export var baseStyles = css(_defineProperty({
|
|
|
46
48
|
'.ProseMirror': {
|
|
47
49
|
'--ak-editor--breakout-wide-layout-width': "".concat(akEditorCalculatedWideLayoutWidth, "px")
|
|
48
50
|
}
|
|
51
|
+
}));
|
|
52
|
+
|
|
53
|
+
// This is to avoid using akEditorGutterPaddingDynamic()
|
|
54
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
55
|
+
export var editorLargeGutterPuddingBaseStyles = css({
|
|
56
|
+
'--ak-editor--large-gutter-padding': '52px'
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
// This is to avoid using akEditorGutterPaddingDynamic
|
|
60
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
61
|
+
export var editorLargeGutterPuddingBaseStylesEditorControls = css({
|
|
62
|
+
'--ak-editor--large-gutter-padding': '72px'
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
66
|
+
export var editorLargeGutterPuddingReducedBaseStyles = css(_defineProperty({}, "@container editor-area (max-width: ".concat(akEditorFullPageNarrowBreakout, "px)"), {
|
|
67
|
+
'--ak-editor--large-gutter-padding': "".concat(akEditorGutterPaddingReduced, "px")
|
|
49
68
|
}));
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "209.1.
|
|
2
|
+
export var version = "209.1.8";
|
|
@@ -1 +1,4 @@
|
|
|
1
1
|
export declare const baseStyles: import("@emotion/react").SerializedStyles;
|
|
2
|
+
export declare const editorLargeGutterPuddingBaseStyles: import("@emotion/react").SerializedStyles;
|
|
3
|
+
export declare const editorLargeGutterPuddingBaseStylesEditorControls: import("@emotion/react").SerializedStyles;
|
|
4
|
+
export declare const editorLargeGutterPuddingReducedBaseStyles: import("@emotion/react").SerializedStyles;
|
|
@@ -1 +1,4 @@
|
|
|
1
1
|
export declare const baseStyles: import("@emotion/react").SerializedStyles;
|
|
2
|
+
export declare const editorLargeGutterPuddingBaseStyles: import("@emotion/react").SerializedStyles;
|
|
3
|
+
export declare const editorLargeGutterPuddingBaseStylesEditorControls: import("@emotion/react").SerializedStyles;
|
|
4
|
+
export declare const editorLargeGutterPuddingReducedBaseStyles: import("@emotion/react").SerializedStyles;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "209.1.
|
|
3
|
+
"version": "209.1.9",
|
|
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-plugin-user-preferences": "^1.1.0",
|
|
52
52
|
"@atlaskit/editor-plugins": "^9.4.0",
|
|
53
53
|
"@atlaskit/editor-prosemirror": "7.0.0",
|
|
54
|
-
"@atlaskit/editor-shared-styles": "^3.
|
|
54
|
+
"@atlaskit/editor-shared-styles": "^3.5.0",
|
|
55
55
|
"@atlaskit/emoji": "^69.3.0",
|
|
56
56
|
"@atlaskit/icon": "^27.3.0",
|
|
57
57
|
"@atlaskit/link": "^3.2.0",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"@atlaskit/platform-feature-flags-react": "^0.2.0",
|
|
62
62
|
"@atlaskit/react-ufo": "^4.0.0",
|
|
63
63
|
"@atlaskit/task-decision": "^19.2.0",
|
|
64
|
-
"@atlaskit/tmp-editor-statsig": "^9.
|
|
64
|
+
"@atlaskit/tmp-editor-statsig": "^9.8.0",
|
|
65
65
|
"@atlaskit/tokens": "^5.5.0",
|
|
66
66
|
"@atlaskit/tooltip": "^20.3.0",
|
|
67
67
|
"@atlaskit/width-detector": "^5.0.0",
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
"@atlaskit/primitives": "^14.10.0",
|
|
105
105
|
"@atlaskit/renderer": "^120.1.0",
|
|
106
106
|
"@atlaskit/section-message": "^8.2.0",
|
|
107
|
-
"@atlaskit/smart-card": "^40.
|
|
107
|
+
"@atlaskit/smart-card": "^40.2.0",
|
|
108
108
|
"@atlaskit/synchrony-test-helpers": "workspace:^",
|
|
109
109
|
"@atlaskit/toggle": "^15.0.0",
|
|
110
110
|
"@atlaskit/util-data-test": "^18.0.0",
|
|
@@ -511,10 +511,6 @@
|
|
|
511
511
|
"type": "boolean",
|
|
512
512
|
"referenceOnly": true
|
|
513
513
|
},
|
|
514
|
-
"platform_editor_controls_toolbar_ssr_fix": {
|
|
515
|
-
"type": "boolean",
|
|
516
|
-
"referenceOnly": true
|
|
517
|
-
},
|
|
518
514
|
"platform_editor_refactor_view_more": {
|
|
519
515
|
"type": "boolean",
|
|
520
516
|
"referenceOnly": true
|