@atlaskit/editor-core 215.20.1 → 215.21.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,28 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 215.21.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`8677e7b660127`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8677e7b660127) -
8
+ EDITOR-3792 Rollup max width changes previously gated with editor_tinymce_full_width_mode into
9
+ combined frontend/backend flag confluence_max_width_content_appearance
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
15
+ ## 215.20.2
16
+
17
+ ### Patch Changes
18
+
19
+ - [`dcc6a3e73f414`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dcc6a3e73f414) -
20
+ [ux] EDITOR-3304 add offline error state for sync blocks and update other error UI to match new
21
+ designs
22
+ - [`0c0f8207e7294`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0c0f8207e7294) -
23
+ Added sync block resizing
24
+ - Updated dependencies
25
+
3
26
  ## 215.20.1
4
27
 
5
28
  ### Patch Changes
@@ -262,7 +262,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
262
262
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
263
263
  (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !(0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !(0, _platformFeatureFlags.fg)('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
264
264
  style: {
265
- '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? // @ts-ignore
265
+ '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true)) ? // @ts-ignore
266
266
  "".concat(akEditorUltraWideLayoutWidth + getTotalPadding(), "px") : // @ts-ignore
267
267
  "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
268
268
  }
@@ -121,7 +121,7 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
121
121
  var theme = (0, _react2.useTheme)();
122
122
  var _useThemeObserver = (0, _tokens.useThemeObserver)(),
123
123
  colorMode = _useThemeObserver.colorMode;
124
- var isFullPage = appearance === 'full-page' || appearance === 'full-width' || (0, _expValEqualsNoExposure.expValEqualsNoExposure)('editor_tinymce_full_width_mode', 'isEnabled', true) && appearance === 'max';
124
+ var isFullPage = appearance === 'full-page' || appearance === 'full-width' || ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEqualsNoExposure.expValEqualsNoExposure)('confluence_max_width_content_appearance', 'isEnabled', true)) && appearance === 'max';
125
125
  var isComment = appearance === 'comment';
126
126
  var baseFontSize = (0, _getBaseFontSize.getBaseFontSize)(appearance, contentMode);
127
127
  var style = (0, _experiments.editorExperiment)('platform_editor_preview_panel_responsiveness', true, {
@@ -388,7 +388,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
388
388
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
389
389
  _resizerStyles.pragmaticResizerStylesNew :
390
390
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
391
- _resizerStyles.pragmaticResizerStyles : undefined, (0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) &&
391
+ _resizerStyles.pragmaticResizerStyles : undefined, (0, _experiments.editorExperiment)('platform_synced_block', true) &&
392
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
393
+ _resizerStyles.pragmaticResizerStylesSyncedBlock, (0, _experiments.editorExperiment)('advanced_layouts', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) &&
392
394
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
393
395
  _resizerStyles.pragmaticStylesLayoutFirstNodeResizeHandleFix, (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_breakout_resizing', 'isEnabled', true) &&
394
396
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -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.resizerStyles = exports.resizerItemClassName = exports.resizerHoverZoneClassName = exports.resizerHandleTrackClassName = exports.resizerHandleThumbWidth = exports.resizerHandleThumbClassName = exports.resizerHandleClassName = exports.resizerExtendedZone = exports.resizerDangerClassName = exports.pragmaticStylesLayoutFirstNodeResizeHandleFix = exports.pragmaticResizerStylesWithReducedEditorGutter = exports.pragmaticResizerStylesNew = exports.pragmaticResizerStylesForTooltip = exports.pragmaticResizerStyles = exports.handleWrapperClass = void 0;
7
+ exports.resizerStyles = exports.resizerItemClassName = exports.resizerHoverZoneClassName = exports.resizerHandleTrackClassName = exports.resizerHandleThumbWidth = exports.resizerHandleThumbClassName = exports.resizerHandleClassName = exports.resizerExtendedZone = exports.resizerDangerClassName = exports.pragmaticStylesLayoutFirstNodeResizeHandleFix = exports.pragmaticResizerStylesWithReducedEditorGutter = exports.pragmaticResizerStylesSyncedBlock = exports.pragmaticResizerStylesNew = exports.pragmaticResizerStylesForTooltip = exports.pragmaticResizerStyles = exports.handleWrapperClass = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
9
  var _react = require("@emotion/react");
10
10
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -446,6 +446,38 @@ var pragmaticResizerStylesNew = exports.pragmaticResizerStylesNew = (0, _react.c
446
446
  }
447
447
  });
448
448
 
449
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
450
+ var pragmaticResizerStylesSyncedBlock = exports.pragmaticResizerStylesSyncedBlock = (0, _react.css)({
451
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
452
+ '.fabric-editor-breakout-mark': {
453
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
454
+ '&:has([data-prosemirror-node-name="syncBlock"]), &:has([data-prosemirror-node-name="bodiedSyncBlock"])': {
455
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
456
+ '> .pm-breakout-resize-handle-container--left': {
457
+ left: '-20px'
458
+ },
459
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
460
+ '> .pm-breakout-resize-handle-container--right': {
461
+ right: '-20px'
462
+ }
463
+ },
464
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
465
+ '&:has([data-prosemirror-node-name="syncBlock"])': {
466
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
467
+ '> .pm-breakout-resize-handle-container': {
468
+ height: 'calc(100% - 12px)'
469
+ }
470
+ },
471
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
472
+ '&:has([data-prosemirror-node-name="bodiedSyncBlock"])': {
473
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
474
+ '> .pm-breakout-resize-handle-container': {
475
+ height: 'calc(100% - 2px)'
476
+ }
477
+ }
478
+ }
479
+ });
480
+
449
481
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
450
482
  var pragmaticResizerStylesWithReducedEditorGutter = exports.pragmaticResizerStylesWithReducedEditorGutter = (0, _react.css)((0, _defineProperty2.default)({}, "@container editor-area (max-width: ".concat(_editorSharedStyles.akEditorFullPageNarrowBreakout, "px)"), {
451
483
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -8,21 +8,20 @@ exports.syncBlockStyles = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
9
  var _react = require("@emotion/react");
10
10
  var _syncBlock = require("@atlaskit/editor-common/sync-block");
11
- var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
12
11
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
13
12
 
14
13
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
15
14
  var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _defineProperty2.default)({
16
15
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
17
- '.ProseMirror': (0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
16
+ '.ProseMirror': (0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
18
17
  position: 'relative',
19
18
  cursor: 'pointer',
20
19
  borderRadius: "var(--ds-radius-small, 3px)",
21
20
  marginTop: "var(--ds-space-150, 12px)",
22
21
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
23
- marginRight: "-".concat(_editorSharedStyles.akEditorGutterPadding, "px"),
22
+ marginRight: "-18px",
24
23
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
25
- marginLeft: "-".concat(_editorSharedStyles.akEditorGutterPadding, "px"),
24
+ marginLeft: "-18px",
26
25
  marginBottom: 0,
27
26
  paddingTop: "var(--ds-space-050, 4px)",
28
27
  paddingBottom: "var(--ds-space-050, 4px)",
@@ -95,11 +94,18 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _definePrope
95
94
  '&::before': {
96
95
  border: 'none'
97
96
  }
98
- })), "&has(.".concat(_syncBlock.SyncBlockSharedCssClassName.error, ")"), (0, _defineProperty2.default)({
99
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
100
- '&:hover:not(.ak-editor-selected-node)': {
101
- boxShadow: 'none'
97
+ })), ":has(.".concat(_syncBlock.SyncBlockSharedCssClassName.error, ")"), (0, _defineProperty2.default)({
98
+ backgroundColor: "var(--ds-background-disabled, #17171708)",
99
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
100
+ }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
101
+ opacity: 1,
102
+ visibility: 'visible',
103
+ backgroundColor: "var(--ds-surface, #FFFFFF)",
104
+ '&::before': {
105
+ border: 'none'
102
106
  }
107
+ })), ":has(.".concat(_syncBlock.SyncBlockSharedCssClassName.loading, ")"), (0, _defineProperty2.default)({
108
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
103
109
  }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
104
110
  opacity: 0,
105
111
  visibility: 'hidden'
@@ -110,10 +116,10 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _definePrope
110
116
  opacity: 0,
111
117
  visibility: 'hidden'
112
118
  })), ".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.content), {
113
- padding: '0 32px',
119
+ padding: '0 18px',
114
120
  cursor: 'text'
115
121
  }), ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer), {
116
- padding: '0 32px'
122
+ padding: '0 18px'
117
123
  }))
118
124
  }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
119
125
  color: "var(--ds-text-subtle, #505258)",
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "215.20.0";
8
+ var version = exports.version = "215.20.2";
@@ -254,7 +254,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
254
254
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
255
255
  expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
256
256
  style: {
257
- '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ?
257
+ '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) ?
258
258
  // @ts-ignore
259
259
  `${akEditorUltraWideLayoutWidth + getTotalPadding()}px` :
260
260
  // @ts-ignore
@@ -50,7 +50,7 @@ import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsSel
50
50
  import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
51
51
  import { paragraphStylesOld, paragraphStylesOldWithScaledMargin, paragraphStylesUGCRefreshed, paragraphStylesWithScaledMargin } from './styles/paragraphStyles';
52
52
  import { placeholderOverflowStyles, placeholderStyles, placeholderTextStyles, placeholderWrapStyles } from './styles/placeholderStyles';
53
- import { pragmaticResizerStyles, pragmaticResizerStylesNew, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, pragmaticResizerStylesWithReducedEditorGutter, resizerStyles } from './styles/resizerStyles';
53
+ import { pragmaticResizerStyles, pragmaticResizerStylesNew, pragmaticResizerStylesSyncedBlock, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, pragmaticResizerStylesWithReducedEditorGutter, resizerStyles } from './styles/resizerStyles';
54
54
  import { dangerRuleStyles, ruleStyles } from './styles/rule';
55
55
  import { scrollbarStyles } from './styles/scrollbarStyles';
56
56
  import { hideCursorWhenHideSelectionStyles, hideSelectionStyles, selectedNodeStyles } from './styles/selectionStyles';
@@ -117,7 +117,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
117
117
  const {
118
118
  colorMode
119
119
  } = useThemeObserver();
120
- const isFullPage = appearance === 'full-page' || appearance === 'full-width' || expValEqualsNoExposure('editor_tinymce_full_width_mode', 'isEnabled', true) && appearance === 'max';
120
+ const isFullPage = appearance === 'full-page' || appearance === 'full-width' || (expValEqualsNoExposure('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEqualsNoExposure('confluence_max_width_content_appearance', 'isEnabled', true)) && appearance === 'max';
121
121
  const isComment = appearance === 'comment';
122
122
  const baseFontSize = getBaseFontSize(appearance, contentMode);
123
123
  const style = editorExperiment('platform_editor_preview_panel_responsiveness', true, {
@@ -384,7 +384,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
384
384
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
385
385
  pragmaticResizerStylesNew :
386
386
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
387
- pragmaticResizerStyles : undefined, editorExperiment('advanced_layouts', true) && expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) &&
387
+ pragmaticResizerStyles : undefined, editorExperiment('platform_synced_block', true) &&
388
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
389
+ pragmaticResizerStylesSyncedBlock, editorExperiment('advanced_layouts', true) && expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) &&
388
390
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
389
391
  pragmaticStylesLayoutFirstNodeResizeHandleFix, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) &&
390
392
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -493,6 +493,38 @@ export const pragmaticResizerStylesNew = css({
493
493
  }
494
494
  });
495
495
 
496
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
497
+ export const pragmaticResizerStylesSyncedBlock = css({
498
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
499
+ '.fabric-editor-breakout-mark': {
500
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
501
+ '&:has([data-prosemirror-node-name="syncBlock"]), &:has([data-prosemirror-node-name="bodiedSyncBlock"])': {
502
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
503
+ '> .pm-breakout-resize-handle-container--left': {
504
+ left: '-20px'
505
+ },
506
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
507
+ '> .pm-breakout-resize-handle-container--right': {
508
+ right: '-20px'
509
+ }
510
+ },
511
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
512
+ '&:has([data-prosemirror-node-name="syncBlock"])': {
513
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
514
+ '> .pm-breakout-resize-handle-container': {
515
+ height: 'calc(100% - 12px)'
516
+ }
517
+ },
518
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
519
+ '&:has([data-prosemirror-node-name="bodiedSyncBlock"])': {
520
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
521
+ '> .pm-breakout-resize-handle-container': {
522
+ height: 'calc(100% - 2px)'
523
+ }
524
+ }
525
+ }
526
+ });
527
+
496
528
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
497
529
  export const pragmaticResizerStylesWithReducedEditorGutter = css({
498
530
  /* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */
@@ -1,7 +1,6 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
2
2
  import { css } from '@emotion/react';
3
3
  import { BodiedSyncBlockSharedCssClassName, SyncBlockSharedCssClassName, SyncBlockLabelSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
4
- import { akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
5
4
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
6
5
  export const syncBlockStyles = css({
7
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -13,9 +12,9 @@ export const syncBlockStyles = css({
13
12
  borderRadius: "var(--ds-radius-small, 3px)",
14
13
  marginTop: "var(--ds-space-150, 12px)",
15
14
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
16
- marginRight: `-${akEditorGutterPadding}px`,
15
+ marginRight: `-18px`,
17
16
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
18
- marginLeft: `-${akEditorGutterPadding}px`,
17
+ marginLeft: `-18px`,
19
18
  marginBottom: 0,
20
19
  paddingTop: "var(--ds-space-050, 4px)",
21
20
  paddingBottom: "var(--ds-space-050, 4px)",
@@ -113,11 +112,22 @@ export const syncBlockStyles = css({
113
112
  /* Error state */
114
113
  /* In error state sync block should not have hover styles or show the label */
115
114
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
116
- [`&has(.${SyncBlockSharedCssClassName.error})`]: {
117
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
118
- '&:hover:not(.ak-editor-selected-node)': {
119
- boxShadow: 'none'
120
- },
115
+ [`:has(.${SyncBlockSharedCssClassName.error})`]: {
116
+ backgroundColor: "var(--ds-background-disabled, #17171708)",
117
+ boxShadow: `0 0 0 1px ${"var(--ds-border, #0B120E24)"}`,
118
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
119
+ [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
120
+ opacity: 1,
121
+ visibility: 'visible',
122
+ backgroundColor: "var(--ds-surface, #FFFFFF)",
123
+ '&::before': {
124
+ border: 'none'
125
+ }
126
+ }
127
+ },
128
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
129
+ [`:has(.${SyncBlockSharedCssClassName.loading})`]: {
130
+ boxShadow: `0 0 0 1px ${"var(--ds-border, #0B120E24)"}`,
121
131
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
122
132
  [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
123
133
  opacity: 0,
@@ -137,12 +147,12 @@ export const syncBlockStyles = css({
137
147
  },
138
148
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
139
149
  [`.${BodiedSyncBlockSharedCssClassName.content}`]: {
140
- padding: '0 32px',
150
+ padding: '0 18px',
141
151
  cursor: 'text'
142
152
  },
143
153
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
144
154
  [`.${SyncBlockSharedCssClassName.renderer}`]: {
145
- padding: '0 32px'
155
+ padding: '0 18px'
146
156
  }
147
157
  }
148
158
  },
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "215.20.0";
2
+ export const version = "215.20.2";
@@ -252,7 +252,7 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
252
252
  // for breakout resizing, there's no need to restrict the width of codeblocks as they're always wrapped in a breakout mark
253
253
  expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) && fg('platform_editor_breakout_resizing_width_changes') ? editorContentAreaContainerStyleExcludeCodeBlockNew : editorContentAreaContainerStyleNew, fg('platform_editor_nested_dnd_styles_changes') && editorContentAreaContainerNestedDndStyle, !fg('platform_editor_controls_no_toolbar_space') && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReducedHeaderSpace, !fg('platform_editor_controls_no_toolbar_space') && props.isEditorToolbarHidden && editorExperiment('platform_editor_controls', 'variant1') && contentAreaReservedPrimaryToolbarSpace],
254
254
  style: {
255
- '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? // @ts-ignore
255
+ '--ak-editor-content-area-max-width': !fullWidthMode ? Boolean(maxWidthMode) && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) ? // @ts-ignore
256
256
  "".concat(akEditorUltraWideLayoutWidth + getTotalPadding(), "px") : // @ts-ignore
257
257
  "".concat(theme.layoutMaxWidth + getTotalPadding(), "px") : "".concat(akEditorFullWidthLayoutWidth + getTotalPadding(), "px")
258
258
  }
@@ -51,7 +51,7 @@ import { mentionsStyles, mentionsSelectionStyles, mentionNodeStyles, mentionsSel
51
51
  import { panelStyles, panelStylesMixin, nestedPanelBorderStylesMixin, panelStylesMixin_fg_platform_editor_nested_dnd_styles_changes, panelViewStyles, nestedPanelDangerStyles } from './styles/panelStyles';
52
52
  import { paragraphStylesOld, paragraphStylesOldWithScaledMargin, paragraphStylesUGCRefreshed, paragraphStylesWithScaledMargin } from './styles/paragraphStyles';
53
53
  import { placeholderOverflowStyles, placeholderStyles, placeholderTextStyles, placeholderWrapStyles } from './styles/placeholderStyles';
54
- import { pragmaticResizerStyles, pragmaticResizerStylesNew, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, pragmaticResizerStylesWithReducedEditorGutter, resizerStyles } from './styles/resizerStyles';
54
+ import { pragmaticResizerStyles, pragmaticResizerStylesNew, pragmaticResizerStylesSyncedBlock, pragmaticStylesLayoutFirstNodeResizeHandleFix, pragmaticResizerStylesForTooltip, pragmaticResizerStylesWithReducedEditorGutter, resizerStyles } from './styles/resizerStyles';
55
55
  import { dangerRuleStyles, ruleStyles } from './styles/rule';
56
56
  import { scrollbarStyles } from './styles/scrollbarStyles';
57
57
  import { hideCursorWhenHideSelectionStyles, hideSelectionStyles, selectedNodeStyles } from './styles/selectionStyles';
@@ -113,7 +113,7 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
113
113
  var theme = useTheme();
114
114
  var _useThemeObserver = useThemeObserver(),
115
115
  colorMode = _useThemeObserver.colorMode;
116
- var isFullPage = appearance === 'full-page' || appearance === 'full-width' || expValEqualsNoExposure('editor_tinymce_full_width_mode', 'isEnabled', true) && appearance === 'max';
116
+ var isFullPage = appearance === 'full-page' || appearance === 'full-width' || (expValEqualsNoExposure('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEqualsNoExposure('confluence_max_width_content_appearance', 'isEnabled', true)) && appearance === 'max';
117
117
  var isComment = appearance === 'comment';
118
118
  var baseFontSize = getBaseFontSize(appearance, contentMode);
119
119
  var style = editorExperiment('platform_editor_preview_panel_responsiveness', true, {
@@ -380,7 +380,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
380
380
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
381
381
  pragmaticResizerStylesNew :
382
382
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
383
- pragmaticResizerStyles : undefined, editorExperiment('advanced_layouts', true) && expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) &&
383
+ pragmaticResizerStyles : undefined, editorExperiment('platform_synced_block', true) &&
384
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
385
+ pragmaticResizerStylesSyncedBlock, editorExperiment('advanced_layouts', true) && expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) &&
384
386
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
385
387
  pragmaticStylesLayoutFirstNodeResizeHandleFix, expValEqualsNoExposure('platform_editor_breakout_resizing', 'isEnabled', true) &&
386
388
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -438,6 +438,38 @@ export var pragmaticResizerStylesNew = css({
438
438
  }
439
439
  });
440
440
 
441
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
442
+ export var pragmaticResizerStylesSyncedBlock = css({
443
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
444
+ '.fabric-editor-breakout-mark': {
445
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
446
+ '&:has([data-prosemirror-node-name="syncBlock"]), &:has([data-prosemirror-node-name="bodiedSyncBlock"])': {
447
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
448
+ '> .pm-breakout-resize-handle-container--left': {
449
+ left: '-20px'
450
+ },
451
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
452
+ '> .pm-breakout-resize-handle-container--right': {
453
+ right: '-20px'
454
+ }
455
+ },
456
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
457
+ '&:has([data-prosemirror-node-name="syncBlock"])': {
458
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
459
+ '> .pm-breakout-resize-handle-container': {
460
+ height: 'calc(100% - 12px)'
461
+ }
462
+ },
463
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
464
+ '&:has([data-prosemirror-node-name="bodiedSyncBlock"])': {
465
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
466
+ '> .pm-breakout-resize-handle-container': {
467
+ height: 'calc(100% - 2px)'
468
+ }
469
+ }
470
+ }
471
+ });
472
+
441
473
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
442
474
  export var pragmaticResizerStylesWithReducedEditorGutter = css(_defineProperty({}, "@container editor-area (max-width: ".concat(akEditorFullPageNarrowBreakout, "px)"), {
443
475
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -2,19 +2,18 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
3
3
  import { css } from '@emotion/react';
4
4
  import { BodiedSyncBlockSharedCssClassName, SyncBlockSharedCssClassName, SyncBlockLabelSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
5
- import { akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
6
5
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
7
6
  export var syncBlockStyles = css(_defineProperty({
8
7
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
9
- '.ProseMirror': _defineProperty({}, ".".concat(SyncBlockSharedCssClassName.prefix, ", .").concat(BodiedSyncBlockSharedCssClassName.prefix), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
8
+ '.ProseMirror': _defineProperty({}, ".".concat(SyncBlockSharedCssClassName.prefix, ", .").concat(BodiedSyncBlockSharedCssClassName.prefix), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
10
9
  position: 'relative',
11
10
  cursor: 'pointer',
12
11
  borderRadius: "var(--ds-radius-small, 3px)",
13
12
  marginTop: "var(--ds-space-150, 12px)",
14
13
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
15
- marginRight: "-".concat(akEditorGutterPadding, "px"),
14
+ marginRight: "-18px",
16
15
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
17
- marginLeft: "-".concat(akEditorGutterPadding, "px"),
16
+ marginLeft: "-18px",
18
17
  marginBottom: 0,
19
18
  paddingTop: "var(--ds-space-050, 4px)",
20
19
  paddingBottom: "var(--ds-space-050, 4px)",
@@ -87,11 +86,18 @@ export var syncBlockStyles = css(_defineProperty({
87
86
  '&::before': {
88
87
  border: 'none'
89
88
  }
90
- })), "&has(.".concat(SyncBlockSharedCssClassName.error, ")"), _defineProperty({
91
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
92
- '&:hover:not(.ak-editor-selected-node)': {
93
- boxShadow: 'none'
89
+ })), ":has(.".concat(SyncBlockSharedCssClassName.error, ")"), _defineProperty({
90
+ backgroundColor: "var(--ds-background-disabled, #17171708)",
91
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
92
+ }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
93
+ opacity: 1,
94
+ visibility: 'visible',
95
+ backgroundColor: "var(--ds-surface, #FFFFFF)",
96
+ '&::before': {
97
+ border: 'none'
94
98
  }
99
+ })), ":has(.".concat(SyncBlockSharedCssClassName.loading, ")"), _defineProperty({
100
+ boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
95
101
  }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
96
102
  opacity: 0,
97
103
  visibility: 'hidden'
@@ -102,10 +108,10 @@ export var syncBlockStyles = css(_defineProperty({
102
108
  opacity: 0,
103
109
  visibility: 'hidden'
104
110
  })), ".".concat(BodiedSyncBlockSharedCssClassName.content), {
105
- padding: '0 32px',
111
+ padding: '0 18px',
106
112
  cursor: 'text'
107
113
  }), ".".concat(SyncBlockSharedCssClassName.renderer), {
108
- padding: '0 32px'
114
+ padding: '0 18px'
109
115
  }))
110
116
  }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
111
117
  color: "var(--ds-text-subtle, #505258)",
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "215.20.0";
2
+ export var version = "215.20.2";
@@ -13,4 +13,5 @@ export declare const pragmaticResizerStylesForTooltip: SerializedStyles;
13
13
  export declare const pragmaticStylesLayoutFirstNodeResizeHandleFix: SerializedStyles;
14
14
  export declare const pragmaticResizerStyles: SerializedStyles;
15
15
  export declare const pragmaticResizerStylesNew: SerializedStyles;
16
+ export declare const pragmaticResizerStylesSyncedBlock: SerializedStyles;
16
17
  export declare const pragmaticResizerStylesWithReducedEditorGutter: SerializedStyles;
@@ -13,4 +13,5 @@ export declare const pragmaticResizerStylesForTooltip: SerializedStyles;
13
13
  export declare const pragmaticStylesLayoutFirstNodeResizeHandleFix: SerializedStyles;
14
14
  export declare const pragmaticResizerStyles: SerializedStyles;
15
15
  export declare const pragmaticResizerStylesNew: SerializedStyles;
16
+ export declare const pragmaticResizerStylesSyncedBlock: SerializedStyles;
16
17
  export declare const pragmaticResizerStylesWithReducedEditorGutter: SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "215.20.1",
3
+ "version": "215.21.0",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -44,7 +44,7 @@
44
44
  "@atlaskit/analytics-namespaced-context": "^7.2.0",
45
45
  "@atlaskit/analytics-next": "^11.1.0",
46
46
  "@atlaskit/analytics-next-stable-react-context": "1.0.1",
47
- "@atlaskit/button": "^23.6.0",
47
+ "@atlaskit/button": "^23.7.0",
48
48
  "@atlaskit/css": "^0.17.0",
49
49
  "@atlaskit/editor-json-transformer": "^8.31.0",
50
50
  "@atlaskit/editor-performance-metrics": "^2.1.0",
@@ -59,13 +59,13 @@
59
59
  "@atlaskit/emoji": "^69.9.0",
60
60
  "@atlaskit/icon": "^29.0.0",
61
61
  "@atlaskit/link": "^3.2.0",
62
- "@atlaskit/media-card": "^79.9.0",
62
+ "@atlaskit/media-card": "^79.10.0",
63
63
  "@atlaskit/mention": "^24.4.0",
64
64
  "@atlaskit/platform-feature-flags": "^1.1.0",
65
65
  "@atlaskit/platform-feature-flags-react": "^0.4.0",
66
66
  "@atlaskit/react-ufo": "^4.15.0",
67
67
  "@atlaskit/task-decision": "^19.2.0",
68
- "@atlaskit/tmp-editor-statsig": "^15.6.0",
68
+ "@atlaskit/tmp-editor-statsig": "^15.8.0",
69
69
  "@atlaskit/tokens": "^8.4.0",
70
70
  "@atlaskit/tooltip": "^20.11.0",
71
71
  "@atlaskit/width-detector": "^5.0.0",
@@ -104,19 +104,18 @@
104
104
  "@atlaskit/media-core": "^37.0.0",
105
105
  "@atlaskit/media-integration-test-helpers": "workspace:^",
106
106
  "@atlaskit/media-test-helpers": "^39.0.0",
107
- "@atlaskit/modal-dialog": "^14.7.0",
108
- "@atlaskit/renderer": "^124.17.0",
109
- "@atlaskit/section-message": "^8.9.0",
107
+ "@atlaskit/modal-dialog": "^14.8.0",
108
+ "@atlaskit/renderer": "^124.18.0",
109
+ "@atlaskit/section-message": "^8.10.0",
110
110
  "@atlaskit/synchrony-test-helpers": "workspace:^",
111
- "@atlaskit/toggle": "^15.1.0",
111
+ "@atlaskit/toggle": "^15.2.0",
112
112
  "@atlaskit/util-data-test": "^18.3.0",
113
113
  "@atlassian/adf-schema-json": "^1.31.0",
114
114
  "@atlassian/feature-flags-test-utils": "^1.0.0",
115
115
  "@atlassian/search-provider": "^7.0.0",
116
116
  "@emotion/jest": "^11.8.0",
117
117
  "@storybook/addon-knobs": "^6.4.0",
118
- "@testing-library/react": "^13.4.0",
119
- "@testing-library/react-hooks": "^8.0.1",
118
+ "@testing-library/react": "^16.3.0",
120
119
  "@types/diff": "^5.0.2",
121
120
  "@types/is-number": "^7.0.0",
122
121
  "@types/react-transition-group": "^2.0.6",
@@ -389,10 +388,6 @@
389
388
  "platform_editor_nov_a11y_fixes": {
390
389
  "type": "boolean"
391
390
  },
392
- "platform_editor_table_width_refactor": {
393
- "type": "boolean",
394
- "referenceOnly": true
395
- },
396
391
  "platform_editor_toolbar_aifc_responsive_improve": {
397
392
  "type": "boolean"
398
393
  },