@atlaskit/editor-core 216.8.3 → 216.9.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 +19 -0
- package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +7 -3
- package/dist/cjs/ui/EditorContentContainer/styles/layout.js +45 -1
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +8 -4
- package/dist/es2019/ui/EditorContentContainer/styles/layout.js +46 -0
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +8 -4
- package/dist/esm/ui/EditorContentContainer/styles/layout.js +44 -0
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/create-editor/create-universal-preset.d.ts +1 -0
- package/dist/types/presets/universal.d.ts +1 -0
- package/dist/types/presets/useUniversalPreset.d.ts +1 -0
- package/dist/types/ui/EditorContentContainer/styles/layout.d.ts +6 -0
- package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts +1 -0
- package/dist/types-ts4.5/presets/universal.d.ts +1 -0
- package/dist/types-ts4.5/presets/useUniversalPreset.d.ts +1 -0
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/layout.d.ts +6 -0
- package/package.json +7 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 216.9.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`280d14e2d5518`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/280d14e2d5518) -
|
|
8
|
+
Clean up platform_editor_drag_handle_aria_label
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
11
|
+
## 216.9.0
|
|
12
|
+
|
|
13
|
+
### Minor Changes
|
|
14
|
+
|
|
15
|
+
- [`8f0979d3d26a8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8f0979d3d26a8) -
|
|
16
|
+
EDITOR-3963 fix nested layout style inside synced block
|
|
17
|
+
|
|
18
|
+
### Patch Changes
|
|
19
|
+
|
|
20
|
+
- Updated dependencies
|
|
21
|
+
|
|
3
22
|
## 216.8.3
|
|
4
23
|
|
|
5
24
|
### Patch Changes
|
|
@@ -378,13 +378,17 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
378
378
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
379
379
|
_layout.layoutSelectedStylesAdvanced :
|
|
380
380
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
381
|
-
_layout.layoutSelectedStylesNotAdvanced,
|
|
381
|
+
_layout.layoutSelectedStylesNotAdvanced, (0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_2') &&
|
|
382
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
383
|
+
_layout.layoutSelectedStylesAdvancedFix,
|
|
382
384
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
383
385
|
(0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutColumnResponsiveStyles,
|
|
384
386
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
385
|
-
(0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutResponsiveBaseStyles, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') &&
|
|
387
|
+
(0, _experiments.editorExperiment)('advanced_layouts', true) && _layout.layoutResponsiveBaseStyles, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && ((0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_2') ?
|
|
388
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
389
|
+
_layout.layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync :
|
|
386
390
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
387
|
-
_layout.layoutBaseStylesFixesUnderNestedDnDFG, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ?
|
|
391
|
+
_layout.layoutBaseStylesFixesUnderNestedDnDFG), (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ?
|
|
388
392
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
389
393
|
_layout.layoutColumnMartinTopFixesNew :
|
|
390
394
|
// 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.layoutStylesForView = exports.layoutSelectedStylesNotAdvanced = exports.layoutSelectedStylesForViewNotAdvanced = exports.layoutSelectedStylesForViewAdvanced = exports.layoutSelectedStylesAdvanced = exports.layoutSectionStylesNotAdvanced = exports.layoutSectionStylesAdvanced = exports.layoutResponsiveStylesForView = exports.layoutResponsiveBaseStyles = exports.layoutColumnStylesNotAdvanced = exports.layoutColumnStylesAdvanced = exports.layoutColumnResponsiveStyles = exports.layoutColumnMartinTopFixesOld = exports.layoutColumnMartinTopFixesNew = exports.layoutBaseStylesWithTableExcerptsFix = exports.layoutBaseStylesFixesUnderNestedDnDFG = exports.layoutBaseStylesAdvanced = exports.layoutBaseStyles = void 0;
|
|
7
|
+
exports.layoutStylesForView = exports.layoutSelectedStylesNotAdvanced = exports.layoutSelectedStylesForViewNotAdvanced = exports.layoutSelectedStylesForViewAdvanced = exports.layoutSelectedStylesAdvancedFix = exports.layoutSelectedStylesAdvanced = exports.layoutSectionStylesNotAdvanced = exports.layoutSectionStylesAdvanced = exports.layoutResponsiveStylesForView = exports.layoutResponsiveBaseStyles = exports.layoutColumnStylesNotAdvanced = exports.layoutColumnStylesAdvanced = exports.layoutColumnResponsiveStyles = exports.layoutColumnMartinTopFixesOld = exports.layoutColumnMartinTopFixesNew = exports.layoutBaseStylesWithTableExcerptsFix = exports.layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync = exports.layoutBaseStylesFixesUnderNestedDnDFG = exports.layoutBaseStylesAdvanced = exports.layoutBaseStyles = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _react = require("@emotion/react");
|
|
10
10
|
var _selectionStyles = require("./selectionStyles");
|
|
@@ -263,6 +263,26 @@ var layoutSelectedStylesAdvanced = exports.layoutSelectedStylesAdvanced = (0, _r
|
|
|
263
263
|
}
|
|
264
264
|
});
|
|
265
265
|
|
|
266
|
+
// Fix for layoutSelectedStylesAdvanced that addresses an issue where the delete indicator
|
|
267
|
+
// sometimes doesn't appear when inside a synced block.
|
|
268
|
+
// Separated as a distinct style to allow feature-gating without affecting module-level styles.
|
|
269
|
+
// This prevents style inconsistencies before the feature flag is initialized.
|
|
270
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
271
|
+
var layoutSelectedStylesAdvancedFix = exports.layoutSelectedStylesAdvancedFix = (0, _react.css)({
|
|
272
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
273
|
+
'.ProseMirror': {
|
|
274
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
275
|
+
'[data-layout-section], .layoutSectionView-content-wrap': (0, _defineProperty2.default)({
|
|
276
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
277
|
+
'&.selected.danger [data-layout-section]': {
|
|
278
|
+
boxShadow: "inset 0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)")
|
|
279
|
+
}
|
|
280
|
+
}, "&.".concat(akEditorSelectedNodeClassName, ":not(.danger) [data-layout-section]"), {
|
|
281
|
+
boxShadow: "inset 0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)")
|
|
282
|
+
})
|
|
283
|
+
}
|
|
284
|
+
});
|
|
285
|
+
|
|
266
286
|
/**
|
|
267
287
|
* Base responsive styles for layout
|
|
268
288
|
*/
|
|
@@ -465,6 +485,30 @@ var layoutBaseStylesFixesUnderNestedDnDFG = exports.layoutBaseStylesFixesUnderNe
|
|
|
465
485
|
}
|
|
466
486
|
});
|
|
467
487
|
|
|
488
|
+
/**
|
|
489
|
+
* Spacing overrides when platform_editor_nested_dnd_styles_changes is on,
|
|
490
|
+
* excluding layouts inside bodied sync blocks
|
|
491
|
+
*/
|
|
492
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
493
|
+
var layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync = exports.layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync = (0, _react.css)({
|
|
494
|
+
// Apply -20px margin to all sections
|
|
495
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
496
|
+
'.ProseMirror [data-layout-section]': {
|
|
497
|
+
margin: "var(--ds-space-100, 8px)".concat(" -20px 0")
|
|
498
|
+
},
|
|
499
|
+
// Reset to default margin when inside bodied sync block
|
|
500
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
501
|
+
'.ProseMirror [data-prosemirror-node-name="bodiedSyncBlock"] [data-layout-section]': {
|
|
502
|
+
margin: "var(--ds-space-100, 8px)".concat(" -12px 0")
|
|
503
|
+
},
|
|
504
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
505
|
+
'.ProseMirror [data-layout-section] [data-layout-column]': {
|
|
506
|
+
padding: '12px 20px'
|
|
507
|
+
}
|
|
508
|
+
});
|
|
509
|
+
|
|
510
|
+
// platform_synced_block_patch_2
|
|
511
|
+
|
|
468
512
|
/**
|
|
469
513
|
* Layout in view mode styles for selected state when advanced layouts experiment is on.
|
|
470
514
|
*/
|
|
@@ -41,7 +41,7 @@ import { gapCursorStyles } from './styles/gapCursorStyles';
|
|
|
41
41
|
import { gridStyles } from './styles/gridStyles';
|
|
42
42
|
import { indentationStyles } from './styles/indentationStyles';
|
|
43
43
|
import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
|
|
44
|
-
import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesWithTableExcerptsFix, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
|
|
44
|
+
import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesWithTableExcerptsFix, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView, layoutSelectedStylesAdvancedFix, layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync } from './styles/layout';
|
|
45
45
|
import { hyperLinkFloatingToolbarStyles, linkStyles } from './styles/link';
|
|
46
46
|
import { diffListStyles, getDenseListStyles, listsStyles, listsStylesMarginLayoutShiftFix, listsStylesSafariFix } from './styles/list';
|
|
47
47
|
import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
|
|
@@ -374,13 +374,17 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
374
374
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
375
375
|
layoutSelectedStylesAdvanced :
|
|
376
376
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
377
|
-
layoutSelectedStylesNotAdvanced,
|
|
377
|
+
layoutSelectedStylesNotAdvanced, editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_2') &&
|
|
378
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
379
|
+
layoutSelectedStylesAdvancedFix,
|
|
378
380
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
379
381
|
editorExperiment('advanced_layouts', true) && layoutColumnResponsiveStyles,
|
|
380
382
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
381
|
-
editorExperiment('advanced_layouts', true) && layoutResponsiveBaseStyles, fg('platform_editor_nested_dnd_styles_changes') &&
|
|
383
|
+
editorExperiment('advanced_layouts', true) && layoutResponsiveBaseStyles, fg('platform_editor_nested_dnd_styles_changes') && (editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_2') ?
|
|
384
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
385
|
+
layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync :
|
|
382
386
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
383
|
-
layoutBaseStylesFixesUnderNestedDnDFG, fg('platform_editor_nested_dnd_styles_changes') ?
|
|
387
|
+
layoutBaseStylesFixesUnderNestedDnDFG), fg('platform_editor_nested_dnd_styles_changes') ?
|
|
384
388
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
385
389
|
layoutColumnMartinTopFixesNew :
|
|
386
390
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -271,6 +271,28 @@ export const layoutSelectedStylesAdvanced = css({
|
|
|
271
271
|
}
|
|
272
272
|
});
|
|
273
273
|
|
|
274
|
+
// Fix for layoutSelectedStylesAdvanced that addresses an issue where the delete indicator
|
|
275
|
+
// sometimes doesn't appear when inside a synced block.
|
|
276
|
+
// Separated as a distinct style to allow feature-gating without affecting module-level styles.
|
|
277
|
+
// This prevents style inconsistencies before the feature flag is initialized.
|
|
278
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
279
|
+
export const layoutSelectedStylesAdvancedFix = css({
|
|
280
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
281
|
+
'.ProseMirror': {
|
|
282
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
283
|
+
'[data-layout-section], .layoutSectionView-content-wrap': {
|
|
284
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
285
|
+
'&.selected.danger [data-layout-section]': {
|
|
286
|
+
boxShadow: `inset 0 0 0 1px ${"var(--ds-border-danger, #E2483D)"}`
|
|
287
|
+
},
|
|
288
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
|
|
289
|
+
[`&.${akEditorSelectedNodeClassName}:not(.danger) [data-layout-section]`]: {
|
|
290
|
+
boxShadow: `inset 0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}`
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
});
|
|
295
|
+
|
|
274
296
|
/**
|
|
275
297
|
* Base responsive styles for layout
|
|
276
298
|
*/
|
|
@@ -528,6 +550,30 @@ export const layoutBaseStylesFixesUnderNestedDnDFG = css({
|
|
|
528
550
|
}
|
|
529
551
|
});
|
|
530
552
|
|
|
553
|
+
/**
|
|
554
|
+
* Spacing overrides when platform_editor_nested_dnd_styles_changes is on,
|
|
555
|
+
* excluding layouts inside bodied sync blocks
|
|
556
|
+
*/
|
|
557
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
558
|
+
export const layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync = css({
|
|
559
|
+
// Apply -20px margin to all sections
|
|
560
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
561
|
+
'.ProseMirror [data-layout-section]': {
|
|
562
|
+
margin: `${"var(--ds-space-100, 8px)"} -20px 0`
|
|
563
|
+
},
|
|
564
|
+
// Reset to default margin when inside bodied sync block
|
|
565
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
566
|
+
'.ProseMirror [data-prosemirror-node-name="bodiedSyncBlock"] [data-layout-section]': {
|
|
567
|
+
margin: `${"var(--ds-space-100, 8px)"} -12px 0`
|
|
568
|
+
},
|
|
569
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
570
|
+
'.ProseMirror [data-layout-section] [data-layout-column]': {
|
|
571
|
+
padding: '12px 20px'
|
|
572
|
+
}
|
|
573
|
+
});
|
|
574
|
+
|
|
575
|
+
// platform_synced_block_patch_2
|
|
576
|
+
|
|
531
577
|
/**
|
|
532
578
|
* Layout in view mode styles for selected state when advanced layouts experiment is on.
|
|
533
579
|
*/
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "
|
|
2
|
+
export const version = "216.9.0";
|
|
@@ -42,7 +42,7 @@ import { gapCursorStyles } from './styles/gapCursorStyles';
|
|
|
42
42
|
import { gridStyles } from './styles/gridStyles';
|
|
43
43
|
import { indentationStyles } from './styles/indentationStyles';
|
|
44
44
|
import { InlineNodeViewSharedStyles } from './styles/inlineNodeViewSharedStyles';
|
|
45
|
-
import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesWithTableExcerptsFix, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView } from './styles/layout';
|
|
45
|
+
import { layoutBaseStyles, layoutBaseStylesAdvanced, layoutBaseStylesWithTableExcerptsFix, layoutBaseStylesFixesUnderNestedDnDFG, layoutColumnMartinTopFixesNew, layoutColumnMartinTopFixesOld, layoutColumnResponsiveStyles, layoutColumnStylesAdvanced, layoutColumnStylesNotAdvanced, layoutResponsiveBaseStyles, layoutResponsiveStylesForView, layoutSectionStylesAdvanced, layoutSectionStylesNotAdvanced, layoutSelectedStylesAdvanced, layoutSelectedStylesForViewAdvanced, layoutSelectedStylesForViewNotAdvanced, layoutSelectedStylesNotAdvanced, layoutStylesForView, layoutSelectedStylesAdvancedFix, layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync } from './styles/layout';
|
|
46
46
|
import { hyperLinkFloatingToolbarStyles, linkStyles } from './styles/link';
|
|
47
47
|
import { diffListStyles, getDenseListStyles, listsStyles, listsStylesMarginLayoutShiftFix, listsStylesSafariFix } from './styles/list';
|
|
48
48
|
import { mediaAlignmentStyles, mediaCaptionStyles, mediaDangerStyles, mediaGroupStyles, mediaStyles } from './styles/mediaStyles';
|
|
@@ -370,13 +370,17 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
370
370
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
371
371
|
layoutSelectedStylesAdvanced :
|
|
372
372
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
373
|
-
layoutSelectedStylesNotAdvanced,
|
|
373
|
+
layoutSelectedStylesNotAdvanced, editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_2') &&
|
|
374
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
375
|
+
layoutSelectedStylesAdvancedFix,
|
|
374
376
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
375
377
|
editorExperiment('advanced_layouts', true) && layoutColumnResponsiveStyles,
|
|
376
378
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
377
|
-
editorExperiment('advanced_layouts', true) && layoutResponsiveBaseStyles, fg('platform_editor_nested_dnd_styles_changes') &&
|
|
379
|
+
editorExperiment('advanced_layouts', true) && layoutResponsiveBaseStyles, fg('platform_editor_nested_dnd_styles_changes') && (editorExperiment('platform_synced_block', true) && fg('platform_synced_block_patch_2') ?
|
|
380
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
381
|
+
layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync :
|
|
378
382
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
379
|
-
layoutBaseStylesFixesUnderNestedDnDFG, fg('platform_editor_nested_dnd_styles_changes') ?
|
|
383
|
+
layoutBaseStylesFixesUnderNestedDnDFG), fg('platform_editor_nested_dnd_styles_changes') ?
|
|
380
384
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
381
385
|
layoutColumnMartinTopFixesNew :
|
|
382
386
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -255,6 +255,26 @@ export var layoutSelectedStylesAdvanced = css({
|
|
|
255
255
|
}
|
|
256
256
|
});
|
|
257
257
|
|
|
258
|
+
// Fix for layoutSelectedStylesAdvanced that addresses an issue where the delete indicator
|
|
259
|
+
// sometimes doesn't appear when inside a synced block.
|
|
260
|
+
// Separated as a distinct style to allow feature-gating without affecting module-level styles.
|
|
261
|
+
// This prevents style inconsistencies before the feature flag is initialized.
|
|
262
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
263
|
+
export var layoutSelectedStylesAdvancedFix = css({
|
|
264
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
265
|
+
'.ProseMirror': {
|
|
266
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
267
|
+
'[data-layout-section], .layoutSectionView-content-wrap': _defineProperty({
|
|
268
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
269
|
+
'&.selected.danger [data-layout-section]': {
|
|
270
|
+
boxShadow: "inset 0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)")
|
|
271
|
+
}
|
|
272
|
+
}, "&.".concat(akEditorSelectedNodeClassName, ":not(.danger) [data-layout-section]"), {
|
|
273
|
+
boxShadow: "inset 0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)")
|
|
274
|
+
})
|
|
275
|
+
}
|
|
276
|
+
});
|
|
277
|
+
|
|
258
278
|
/**
|
|
259
279
|
* Base responsive styles for layout
|
|
260
280
|
*/
|
|
@@ -457,6 +477,30 @@ export var layoutBaseStylesFixesUnderNestedDnDFG = css({
|
|
|
457
477
|
}
|
|
458
478
|
});
|
|
459
479
|
|
|
480
|
+
/**
|
|
481
|
+
* Spacing overrides when platform_editor_nested_dnd_styles_changes is on,
|
|
482
|
+
* excluding layouts inside bodied sync blocks
|
|
483
|
+
*/
|
|
484
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
485
|
+
export var layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync = css({
|
|
486
|
+
// Apply -20px margin to all sections
|
|
487
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
488
|
+
'.ProseMirror [data-layout-section]': {
|
|
489
|
+
margin: "var(--ds-space-100, 8px)".concat(" -20px 0")
|
|
490
|
+
},
|
|
491
|
+
// Reset to default margin when inside bodied sync block
|
|
492
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
493
|
+
'.ProseMirror [data-prosemirror-node-name="bodiedSyncBlock"] [data-layout-section]': {
|
|
494
|
+
margin: "var(--ds-space-100, 8px)".concat(" -12px 0")
|
|
495
|
+
},
|
|
496
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
497
|
+
'.ProseMirror [data-layout-section] [data-layout-column]': {
|
|
498
|
+
padding: '12px 20px'
|
|
499
|
+
}
|
|
500
|
+
});
|
|
501
|
+
|
|
502
|
+
// platform_synced_block_patch_2
|
|
503
|
+
|
|
460
504
|
/**
|
|
461
505
|
* Layout in view mode styles for selected state when advanced layouts experiment is on.
|
|
462
506
|
*/
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "
|
|
2
|
+
export var version = "216.9.0";
|
|
@@ -493,6 +493,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
|
|
|
493
493
|
addQuickInsertItem: (item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
494
494
|
openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
|
|
495
495
|
removeQuickInsertItem: (key: string) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
496
|
+
updateQuickInsertItem: (key: string, item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
496
497
|
};
|
|
497
498
|
dependencies: [import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugin-connectivity").ConnectivityPlugin>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/metrics").MetricsPlugin>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/analytics").AnalyticsPlugin>];
|
|
498
499
|
pluginConfiguration: import("@atlaskit/editor-plugin-quick-insert").QuickInsertPluginOptions | undefined;
|
|
@@ -566,6 +566,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
|
|
|
566
566
|
addQuickInsertItem: (item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
567
567
|
openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
|
|
568
568
|
removeQuickInsertItem: (key: string) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
569
|
+
updateQuickInsertItem: (key: string, item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
569
570
|
};
|
|
570
571
|
dependencies: [import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugin-connectivity").ConnectivityPlugin>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/metrics").MetricsPlugin>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/analytics").AnalyticsPlugin>];
|
|
571
572
|
pluginConfiguration: import("@atlaskit/editor-plugin-quick-insert").QuickInsertPluginOptions | undefined;
|
|
@@ -493,6 +493,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
|
|
|
493
493
|
addQuickInsertItem: (item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
494
494
|
openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
|
|
495
495
|
removeQuickInsertItem: (key: string) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
496
|
+
updateQuickInsertItem: (key: string, item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
496
497
|
};
|
|
497
498
|
dependencies: [import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugin-connectivity").ConnectivityPlugin>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/metrics").MetricsPlugin>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-plugins/analytics").AnalyticsPlugin>];
|
|
498
499
|
pluginConfiguration: import("@atlaskit/editor-plugin-quick-insert").QuickInsertPluginOptions | undefined;
|
|
@@ -27,6 +27,7 @@ export declare const layoutSelectedStylesNotAdvanced: SerializedStyles;
|
|
|
27
27
|
* Selected styles for layout when advanced layouts experiment is on
|
|
28
28
|
*/
|
|
29
29
|
export declare const layoutSelectedStylesAdvanced: SerializedStyles;
|
|
30
|
+
export declare const layoutSelectedStylesAdvancedFix: SerializedStyles;
|
|
30
31
|
/**
|
|
31
32
|
* Base responsive styles for layout
|
|
32
33
|
*/
|
|
@@ -48,6 +49,11 @@ export declare const layoutBaseStylesAdvanced: SerializedStyles;
|
|
|
48
49
|
* Spacing overrides when platform_editor_nested_dnd_styles_changes is on
|
|
49
50
|
*/
|
|
50
51
|
export declare const layoutBaseStylesFixesUnderNestedDnDFG: SerializedStyles;
|
|
52
|
+
/**
|
|
53
|
+
* Spacing overrides when platform_editor_nested_dnd_styles_changes is on,
|
|
54
|
+
* excluding layouts inside bodied sync blocks
|
|
55
|
+
*/
|
|
56
|
+
export declare const layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync: SerializedStyles;
|
|
51
57
|
/**
|
|
52
58
|
* Layout in view mode styles for selected state when advanced layouts experiment is on.
|
|
53
59
|
*/
|
|
@@ -694,6 +694,7 @@ export declare function createUniversalPreset({ props, prevProps, initialPluginC
|
|
|
694
694
|
addQuickInsertItem: (item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
695
695
|
openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
|
|
696
696
|
removeQuickInsertItem: (key: string) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
697
|
+
updateQuickInsertItem: (key: string, item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
697
698
|
};
|
|
698
699
|
dependencies: [
|
|
699
700
|
import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin,
|
|
@@ -767,6 +767,7 @@ export default function createUniversalPresetInternal({ appearance, props, featu
|
|
|
767
767
|
addQuickInsertItem: (item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
768
768
|
openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
|
|
769
769
|
removeQuickInsertItem: (key: string) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
770
|
+
updateQuickInsertItem: (key: string, item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
770
771
|
};
|
|
771
772
|
dependencies: [
|
|
772
773
|
import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin,
|
|
@@ -694,6 +694,7 @@ export default function useUniversalPreset({ props, initialPluginConfiguration }
|
|
|
694
694
|
addQuickInsertItem: (item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
695
695
|
openElementBrowserModal: import("@atlaskit/editor-common/types").EditorCommand;
|
|
696
696
|
removeQuickInsertItem: (key: string) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
697
|
+
updateQuickInsertItem: (key: string, item: import("@atlaskit/editor-common/types").QuickInsertHandler) => import("@atlaskit/editor-common/types").EditorCommand;
|
|
697
698
|
};
|
|
698
699
|
dependencies: [
|
|
699
700
|
import("@atlaskit/editor-plugins/type-ahead").TypeAheadPlugin,
|
|
@@ -27,6 +27,7 @@ export declare const layoutSelectedStylesNotAdvanced: SerializedStyles;
|
|
|
27
27
|
* Selected styles for layout when advanced layouts experiment is on
|
|
28
28
|
*/
|
|
29
29
|
export declare const layoutSelectedStylesAdvanced: SerializedStyles;
|
|
30
|
+
export declare const layoutSelectedStylesAdvancedFix: SerializedStyles;
|
|
30
31
|
/**
|
|
31
32
|
* Base responsive styles for layout
|
|
32
33
|
*/
|
|
@@ -48,6 +49,11 @@ export declare const layoutBaseStylesAdvanced: SerializedStyles;
|
|
|
48
49
|
* Spacing overrides when platform_editor_nested_dnd_styles_changes is on
|
|
49
50
|
*/
|
|
50
51
|
export declare const layoutBaseStylesFixesUnderNestedDnDFG: SerializedStyles;
|
|
52
|
+
/**
|
|
53
|
+
* Spacing overrides when platform_editor_nested_dnd_styles_changes is on,
|
|
54
|
+
* excluding layouts inside bodied sync blocks
|
|
55
|
+
*/
|
|
56
|
+
export declare const layoutBaseStylesFixesUnderNestedDnDFGExcludingBodiedSync: SerializedStyles;
|
|
51
57
|
/**
|
|
52
58
|
* Layout in view mode styles for selected state when advanced layouts experiment is on.
|
|
53
59
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "216.
|
|
3
|
+
"version": "216.9.1",
|
|
4
4
|
"description": "A package contains Atlassian editor core functionality",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@atlaskit/editor-json-transformer": "^8.31.0",
|
|
50
50
|
"@atlaskit/editor-performance-metrics": "^2.1.0",
|
|
51
51
|
"@atlaskit/editor-plugin-connectivity": "^7.0.0",
|
|
52
|
-
"@atlaskit/editor-plugin-quick-insert": "^7.
|
|
52
|
+
"@atlaskit/editor-plugin-quick-insert": "^7.3.0",
|
|
53
53
|
"@atlaskit/editor-plugin-user-preferences": "^5.0.0",
|
|
54
54
|
"@atlaskit/editor-plugins": "^12.0.0",
|
|
55
55
|
"@atlaskit/editor-prosemirror": "^7.3.0",
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"@atlaskit/platform-feature-flags-react": "^0.4.0",
|
|
67
67
|
"@atlaskit/react-ufo": "^5.1.0",
|
|
68
68
|
"@atlaskit/task-decision": "^19.2.0",
|
|
69
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
69
|
+
"@atlaskit/tmp-editor-statsig": "^23.0.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.12.0",
|
|
87
87
|
"@atlaskit/link-provider": "^4.1.0",
|
|
88
88
|
"@atlaskit/media-core": "^37.0.0",
|
|
89
89
|
"react": "^18.2.0",
|
|
@@ -343,6 +343,9 @@
|
|
|
343
343
|
},
|
|
344
344
|
"platform_synced_block_patch_1": {
|
|
345
345
|
"type": "boolean"
|
|
346
|
+
},
|
|
347
|
+
"platform_synced_block_patch_2": {
|
|
348
|
+
"type": "boolean"
|
|
346
349
|
}
|
|
347
350
|
},
|
|
348
351
|
"stricter": {
|