@atlaskit/editor-core 216.9.6 → 216.9.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/dist/cjs/presets/default.js +1 -2
- package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +6 -2
- package/dist/cjs/ui/EditorContentContainer/styles/syncBlockStyles.js +21 -2
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/presets/default.js +1 -2
- package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +7 -3
- package/dist/es2019/ui/EditorContentContainer/styles/syncBlockStyles.js +30 -0
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/presets/default.js +1 -2
- package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +7 -3
- package/dist/esm/ui/EditorContentContainer/styles/syncBlockStyles.js +20 -1
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/ui/EditorContentContainer/styles/syncBlockStyles.d.ts +2 -0
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/syncBlockStyles.d.ts +2 -0
- package/package.json +9 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 216.9.8
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`791e28216dcb1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/791e28216dcb1) -
|
|
8
|
+
[ux] EDITOR-5400 fix telepointer inside synced block is cut off
|
|
9
|
+
- [`7ef3027df8198`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7ef3027df8198) -
|
|
10
|
+
remove platform_editor_lovability_user_intent experiment
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
|
|
13
|
+
## 216.9.7
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- [`899c299510719`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/899c299510719) -
|
|
18
|
+
[ux] EDITOR-5273 fix first node in document margin for sync blocks to fix shift during ssr
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 216.9.6
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
|
@@ -43,7 +43,6 @@ var _userIntent = require("@atlaskit/editor-plugins/user-intent");
|
|
|
43
43
|
var _width = require("@atlaskit/editor-plugins/width");
|
|
44
44
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
45
45
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
46
|
-
var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
|
|
47
46
|
var _isFullPage = require("../utils/is-full-page");
|
|
48
47
|
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; }
|
|
49
48
|
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; } // #region Imports
|
|
@@ -71,7 +70,7 @@ function createDefaultPreset(options) {
|
|
|
71
70
|
return (0, _platformFeatureFlags.fg)('platform_editor_use_preferences_plugin');
|
|
72
71
|
}).maybeAdd(_interaction.interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage) || (0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)).add(_composition.compositionPlugin).add([_contextIdentifier.contextIdentifierPlugin, {
|
|
73
72
|
contextIdentifierProvider: options.contextIdentifierProvider
|
|
74
|
-
}]).add([_base.basePlugin, options.base]).add(_decorations.decorationsPlugin).add([_typeAhead.typeAheadPlugin, options.typeAhead]).maybeAdd(_history.historyPlugin, Boolean(options.allowUndoRedoButtons)).
|
|
73
|
+
}]).add([_base.basePlugin, options.base]).add(_decorations.decorationsPlugin).add([_typeAhead.typeAheadPlugin, options.typeAhead]).maybeAdd(_history.historyPlugin, Boolean(options.allowUndoRedoButtons)).add(_userIntent.userIntentPlugin).maybeAdd([_toolbar.toolbarPlugin, options.toolbar || {}], Boolean((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience)).add([_primaryToolbar.primaryToolbarPlugin, {
|
|
75
74
|
contextualFormattingEnabled: isFullPage
|
|
76
75
|
}]).maybeAdd(_undoRedo.undoRedoPlugin, Boolean((_options$featureFlags = (_options$featureFlags2 = options.featureFlags) === null || _options$featureFlags2 === void 0 ? void 0 : _options$featureFlags2.undoRedoButtons) !== null && _options$featureFlags !== void 0 ? _options$featureFlags : options.allowUndoRedoButtons)).add([_blockType.blockTypePlugin, _objectSpread(_objectSpread({}, options.blockType), {}, {
|
|
77
76
|
includeBlockQuoteAsTextstyleOption: isFullPage
|
|
@@ -360,9 +360,13 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
360
360
|
// merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
|
|
361
361
|
(0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) &&
|
|
362
362
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
363
|
-
_syncBlockStyles.syncBlockStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) &&
|
|
363
|
+
_syncBlockStyles.syncBlockStyles, (0, _experiments.editorExperiment)('platform_synced_block', true) && ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ?
|
|
364
364
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
365
|
-
_syncBlockStyles.
|
|
365
|
+
_syncBlockStyles.syncBlockOverflowStylesNew :
|
|
366
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
367
|
+
_syncBlockStyles.syncBlockOverflowStyles), (0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') &&
|
|
368
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
369
|
+
_syncBlockStyles.syncBlockFirstNodeStyles,
|
|
366
370
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
367
371
|
(0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutBaseStylesAdvanced, (0, _experiments.editorExperiment)('advanced_layouts', true) ?
|
|
368
372
|
// 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.syncBlockStyles = exports.syncBlockOverflowStyles = void 0;
|
|
7
|
+
exports.syncBlockStyles = exports.syncBlockOverflowStylesNew = exports.syncBlockOverflowStyles = exports.syncBlockFirstNodeStyles = 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");
|
|
@@ -160,4 +160,23 @@ var syncBlockOverflowStyles = exports.syncBlockOverflowStyles = (0, _react.css)(
|
|
|
160
160
|
// Contain floated elements (wrap-left/wrap-right) within synced block borders
|
|
161
161
|
overflow: 'hidden'
|
|
162
162
|
})
|
|
163
|
-
});
|
|
163
|
+
});
|
|
164
|
+
|
|
165
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
166
|
+
var syncBlockOverflowStylesNew = exports.syncBlockOverflowStylesNew = (0, _react.css)({
|
|
167
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
168
|
+
'.ProseMirror': (0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.content), {
|
|
169
|
+
// Contain floated elements (wrap-left/wrap-right) within synced block borders
|
|
170
|
+
// Use display: flow-root to create a block formatting context without clipping other content e.g. telepointers
|
|
171
|
+
display: 'flow-root'
|
|
172
|
+
}), ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer), {
|
|
173
|
+
// Contain floated elements (wrap-left/wrap-right) within synced block borders
|
|
174
|
+
// Use display: flow-root to create a block formatting context without clipping other content e.g. telepointers
|
|
175
|
+
display: 'flow-root'
|
|
176
|
+
})
|
|
177
|
+
});
|
|
178
|
+
|
|
179
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
180
|
+
var syncBlockFirstNodeStyles = exports.syncBlockFirstNodeStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".ProseMirror > .fabric-editor-breakout-mark:first-child", (0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.prefix, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.prefix), {
|
|
181
|
+
marginTop: 0
|
|
182
|
+
})));
|
|
@@ -36,7 +36,6 @@ import { userIntentPlugin } from '@atlaskit/editor-plugins/user-intent';
|
|
|
36
36
|
import { widthPlugin } from '@atlaskit/editor-plugins/width';
|
|
37
37
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
38
38
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
39
|
-
import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
|
|
40
39
|
import { isFullPage as fullPageCheck } from '../utils/is-full-page';
|
|
41
40
|
|
|
42
41
|
// #endregion
|
|
@@ -62,7 +61,7 @@ export function createDefaultPreset(options) {
|
|
|
62
61
|
}
|
|
63
62
|
}], () => fg('platform_editor_use_preferences_plugin')).maybeAdd(interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage) || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)).add(compositionPlugin).add([contextIdentifierPlugin, {
|
|
64
63
|
contextIdentifierProvider: options.contextIdentifierProvider
|
|
65
|
-
}]).add([basePlugin, options.base]).add(decorationsPlugin).add([typeAheadPlugin, options.typeAhead]).maybeAdd(historyPlugin, Boolean(options.allowUndoRedoButtons)).
|
|
64
|
+
}]).add([basePlugin, options.base]).add(decorationsPlugin).add([typeAheadPlugin, options.typeAhead]).maybeAdd(historyPlugin, Boolean(options.allowUndoRedoButtons)).add(userIntentPlugin).maybeAdd([toolbarPlugin, options.toolbar || {}], Boolean((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience)).add([primaryToolbarPlugin, {
|
|
66
65
|
contextualFormattingEnabled: isFullPage
|
|
67
66
|
}]).maybeAdd(undoRedoPlugin, Boolean((_options$featureFlags = (_options$featureFlags2 = options.featureFlags) === null || _options$featureFlags2 === void 0 ? void 0 : _options$featureFlags2.undoRedoButtons) !== null && _options$featureFlags !== void 0 ? _options$featureFlags : options.allowUndoRedoButtons)).add([blockTypePlugin, {
|
|
68
67
|
...options.blockType,
|
|
@@ -57,7 +57,7 @@ import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles
|
|
|
57
57
|
import { shadowStyles } from './styles/shadowStyles';
|
|
58
58
|
import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, showDiffDeletedNodeStyles, showDiffDeletedNodeStylesNew, smartCardDiffStyles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
|
|
59
59
|
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';
|
|
60
|
-
import { syncBlockStyles, syncBlockOverflowStyles } from './styles/syncBlockStyles';
|
|
60
|
+
import { syncBlockStyles, syncBlockFirstNodeStyles, syncBlockOverflowStyles, syncBlockOverflowStylesNew } from './styles/syncBlockStyles';
|
|
61
61
|
import { tableCommentEditorStyles, tableContainerOverflowY, tableContainerStyles, tableEmptyRowStyles, tableLayoutFixes } from './styles/tableStyles';
|
|
62
62
|
import { decisionDangerStyles, decisionIconWithVisualRefresh, decisionStyles, getDenseTasksAndDecisionsStyles, taskItemCheckboxStyles, taskItemCheckboxStylesWithBlockTaskItem, taskItemNextCheckboxStyles, taskItemStyles, taskItemStylesWithBlockTaskItem, tasksAndDecisionsStyles } from './styles/tasksAndDecisionsStyles';
|
|
63
63
|
import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
|
|
@@ -356,9 +356,13 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
356
356
|
// merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
|
|
357
357
|
fg('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, editorExperiment('platform_synced_block', true) &&
|
|
358
358
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
359
|
-
syncBlockStyles, editorExperiment('platform_synced_block', true) &&
|
|
359
|
+
syncBlockStyles, editorExperiment('platform_synced_block', true) && (fg('platform_synced_block_patch_3') ?
|
|
360
360
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
361
|
-
|
|
361
|
+
syncBlockOverflowStylesNew :
|
|
362
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
363
|
+
syncBlockOverflowStyles), editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_3') &&
|
|
364
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
365
|
+
syncBlockFirstNodeStyles,
|
|
362
366
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
363
367
|
editorExperiment('advanced_layouts', true) && layoutBaseStylesAdvanced, editorExperiment('advanced_layouts', true) ?
|
|
364
368
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -209,4 +209,34 @@ export const syncBlockOverflowStyles = css({
|
|
|
209
209
|
overflow: 'hidden'
|
|
210
210
|
}
|
|
211
211
|
}
|
|
212
|
+
});
|
|
213
|
+
|
|
214
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
215
|
+
export const syncBlockOverflowStylesNew = css({
|
|
216
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
217
|
+
'.ProseMirror': {
|
|
218
|
+
// 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
|
|
219
|
+
[`.${BodiedSyncBlockSharedCssClassName.content}`]: {
|
|
220
|
+
// Contain floated elements (wrap-left/wrap-right) within synced block borders
|
|
221
|
+
// Use display: flow-root to create a block formatting context without clipping other content e.g. telepointers
|
|
222
|
+
display: 'flow-root'
|
|
223
|
+
},
|
|
224
|
+
// 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
|
|
225
|
+
[`.${SyncBlockSharedCssClassName.renderer}`]: {
|
|
226
|
+
// Contain floated elements (wrap-left/wrap-right) within synced block borders
|
|
227
|
+
// Use display: flow-root to create a block formatting context without clipping other content e.g. telepointers
|
|
228
|
+
display: 'flow-root'
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
});
|
|
232
|
+
|
|
233
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
234
|
+
export const syncBlockFirstNodeStyles = css({
|
|
235
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
|
|
236
|
+
[`.ProseMirror > .fabric-editor-breakout-mark:first-child`]: {
|
|
237
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values,@atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
|
|
238
|
+
[`.${SyncBlockSharedCssClassName.prefix}, .${BodiedSyncBlockSharedCssClassName.prefix}`]: {
|
|
239
|
+
marginTop: 0
|
|
240
|
+
}
|
|
241
|
+
}
|
|
212
242
|
});
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "216.9.
|
|
2
|
+
export const version = "216.9.7";
|
|
@@ -39,7 +39,6 @@ import { userIntentPlugin } from '@atlaskit/editor-plugins/user-intent';
|
|
|
39
39
|
import { widthPlugin } from '@atlaskit/editor-plugins/width';
|
|
40
40
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
41
41
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
42
|
-
import { expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
|
|
43
42
|
import { isFullPage as fullPageCheck } from '../utils/is-full-page';
|
|
44
43
|
|
|
45
44
|
// #endregion
|
|
@@ -66,7 +65,7 @@ export function createDefaultPreset(options) {
|
|
|
66
65
|
return fg('platform_editor_use_preferences_plugin');
|
|
67
66
|
}).maybeAdd(interactionPlugin, Boolean(options === null || options === void 0 ? void 0 : options.__livePage) || expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true)).add(compositionPlugin).add([contextIdentifierPlugin, {
|
|
68
67
|
contextIdentifierProvider: options.contextIdentifierProvider
|
|
69
|
-
}]).add([basePlugin, options.base]).add(decorationsPlugin).add([typeAheadPlugin, options.typeAhead]).maybeAdd(historyPlugin, Boolean(options.allowUndoRedoButtons)).
|
|
68
|
+
}]).add([basePlugin, options.base]).add(decorationsPlugin).add([typeAheadPlugin, options.typeAhead]).maybeAdd(historyPlugin, Boolean(options.allowUndoRedoButtons)).add(userIntentPlugin).maybeAdd([toolbarPlugin, options.toolbar || {}], Boolean((_options$toolbar = options.toolbar) === null || _options$toolbar === void 0 ? void 0 : _options$toolbar.enableNewToolbarExperience)).add([primaryToolbarPlugin, {
|
|
70
69
|
contextualFormattingEnabled: isFullPage
|
|
71
70
|
}]).maybeAdd(undoRedoPlugin, Boolean((_options$featureFlags = (_options$featureFlags2 = options.featureFlags) === null || _options$featureFlags2 === void 0 ? void 0 : _options$featureFlags2.undoRedoButtons) !== null && _options$featureFlags !== void 0 ? _options$featureFlags : options.allowUndoRedoButtons)).add([blockTypePlugin, _objectSpread(_objectSpread({}, options.blockType), {}, {
|
|
72
71
|
includeBlockQuoteAsTextstyleOption: isFullPage
|
|
@@ -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, syncBlockOverflowStyles } from './styles/syncBlockStyles';
|
|
61
|
+
import { syncBlockStyles, syncBlockFirstNodeStyles, syncBlockOverflowStyles, syncBlockOverflowStylesNew } 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';
|
|
@@ -352,9 +352,13 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
352
352
|
// merge alignMultipleWrappedImageInLayoutStyles with layoutBaseStyles when clean up platform_editor_fix_media_in_renderer
|
|
353
353
|
fg('platform_editor_fix_media_in_renderer') && alignMultipleWrappedImageInLayoutStyles, editorExperiment('platform_synced_block', true) &&
|
|
354
354
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
355
|
-
syncBlockStyles, editorExperiment('platform_synced_block', true) &&
|
|
355
|
+
syncBlockStyles, editorExperiment('platform_synced_block', true) && (fg('platform_synced_block_patch_3') ?
|
|
356
356
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
357
|
-
|
|
357
|
+
syncBlockOverflowStylesNew :
|
|
358
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
359
|
+
syncBlockOverflowStyles), editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_3') &&
|
|
360
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
361
|
+
syncBlockFirstNodeStyles,
|
|
358
362
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
359
363
|
editorExperiment('advanced_layouts', true) && layoutBaseStylesAdvanced, editorExperiment('advanced_layouts', true) ?
|
|
360
364
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -152,4 +152,23 @@ export var syncBlockOverflowStyles = css({
|
|
|
152
152
|
// Contain floated elements (wrap-left/wrap-right) within synced block borders
|
|
153
153
|
overflow: 'hidden'
|
|
154
154
|
})
|
|
155
|
-
});
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
158
|
+
export var syncBlockOverflowStylesNew = css({
|
|
159
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
160
|
+
'.ProseMirror': _defineProperty(_defineProperty({}, ".".concat(BodiedSyncBlockSharedCssClassName.content), {
|
|
161
|
+
// Contain floated elements (wrap-left/wrap-right) within synced block borders
|
|
162
|
+
// Use display: flow-root to create a block formatting context without clipping other content e.g. telepointers
|
|
163
|
+
display: 'flow-root'
|
|
164
|
+
}), ".".concat(SyncBlockSharedCssClassName.renderer), {
|
|
165
|
+
// Contain floated elements (wrap-left/wrap-right) within synced block borders
|
|
166
|
+
// Use display: flow-root to create a block formatting context without clipping other content e.g. telepointers
|
|
167
|
+
display: 'flow-root'
|
|
168
|
+
})
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
172
|
+
export var syncBlockFirstNodeStyles = css(_defineProperty({}, ".ProseMirror > .fabric-editor-breakout-mark:first-child", _defineProperty({}, ".".concat(SyncBlockSharedCssClassName.prefix, ", .").concat(BodiedSyncBlockSharedCssClassName.prefix), {
|
|
173
|
+
marginTop: 0
|
|
174
|
+
})));
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "216.9.
|
|
2
|
+
export var version = "216.9.7";
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { type SerializedStyles } from '@emotion/react';
|
|
2
2
|
export declare const syncBlockStyles: SerializedStyles;
|
|
3
3
|
export declare const syncBlockOverflowStyles: SerializedStyles;
|
|
4
|
+
export declare const syncBlockOverflowStylesNew: SerializedStyles;
|
|
5
|
+
export declare const syncBlockFirstNodeStyles: SerializedStyles;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { type SerializedStyles } from '@emotion/react';
|
|
2
2
|
export declare const syncBlockStyles: SerializedStyles;
|
|
3
3
|
export declare const syncBlockOverflowStyles: SerializedStyles;
|
|
4
|
+
export declare const syncBlockOverflowStylesNew: SerializedStyles;
|
|
5
|
+
export declare const syncBlockFirstNodeStyles: SerializedStyles;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "216.9.
|
|
3
|
+
"version": "216.9.8",
|
|
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.2.0",
|
|
68
68
|
"@atlaskit/task-decision": "^19.2.0",
|
|
69
|
-
"@atlaskit/tmp-editor-statsig": "^25.
|
|
69
|
+
"@atlaskit/tmp-editor-statsig": "^25.6.0",
|
|
70
70
|
"@atlaskit/tokens": "^11.0.0",
|
|
71
71
|
"@atlaskit/tooltip": "^20.14.0",
|
|
72
72
|
"@atlaskit/width-detector": "^5.0.0",
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"uuid": "^3.1.0"
|
|
84
84
|
},
|
|
85
85
|
"peerDependencies": {
|
|
86
|
-
"@atlaskit/editor-common": "^111.
|
|
86
|
+
"@atlaskit/editor-common": "^111.15.0",
|
|
87
87
|
"@atlaskit/link-provider": "^4.2.0",
|
|
88
88
|
"@atlaskit/media-core": "^37.0.0",
|
|
89
89
|
"react": "^18.2.0",
|
|
@@ -100,14 +100,14 @@
|
|
|
100
100
|
"@atlaskit/editor-plugin-annotation": "^7.1.0",
|
|
101
101
|
"@atlaskit/editor-plugin-card": "^12.3.0",
|
|
102
102
|
"@atlaskit/editor-plugin-list": "^9.0.0",
|
|
103
|
-
"@atlaskit/editor-plugin-paste": "^8.
|
|
103
|
+
"@atlaskit/editor-plugin-paste": "^8.2.0",
|
|
104
104
|
"@atlaskit/link-provider": "^4.2.0",
|
|
105
105
|
"@atlaskit/logo": "^19.10.0",
|
|
106
106
|
"@atlaskit/media-core": "^37.0.0",
|
|
107
107
|
"@atlaskit/media-integration-test-helpers": "workspace:^",
|
|
108
|
-
"@atlaskit/media-test-helpers": "^
|
|
108
|
+
"@atlaskit/media-test-helpers": "^40.0.0",
|
|
109
109
|
"@atlaskit/modal-dialog": "^14.10.0",
|
|
110
|
-
"@atlaskit/renderer": "^126.
|
|
110
|
+
"@atlaskit/renderer": "^126.9.0",
|
|
111
111
|
"@atlaskit/section-message": "^8.12.0",
|
|
112
112
|
"@atlaskit/synchrony-test-helpers": "workspace:^",
|
|
113
113
|
"@atlaskit/toggle": "^15.2.0",
|
|
@@ -339,6 +339,9 @@
|
|
|
339
339
|
},
|
|
340
340
|
"platform_synced_block_patch_2": {
|
|
341
341
|
"type": "boolean"
|
|
342
|
+
},
|
|
343
|
+
"platform_synced_block_patch_3": {
|
|
344
|
+
"type": "boolean"
|
|
342
345
|
}
|
|
343
346
|
},
|
|
344
347
|
"stricter": {
|