@atlaskit/editor-core 216.7.11 → 216.7.13

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.
Files changed (13) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +3 -1
  3. package/dist/cjs/ui/EditorContentContainer/styles/syncBlockStyles.js +17 -13
  4. package/dist/cjs/version-wrapper.js +1 -1
  5. package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +4 -2
  6. package/dist/es2019/ui/EditorContentContainer/styles/syncBlockStyles.js +19 -12
  7. package/dist/es2019/version-wrapper.js +1 -1
  8. package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +4 -2
  9. package/dist/esm/ui/EditorContentContainer/styles/syncBlockStyles.js +16 -12
  10. package/dist/esm/version-wrapper.js +1 -1
  11. package/dist/types/ui/EditorContentContainer/styles/syncBlockStyles.d.ts +1 -0
  12. package/dist/types-ts4.5/ui/EditorContentContainer/styles/syncBlockStyles.d.ts +1 -0
  13. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 216.7.13
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 216.7.12
10
+
11
+ ### Patch Changes
12
+
13
+ - [`e2542bcabe129`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e2542bcabe129) -
14
+ [ux] EDITOR-4753 fix sync block label styles and border styles when it is in error state
15
+ - Updated dependencies
16
+
3
17
  ## 216.7.11
4
18
 
5
19
  ### Patch Changes
package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -359,7 +359,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
359
359
  // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
360
360
  (0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) &&
361
361
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
362
- _syncBlockStyles.syncBlockStyles,
362
+ _syncBlockStyles.syncBlockStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding') &&
363
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
364
+ _syncBlockStyles.syncBlockOverflowStyles,
363
365
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
364
366
  (0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutBaseStylesAdvanced, (0, _experiments.editorExperiment)('advanced_layouts', true) ?
365
367
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
package/dist/cjs/ui/EditorContentContainer/styles/syncBlockStyles.js CHANGED
@@ -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.syncBlockStyles = void 0;
7
+ exports.syncBlockStyles = exports.syncBlockOverflowStyles = 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");
@@ -78,17 +78,9 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _definePrope
78
78
  '&::before': {
79
79
  border: 'none'
80
80
  }
81
- })), ":has(.".concat(_syncBlock.SyncBlockSharedCssClassName.error, ")"), (0, _defineProperty2.default)({
82
- backgroundColor: "var(--ds-background-disabled, #17171708)",
83
- boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
84
- }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
85
- opacity: 1,
86
- visibility: 'visible',
87
- backgroundColor: "var(--ds-surface, #FFFFFF)",
88
- '&::before': {
89
- border: 'none'
90
- }
91
- })), ":has(.".concat(_syncBlock.SyncBlockSharedCssClassName.loading, ")"), (0, _defineProperty2.default)({
81
+ })), ":has(.".concat(_syncBlock.SyncBlockSharedCssClassName.error, ")"), {
82
+ backgroundColor: "var(--ds-background-disabled, #17171708)"
83
+ }), ":has(.".concat(_syncBlock.SyncBlockSharedCssClassName.loading, ")"), (0, _defineProperty2.default)({
92
84
  boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
93
85
  }, ".".concat(_syncBlock.SyncBlockLabelSharedCssClassName.labelClassName), {
94
86
  opacity: 0,
@@ -135,4 +127,16 @@ var syncBlockStyles = exports.syncBlockStyles = (0, _react.css)((0, _definePrope
135
127
  right: "var(--ds-space-150, 12px)",
136
128
  backgroundColor: "var(--ds-surface, #FFFFFF)",
137
129
  maxWidth: '140px'
138
- }));
130
+ }));
131
+
132
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
133
+ var syncBlockOverflowStyles = exports.syncBlockOverflowStyles = (0, _react.css)({
134
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
135
+ '.ProseMirror': (0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.content), {
136
+ // Contain floated elements (wrap-left/wrap-right) within synced block borders
137
+ overflow: 'hidden'
138
+ }), ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer), {
139
+ // Contain floated elements (wrap-left/wrap-right) within synced block borders
140
+ overflow: 'hidden'
141
+ })
142
+ });
package/dist/cjs/version-wrapper.js CHANGED
@@ -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 = "216.7.10";
8
+ var version = exports.version = "216.7.12";
package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -58,7 +58,7 @@ import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles
58
58
  import { shadowStyles } from './styles/shadowStyles';
59
59
  import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, showDiffDeletedNodeStylesNew, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
60
60
  import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
61
- import { syncBlockStyles } from './styles/syncBlockStyles';
61
+ import { syncBlockStyles, syncBlockOverflowStyles } from './styles/syncBlockStyles';
62
62
  import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
63
63
  import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemCheckboxStyles, taskItemCheckboxStylesWithBlockTaskItem, taskItemNextCheckboxStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
64
64
  import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
@@ -355,7 +355,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
355
355
  // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
356
356
  fg('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, editorExperiment('platform_synced_block', true) &&
357
357
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
358
- syncBlockStyles,
358
+ syncBlockStyles, editorExperiment('platform_synced_block', true) && fg('platform_synced_block_dogfooding') &&
359
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
360
+ syncBlockOverflowStyles,
359
361
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
360
362
  editorExperiment('advanced_layouts', true) && layoutBaseStylesAdvanced, editorExperiment('advanced_layouts', true) ?
361
363
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
package/dist/es2019/ui/EditorContentContainer/styles/syncBlockStyles.js CHANGED
@@ -94,20 +94,10 @@ export const syncBlockStyles = css({
94
94
  }
95
95
  },
96
96
  /* Error state */
97
- /* In error state sync block should not have hover styles or show the label */
97
+ /* In error state sync block should have disabled background colour */
98
98
  // 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
99
99
  [`:has(.${SyncBlockSharedCssClassName.error})`]: {
100
- backgroundColor: "var(--ds-background-disabled, #17171708)",
101
- boxShadow: `0 0 0 1px ${"var(--ds-border, #0B120E24)"}`,
102
- // 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
103
- [`.${SyncBlockLabelSharedCssClassName.labelClassName}`]: {
104
- opacity: 1,
105
- visibility: 'visible',
106
- backgroundColor: "var(--ds-surface, #FFFFFF)",
107
- '&::before': {
108
- border: 'none'
109
- }
110
- }
100
+ backgroundColor: "var(--ds-background-disabled, #17171708)"
111
101
  },
112
102
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
113
103
  [`:has(.${SyncBlockSharedCssClassName.loading})`]: {
@@ -176,4 +166,21 @@ export const syncBlockStyles = css({
176
166
  backgroundColor: "var(--ds-surface, #FFFFFF)",
177
167
  maxWidth: '140px'
178
168
  }
169
+ });
170
+
171
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
172
+ export const syncBlockOverflowStyles = css({
173
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
174
+ '.ProseMirror': {
175
+ // 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
176
+ [`.${BodiedSyncBlockSharedCssClassName.content}`]: {
177
+ // Contain floated elements (wrap-left/wrap-right) within synced block borders
178
+ overflow: 'hidden'
179
+ },
180
+ // 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
181
+ [`.${SyncBlockSharedCssClassName.renderer}`]: {
182
+ // Contain floated elements (wrap-left/wrap-right) within synced block borders
183
+ overflow: 'hidden'
184
+ }
185
+ }
179
186
  });
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "216.7.10";
2
+ export const version = "216.7.12";
package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js CHANGED
@@ -59,7 +59,7 @@ import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles
59
59
  import { shadowStyles } from './styles/shadowStyles';
60
60
  import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, showDiffDeletedNodeStylesNew, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
61
61
  import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
62
- import { syncBlockStyles } from './styles/syncBlockStyles';
62
+ import { syncBlockStyles, syncBlockOverflowStyles } from './styles/syncBlockStyles';
63
63
  import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
64
64
  import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemCheckboxStyles, taskItemCheckboxStylesWithBlockTaskItem, taskItemNextCheckboxStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
65
65
  import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
@@ -351,7 +351,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
351
351
  // merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
352
352
  fg('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, editorExperiment('platform_synced_block', true) &&
353
353
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
354
- syncBlockStyles,
354
+ syncBlockStyles, editorExperiment('platform_synced_block', true) && fg('platform_synced_block_dogfooding') &&
355
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
356
+ syncBlockOverflowStyles,
355
357
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
356
358
  editorExperiment('advanced_layouts', true) && layoutBaseStylesAdvanced, editorExperiment('advanced_layouts', true) ?
357
359
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
package/dist/esm/ui/EditorContentContainer/styles/syncBlockStyles.js CHANGED
@@ -70,17 +70,9 @@ export var syncBlockStyles = css(_defineProperty({
70
70
  '&::before': {
71
71
  border: 'none'
72
72
  }
73
- })), ":has(.".concat(SyncBlockSharedCssClassName.error, ")"), _defineProperty({
74
- backgroundColor: "var(--ds-background-disabled, #17171708)",
75
- boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
76
- }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
77
- opacity: 1,
78
- visibility: 'visible',
79
- backgroundColor: "var(--ds-surface, #FFFFFF)",
80
- '&::before': {
81
- border: 'none'
82
- }
83
- })), ":has(.".concat(SyncBlockSharedCssClassName.loading, ")"), _defineProperty({
73
+ })), ":has(.".concat(SyncBlockSharedCssClassName.error, ")"), {
74
+ backgroundColor: "var(--ds-background-disabled, #17171708)"
75
+ }), ":has(.".concat(SyncBlockSharedCssClassName.loading, ")"), _defineProperty({
84
76
  boxShadow: "0 0 0 1px ".concat("var(--ds-border, #0B120E24)")
85
77
  }, ".".concat(SyncBlockLabelSharedCssClassName.labelClassName), {
86
78
  opacity: 0,
@@ -127,4 +119,16 @@ export var syncBlockStyles = css(_defineProperty({
127
119
  right: "var(--ds-space-150, 12px)",
128
120
  backgroundColor: "var(--ds-surface, #FFFFFF)",
129
121
  maxWidth: '140px'
130
- }));
122
+ }));
123
+
124
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
125
+ export var syncBlockOverflowStyles = css({
126
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
127
+ '.ProseMirror': _defineProperty(_defineProperty({}, ".".concat(BodiedSyncBlockSharedCssClassName.content), {
128
+ // Contain floated elements (wrap-left/wrap-right) within synced block borders
129
+ overflow: 'hidden'
130
+ }), ".".concat(SyncBlockSharedCssClassName.renderer), {
131
+ // Contain floated elements (wrap-left/wrap-right) within synced block borders
132
+ overflow: 'hidden'
133
+ })
134
+ });
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "216.7.10";
2
+ export var version = "216.7.12";
package/dist/types/ui/EditorContentContainer/styles/syncBlockStyles.d.ts CHANGED
@@ -1,2 +1,3 @@
1
1
  import { type SerializedStyles } from '@emotion/react';
2
2
  export declare const syncBlockStyles: SerializedStyles;
3
+ export declare const syncBlockOverflowStyles: SerializedStyles;
package/dist/types-ts4.5/ui/EditorContentContainer/styles/syncBlockStyles.d.ts CHANGED
@@ -1,2 +1,3 @@
1
1
  import { type SerializedStyles } from '@emotion/react';
2
2
  export declare const syncBlockStyles: SerializedStyles;
3
+ export declare const syncBlockOverflowStyles: SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "216.7.11",
3
+ "version": "216.7.13",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -66,7 +66,7 @@
66
66
  "@atlaskit/platform-feature-flags-react": "^0.4.0",
67
67
  "@atlaskit/react-ufo": "^5.0.0",
68
68
  "@atlaskit/task-decision": "^19.2.0",
69
- "@atlaskit/tmp-editor-statsig": "^16.35.0",
69
+ "@atlaskit/tmp-editor-statsig": "^17.0.0",
70
70
  "@atlaskit/tokens": "^10.1.0",
71
71
  "@atlaskit/tooltip": "^20.14.0",
72
72
  "@atlaskit/width-detector": "^5.0.0",
@@ -96,7 +96,7 @@
96
96
  "@af/visual-regression": "workspace:^",
97
97
  "@atlaskit/adf-utils": "^19.27.0",
98
98
  "@atlaskit/analytics-listeners": "^9.3.0",
99
- "@atlaskit/collab-provider": "^15.0.0",
99
+ "@atlaskit/collab-provider": "^15.1.0",
100
100
  "@atlaskit/editor-plugin-annotation": "^7.1.0",
101
101
  "@atlaskit/editor-plugin-card": "^12.1.0",
102
102
  "@atlaskit/editor-plugin-list": "^9.0.0",