@atlaskit/editor-core 220.1.0 → 220.1.1
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 +8 -0
- package/dist/cjs/composable-editor/BaseThemeWrapper.js +24 -5
- package/dist/cjs/composable-editor/editor-internal-compiled.js +5 -1
- package/dist/cjs/composable-editor/editor-internal-emotion.js +6 -2
- package/dist/cjs/composable-editor/editor-internal.js +11 -2
- package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +2 -1
- package/dist/cjs/ui/EditorContentContainer/EditorContentContainer-compiled.js +15 -21
- package/dist/cjs/ui/EditorContentContainer/EditorContentContainer-emotion.js +12 -17
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/composable-editor/BaseThemeWrapper.js +19 -3
- package/dist/es2019/composable-editor/editor-internal-compiled.js +5 -1
- package/dist/es2019/composable-editor/editor-internal-emotion.js +6 -2
- package/dist/es2019/composable-editor/editor-internal.js +11 -2
- package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +3 -2
- package/dist/es2019/ui/EditorContentContainer/EditorContentContainer-compiled.js +14 -19
- package/dist/es2019/ui/EditorContentContainer/EditorContentContainer-emotion.js +17 -14
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/composable-editor/BaseThemeWrapper.js +23 -4
- package/dist/esm/composable-editor/editor-internal-compiled.js +5 -1
- package/dist/esm/composable-editor/editor-internal-emotion.js +6 -2
- package/dist/esm/composable-editor/editor-internal.js +11 -2
- package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +3 -2
- package/dist/esm/ui/EditorContentContainer/EditorContentContainer-compiled.js +18 -21
- package/dist/esm/ui/EditorContentContainer/EditorContentContainer-emotion.js +11 -11
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/composable-editor/BaseThemeWrapper.d.ts +1 -1
- package/dist/types/composable-editor/editor-internal-compiled.d.ts +2 -1
- package/dist/types/composable-editor/editor-internal-emotion.d.ts +2 -1
- package/dist/types-ts4.5/composable-editor/BaseThemeWrapper.d.ts +1 -1
- package/dist/types-ts4.5/composable-editor/editor-internal-compiled.d.ts +2 -1
- package/dist/types-ts4.5/composable-editor/editor-internal-emotion.d.ts +2 -1
- package/package.json +11 -11
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 220.1.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`4c44277d90774`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4c44277d90774) -
|
|
8
|
+
depreciate theme in editor
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
3
11
|
## 220.1.0
|
|
4
12
|
|
|
5
13
|
### Minor Changes
|
|
@@ -4,18 +4,31 @@ var _typeof = require("@babel/runtime/helpers/typeof");
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.BaseThemeWrapper =
|
|
7
|
+
exports.BaseThemeWrapper = void 0;
|
|
8
8
|
var _react = _interopRequireWildcard(require("react"));
|
|
9
9
|
var _react2 = require("@emotion/react");
|
|
10
10
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
11
|
+
var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
|
|
12
|
+
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
11
13
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
12
14
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
13
15
|
|
|
14
16
|
// Default value from: `import { fontSize } from '@atlaskit/theme/constants';`
|
|
15
17
|
var defaultFontSize = 14;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
|
|
19
|
+
// No-op variant used when the static-css experiment is enabled. Editor consumers
|
|
20
|
+
// no longer read theme.baseFontSize / theme.layoutMaxWidth via Emotion's useTheme(),
|
|
21
|
+
// so no <ThemeProvider> is required in the React tree.
|
|
22
|
+
var BaseThemeWrapperNoop = function BaseThemeWrapperNoop(_ref) {
|
|
23
|
+
var children = _ref.children;
|
|
24
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
// Legacy variant keeping the original Emotion <ThemeProvider> behaviour for
|
|
28
|
+
// callers that still rely on theme.baseFontSize / theme.layoutMaxWidth.
|
|
29
|
+
var BaseThemeWrapperLegacy = function BaseThemeWrapperLegacy(_ref2) {
|
|
30
|
+
var baseFontSize = _ref2.baseFontSize,
|
|
31
|
+
children = _ref2.children;
|
|
19
32
|
var memoizedTheme = (0, _react.useMemo)(function () {
|
|
20
33
|
return {
|
|
21
34
|
baseFontSize: baseFontSize || defaultFontSize,
|
|
@@ -25,4 +38,10 @@ function BaseThemeWrapper(_ref) {
|
|
|
25
38
|
return /*#__PURE__*/_react.default.createElement(_react2.ThemeProvider, {
|
|
26
39
|
theme: memoizedTheme
|
|
27
40
|
}, children);
|
|
28
|
-
}
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
// Gated at module load — when the experiment is enabled, this becomes a no-op
|
|
44
|
+
// wrapper; otherwise it preserves today's Emotion <ThemeProvider> behaviour.
|
|
45
|
+
var BaseThemeWrapper = exports.BaseThemeWrapper = (0, _platformFeatureFlagsReact.componentWithCondition)(function () {
|
|
46
|
+
return (0, _expValEquals.expValEquals)('platform_editor_core_non_ecc_static_css', 'isEnabled', true);
|
|
47
|
+
}, BaseThemeWrapperNoop, BaseThemeWrapperLegacy);
|
|
@@ -20,8 +20,12 @@ var editorContainerCompiledStyles = {
|
|
|
20
20
|
root: "_kqswh2mm _1bsb1osq _4t3i1osq"
|
|
21
21
|
};
|
|
22
22
|
var EditorInternalContainerCompiled = exports.EditorInternalContainerCompiled = function EditorInternalContainerCompiled(_ref) {
|
|
23
|
-
var children = _ref.children
|
|
23
|
+
var children = _ref.children,
|
|
24
|
+
fontSize = _ref.fontSize;
|
|
24
25
|
return /*#__PURE__*/React.createElement("div", {
|
|
26
|
+
style: {
|
|
27
|
+
'--ak-editor-base-font-size': "".concat(fontSize, "px")
|
|
28
|
+
},
|
|
25
29
|
className: (0, _runtime.ax)([editorContainerCompiledStyles.root])
|
|
26
30
|
}, children);
|
|
27
31
|
};
|
|
@@ -24,8 +24,12 @@ var editorContainerEmotionStyles = (0, _react.css)({
|
|
|
24
24
|
height: '100%'
|
|
25
25
|
});
|
|
26
26
|
var EditorInternalContainerEmotion = exports.EditorInternalContainerEmotion = function EditorInternalContainerEmotion(_ref) {
|
|
27
|
-
var children = _ref.children
|
|
27
|
+
var children = _ref.children,
|
|
28
|
+
fontSize = _ref.fontSize;
|
|
28
29
|
return (0, _react.jsx)("div", {
|
|
29
|
-
css: editorContainerEmotionStyles
|
|
30
|
+
css: editorContainerEmotionStyles,
|
|
31
|
+
style: {
|
|
32
|
+
'--ak-editor-base-font-size': "".concat(fontSize, "px")
|
|
33
|
+
}
|
|
30
34
|
}, children);
|
|
31
35
|
};
|
|
@@ -11,6 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
11
11
|
var _react = _interopRequireWildcard(require("react"));
|
|
12
12
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
13
13
|
var _portal = require("@atlaskit/editor-common/portal");
|
|
14
|
+
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
14
15
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
16
|
var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
|
|
16
17
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
@@ -67,6 +68,12 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
|
|
|
67
68
|
nodeViewPortalProviderAPI = _usePortalProvider4[0],
|
|
68
69
|
NodeViewPortalRenderer = _usePortalProvider4[1];
|
|
69
70
|
var propsToIgnore = (0, _expValEquals.expValEquals)('platform_editor_perf_lint_cleanup', 'isEnabled', true) ? DEFAULT_VALUE_PROP_TO_IGNORE : ['defaultValue'];
|
|
71
|
+
var baseFontSize = (0, _getBaseFontSize.getBaseFontSize)(props.appearance, props.contentMode);
|
|
72
|
+
var fontSize = (0, _expValEquals.expValEquals)('platform_editor_core_non_ecc_static_css', 'isEnabled', true) || (0, _expValEquals.expValEquals)('platform_editor_core_static_css', 'isEnabled', true) ? (0, _editorSharedStyles.editorFontSize)({
|
|
73
|
+
theme: {
|
|
74
|
+
baseFontSize: baseFontSize
|
|
75
|
+
}
|
|
76
|
+
}) : undefined;
|
|
70
77
|
return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, renderTrackingEnabled && /*#__PURE__*/_react.default.createElement(_RenderTracking.RenderTracking, {
|
|
71
78
|
componentProps: props,
|
|
72
79
|
action: _analytics.ACTION.RE_RENDERED,
|
|
@@ -79,7 +86,9 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
|
|
|
79
86
|
createAnalyticsEvent: createAnalyticsEvent,
|
|
80
87
|
contextIdentifierProvider: props.contextIdentifierProvider,
|
|
81
88
|
featureFlags: featureFlags
|
|
82
|
-
}, /*#__PURE__*/_react.default.createElement(EditorInternalContainerMigration,
|
|
89
|
+
}, /*#__PURE__*/_react.default.createElement(EditorInternalContainerMigration, {
|
|
90
|
+
fontSize: fontSize
|
|
91
|
+
}, /*#__PURE__*/_react.default.createElement(_EditorContext.default, {
|
|
83
92
|
editorActions: editorActions
|
|
84
93
|
}, /*#__PURE__*/_react.default.createElement(_IntlProviderIfMissingWrapper.IntlProviderIfMissingWrapper, null, /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_ReactEditorView.default, {
|
|
85
94
|
editorProps: overriddenEditorProps,
|
|
@@ -103,7 +112,7 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
|
|
|
103
112
|
editorRef = _ref2.editorRef,
|
|
104
113
|
editorAPI = _ref2.editorAPI;
|
|
105
114
|
return /*#__PURE__*/_react.default.createElement(_BaseThemeWrapper.BaseThemeWrapper, {
|
|
106
|
-
baseFontSize:
|
|
115
|
+
baseFontSize: baseFontSize
|
|
107
116
|
}, /*#__PURE__*/_react.default.createElement(AppearanceComponent, {
|
|
108
117
|
innerRef: editorRef,
|
|
109
118
|
editorAPI: editorAPI
|
|
@@ -17,6 +17,7 @@ var _messages = require("@atlaskit/editor-common/messages");
|
|
|
17
17
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
18
18
|
var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
|
|
19
19
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
20
|
+
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
20
21
|
var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
|
|
21
22
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
22
23
|
var _ClickAreaBlock = _interopRequireDefault(require("../../Addon/ClickAreaBlock"));
|
|
@@ -232,7 +233,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
232
233
|
var contentAreaRef = (0, _react.useRef)(null);
|
|
233
234
|
var containerRef = (0, _react.useRef)(null);
|
|
234
235
|
var allowScrollGutter = (_props$editorAPI = props.editorAPI) === null || _props$editorAPI === void 0 || (_props$editorAPI = _props$editorAPI.base) === null || _props$editorAPI === void 0 || (_props$editorAPI = _props$editorAPI.sharedState.currentState()) === null || _props$editorAPI === void 0 ? void 0 : _props$editorAPI.allowScrollGutter;
|
|
235
|
-
var contentAreaMaxWidth = getTotalPadding() + (!fullWidthMode ? maxWidthMode ? akEditorUltraWideLayoutWidth : theme.layoutMaxWidth : akEditorFullWidthLayoutWidth);
|
|
236
|
+
var contentAreaMaxWidth = getTotalPadding() + (!fullWidthMode ? maxWidthMode ? akEditorUltraWideLayoutWidth : (0, _expValEquals.expValEquals)('platform_editor_core_non_ecc_static_css', 'isEnabled', true) || (0, _expValEquals.expValEquals)('platform_editor_core_static_css', 'isEnabled', true) ? _editorSharedStyles.akEditorDefaultLayoutWidth : theme.layoutMaxWidth : akEditorFullWidthLayoutWidth);
|
|
236
237
|
|
|
237
238
|
// Get useStandardNodeWidth from block menu plugin shared state
|
|
238
239
|
// Only access editorAPI when the experiment is enabled to avoid performance impact
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
/* EditorContentContainer-compiled.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
|
-
// TODO: EDITOR-6833 - Expected across this entire file, future violations are expected. Will try to remove them later after fully migration
|
|
3
|
-
/* eslint-disable @atlaskit/platform/use-motion-token-values, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/design-system/no-invalid-css-map, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/platform/expand-spacing-shorthand, @atlaskit/platform/expand-border-shorthand, @atlaskit/platform/expand-background-shorthand */
|
|
4
2
|
"use strict";
|
|
5
3
|
|
|
6
4
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
@@ -10,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
10
8
|
exports.EditorContentContainerCompiled = void 0;
|
|
11
9
|
require("./EditorContentContainer-compiled.compiled.css");
|
|
12
10
|
var _runtime = require("@compiled/react/runtime");
|
|
11
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
12
|
var _react = _interopRequireDefault(require("react"));
|
|
14
13
|
var _browser = require("@atlaskit/editor-common/browser");
|
|
15
14
|
var _panel = require("@atlaskit/editor-common/panel");
|
|
@@ -24,7 +23,9 @@ var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equa
|
|
|
24
23
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
25
24
|
var _tokens = require("@atlaskit/tokens");
|
|
26
25
|
var _getBaseFontSize = require("../../composable-editor/utils/getBaseFontSize");
|
|
27
|
-
|
|
26
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
27
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // TODO: EDITOR-6833 - Expected across this entire file, future violations are expected. Will try to remove them later after fully migration
|
|
28
|
+
/* eslint-disable @atlaskit/platform/use-motion-token-values, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/design-system/no-invalid-css-map, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/platform/expand-spacing-shorthand, @atlaskit/platform/expand-border-shorthand, @atlaskit/platform/expand-background-shorthand */ // eslint-disable-next-line import/order
|
|
28
29
|
// eslint-disable-next-line @atlaskit/editor/enforce-todo-comment-format
|
|
29
30
|
// TODO: add back tableSharedStyle when migrate table styles
|
|
30
31
|
// import { richMediaClassName, tableSharedStyle } from '@atlaskit/editor-common/styles';
|
|
@@ -349,24 +350,17 @@ var EditorContentContainerCompiled = exports.EditorContentContainerCompiled = /*
|
|
|
349
350
|
var tableOverflowShadow = (0, _overflowShadowForCompiled.overflowShadowForCompiled)({
|
|
350
351
|
leftCoverWidth: "var(--ds-space-300, 24px)"
|
|
351
352
|
});
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
baseFontSize: baseFontSize
|
|
358
|
-
}
|
|
359
|
-
}), "px"),
|
|
360
|
-
'--ak-editor--table-overflow-shadow': tableOverflowShadow
|
|
361
|
-
} : {
|
|
362
|
-
'--ak-editor-base-font-size': "".concat((0, _editorSharedStyles.editorFontSize)({
|
|
363
|
-
theme: {
|
|
364
|
-
baseFontSize: baseFontSize
|
|
365
|
-
}
|
|
366
|
-
}), "px"),
|
|
367
|
-
'--ak-editor--large-gutter-padding': "".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px"),
|
|
353
|
+
|
|
354
|
+
// Under the static-CSS experiment, --ak-editor-base-font-size is set earlier on the
|
|
355
|
+
// root div in editor-internal.tsx and inherited via the CSS cascade — do not set it here.
|
|
356
|
+
// For the legacy path, compute it from the Emotion theme as before.
|
|
357
|
+
var style = _objectSpread({
|
|
368
358
|
'--ak-editor--table-overflow-shadow': tableOverflowShadow
|
|
369
|
-
}
|
|
359
|
+
}, !(0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true, {
|
|
360
|
+
exposure: true
|
|
361
|
+
}) && {
|
|
362
|
+
'--ak-editor--large-gutter-padding': "".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px")
|
|
363
|
+
});
|
|
370
364
|
var browser = (0, _browser.getBrowserInfo)();
|
|
371
365
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
372
366
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -395,7 +389,7 @@ var EditorContentContainerCompiled = exports.EditorContentContainerCompiled = /*
|
|
|
395
389
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
396
390
|
(0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesWithScaledMargin : editorContentStyles.paragraphStylesUGCRefreshed : contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
|
|
397
391
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
398
|
-
(0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesOldWithScaledMargin : editorContentStyles.paragraphStylesOld, editorContentStyles.linkStyles, browser.safari && editorContentStyles.listsStylesSafariFix, (0, _experiments.editorExperiment)('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesSyncedBlock, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) &&
|
|
392
|
+
(0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesOldWithScaledMargin : editorContentStyles.paragraphStylesOld, editorContentStyles.linkStyles, browser.safari && editorContentStyles.listsStylesSafariFix, (0, _experiments.editorExperiment)('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesSyncedBlock, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticResizerStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && (0, _experiments.editorExperiment)('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesCodeBlockSyncedBlockPatch, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && !(0, _experiments.editorExperiment)('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesCodeBlockLegacy, (0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticStylesLayoutFirstNodeResizeHandleFix, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticResizerStylesForTooltip, (0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true) && ((0, _experiments.editorExperiment)('advanced_layouts', true) || (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true)) && editorContentStyles.pragmaticResizerStylesWithReducedEditorGutter, editorContentStyles.aiPanelBaseStyles, isFirefox && editorContentStyles.aiPanelBaseFirefoxStyles, colorMode === 'dark' && editorContentStyles.aiPanelDarkStyles, colorMode === 'dark' && isFirefox && editorContentStyles.aiPanelDarkFirefoxStyles, viewMode === 'view' && editorContentStyles.layoutStylesForView, viewMode === 'view' && (0, _experiments.editorExperiment)('advanced_layouts', true) && editorContentStyles.layoutSelectedStylesForViewAdvanced, viewMode === 'view' && (0, _experiments.editorExperiment)('advanced_layouts', false) && editorContentStyles.layoutSelectedStylesForViewNotAdvanced, viewMode === 'view' && (0, _experiments.editorExperiment)('advanced_layouts', true) && editorContentStyles.layoutResponsiveStylesForView, isComment && editorContentStyles.commentEditorStyles, isComment && editorContentStyles.tableCommentEditorStyles, isFullPage && editorContentStyles.fullPageEditorStyles, isFullPage && editorContentStyles.scrollbarStyles, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ? editorContentStyles.firstCodeBlockWithNoMargin : editorContentStyles.firstCodeBlockWithNoMarginOld, editorContentStyles.firstBlockNodeStyles, editorContentStyles.mentionNodeStyles, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? editorContentStyles.mentionsSelectionStylesWithSearchMatch : editorContentStyles.mentionsSelectionStyles, (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? editorContentStyles.scaledEmojiStyles : editorContentStyles.emojiStyles, contentMode === 'compact' && isDense && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) && (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) && editorContentStyles.scaledEmojiDenseStyles, contentMode === 'compact' && isDense && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) || (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp')) && !(0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) && editorContentStyles.emojiDenseStyles, editorContentStyles.panelViewStyles, editorContentStyles.mediaGroupStyles, editorContentStyles.mediaAlignmentStyles, (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? editorContentStyles.tableLayoutFixesWithFontSize : editorContentStyles.tableLayoutFixes, editorContentStyles.tableContainerStyles, editorContentStyles.tableSharedStyle, (browser.gecko || browser.ie || browser.mac && browser.chrome) && editorContentStyles.tableSharedStyleBackgroundClipFix, editorContentStyles.tableEmptyRowStyles, (0, _expValEquals.expValEquals)('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && editorContentStyles.tableContentModeStyles, editorContentStyles.hyperLinkFloatingToolbarStyles, editorContentStyles.selectionToolbarAnimationStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.blockquoteDangerStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.textDangerStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.listDangerStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.dangerDateStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.emojiDangerStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.mentionDangerStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.decisionDangerStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.statusDangerStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.dangerRuleStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.mediaDangerStyles, (0, _experiments.editorExperiment)('platform_editor_block_menu', true) && editorContentStyles.nestedPanelDangerStyles, className]),
|
|
399
393
|
ref: ref,
|
|
400
394
|
"data-editor-scroll-container": isScrollable ? 'true' : undefined,
|
|
401
395
|
"data-testid": "editor-content-container"
|
|
@@ -66,14 +66,11 @@ var _textColorStyles = require("./styles/textColorStyles");
|
|
|
66
66
|
var _textHighlightStyles = require("./styles/textHighlightStyles");
|
|
67
67
|
var _unsupportedStyles = require("./styles/unsupportedStyles");
|
|
68
68
|
var _whitespaceStyles = require("./styles/whitespaceStyles");
|
|
69
|
-
|
|
70
|
-
/**
|
|
69
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
70
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */ /**
|
|
71
71
|
* @jsxRuntime classic
|
|
72
72
|
* @jsx jsx
|
|
73
|
-
*/
|
|
74
|
-
|
|
75
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- Ignored via go/DSP-18766; jsx required at runtime for @jsxRuntime classic
|
|
76
|
-
|
|
73
|
+
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports -- Ignored via go/DSP-18766; jsx required at runtime for @jsxRuntime classic
|
|
77
74
|
var isFirefox = typeof navigator !== 'undefined' && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
|
|
78
75
|
var alignMultipleWrappedImageInLayoutStyles = {
|
|
79
76
|
'.ProseMirror [data-layout-section] [data-layout-column] > div': {
|
|
@@ -127,21 +124,19 @@ var EditorContentContainerEmotion = exports.EditorContentContainerEmotion = /*#_
|
|
|
127
124
|
var isComment = appearance === 'comment';
|
|
128
125
|
var isChromeless = appearance === 'chromeless';
|
|
129
126
|
var baseFontSize = (0, _getBaseFontSize.getBaseFontSize)(appearance, contentMode);
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
127
|
+
|
|
128
|
+
// Under the static-CSS experiment, --ak-editor-base-font-size is set earlier on the
|
|
129
|
+
// root div in editor-internal.tsx and inherited via the CSS cascade — do not set it here.
|
|
130
|
+
// For the legacy path, compute it from the Emotion theme as before.
|
|
131
|
+
var style = _objectSpread(_objectSpread({}, !(0, _expValEquals.expValEquals)('platform_editor_core_non_ecc_static_css', 'isEnabled', true) && {
|
|
134
132
|
'--ak-editor-base-font-size': "".concat((0, _editorSharedStyles.editorFontSize)({
|
|
135
133
|
theme: theme
|
|
136
134
|
}), "px")
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
theme: theme
|
|
141
|
-
}), "px"),
|
|
142
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
135
|
+
}), !(0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true, {
|
|
136
|
+
exposure: true
|
|
137
|
+
}) && {
|
|
143
138
|
'--ak-editor--large-gutter-padding': "".concat((0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), "px")
|
|
144
|
-
};
|
|
139
|
+
});
|
|
145
140
|
var browser = (0, _browser.getBrowserInfo)();
|
|
146
141
|
return (0, _react2.jsx)("div", {
|
|
147
142
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -3,12 +3,24 @@ import React, { useMemo } from 'react';
|
|
|
3
3
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
4
4
|
import { ThemeProvider } from '@emotion/react';
|
|
5
5
|
import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
|
|
6
|
+
import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
|
|
7
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
6
8
|
// Default value from: `import { fontSize } from '@atlaskit/theme/constants';`
|
|
7
9
|
const defaultFontSize = 14;
|
|
8
|
-
|
|
10
|
+
|
|
11
|
+
// No-op variant used when the static-css experiment is enabled. Editor consumers
|
|
12
|
+
// no longer read theme.baseFontSize / theme.layoutMaxWidth via Emotion's useTheme(),
|
|
13
|
+
// so no <ThemeProvider> is required in the React tree.
|
|
14
|
+
const BaseThemeWrapperNoop = ({
|
|
15
|
+
children
|
|
16
|
+
}) => /*#__PURE__*/React.createElement(React.Fragment, null, children);
|
|
17
|
+
|
|
18
|
+
// Legacy variant keeping the original Emotion <ThemeProvider> behaviour for
|
|
19
|
+
// callers that still rely on theme.baseFontSize / theme.layoutMaxWidth.
|
|
20
|
+
const BaseThemeWrapperLegacy = ({
|
|
9
21
|
baseFontSize,
|
|
10
22
|
children
|
|
11
|
-
}) {
|
|
23
|
+
}) => {
|
|
12
24
|
const memoizedTheme = useMemo(() => ({
|
|
13
25
|
baseFontSize: baseFontSize || defaultFontSize,
|
|
14
26
|
layoutMaxWidth: akEditorDefaultLayoutWidth
|
|
@@ -16,4 +28,8 @@ export function BaseThemeWrapper({
|
|
|
16
28
|
return /*#__PURE__*/React.createElement(ThemeProvider, {
|
|
17
29
|
theme: memoizedTheme
|
|
18
30
|
}, children);
|
|
19
|
-
}
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
// Gated at module load — when the experiment is enabled, this becomes a no-op
|
|
34
|
+
// wrapper; otherwise it preserves today's Emotion <ThemeProvider> behaviour.
|
|
35
|
+
export const BaseThemeWrapper = componentWithCondition(() => expValEquals('platform_editor_core_non_ecc_static_css', 'isEnabled', true), BaseThemeWrapperNoop, BaseThemeWrapperLegacy);
|
|
@@ -12,7 +12,11 @@ const editorContainerCompiledStyles = {
|
|
|
12
12
|
root: "_kqswh2mm _1bsb1osq _4t3i1osq"
|
|
13
13
|
};
|
|
14
14
|
export const EditorInternalContainerCompiled = ({
|
|
15
|
-
children
|
|
15
|
+
children,
|
|
16
|
+
fontSize
|
|
16
17
|
}) => /*#__PURE__*/React.createElement("div", {
|
|
18
|
+
style: {
|
|
19
|
+
'--ak-editor-base-font-size': `${fontSize}px`
|
|
20
|
+
},
|
|
17
21
|
className: ax([editorContainerCompiledStyles.root])
|
|
18
22
|
}, children);
|
|
@@ -17,7 +17,11 @@ const editorContainerEmotionStyles = css({
|
|
|
17
17
|
height: '100%'
|
|
18
18
|
});
|
|
19
19
|
export const EditorInternalContainerEmotion = ({
|
|
20
|
-
children
|
|
20
|
+
children,
|
|
21
|
+
fontSize
|
|
21
22
|
}) => jsx("div", {
|
|
22
|
-
css: editorContainerEmotionStyles
|
|
23
|
+
css: editorContainerEmotionStyles,
|
|
24
|
+
style: {
|
|
25
|
+
'--ak-editor-base-font-size': `${fontSize}px`
|
|
26
|
+
}
|
|
23
27
|
}, children);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React, { Fragment, memo } from 'react';
|
|
2
2
|
import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
|
|
3
3
|
import { usePortalProvider } from '@atlaskit/editor-common/portal';
|
|
4
|
+
import { editorFontSize } from '@atlaskit/editor-shared-styles';
|
|
4
5
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
6
|
import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
|
|
6
7
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
@@ -48,6 +49,12 @@ export const EditorInternal = /*#__PURE__*/memo(({
|
|
|
48
49
|
const [portalProviderAPI, PortalRenderer] = usePortalProvider();
|
|
49
50
|
const [nodeViewPortalProviderAPI, NodeViewPortalRenderer] = usePortalProvider();
|
|
50
51
|
const propsToIgnore = expValEquals('platform_editor_perf_lint_cleanup', 'isEnabled', true) ? DEFAULT_VALUE_PROP_TO_IGNORE : ['defaultValue'];
|
|
52
|
+
const baseFontSize = getBaseFontSize(props.appearance, props.contentMode);
|
|
53
|
+
const fontSize = expValEquals('platform_editor_core_non_ecc_static_css', 'isEnabled', true) || expValEquals('platform_editor_core_static_css', 'isEnabled', true) ? editorFontSize({
|
|
54
|
+
theme: {
|
|
55
|
+
baseFontSize
|
|
56
|
+
}
|
|
57
|
+
}) : undefined;
|
|
51
58
|
return /*#__PURE__*/React.createElement(Fragment, null, renderTrackingEnabled && /*#__PURE__*/React.createElement(RenderTracking, {
|
|
52
59
|
componentProps: props,
|
|
53
60
|
action: ACTION.RE_RENDERED,
|
|
@@ -60,7 +67,9 @@ export const EditorInternal = /*#__PURE__*/memo(({
|
|
|
60
67
|
createAnalyticsEvent: createAnalyticsEvent,
|
|
61
68
|
contextIdentifierProvider: props.contextIdentifierProvider,
|
|
62
69
|
featureFlags: featureFlags
|
|
63
|
-
}, /*#__PURE__*/React.createElement(EditorInternalContainerMigration,
|
|
70
|
+
}, /*#__PURE__*/React.createElement(EditorInternalContainerMigration, {
|
|
71
|
+
fontSize: fontSize
|
|
72
|
+
}, /*#__PURE__*/React.createElement(EditorContext, {
|
|
64
73
|
editorActions: editorActions
|
|
65
74
|
}, /*#__PURE__*/React.createElement(IntlProviderIfMissingWrapper, null, /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(ReactEditorViewNext, {
|
|
66
75
|
editorProps: overriddenEditorProps,
|
|
@@ -85,7 +94,7 @@ export const EditorInternal = /*#__PURE__*/memo(({
|
|
|
85
94
|
}) => {
|
|
86
95
|
var _props$featureFlags, _props$featureFlags2;
|
|
87
96
|
return /*#__PURE__*/React.createElement(BaseThemeWrapper, {
|
|
88
|
-
baseFontSize:
|
|
97
|
+
baseFontSize: baseFontSize
|
|
89
98
|
}, /*#__PURE__*/React.createElement(AppearanceComponent, {
|
|
90
99
|
innerRef: editorRef,
|
|
91
100
|
editorAPI: editorAPI
|
|
@@ -12,9 +12,10 @@ import { injectIntl } from 'react-intl';
|
|
|
12
12
|
import { decisionListSelector, taskListSelector } from '@atlaskit/adf-schema';
|
|
13
13
|
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
|
|
14
14
|
import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
|
|
15
|
-
import { akEditorFullPageNarrowBreakout, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced } from '@atlaskit/editor-shared-styles';
|
|
15
|
+
import { akEditorFullPageNarrowBreakout, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
|
|
16
16
|
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
17
17
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
18
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
18
19
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
19
20
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
20
21
|
// Ignored via go/ees005
|
|
@@ -226,7 +227,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
226
227
|
const contentAreaRef = useRef(null);
|
|
227
228
|
const containerRef = useRef(null);
|
|
228
229
|
const allowScrollGutter = (_props$editorAPI = props.editorAPI) === null || _props$editorAPI === void 0 ? void 0 : (_props$editorAPI$base = _props$editorAPI.base) === null || _props$editorAPI$base === void 0 ? void 0 : (_props$editorAPI$base2 = _props$editorAPI$base.sharedState.currentState()) === null || _props$editorAPI$base2 === void 0 ? void 0 : _props$editorAPI$base2.allowScrollGutter;
|
|
229
|
-
const contentAreaMaxWidth = getTotalPadding() + (!fullWidthMode ? maxWidthMode ? akEditorUltraWideLayoutWidth : theme.layoutMaxWidth : akEditorFullWidthLayoutWidth);
|
|
230
|
+
const contentAreaMaxWidth = getTotalPadding() + (!fullWidthMode ? maxWidthMode ? akEditorUltraWideLayoutWidth : expValEquals('platform_editor_core_non_ecc_static_css', 'isEnabled', true) || expValEquals('platform_editor_core_static_css', 'isEnabled', true) ? akEditorDefaultLayoutWidth : theme.layoutMaxWidth : akEditorFullWidthLayoutWidth);
|
|
230
231
|
|
|
231
232
|
// Get useStandardNodeWidth from block menu plugin shared state
|
|
232
233
|
// Only access editorAPI when the experiment is enabled to avoid performance impact
|
|
@@ -14,7 +14,7 @@ import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
|
|
|
14
14
|
import { AnnotationSharedClassNames, richMediaClassName, expandClassNames, SmartCardSharedCssClassName, CodeBlockSharedCssClassName, tableCellBorderWidth, tableCellMinWidth, TaskDecisionSharedCssClassName } from '@atlaskit/editor-common/styles';
|
|
15
15
|
import { BodiedSyncBlockSharedCssClassName, SyncBlockSharedCssClassName, SyncBlockLabelSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
|
|
16
16
|
import { tableCellBackgroundStyleOverrideForCompiled } from '@atlaskit/editor-common/table-cell-background-for-compiled';
|
|
17
|
-
import { akEditorFullPageDefaultFontSize, akEditorFullPageDenseFontSize, akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier, akEditorTableNumberColumnWidth
|
|
17
|
+
import { akEditorFullPageDefaultFontSize, akEditorFullPageDenseFontSize, akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
|
|
18
18
|
import { overflowShadowForCompiled } from '@atlaskit/editor-shared-styles/overflow-shadow-for-compiled';
|
|
19
19
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
20
20
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
@@ -404,23 +404,18 @@ export const EditorContentContainerCompiled = /*#__PURE__*/React.forwardRef((pro
|
|
|
404
404
|
const tableOverflowShadow = overflowShadowForCompiled({
|
|
405
405
|
leftCoverWidth: "var(--ds-space-300, 24px)"
|
|
406
406
|
});
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
baseFontSize
|
|
420
|
-
}
|
|
421
|
-
})}px`,
|
|
422
|
-
'--ak-editor--large-gutter-padding': `${akEditorGutterPaddingDynamic()}px`,
|
|
423
|
-
'--ak-editor--table-overflow-shadow': tableOverflowShadow
|
|
407
|
+
|
|
408
|
+
// Under the static-CSS experiment, --ak-editor-base-font-size is set earlier on the
|
|
409
|
+
// root div in editor-internal.tsx and inherited via the CSS cascade — do not set it here.
|
|
410
|
+
// For the legacy path, compute it from the Emotion theme as before.
|
|
411
|
+
const style = {
|
|
412
|
+
'--ak-editor--table-overflow-shadow': tableOverflowShadow,
|
|
413
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
414
|
+
...(!editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
415
|
+
exposure: true
|
|
416
|
+
}) && {
|
|
417
|
+
'--ak-editor--large-gutter-padding': `${akEditorGutterPaddingDynamic()}px`
|
|
418
|
+
})
|
|
424
419
|
};
|
|
425
420
|
const browser = getBrowserInfo();
|
|
426
421
|
return /*#__PURE__*/React.createElement("div", {
|
|
@@ -450,7 +445,7 @@ export const EditorContentContainerCompiled = /*#__PURE__*/React.forwardRef((pro
|
|
|
450
445
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
451
446
|
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesWithScaledMargin : editorContentStyles.paragraphStylesUGCRefreshed : contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
|
|
452
447
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
453
|
-
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesOldWithScaledMargin : editorContentStyles.paragraphStylesOld, editorContentStyles.linkStyles, browser.safari && editorContentStyles.listsStylesSafariFix, editorExperiment('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesSyncedBlock, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) &&
|
|
448
|
+
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesOldWithScaledMargin : editorContentStyles.paragraphStylesOld, editorContentStyles.linkStyles, browser.safari && editorContentStyles.listsStylesSafariFix, editorExperiment('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesSyncedBlock, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticResizerStyles, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && editorExperiment('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesCodeBlockSyncedBlockPatch, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && !editorExperiment('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesCodeBlockLegacy, editorExperiment('advanced_layouts', true) && expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticStylesLayoutFirstNodeResizeHandleFix, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticResizerStylesForTooltip, editorExperiment('platform_editor_preview_panel_responsiveness', true) && (editorExperiment('advanced_layouts', true) || expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true)) && editorContentStyles.pragmaticResizerStylesWithReducedEditorGutter, editorContentStyles.aiPanelBaseStyles, isFirefox && editorContentStyles.aiPanelBaseFirefoxStyles, colorMode === 'dark' && editorContentStyles.aiPanelDarkStyles, colorMode === 'dark' && isFirefox && editorContentStyles.aiPanelDarkFirefoxStyles, viewMode === 'view' && editorContentStyles.layoutStylesForView, viewMode === 'view' && editorExperiment('advanced_layouts', true) && editorContentStyles.layoutSelectedStylesForViewAdvanced, viewMode === 'view' && editorExperiment('advanced_layouts', false) && editorContentStyles.layoutSelectedStylesForViewNotAdvanced, viewMode === 'view' && editorExperiment('advanced_layouts', true) && editorContentStyles.layoutResponsiveStylesForView, isComment && editorContentStyles.commentEditorStyles, isComment && editorContentStyles.tableCommentEditorStyles, isFullPage && editorContentStyles.fullPageEditorStyles, isFullPage && editorContentStyles.scrollbarStyles, fg('platform_editor_nested_dnd_styles_changes') ? editorContentStyles.firstCodeBlockWithNoMargin : editorContentStyles.firstCodeBlockWithNoMarginOld, editorContentStyles.firstBlockNodeStyles, editorContentStyles.mentionNodeStyles, expValEqualsNoExposure('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? editorContentStyles.mentionsSelectionStylesWithSearchMatch : editorContentStyles.mentionsSelectionStyles, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? editorContentStyles.scaledEmojiStyles : editorContentStyles.emojiStyles, contentMode === 'compact' && isDense && (expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) && expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) && editorContentStyles.scaledEmojiDenseStyles, contentMode === 'compact' && isDense && (expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) && !expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) && editorContentStyles.emojiDenseStyles, editorContentStyles.panelViewStyles, editorContentStyles.mediaGroupStyles, editorContentStyles.mediaAlignmentStyles, expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? editorContentStyles.tableLayoutFixesWithFontSize : editorContentStyles.tableLayoutFixes, editorContentStyles.tableContainerStyles, editorContentStyles.tableSharedStyle, (browser.gecko || browser.ie || browser.mac && browser.chrome) && editorContentStyles.tableSharedStyleBackgroundClipFix, editorContentStyles.tableEmptyRowStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && editorContentStyles.tableContentModeStyles, editorContentStyles.hyperLinkFloatingToolbarStyles, editorContentStyles.selectionToolbarAnimationStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.blockquoteDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.textDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.listDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.dangerDateStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.emojiDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.mentionDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.decisionDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.statusDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.dangerRuleStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.mediaDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.nestedPanelDangerStyles, className]),
|
|
454
449
|
ref: ref,
|
|
455
450
|
"data-editor-scroll-container": isScrollable ? 'true' : undefined,
|
|
456
451
|
"data-testid": "editor-content-container"
|
|
@@ -123,20 +123,23 @@ export const EditorContentContainerEmotion = /*#__PURE__*/React.forwardRef((prop
|
|
|
123
123
|
const isComment = appearance === 'comment';
|
|
124
124
|
const isChromeless = appearance === 'chromeless';
|
|
125
125
|
const baseFontSize = getBaseFontSize(appearance, contentMode);
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
126
|
+
|
|
127
|
+
// Under the static-CSS experiment, --ak-editor-base-font-size is set earlier on the
|
|
128
|
+
// root div in editor-internal.tsx and inherited via the CSS cascade — do not set it here.
|
|
129
|
+
// For the legacy path, compute it from the Emotion theme as before.
|
|
130
|
+
const style = {
|
|
131
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
132
|
+
...(!expValEquals('platform_editor_core_non_ecc_static_css', 'isEnabled', true) && {
|
|
133
|
+
'--ak-editor-base-font-size': `${editorFontSize({
|
|
134
|
+
theme
|
|
135
|
+
})}px`
|
|
136
|
+
}),
|
|
137
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
138
|
+
...(!editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
139
|
+
exposure: true
|
|
140
|
+
}) && {
|
|
141
|
+
'--ak-editor--large-gutter-padding': `${akEditorGutterPaddingDynamic()}px`
|
|
142
|
+
})
|
|
140
143
|
};
|
|
141
144
|
const browser = getBrowserInfo();
|
|
142
145
|
return jsx("div", {
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "220.0
|
|
2
|
+
export const version = "220.1.0";
|
|
@@ -3,11 +3,24 @@ import React, { useMemo } from 'react';
|
|
|
3
3
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
4
4
|
import { ThemeProvider } from '@emotion/react';
|
|
5
5
|
import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
|
|
6
|
+
import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
|
|
7
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
6
8
|
// Default value from: `import { fontSize } from '@atlaskit/theme/constants';`
|
|
7
9
|
var defaultFontSize = 14;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
|
|
11
|
+
// No-op variant used when the static-css experiment is enabled. Editor consumers
|
|
12
|
+
// no longer read theme.baseFontSize / theme.layoutMaxWidth via Emotion's useTheme(),
|
|
13
|
+
// so no <ThemeProvider> is required in the React tree.
|
|
14
|
+
var BaseThemeWrapperNoop = function BaseThemeWrapperNoop(_ref) {
|
|
15
|
+
var children = _ref.children;
|
|
16
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, children);
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
// Legacy variant keeping the original Emotion <ThemeProvider> behaviour for
|
|
20
|
+
// callers that still rely on theme.baseFontSize / theme.layoutMaxWidth.
|
|
21
|
+
var BaseThemeWrapperLegacy = function BaseThemeWrapperLegacy(_ref2) {
|
|
22
|
+
var baseFontSize = _ref2.baseFontSize,
|
|
23
|
+
children = _ref2.children;
|
|
11
24
|
var memoizedTheme = useMemo(function () {
|
|
12
25
|
return {
|
|
13
26
|
baseFontSize: baseFontSize || defaultFontSize,
|
|
@@ -17,4 +30,10 @@ export function BaseThemeWrapper(_ref) {
|
|
|
17
30
|
return /*#__PURE__*/React.createElement(ThemeProvider, {
|
|
18
31
|
theme: memoizedTheme
|
|
19
32
|
}, children);
|
|
20
|
-
}
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
// Gated at module load — when the experiment is enabled, this becomes a no-op
|
|
36
|
+
// wrapper; otherwise it preserves today's Emotion <ThemeProvider> behaviour.
|
|
37
|
+
export var BaseThemeWrapper = componentWithCondition(function () {
|
|
38
|
+
return expValEquals('platform_editor_core_non_ecc_static_css', 'isEnabled', true);
|
|
39
|
+
}, BaseThemeWrapperNoop, BaseThemeWrapperLegacy);
|
|
@@ -12,8 +12,12 @@ var editorContainerCompiledStyles = {
|
|
|
12
12
|
root: "_kqswh2mm _1bsb1osq _4t3i1osq"
|
|
13
13
|
};
|
|
14
14
|
export var EditorInternalContainerCompiled = function EditorInternalContainerCompiled(_ref) {
|
|
15
|
-
var children = _ref.children
|
|
15
|
+
var children = _ref.children,
|
|
16
|
+
fontSize = _ref.fontSize;
|
|
16
17
|
return /*#__PURE__*/React.createElement("div", {
|
|
18
|
+
style: {
|
|
19
|
+
'--ak-editor-base-font-size': "".concat(fontSize, "px")
|
|
20
|
+
},
|
|
17
21
|
className: ax([editorContainerCompiledStyles.root])
|
|
18
22
|
}, children);
|
|
19
23
|
};
|
|
@@ -17,8 +17,12 @@ var editorContainerEmotionStyles = css({
|
|
|
17
17
|
height: '100%'
|
|
18
18
|
});
|
|
19
19
|
export var EditorInternalContainerEmotion = function EditorInternalContainerEmotion(_ref) {
|
|
20
|
-
var children = _ref.children
|
|
20
|
+
var children = _ref.children,
|
|
21
|
+
fontSize = _ref.fontSize;
|
|
21
22
|
return jsx("div", {
|
|
22
|
-
css: editorContainerEmotionStyles
|
|
23
|
+
css: editorContainerEmotionStyles,
|
|
24
|
+
style: {
|
|
25
|
+
'--ak-editor-base-font-size': "".concat(fontSize, "px")
|
|
26
|
+
}
|
|
23
27
|
}, children);
|
|
24
28
|
};
|
|
@@ -5,6 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
5
5
|
import React, { Fragment, memo } from 'react';
|
|
6
6
|
import { ACTION, ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
|
|
7
7
|
import { usePortalProvider } from '@atlaskit/editor-common/portal';
|
|
8
|
+
import { editorFontSize } from '@atlaskit/editor-shared-styles';
|
|
8
9
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
10
|
import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
|
|
10
11
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
@@ -58,6 +59,12 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
|
|
|
58
59
|
nodeViewPortalProviderAPI = _usePortalProvider4[0],
|
|
59
60
|
NodeViewPortalRenderer = _usePortalProvider4[1];
|
|
60
61
|
var propsToIgnore = expValEquals('platform_editor_perf_lint_cleanup', 'isEnabled', true) ? DEFAULT_VALUE_PROP_TO_IGNORE : ['defaultValue'];
|
|
62
|
+
var baseFontSize = getBaseFontSize(props.appearance, props.contentMode);
|
|
63
|
+
var fontSize = expValEquals('platform_editor_core_non_ecc_static_css', 'isEnabled', true) || expValEquals('platform_editor_core_static_css', 'isEnabled', true) ? editorFontSize({
|
|
64
|
+
theme: {
|
|
65
|
+
baseFontSize: baseFontSize
|
|
66
|
+
}
|
|
67
|
+
}) : undefined;
|
|
61
68
|
return /*#__PURE__*/React.createElement(Fragment, null, renderTrackingEnabled && /*#__PURE__*/React.createElement(RenderTracking, {
|
|
62
69
|
componentProps: props,
|
|
63
70
|
action: ACTION.RE_RENDERED,
|
|
@@ -70,7 +77,9 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
|
|
|
70
77
|
createAnalyticsEvent: createAnalyticsEvent,
|
|
71
78
|
contextIdentifierProvider: props.contextIdentifierProvider,
|
|
72
79
|
featureFlags: featureFlags
|
|
73
|
-
}, /*#__PURE__*/React.createElement(EditorInternalContainerMigration,
|
|
80
|
+
}, /*#__PURE__*/React.createElement(EditorInternalContainerMigration, {
|
|
81
|
+
fontSize: fontSize
|
|
82
|
+
}, /*#__PURE__*/React.createElement(EditorContext, {
|
|
74
83
|
editorActions: editorActions
|
|
75
84
|
}, /*#__PURE__*/React.createElement(IntlProviderIfMissingWrapper, null, /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(ReactEditorViewNext, {
|
|
76
85
|
editorProps: overriddenEditorProps,
|
|
@@ -94,7 +103,7 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
|
|
|
94
103
|
editorRef = _ref2.editorRef,
|
|
95
104
|
editorAPI = _ref2.editorAPI;
|
|
96
105
|
return /*#__PURE__*/React.createElement(BaseThemeWrapper, {
|
|
97
|
-
baseFontSize:
|
|
106
|
+
baseFontSize: baseFontSize
|
|
98
107
|
}, /*#__PURE__*/React.createElement(AppearanceComponent, {
|
|
99
108
|
innerRef: editorRef,
|
|
100
109
|
editorAPI: editorAPI
|
|
@@ -13,9 +13,10 @@ import { injectIntl } from 'react-intl';
|
|
|
13
13
|
import { decisionListSelector, taskListSelector } from '@atlaskit/adf-schema';
|
|
14
14
|
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
|
|
15
15
|
import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
|
|
16
|
-
import { akEditorFullPageNarrowBreakout, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced } from '@atlaskit/editor-shared-styles';
|
|
16
|
+
import { akEditorFullPageNarrowBreakout, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
|
|
17
17
|
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
18
18
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
19
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
19
20
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
20
21
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
21
22
|
// Ignored via go/ees005
|
|
@@ -222,7 +223,7 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
222
223
|
var contentAreaRef = useRef(null);
|
|
223
224
|
var containerRef = useRef(null);
|
|
224
225
|
var allowScrollGutter = (_props$editorAPI = props.editorAPI) === null || _props$editorAPI === void 0 || (_props$editorAPI = _props$editorAPI.base) === null || _props$editorAPI === void 0 || (_props$editorAPI = _props$editorAPI.sharedState.currentState()) === null || _props$editorAPI === void 0 ? void 0 : _props$editorAPI.allowScrollGutter;
|
|
225
|
-
var contentAreaMaxWidth = getTotalPadding() + (!fullWidthMode ? maxWidthMode ? akEditorUltraWideLayoutWidth : theme.layoutMaxWidth : akEditorFullWidthLayoutWidth);
|
|
226
|
+
var contentAreaMaxWidth = getTotalPadding() + (!fullWidthMode ? maxWidthMode ? akEditorUltraWideLayoutWidth : expValEquals('platform_editor_core_non_ecc_static_css', 'isEnabled', true) || expValEquals('platform_editor_core_static_css', 'isEnabled', true) ? akEditorDefaultLayoutWidth : theme.layoutMaxWidth : akEditorFullWidthLayoutWidth);
|
|
226
227
|
|
|
227
228
|
// Get useStandardNodeWidth from block menu plugin shared state
|
|
228
229
|
// Only access editorAPI when the experiment is enabled to avoid performance impact
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
/* EditorContentContainer-compiled.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
|
-
|
|
3
|
-
/* eslint-disable @atlaskit/platform/use-motion-token-values, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/design-system/no-invalid-css-map, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/platform/expand-spacing-shorthand, @atlaskit/platform/expand-border-shorthand, @atlaskit/platform/expand-background-shorthand */
|
|
2
|
+
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
4
3
|
import "./EditorContentContainer-compiled.compiled.css";
|
|
5
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
5
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
6
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
7
|
+
// TODO: EDITOR-6833 - Expected across this entire file, future violations are expected. Will try to remove them later after fully migration
|
|
8
|
+
/* eslint-disable @atlaskit/platform/use-motion-token-values, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/design-system/no-invalid-css-map, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/platform/expand-spacing-shorthand, @atlaskit/platform/expand-border-shorthand, @atlaskit/platform/expand-background-shorthand */
|
|
9
|
+
|
|
6
10
|
import React from 'react';
|
|
7
11
|
// eslint-disable-next-line import/order
|
|
8
12
|
import { getBrowserInfo } from '@atlaskit/editor-common/browser';
|
|
@@ -14,7 +18,7 @@ import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
|
|
|
14
18
|
import { AnnotationSharedClassNames, richMediaClassName, expandClassNames, SmartCardSharedCssClassName, CodeBlockSharedCssClassName, tableCellBorderWidth, tableCellMinWidth, TaskDecisionSharedCssClassName } from '@atlaskit/editor-common/styles';
|
|
15
19
|
import { BodiedSyncBlockSharedCssClassName, SyncBlockSharedCssClassName, SyncBlockLabelSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
|
|
16
20
|
import { tableCellBackgroundStyleOverrideForCompiled } from '@atlaskit/editor-common/table-cell-background-for-compiled';
|
|
17
|
-
import { akEditorFullPageDefaultFontSize, akEditorFullPageDenseFontSize, akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier, akEditorTableNumberColumnWidth
|
|
21
|
+
import { akEditorFullPageDefaultFontSize, akEditorFullPageDenseFontSize, akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
|
|
18
22
|
import { overflowShadowForCompiled } from '@atlaskit/editor-shared-styles/overflow-shadow-for-compiled';
|
|
19
23
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
20
24
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
@@ -344,24 +348,17 @@ export var EditorContentContainerCompiled = /*#__PURE__*/React.forwardRef(functi
|
|
|
344
348
|
var tableOverflowShadow = overflowShadowForCompiled({
|
|
345
349
|
leftCoverWidth: "var(--ds-space-300, 24px)"
|
|
346
350
|
});
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
baseFontSize: baseFontSize
|
|
353
|
-
}
|
|
354
|
-
}), "px"),
|
|
355
|
-
'--ak-editor--table-overflow-shadow': tableOverflowShadow
|
|
356
|
-
} : {
|
|
357
|
-
'--ak-editor-base-font-size': "".concat(editorFontSize({
|
|
358
|
-
theme: {
|
|
359
|
-
baseFontSize: baseFontSize
|
|
360
|
-
}
|
|
361
|
-
}), "px"),
|
|
362
|
-
'--ak-editor--large-gutter-padding': "".concat(akEditorGutterPaddingDynamic(), "px"),
|
|
351
|
+
|
|
352
|
+
// Under the static-CSS experiment, --ak-editor-base-font-size is set earlier on the
|
|
353
|
+
// root div in editor-internal.tsx and inherited via the CSS cascade — do not set it here.
|
|
354
|
+
// For the legacy path, compute it from the Emotion theme as before.
|
|
355
|
+
var style = _objectSpread({
|
|
363
356
|
'--ak-editor--table-overflow-shadow': tableOverflowShadow
|
|
364
|
-
}
|
|
357
|
+
}, !editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
358
|
+
exposure: true
|
|
359
|
+
}) && {
|
|
360
|
+
'--ak-editor--large-gutter-padding': "".concat(akEditorGutterPaddingDynamic(), "px")
|
|
361
|
+
});
|
|
365
362
|
var browser = getBrowserInfo();
|
|
366
363
|
return /*#__PURE__*/React.createElement("div", {
|
|
367
364
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -390,7 +387,7 @@ export var EditorContentContainerCompiled = /*#__PURE__*/React.forwardRef(functi
|
|
|
390
387
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
391
388
|
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesWithScaledMargin : editorContentStyles.paragraphStylesUGCRefreshed : contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
|
|
392
389
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
393
|
-
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesOldWithScaledMargin : editorContentStyles.paragraphStylesOld, editorContentStyles.linkStyles, browser.safari && editorContentStyles.listsStylesSafariFix, editorExperiment('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesSyncedBlock, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) &&
|
|
390
|
+
expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) ? editorContentStyles.paragraphStylesOldWithScaledMargin : editorContentStyles.paragraphStylesOld, editorContentStyles.linkStyles, browser.safari && editorContentStyles.listsStylesSafariFix, editorExperiment('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesSyncedBlock, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticResizerStyles, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && editorExperiment('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesCodeBlockSyncedBlockPatch, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && !editorExperiment('platform_synced_block', true) && editorContentStyles.pragmaticResizerStylesCodeBlockLegacy, editorExperiment('advanced_layouts', true) && expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticStylesLayoutFirstNodeResizeHandleFix, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && editorContentStyles.pragmaticResizerStylesForTooltip, editorExperiment('platform_editor_preview_panel_responsiveness', true) && (editorExperiment('advanced_layouts', true) || expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true)) && editorContentStyles.pragmaticResizerStylesWithReducedEditorGutter, editorContentStyles.aiPanelBaseStyles, isFirefox && editorContentStyles.aiPanelBaseFirefoxStyles, colorMode === 'dark' && editorContentStyles.aiPanelDarkStyles, colorMode === 'dark' && isFirefox && editorContentStyles.aiPanelDarkFirefoxStyles, viewMode === 'view' && editorContentStyles.layoutStylesForView, viewMode === 'view' && editorExperiment('advanced_layouts', true) && editorContentStyles.layoutSelectedStylesForViewAdvanced, viewMode === 'view' && editorExperiment('advanced_layouts', false) && editorContentStyles.layoutSelectedStylesForViewNotAdvanced, viewMode === 'view' && editorExperiment('advanced_layouts', true) && editorContentStyles.layoutResponsiveStylesForView, isComment && editorContentStyles.commentEditorStyles, isComment && editorContentStyles.tableCommentEditorStyles, isFullPage && editorContentStyles.fullPageEditorStyles, isFullPage && editorContentStyles.scrollbarStyles, fg('platform_editor_nested_dnd_styles_changes') ? editorContentStyles.firstCodeBlockWithNoMargin : editorContentStyles.firstCodeBlockWithNoMarginOld, editorContentStyles.firstBlockNodeStyles, editorContentStyles.mentionNodeStyles, expValEqualsNoExposure('platform_editor_find_and_replace_improvements', 'isEnabled', true) ? editorContentStyles.mentionsSelectionStylesWithSearchMatch : editorContentStyles.mentionsSelectionStyles, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? editorContentStyles.scaledEmojiStyles : editorContentStyles.emojiStyles, contentMode === 'compact' && isDense && (expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) && expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) && editorContentStyles.scaledEmojiDenseStyles, contentMode === 'compact' && isDense && (expValEquals('confluence_compact_text_format', 'isEnabled', true) || expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp')) && !expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) && editorContentStyles.emojiDenseStyles, editorContentStyles.panelViewStyles, editorContentStyles.mediaGroupStyles, editorContentStyles.mediaAlignmentStyles, expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? editorContentStyles.tableLayoutFixesWithFontSize : editorContentStyles.tableLayoutFixes, editorContentStyles.tableContainerStyles, editorContentStyles.tableSharedStyle, (browser.gecko || browser.ie || browser.mac && browser.chrome) && editorContentStyles.tableSharedStyleBackgroundClipFix, editorContentStyles.tableEmptyRowStyles, expValEquals('platform_editor_table_fit_to_content_auto_convert', 'isEnabled', true) && editorContentStyles.tableContentModeStyles, editorContentStyles.hyperLinkFloatingToolbarStyles, editorContentStyles.selectionToolbarAnimationStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.blockquoteDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.textDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.listDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.dangerDateStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.emojiDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.mentionDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.decisionDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.statusDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.dangerRuleStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.mediaDangerStyles, editorExperiment('platform_editor_block_menu', true) && editorContentStyles.nestedPanelDangerStyles, className]),
|
|
394
391
|
ref: ref,
|
|
395
392
|
"data-editor-scroll-container": isScrollable ? 'true' : undefined,
|
|
396
393
|
"data-testid": "editor-content-container"
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
2
4
|
/* eslint-disable @atlaskit/design-system/consistent-css-prop-usage */
|
|
3
5
|
/**
|
|
4
6
|
* @jsxRuntime classic
|
|
@@ -119,21 +121,19 @@ export var EditorContentContainerEmotion = /*#__PURE__*/React.forwardRef(functio
|
|
|
119
121
|
var isComment = appearance === 'comment';
|
|
120
122
|
var isChromeless = appearance === 'chromeless';
|
|
121
123
|
var baseFontSize = getBaseFontSize(appearance, contentMode);
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
124
|
+
|
|
125
|
+
// Under the static-CSS experiment, --ak-editor-base-font-size is set earlier on the
|
|
126
|
+
// root div in editor-internal.tsx and inherited via the CSS cascade — do not set it here.
|
|
127
|
+
// For the legacy path, compute it from the Emotion theme as before.
|
|
128
|
+
var style = _objectSpread(_objectSpread({}, !expValEquals('platform_editor_core_non_ecc_static_css', 'isEnabled', true) && {
|
|
126
129
|
'--ak-editor-base-font-size': "".concat(editorFontSize({
|
|
127
130
|
theme: theme
|
|
128
131
|
}), "px")
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
theme: theme
|
|
133
|
-
}), "px"),
|
|
134
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
132
|
+
}), !editorExperiment('platform_editor_preview_panel_responsiveness', true, {
|
|
133
|
+
exposure: true
|
|
134
|
+
}) && {
|
|
135
135
|
'--ak-editor--large-gutter-padding': "".concat(akEditorGutterPaddingDynamic(), "px")
|
|
136
|
-
};
|
|
136
|
+
});
|
|
137
137
|
var browser = getBrowserInfo();
|
|
138
138
|
return jsx("div", {
|
|
139
139
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "220.0
|
|
2
|
+
export var version = "220.1.0";
|
|
@@ -3,5 +3,5 @@ type BaseThemeProps = {
|
|
|
3
3
|
baseFontSize?: number;
|
|
4
4
|
children: React.ReactNode;
|
|
5
5
|
};
|
|
6
|
-
export declare
|
|
6
|
+
export declare const BaseThemeWrapper: React.ComponentType<BaseThemeProps>;
|
|
7
7
|
export {};
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* Cleanup: delete this file once the experiment has shipped.
|
|
10
10
|
*/
|
|
11
11
|
import type { ReactNode } from 'react';
|
|
12
|
-
export declare const EditorInternalContainerCompiled: ({ children }: {
|
|
12
|
+
export declare const EditorInternalContainerCompiled: ({ children, fontSize, }: {
|
|
13
13
|
children?: ReactNode;
|
|
14
|
+
fontSize?: number;
|
|
14
15
|
}) => React.JSX.Element;
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* Cleanup: delete this file once the experiment has shipped.
|
|
10
10
|
*/
|
|
11
11
|
import type { ReactNode } from 'react';
|
|
12
|
-
export declare const EditorInternalContainerEmotion: ({ children }: {
|
|
12
|
+
export declare const EditorInternalContainerEmotion: ({ children, fontSize, }: {
|
|
13
13
|
children?: ReactNode;
|
|
14
|
+
fontSize?: number;
|
|
14
15
|
}) => React.JSX.Element;
|
|
@@ -3,5 +3,5 @@ type BaseThemeProps = {
|
|
|
3
3
|
baseFontSize?: number;
|
|
4
4
|
children: React.ReactNode;
|
|
5
5
|
};
|
|
6
|
-
export declare
|
|
6
|
+
export declare const BaseThemeWrapper: React.ComponentType<BaseThemeProps>;
|
|
7
7
|
export {};
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* Cleanup: delete this file once the experiment has shipped.
|
|
10
10
|
*/
|
|
11
11
|
import type { ReactNode } from 'react';
|
|
12
|
-
export declare const EditorInternalContainerCompiled: ({ children }: {
|
|
12
|
+
export declare const EditorInternalContainerCompiled: ({ children, fontSize, }: {
|
|
13
13
|
children?: ReactNode;
|
|
14
|
+
fontSize?: number;
|
|
14
15
|
}) => React.JSX.Element;
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* Cleanup: delete this file once the experiment has shipped.
|
|
10
10
|
*/
|
|
11
11
|
import type { ReactNode } from 'react';
|
|
12
|
-
export declare const EditorInternalContainerEmotion: ({ children }: {
|
|
12
|
+
export declare const EditorInternalContainerEmotion: ({ children, fontSize, }: {
|
|
13
13
|
children?: ReactNode;
|
|
14
|
+
fontSize?: number;
|
|
14
15
|
}) => React.JSX.Element;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "220.1.
|
|
3
|
+
"version": "220.1.1",
|
|
4
4
|
"description": "A package contains Atlassian editor core functionality",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -61,21 +61,21 @@
|
|
|
61
61
|
"@atlaskit/editor-plugins": "^13.1.0",
|
|
62
62
|
"@atlaskit/editor-prosemirror": "^7.3.0",
|
|
63
63
|
"@atlaskit/editor-shared-styles": "^3.11.0",
|
|
64
|
-
"@atlaskit/editor-ssr-renderer": "^6.
|
|
64
|
+
"@atlaskit/editor-ssr-renderer": "^6.1.0",
|
|
65
65
|
"@atlaskit/editor-toolbar": "^1.10.0",
|
|
66
66
|
"@atlaskit/editor-toolbar-model": "^0.5.0",
|
|
67
67
|
"@atlaskit/emoji": "^70.16.0",
|
|
68
68
|
"@atlaskit/feature-gate-js-client": "^5.7.0",
|
|
69
69
|
"@atlaskit/icon": "^35.4.0",
|
|
70
70
|
"@atlaskit/link": "^3.4.0",
|
|
71
|
-
"@atlaskit/media-card": "^80.
|
|
71
|
+
"@atlaskit/media-card": "^80.8.0",
|
|
72
72
|
"@atlaskit/mention": "^26.2.0",
|
|
73
73
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
74
74
|
"@atlaskit/platform-feature-flags-react": "^0.5.0",
|
|
75
75
|
"@atlaskit/react-ufo": "^6.7.0",
|
|
76
76
|
"@atlaskit/task-decision": "^20.1.0",
|
|
77
|
-
"@atlaskit/tmp-editor-statsig": "^89.
|
|
78
|
-
"@atlaskit/tokens": "^13.
|
|
77
|
+
"@atlaskit/tmp-editor-statsig": "^89.2.0",
|
|
78
|
+
"@atlaskit/tokens": "^13.2.0",
|
|
79
79
|
"@atlaskit/tooltip": "^22.6.0",
|
|
80
80
|
"@atlaskit/width-detector": "^5.1.0",
|
|
81
81
|
"@babel/runtime": "^7.0.0",
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"uuid": "^3.1.0"
|
|
93
93
|
},
|
|
94
94
|
"peerDependencies": {
|
|
95
|
-
"@atlaskit/editor-common": "^115.
|
|
95
|
+
"@atlaskit/editor-common": "^115.6.0",
|
|
96
96
|
"@atlaskit/link-provider": "^4.6.0",
|
|
97
97
|
"@atlaskit/media-core": "^37.1.0",
|
|
98
98
|
"react": "^18.2.0",
|
|
@@ -108,13 +108,13 @@
|
|
|
108
108
|
"@atlaskit/code": "^17.5.0",
|
|
109
109
|
"@atlaskit/collab-provider": "^20.0.0",
|
|
110
110
|
"@atlaskit/editor-plugin-annotation": "^11.0.0",
|
|
111
|
-
"@atlaskit/editor-plugin-card": "^17.
|
|
111
|
+
"@atlaskit/editor-plugin-card": "^17.3.0",
|
|
112
112
|
"@atlaskit/editor-plugin-list": "^13.0.0",
|
|
113
113
|
"@atlaskit/editor-plugin-paste": "^12.1.0",
|
|
114
114
|
"@atlaskit/editor-test-helpers": "workspace:^",
|
|
115
115
|
"@atlaskit/link-provider": "^4.6.0",
|
|
116
116
|
"@atlaskit/linking-common": "^9.13.0",
|
|
117
|
-
"@atlaskit/logo": "^20.
|
|
117
|
+
"@atlaskit/logo": "^20.2.0",
|
|
118
118
|
"@atlaskit/media-core": "^37.1.0",
|
|
119
119
|
"@atlaskit/media-integration-test-helpers": "workspace:^",
|
|
120
120
|
"@atlaskit/media-test-helpers": "^41.2.0",
|
|
@@ -129,13 +129,13 @@
|
|
|
129
129
|
"@atlassian/a11y-jest-testing": "^0.11.0",
|
|
130
130
|
"@atlassian/a11y-playwright-testing": "^0.10.0",
|
|
131
131
|
"@atlassian/adf-schema-json": "^1.33.0",
|
|
132
|
-
"@atlassian/editor-rovo-bridge": "^9.
|
|
132
|
+
"@atlassian/editor-rovo-bridge": "^9.4.0",
|
|
133
133
|
"@atlassian/feature-flags-test-utils": "^1.1.0",
|
|
134
134
|
"@atlassian/react-compiler-gating": "workspace:^",
|
|
135
|
-
"@atlassian/search-client": "^1.
|
|
135
|
+
"@atlassian/search-client": "^1.12.0",
|
|
136
136
|
"@atlassian/search-provider": "^12.0.0",
|
|
137
137
|
"@atlassian/structured-docs-types": "workspace:^",
|
|
138
|
-
"@atlassian/user-profile-card": "^1.
|
|
138
|
+
"@atlassian/user-profile-card": "^1.11.0",
|
|
139
139
|
"@emotion/jest": "^11.8.0",
|
|
140
140
|
"@testing-library/react": "^16.3.0",
|
|
141
141
|
"@types/diff": "^5.0.2",
|