@atlaskit/renderer 149.0.6 → 149.0.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/react/index.js +3 -3
- package/dist/cjs/react/nodes/extension.js +4 -5
- package/dist/cjs/react/nodes/multiBodiedExtension.js +3 -4
- package/dist/cjs/ui/Renderer/RendererStyleContainer.js +2 -35
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/react/index.js +3 -3
- package/dist/es2019/react/nodes/extension.js +4 -5
- package/dist/es2019/react/nodes/multiBodiedExtension.js +3 -4
- package/dist/es2019/ui/Renderer/RendererStyleContainer.js +2 -40
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/react/index.js +3 -3
- package/dist/esm/react/nodes/extension.js +4 -5
- package/dist/esm/react/nodes/multiBodiedExtension.js +3 -4
- package/dist/esm/ui/Renderer/RendererStyleContainer.js +2 -35
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 149.0.8
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`40a03b85a53bb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/40a03b85a53bb) -
|
|
8
|
+
Clean up experiment `platform_editor_remove_important_in_render_ext`
|
|
9
|
+
- [`de7a00d09c978`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/de7a00d09c978) -
|
|
10
|
+
Clean up experiment `platform_editor_blocktaskitem_node_tenantid`
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
|
|
13
|
+
## 149.0.7
|
|
14
|
+
|
|
15
|
+
### Patch Changes
|
|
16
|
+
|
|
17
|
+
- [`2af9684026f37`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2af9684026f37) -
|
|
18
|
+
Clean up experiment `platform_editor_render_bodied_extension_as_inline`
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 149.0.6
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
package/dist/cjs/react/index.js
CHANGED
|
@@ -76,10 +76,10 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
|
|
|
76
76
|
parentInfo = _ref.parentInfo;
|
|
77
77
|
var pos = _this.startPos;
|
|
78
78
|
var currentPath = parentInfo && parentInfo.path || [];
|
|
79
|
-
var parentIsIncompleteTask = (node.type.name === 'taskItem' || node.type.name === 'blockTaskItem'
|
|
79
|
+
var parentIsIncompleteTask = (node.type.name === 'taskItem' || node.type.name === 'blockTaskItem') && node.attrs.state !== 'DONE' ||
|
|
80
80
|
// If blockTaskItem is in the schema, check if the parent of the current node
|
|
81
81
|
// is an incomplete task item, because blockTaskItems can have nested nodes
|
|
82
|
-
node.type.schema.nodes.blockTaskItem && (parentInfo === null || parentInfo === void 0 ? void 0 : parentInfo.parentIsIncompleteTask) === true
|
|
82
|
+
node.type.schema.nodes.blockTaskItem && (parentInfo === null || parentInfo === void 0 ? void 0 : parentInfo.parentIsIncompleteTask) === true;
|
|
83
83
|
var nodeKey = "".concat(node.type.name, "__").concat(_this.startPos);
|
|
84
84
|
var serializedContent = _this.serializeFragment(node.content, _this.getNodeProps(node, parentInfo), (0, _nodes.toReact)(node, {
|
|
85
85
|
allowSelectAllTrap: _this.allowSelectAllTrap,
|
|
@@ -830,7 +830,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
|
|
|
830
830
|
children.push(node);
|
|
831
831
|
});
|
|
832
832
|
children = (0, _nodes.mergeTextNodes)(children);
|
|
833
|
-
if (
|
|
833
|
+
if (this.shouldDisplayExtensionAsInline) {
|
|
834
834
|
(0, _markBlockAsInline.markBlockAsInline)({
|
|
835
835
|
nodes: children,
|
|
836
836
|
onMark: function onMark(_ref5) {
|
|
@@ -14,7 +14,6 @@ var _react2 = require("@emotion/react");
|
|
|
14
14
|
var _enums = require("@atlaskit/editor-common/analytics/types/enums");
|
|
15
15
|
var _OverflowShadow = _interopRequireDefault(require("@atlaskit/editor-common/OverflowShadow"));
|
|
16
16
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
17
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
18
17
|
var _consts = require("../../consts");
|
|
19
18
|
var _context = require("../../ui/annotations/context");
|
|
20
19
|
var _AnnotationHoverContext = require("../../ui/annotations/contexts/AnnotationHoverContext");
|
|
@@ -105,7 +104,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
|
|
|
105
104
|
fireAnalyticsEvent = _ref2.fireAnalyticsEvent;
|
|
106
105
|
|
|
107
106
|
// we should only use custom layout for full-page appearance
|
|
108
|
-
var canUseCustomLayout =
|
|
107
|
+
var canUseCustomLayout = rendererAppearance === 'full-page';
|
|
109
108
|
var isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
110
109
|
var centerAlignClass = isCustomLayout ? _consts.RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
111
110
|
/**
|
|
@@ -141,7 +140,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
|
|
|
141
140
|
* blocks until the sibling marking works at depth.
|
|
142
141
|
*/
|
|
143
142
|
var isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
|
|
144
|
-
var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) &&
|
|
143
|
+
var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && !isNestedForgeInlineBodied;
|
|
145
144
|
var inlineClassName = isInline ? _consts.RendererCssClassName.EXTENSION_AS_INLINE : '';
|
|
146
145
|
/**
|
|
147
146
|
* A native Forge macro does not have its body rendered by the product — the body ADF is
|
|
@@ -167,9 +166,9 @@ var renderExtension = exports.renderExtension = function renderExtension(content
|
|
|
167
166
|
,
|
|
168
167
|
className: "".concat(_consts.RendererCssClassName.EXTENSION, " ").concat(inlineClassName, " ").concat(options.shadowClassNames, " ").concat(centerAlignClass),
|
|
169
168
|
style: {
|
|
170
|
-
width: isInline
|
|
169
|
+
width: !isInline && isCustomLayout ?
|
|
171
170
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
172
|
-
(0, _breakout.calcBreakoutWidthCss)(layout) :
|
|
171
|
+
(0, _breakout.calcBreakoutWidthCss)(layout) : undefined,
|
|
173
172
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
174
173
|
minHeight: isInline ? undefined : extensionMinHeight
|
|
175
174
|
},
|
|
@@ -10,7 +10,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
10
10
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
11
11
|
var _react = _interopRequireWildcard(require("react"));
|
|
12
12
|
var _react2 = require("@emotion/react");
|
|
13
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
14
13
|
var _analyticsContext = _interopRequireDefault(require("../../analytics/analyticsContext"));
|
|
15
14
|
var _consts = require("../../consts");
|
|
16
15
|
var _breakout = require("../utils/breakout");
|
|
@@ -63,7 +62,7 @@ var MultiBodiedExtensionWrapperNext = function MultiBodiedExtensionWrapperNext(_
|
|
|
63
62
|
children = _ref3.children;
|
|
64
63
|
var isTopLevel = path.length < 1;
|
|
65
64
|
// we should only use custom layout for full-page appearance
|
|
66
|
-
var canUseCustomLayout =
|
|
65
|
+
var canUseCustomLayout = rendererAppearance === 'full-page';
|
|
67
66
|
var isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
68
67
|
var centerAlignClass = isCustomLayout ? _consts.RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
69
68
|
|
|
@@ -72,9 +71,9 @@ var MultiBodiedExtensionWrapperNext = function MultiBodiedExtensionWrapperNext(_
|
|
|
72
71
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
73
72
|
className: "".concat(_consts.RendererCssClassName.EXTENSION, " ").concat(centerAlignClass),
|
|
74
73
|
style: {
|
|
75
|
-
width:
|
|
74
|
+
width: isCustomLayout ?
|
|
76
75
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
77
|
-
(0, _breakout.calcBreakoutWidthCss)(layout) :
|
|
76
|
+
(0, _breakout.calcBreakoutWidthCss)(layout) : undefined
|
|
78
77
|
},
|
|
79
78
|
"data-layout": layout,
|
|
80
79
|
"data-testid": "multiBodiedExtension--wrapper-renderer",
|
|
@@ -327,15 +327,6 @@ var rendererFullPageStylesWithReducedPadding = (0, _react.css)((0, _defineProper
|
|
|
327
327
|
}, "@media (max-width: ".concat(_constants.akEditorFullPageNarrowBreakout, "px)"), {
|
|
328
328
|
'--ak-renderer--full-page-gutter': "".concat(_constants.akEditorGutterPaddingReduced, "px")
|
|
329
329
|
}));
|
|
330
|
-
var oldRendererFullWidthStyles = (0, _react.css)({
|
|
331
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
332
|
-
maxWidth: "".concat(_constants.akEditorFullWidthLayoutWidth, "px"),
|
|
333
|
-
margin: "0 auto",
|
|
334
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
335
|
-
'.fabric-editor-breakout-mark:not([data-has-width="true"]), .ak-renderer-extension': {
|
|
336
|
-
width: '100% !important'
|
|
337
|
-
}
|
|
338
|
-
});
|
|
339
330
|
var rendererFullWidthStyles = (0, _react.css)({
|
|
340
331
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
341
332
|
maxWidth: "".concat(_constants.akEditorFullWidthLayoutWidth, "px"),
|
|
@@ -345,15 +336,6 @@ var rendererFullWidthStyles = (0, _react.css)({
|
|
|
345
336
|
width: '100% !important'
|
|
346
337
|
}
|
|
347
338
|
});
|
|
348
|
-
var oldRendererMaxWidthStyles = (0, _react.css)({
|
|
349
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
350
|
-
maxWidth: "".concat(_constants.akEditorMaxWidthLayoutWidth, "px"),
|
|
351
|
-
margin: "0 auto",
|
|
352
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
353
|
-
'.fabric-editor-breakout-mark:not([data-has-width="true"]), .ak-renderer-extension': {
|
|
354
|
-
width: '100% !important'
|
|
355
|
-
}
|
|
356
|
-
});
|
|
357
339
|
var rendererMaxWidthStyles = (0, _react.css)({
|
|
358
340
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
359
341
|
maxWidth: "".concat(_constants.akEditorMaxWidthLayoutWidth, "px"),
|
|
@@ -857,21 +839,6 @@ var extensionStyle = (0, _react.css)({
|
|
|
857
839
|
fontSize: 'var(--ak-renderer-base-font-size)'
|
|
858
840
|
}
|
|
859
841
|
});
|
|
860
|
-
var oldExtensionAsInlineStyle = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_consts2.RendererCssClassName.DOCUMENT, " [data-as-inline=\"on\"]"), {
|
|
861
|
-
display: 'inline-block'
|
|
862
|
-
}), ".".concat(_consts2.RendererCssClassName.DOCUMENT, " .").concat(_consts2.RendererCssClassName.EXTENSION_AS_INLINE), {
|
|
863
|
-
display: 'inline-block',
|
|
864
|
-
// use !important here because the current width has !important applied to it and it's not working when used in React style prop
|
|
865
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
866
|
-
width: 'auto !important',
|
|
867
|
-
marginTop: 0
|
|
868
|
-
}), ".".concat(_consts2.RendererCssClassName.EXTENSION_AS_INLINE, " .").concat(_consts2.RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER), {
|
|
869
|
-
display: 'inline-block',
|
|
870
|
-
overflowX: 'visible',
|
|
871
|
-
containerType: 'normal'
|
|
872
|
-
}), ".".concat(_consts2.RendererCssClassName.EXTENSION_AS_INLINE, " .").concat(_consts2.RendererCssClassName.EXTENSION_INNER_WRAPPER), {
|
|
873
|
-
display: 'inline-block'
|
|
874
|
-
}));
|
|
875
842
|
var extensionAsInlineStyle = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_consts2.RendererCssClassName.DOCUMENT, " [data-as-inline=\"on\"]"), {
|
|
876
843
|
display: 'inline-block'
|
|
877
844
|
}), ".".concat(_consts2.RendererCssClassName.DOCUMENT, " .").concat(_consts2.RendererCssClassName.EXTENSION_AS_INLINE), {
|
|
@@ -2334,13 +2301,13 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
|
|
|
2334
2301
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- CSS custom properties for UGC font tokens
|
|
2335
2302
|
'--ak-renderer-editor-font-small-text': _editorUgcTokenNames.editorUGCTokensRefreshed['editor.font.body.small']
|
|
2336
2303
|
},
|
|
2337
|
-
css: [(0, _expValEquals.expValEquals)('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, fontSizeStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, headingAnchorButtonFocusVisibleStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? hideHeadingCopyLinkWrapperStyles : hideHeadingCopyLinkWrapperStylesDuplicateAnchor, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' &&
|
|
2304
|
+
css: [(0, _expValEquals.expValEquals)('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, fontSizeStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, headingAnchorButtonFocusVisibleStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? hideHeadingCopyLinkWrapperStyles : hideHeadingCopyLinkWrapperStylesDuplicateAnchor, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max') && !(0, _table2.isTableResizingEnabled)(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && rendererMaxWidthStyles, rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, headingsSharedStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingWrapperInlineFlowStyles, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_heading_link_target_size') && headingAnchorWrapperTargetSizeStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingWithAlignmentStyles : headingWithAlignmentStylesDuplicateAnchor, ruleSharedStyles, contentMode === 'compact' && extensionStyle, contentMode === 'compact' ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, listItemHiddenMarkerStyles, indentationSharedStyles, indentationSharedStylesWithMarginFix, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? blockMarksSharedStyles : blockMarksSharedStylesDuplicateAnchor, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, !(0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true) && highlightLinksUnsetStyles,
|
|
2338
2305
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2339
2306
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingPanelStyles, smartCardStyles, smartCardStylesAvatarFix, headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, (0, _fg.fg)('editor_inline_comments_on_inline_nodes') && ((0, _expValEquals.expValEquals)('confluence_fe_renderer_inline_node_mark_color_fix', 'isEnabled', true) ? rendererAnnotationStyles : rendererAnnotationStylesOld),
|
|
2340
2307
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
2341
2308
|
(0, _fg.fg)('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor, expandSsrMarginStyles,
|
|
2342
2309
|
// this should be placed after baseOtherStyles
|
|
2343
|
-
|
|
2310
|
+
extensionAsInlineStyle, (0, _fg.fg)('platform_forge_inline_bodied_macro') && [migratedInlineBodiedFlowStyle, forgeInlineBodiedSpacingStyle], inlineExtensionRendererMarginFix, allowNestedHeaderLinks && ((0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, tableContentModeScopedStyles, tableContentModeExtensionContainmentStyles, tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, (0, _fg.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && ((0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, blockSsrMarginStyles, layoutBlockSsrMarginStyles, browser.safari && codeBlockInListSsrMarginSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max') && responsiveBreakoutWidthFullWidth, (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && (0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, hideExtensionStyles],
|
|
2344
2311
|
"data-testid": testId
|
|
2345
2312
|
}, children);
|
|
2346
2313
|
};
|
|
@@ -79,7 +79,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
79
79
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
80
80
|
var RENDER_EVENT_SAMPLE_RATE = 0.1;
|
|
81
81
|
var packageName = "@atlaskit/renderer";
|
|
82
|
-
var packageVersion = "149.0.
|
|
82
|
+
var packageVersion = "149.0.7";
|
|
83
83
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
84
84
|
containerName: 'ak-renderer-wrapper',
|
|
85
85
|
containerType: 'inline-size'
|
|
@@ -61,10 +61,10 @@ export default class ReactSerializer {
|
|
|
61
61
|
}) => {
|
|
62
62
|
const pos = this.startPos;
|
|
63
63
|
const currentPath = parentInfo && parentInfo.path || [];
|
|
64
|
-
const parentIsIncompleteTask = (node.type.name === 'taskItem' || node.type.name === 'blockTaskItem'
|
|
64
|
+
const parentIsIncompleteTask = (node.type.name === 'taskItem' || node.type.name === 'blockTaskItem') && node.attrs.state !== 'DONE' ||
|
|
65
65
|
// If blockTaskItem is in the schema, check if the parent of the current node
|
|
66
66
|
// is an incomplete task item, because blockTaskItems can have nested nodes
|
|
67
|
-
node.type.schema.nodes.blockTaskItem && (parentInfo === null || parentInfo === void 0 ? void 0 : parentInfo.parentIsIncompleteTask) === true
|
|
67
|
+
node.type.schema.nodes.blockTaskItem && (parentInfo === null || parentInfo === void 0 ? void 0 : parentInfo.parentIsIncompleteTask) === true;
|
|
68
68
|
const nodeKey = `${node.type.name}__${this.startPos}`;
|
|
69
69
|
const serializedContent = this.serializeFragment(node.content, this.getNodeProps(node, parentInfo), toReact(node, {
|
|
70
70
|
allowSelectAllTrap: this.allowSelectAllTrap,
|
|
@@ -736,7 +736,7 @@ export default class ReactSerializer {
|
|
|
736
736
|
children.push(node);
|
|
737
737
|
});
|
|
738
738
|
children = mergeTextNodes(children);
|
|
739
|
-
if (
|
|
739
|
+
if (this.shouldDisplayExtensionAsInline) {
|
|
740
740
|
markBlockAsInline({
|
|
741
741
|
nodes: children,
|
|
742
742
|
onMark: ({
|
|
@@ -11,7 +11,6 @@ import { jsx, css } from '@emotion/react';
|
|
|
11
11
|
import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
|
|
12
12
|
import overflowShadow from '@atlaskit/editor-common/OverflowShadow';
|
|
13
13
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
14
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
15
14
|
import { RendererCssClassName } from '../../consts';
|
|
16
15
|
import { ProvidersContext } from '../../ui/annotations/context';
|
|
17
16
|
import { useAnnotationHoverDispatch } from '../../ui/annotations/contexts/AnnotationHoverContext';
|
|
@@ -83,7 +82,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
|
|
|
83
82
|
} = options || {};
|
|
84
83
|
|
|
85
84
|
// we should only use custom layout for full-page appearance
|
|
86
|
-
const canUseCustomLayout =
|
|
85
|
+
const canUseCustomLayout = rendererAppearance === 'full-page';
|
|
87
86
|
const isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
88
87
|
const centerAlignClass = isCustomLayout ? RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
89
88
|
/**
|
|
@@ -119,7 +118,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
|
|
|
119
118
|
* blocks until the sibling marking works at depth.
|
|
120
119
|
*/
|
|
121
120
|
const isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
|
|
122
|
-
const isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) &&
|
|
121
|
+
const isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && !isNestedForgeInlineBodied;
|
|
123
122
|
const inlineClassName = isInline ? RendererCssClassName.EXTENSION_AS_INLINE : '';
|
|
124
123
|
/**
|
|
125
124
|
* A native Forge macro does not have its body rendered by the product — the body ADF is
|
|
@@ -145,9 +144,9 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
|
|
|
145
144
|
,
|
|
146
145
|
className: `${RendererCssClassName.EXTENSION} ${inlineClassName} ${options.shadowClassNames} ${centerAlignClass}`,
|
|
147
146
|
style: {
|
|
148
|
-
width: isInline
|
|
147
|
+
width: !isInline && isCustomLayout ?
|
|
149
148
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
150
|
-
calcBreakoutWidthCss(layout) :
|
|
149
|
+
calcBreakoutWidthCss(layout) : undefined,
|
|
151
150
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
152
151
|
minHeight: isInline ? undefined : extensionMinHeight
|
|
153
152
|
},
|
|
@@ -8,7 +8,6 @@
|
|
|
8
8
|
|
|
9
9
|
import React, { useContext, useState } from 'react';
|
|
10
10
|
import { jsx, css } from '@emotion/react';
|
|
11
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
12
11
|
import AnalyticsContext from '../../analytics/analyticsContext';
|
|
13
12
|
import { RendererCssClassName } from '../../consts';
|
|
14
13
|
import { calcBreakoutWidthCss } from '../utils/breakout';
|
|
@@ -60,7 +59,7 @@ const MultiBodiedExtensionWrapperNext = ({
|
|
|
60
59
|
}) => {
|
|
61
60
|
const isTopLevel = path.length < 1;
|
|
62
61
|
// we should only use custom layout for full-page appearance
|
|
63
|
-
const canUseCustomLayout =
|
|
62
|
+
const canUseCustomLayout = rendererAppearance === 'full-page';
|
|
64
63
|
const isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
65
64
|
const centerAlignClass = isCustomLayout ? RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
66
65
|
|
|
@@ -69,9 +68,9 @@ const MultiBodiedExtensionWrapperNext = ({
|
|
|
69
68
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
70
69
|
className: `${RendererCssClassName.EXTENSION} ${centerAlignClass}`,
|
|
71
70
|
style: {
|
|
72
|
-
width:
|
|
71
|
+
width: isCustomLayout ?
|
|
73
72
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
74
|
-
calcBreakoutWidthCss(layout) :
|
|
73
|
+
calcBreakoutWidthCss(layout) : undefined
|
|
75
74
|
},
|
|
76
75
|
"data-layout": layout,
|
|
77
76
|
"data-testid": "multiBodiedExtension--wrapper-renderer",
|
|
@@ -425,15 +425,6 @@ const rendererFullPageStylesWithReducedPadding = css({
|
|
|
425
425
|
'--ak-renderer--full-page-gutter': `${akEditorGutterPaddingReduced}px`
|
|
426
426
|
}
|
|
427
427
|
});
|
|
428
|
-
const oldRendererFullWidthStyles = css({
|
|
429
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
430
|
-
maxWidth: `${akEditorFullWidthLayoutWidth}px`,
|
|
431
|
-
margin: `0 auto`,
|
|
432
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
433
|
-
'.fabric-editor-breakout-mark:not([data-has-width="true"]), .ak-renderer-extension': {
|
|
434
|
-
width: '100% !important'
|
|
435
|
-
}
|
|
436
|
-
});
|
|
437
428
|
const rendererFullWidthStyles = css({
|
|
438
429
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
439
430
|
maxWidth: `${akEditorFullWidthLayoutWidth}px`,
|
|
@@ -443,15 +434,6 @@ const rendererFullWidthStyles = css({
|
|
|
443
434
|
width: '100% !important'
|
|
444
435
|
}
|
|
445
436
|
});
|
|
446
|
-
const oldRendererMaxWidthStyles = css({
|
|
447
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
448
|
-
maxWidth: `${akEditorMaxWidthLayoutWidth}px`,
|
|
449
|
-
margin: `0 auto`,
|
|
450
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
451
|
-
'.fabric-editor-breakout-mark:not([data-has-width="true"]), .ak-renderer-extension': {
|
|
452
|
-
width: '100% !important'
|
|
453
|
-
}
|
|
454
|
-
});
|
|
455
437
|
const rendererMaxWidthStyles = css({
|
|
456
438
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
457
439
|
maxWidth: `${akEditorMaxWidthLayoutWidth}px`,
|
|
@@ -1010,26 +992,6 @@ const extensionStyle = css({
|
|
|
1010
992
|
fontSize: 'var(--ak-renderer-base-font-size)'
|
|
1011
993
|
}
|
|
1012
994
|
});
|
|
1013
|
-
const oldExtensionAsInlineStyle = css({
|
|
1014
|
-
[`.${RendererCssClassName.DOCUMENT} [data-as-inline="on"]`]: {
|
|
1015
|
-
display: 'inline-block'
|
|
1016
|
-
},
|
|
1017
|
-
[`.${RendererCssClassName.DOCUMENT} .${RendererCssClassName.EXTENSION_AS_INLINE}`]: {
|
|
1018
|
-
display: 'inline-block',
|
|
1019
|
-
// use !important here because the current width has !important applied to it and it's not working when used in React style prop
|
|
1020
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
1021
|
-
width: 'auto !important',
|
|
1022
|
-
marginTop: 0
|
|
1023
|
-
},
|
|
1024
|
-
[`.${RendererCssClassName.EXTENSION_AS_INLINE} .${RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER}`]: {
|
|
1025
|
-
display: 'inline-block',
|
|
1026
|
-
overflowX: 'visible',
|
|
1027
|
-
containerType: 'normal'
|
|
1028
|
-
},
|
|
1029
|
-
[`.${RendererCssClassName.EXTENSION_AS_INLINE} .${RendererCssClassName.EXTENSION_INNER_WRAPPER}`]: {
|
|
1030
|
-
display: 'inline-block'
|
|
1031
|
-
}
|
|
1032
|
-
});
|
|
1033
995
|
const extensionAsInlineStyle = css({
|
|
1034
996
|
[`.${RendererCssClassName.DOCUMENT} [data-as-inline="on"]`]: {
|
|
1035
997
|
display: 'inline-block'
|
|
@@ -2970,13 +2932,13 @@ export const RendererStyleContainer = props => {
|
|
|
2970
2932
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- CSS custom properties for UGC font tokens
|
|
2971
2933
|
'--ak-renderer-editor-font-small-text': editorUGCTokensRefreshed['editor.font.body.small']
|
|
2972
2934
|
},
|
|
2973
|
-
css: [expValEquals('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, fontSizeStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, headingAnchorButtonFocusVisibleStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? hideHeadingCopyLinkWrapperStyles : hideHeadingCopyLinkWrapperStylesDuplicateAnchor, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' &&
|
|
2935
|
+
css: [expValEquals('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, fontSizeStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, headingAnchorButtonFocusVisibleStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? hideHeadingCopyLinkWrapperStyles : hideHeadingCopyLinkWrapperStylesDuplicateAnchor, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max') && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && rendererMaxWidthStyles, rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, headingsSharedStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingWrapperInlineFlowStyles, isExperimentEnabled('platform_editor_heading_link_target_size') && headingAnchorWrapperTargetSizeStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingWithAlignmentStyles : headingWithAlignmentStylesDuplicateAnchor, ruleSharedStyles, contentMode === 'compact' && extensionStyle, contentMode === 'compact' ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, listItemHiddenMarkerStyles, indentationSharedStyles, indentationSharedStylesWithMarginFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? blockMarksSharedStyles : blockMarksSharedStylesDuplicateAnchor, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, !expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) && highlightLinksUnsetStyles,
|
|
2974
2936
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2975
2937
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingPanelStyles, smartCardStyles, smartCardStylesAvatarFix, headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && (expValEquals('confluence_fe_renderer_inline_node_mark_color_fix', 'isEnabled', true) ? rendererAnnotationStyles : rendererAnnotationStylesOld),
|
|
2976
2938
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
2977
2939
|
fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor, expandSsrMarginStyles,
|
|
2978
2940
|
// this should be placed after baseOtherStyles
|
|
2979
|
-
|
|
2941
|
+
extensionAsInlineStyle, fg('platform_forge_inline_bodied_macro') && [migratedInlineBodiedFlowStyle, forgeInlineBodiedSpacingStyle], inlineExtensionRendererMarginFix, allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, tableContentModeScopedStyles, tableContentModeExtensionContainmentStyles, tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && isExperimentEnabled('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && expValEqualsNoExposure('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, blockSsrMarginStyles, layoutBlockSsrMarginStyles, browser.safari && codeBlockInListSsrMarginSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max') && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, hideExtensionStyles],
|
|
2980
2942
|
"data-testid": testId
|
|
2981
2943
|
}, children);
|
|
2982
2944
|
};
|
|
@@ -64,7 +64,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
64
64
|
const TABLE_INFO_TIMEOUT = 10000;
|
|
65
65
|
const RENDER_EVENT_SAMPLE_RATE = 0.1;
|
|
66
66
|
const packageName = "@atlaskit/renderer";
|
|
67
|
-
const packageVersion = "149.0.
|
|
67
|
+
const packageVersion = "149.0.7";
|
|
68
68
|
const setAsQueryContainerStyles = css({
|
|
69
69
|
containerName: 'ak-renderer-wrapper',
|
|
70
70
|
containerType: 'inline-size'
|
package/dist/esm/react/index.js
CHANGED
|
@@ -69,10 +69,10 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
69
69
|
parentInfo = _ref.parentInfo;
|
|
70
70
|
var pos = _this.startPos;
|
|
71
71
|
var currentPath = parentInfo && parentInfo.path || [];
|
|
72
|
-
var parentIsIncompleteTask = (node.type.name === 'taskItem' || node.type.name === 'blockTaskItem'
|
|
72
|
+
var parentIsIncompleteTask = (node.type.name === 'taskItem' || node.type.name === 'blockTaskItem') && node.attrs.state !== 'DONE' ||
|
|
73
73
|
// If blockTaskItem is in the schema, check if the parent of the current node
|
|
74
74
|
// is an incomplete task item, because blockTaskItems can have nested nodes
|
|
75
|
-
node.type.schema.nodes.blockTaskItem && (parentInfo === null || parentInfo === void 0 ? void 0 : parentInfo.parentIsIncompleteTask) === true
|
|
75
|
+
node.type.schema.nodes.blockTaskItem && (parentInfo === null || parentInfo === void 0 ? void 0 : parentInfo.parentIsIncompleteTask) === true;
|
|
76
76
|
var nodeKey = "".concat(node.type.name, "__").concat(_this.startPos);
|
|
77
77
|
var serializedContent = _this.serializeFragment(node.content, _this.getNodeProps(node, parentInfo), toReact(node, {
|
|
78
78
|
allowSelectAllTrap: _this.allowSelectAllTrap,
|
|
@@ -823,7 +823,7 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
823
823
|
children.push(node);
|
|
824
824
|
});
|
|
825
825
|
children = mergeTextNodes(children);
|
|
826
|
-
if (
|
|
826
|
+
if (this.shouldDisplayExtensionAsInline) {
|
|
827
827
|
markBlockAsInline({
|
|
828
828
|
nodes: children,
|
|
829
829
|
onMark: function onMark(_ref5) {
|
|
@@ -16,7 +16,6 @@ import { jsx, css } from '@emotion/react';
|
|
|
16
16
|
import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
|
|
17
17
|
import overflowShadow from '@atlaskit/editor-common/OverflowShadow';
|
|
18
18
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
19
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
20
19
|
import { RendererCssClassName } from '../../consts';
|
|
21
20
|
import { ProvidersContext } from '../../ui/annotations/context';
|
|
22
21
|
import { useAnnotationHoverDispatch } from '../../ui/annotations/contexts/AnnotationHoverContext';
|
|
@@ -98,7 +97,7 @@ export var renderExtension = function renderExtension(content, layout) {
|
|
|
98
97
|
fireAnalyticsEvent = _ref2.fireAnalyticsEvent;
|
|
99
98
|
|
|
100
99
|
// we should only use custom layout for full-page appearance
|
|
101
|
-
var canUseCustomLayout =
|
|
100
|
+
var canUseCustomLayout = rendererAppearance === 'full-page';
|
|
102
101
|
var isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
103
102
|
var centerAlignClass = isCustomLayout ? RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
104
103
|
/**
|
|
@@ -134,7 +133,7 @@ export var renderExtension = function renderExtension(content, layout) {
|
|
|
134
133
|
* blocks until the sibling marking works at depth.
|
|
135
134
|
*/
|
|
136
135
|
var isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
|
|
137
|
-
var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) &&
|
|
136
|
+
var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && !isNestedForgeInlineBodied;
|
|
138
137
|
var inlineClassName = isInline ? RendererCssClassName.EXTENSION_AS_INLINE : '';
|
|
139
138
|
/**
|
|
140
139
|
* A native Forge macro does not have its body rendered by the product — the body ADF is
|
|
@@ -160,9 +159,9 @@ export var renderExtension = function renderExtension(content, layout) {
|
|
|
160
159
|
,
|
|
161
160
|
className: "".concat(RendererCssClassName.EXTENSION, " ").concat(inlineClassName, " ").concat(options.shadowClassNames, " ").concat(centerAlignClass),
|
|
162
161
|
style: {
|
|
163
|
-
width: isInline
|
|
162
|
+
width: !isInline && isCustomLayout ?
|
|
164
163
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
165
|
-
calcBreakoutWidthCss(layout) :
|
|
164
|
+
calcBreakoutWidthCss(layout) : undefined,
|
|
166
165
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
167
166
|
minHeight: isInline ? undefined : extensionMinHeight
|
|
168
167
|
},
|
|
@@ -11,7 +11,6 @@ var _templateObject;
|
|
|
11
11
|
|
|
12
12
|
import React, { useContext, useState } from 'react';
|
|
13
13
|
import { jsx, css } from '@emotion/react';
|
|
14
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
15
14
|
import AnalyticsContext from '../../analytics/analyticsContext';
|
|
16
15
|
import { RendererCssClassName } from '../../consts';
|
|
17
16
|
import { calcBreakoutWidthCss } from '../utils/breakout';
|
|
@@ -56,7 +55,7 @@ var MultiBodiedExtensionWrapperNext = function MultiBodiedExtensionWrapperNext(_
|
|
|
56
55
|
children = _ref3.children;
|
|
57
56
|
var isTopLevel = path.length < 1;
|
|
58
57
|
// we should only use custom layout for full-page appearance
|
|
59
|
-
var canUseCustomLayout =
|
|
58
|
+
var canUseCustomLayout = rendererAppearance === 'full-page';
|
|
60
59
|
var isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
61
60
|
var centerAlignClass = isCustomLayout ? RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
62
61
|
|
|
@@ -65,9 +64,9 @@ var MultiBodiedExtensionWrapperNext = function MultiBodiedExtensionWrapperNext(_
|
|
|
65
64
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
66
65
|
className: "".concat(RendererCssClassName.EXTENSION, " ").concat(centerAlignClass),
|
|
67
66
|
style: {
|
|
68
|
-
width:
|
|
67
|
+
width: isCustomLayout ?
|
|
69
68
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
70
|
-
calcBreakoutWidthCss(layout) :
|
|
69
|
+
calcBreakoutWidthCss(layout) : undefined
|
|
71
70
|
},
|
|
72
71
|
"data-layout": layout,
|
|
73
72
|
"data-testid": "multiBodiedExtension--wrapper-renderer",
|
|
@@ -320,15 +320,6 @@ var rendererFullPageStylesWithReducedPadding = css(_defineProperty({
|
|
|
320
320
|
}, "@media (max-width: ".concat(akEditorFullPageNarrowBreakout, "px)"), {
|
|
321
321
|
'--ak-renderer--full-page-gutter': "".concat(akEditorGutterPaddingReduced, "px")
|
|
322
322
|
}));
|
|
323
|
-
var oldRendererFullWidthStyles = css({
|
|
324
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
325
|
-
maxWidth: "".concat(akEditorFullWidthLayoutWidth, "px"),
|
|
326
|
-
margin: "0 auto",
|
|
327
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
328
|
-
'.fabric-editor-breakout-mark:not([data-has-width="true"]), .ak-renderer-extension': {
|
|
329
|
-
width: '100% !important'
|
|
330
|
-
}
|
|
331
|
-
});
|
|
332
323
|
var rendererFullWidthStyles = css({
|
|
333
324
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
334
325
|
maxWidth: "".concat(akEditorFullWidthLayoutWidth, "px"),
|
|
@@ -338,15 +329,6 @@ var rendererFullWidthStyles = css({
|
|
|
338
329
|
width: '100% !important'
|
|
339
330
|
}
|
|
340
331
|
});
|
|
341
|
-
var oldRendererMaxWidthStyles = css({
|
|
342
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
343
|
-
maxWidth: "".concat(akEditorMaxWidthLayoutWidth, "px"),
|
|
344
|
-
margin: "0 auto",
|
|
345
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
346
|
-
'.fabric-editor-breakout-mark:not([data-has-width="true"]), .ak-renderer-extension': {
|
|
347
|
-
width: '100% !important'
|
|
348
|
-
}
|
|
349
|
-
});
|
|
350
332
|
var rendererMaxWidthStyles = css({
|
|
351
333
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
|
|
352
334
|
maxWidth: "".concat(akEditorMaxWidthLayoutWidth, "px"),
|
|
@@ -850,21 +832,6 @@ var extensionStyle = css({
|
|
|
850
832
|
fontSize: 'var(--ak-renderer-base-font-size)'
|
|
851
833
|
}
|
|
852
834
|
});
|
|
853
|
-
var oldExtensionAsInlineStyle = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(RendererCssClassName.DOCUMENT, " [data-as-inline=\"on\"]"), {
|
|
854
|
-
display: 'inline-block'
|
|
855
|
-
}), ".".concat(RendererCssClassName.DOCUMENT, " .").concat(RendererCssClassName.EXTENSION_AS_INLINE), {
|
|
856
|
-
display: 'inline-block',
|
|
857
|
-
// use !important here because the current width has !important applied to it and it's not working when used in React style prop
|
|
858
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles
|
|
859
|
-
width: 'auto !important',
|
|
860
|
-
marginTop: 0
|
|
861
|
-
}), ".".concat(RendererCssClassName.EXTENSION_AS_INLINE, " .").concat(RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER), {
|
|
862
|
-
display: 'inline-block',
|
|
863
|
-
overflowX: 'visible',
|
|
864
|
-
containerType: 'normal'
|
|
865
|
-
}), ".".concat(RendererCssClassName.EXTENSION_AS_INLINE, " .").concat(RendererCssClassName.EXTENSION_INNER_WRAPPER), {
|
|
866
|
-
display: 'inline-block'
|
|
867
|
-
}));
|
|
868
835
|
var extensionAsInlineStyle = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(RendererCssClassName.DOCUMENT, " [data-as-inline=\"on\"]"), {
|
|
869
836
|
display: 'inline-block'
|
|
870
837
|
}), ".".concat(RendererCssClassName.DOCUMENT, " .").concat(RendererCssClassName.EXTENSION_AS_INLINE), {
|
|
@@ -2327,13 +2294,13 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
|
|
|
2327
2294
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- CSS custom properties for UGC font tokens
|
|
2328
2295
|
'--ak-renderer-editor-font-small-text': editorUGCTokensRefreshed['editor.font.body.small']
|
|
2329
2296
|
},
|
|
2330
|
-
css: [expValEquals('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, fontSizeStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, headingAnchorButtonFocusVisibleStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? hideHeadingCopyLinkWrapperStyles : hideHeadingCopyLinkWrapperStylesDuplicateAnchor, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' &&
|
|
2297
|
+
css: [expValEquals('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, fontSizeStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, headingAnchorButtonFocusVisibleStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? hideHeadingCopyLinkWrapperStyles : hideHeadingCopyLinkWrapperStylesDuplicateAnchor, appearance === 'full-page' && isPreviewPanelResponsivenessOn && rendererFullPageStylesWithReducedPadding, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, (appearance === 'full-width' || appearance === 'max') && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && rendererMaxWidthStyles, rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, headingsSharedStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingWrapperInlineFlowStyles, isExperimentEnabled('platform_editor_heading_link_target_size') && headingAnchorWrapperTargetSizeStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingWithAlignmentStyles : headingWithAlignmentStylesDuplicateAnchor, ruleSharedStyles, contentMode === 'compact' && extensionStyle, contentMode === 'compact' ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, listItemHiddenMarkerStyles, indentationSharedStyles, indentationSharedStylesWithMarginFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? blockMarksSharedStyles : blockMarksSharedStylesDuplicateAnchor, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, !expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true) && highlightLinksUnsetStyles,
|
|
2331
2298
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2332
2299
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingPanelStyles, smartCardStyles, smartCardStylesAvatarFix, headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && (expValEquals('confluence_fe_renderer_inline_node_mark_color_fix', 'isEnabled', true) ? rendererAnnotationStyles : rendererAnnotationStylesOld),
|
|
2333
2300
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
2334
2301
|
fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor, expandSsrMarginStyles,
|
|
2335
2302
|
// this should be placed after baseOtherStyles
|
|
2336
|
-
|
|
2303
|
+
extensionAsInlineStyle, fg('platform_forge_inline_bodied_macro') && [migratedInlineBodiedFlowStyle, forgeInlineBodiedSpacingStyle], inlineExtensionRendererMarginFix, allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? alignedHeadingAnchorStyle : alignedHeadingAnchorStyleDuplicateAnchor), mediaSingleSharedStyle, firstWrappedMediaStyles, tableSharedStyle, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableOuterBorderOverlayStyles, expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && roundedTableRemixBlockHighlightStyles, tableContentModeScopedStyles, tableContentModeExtensionContainmentStyles, tableContentModeNestedTableStyles, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, firstNodeWithNotMarginTopWithNestedDnD, rendererTableStyles, isStickyScrollbarOn && stickyScrollbarStyles, isStickyScrollbarOn && isExperimentEnabled('platform_editor_table_css_overflow_shadow') && stickyScrollbarOverflowShadowFixStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && expValEqualsNoExposure('platform_editor_table_menu_updates', 'isEnabled', true) && rendererTableSortableColumnValignStyles, allowColumnSorting && allowNestedHeaderLinks && (expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks : rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinksDuplicateAnchor), rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, blockSsrMarginStyles, layoutBlockSsrMarginStyles, browser.safari && codeBlockInListSsrMarginSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max') && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? contentMode === 'compact' ? scaledDenseEmojiStyles : scaledEmojiStyles : contentMode === 'compact' ? denseStyles : undefined, contentMode === 'compact' ? scaledDenseUnicodeEmojiStylesNew : scaledUnicodeEmojiStylesNew, syncBlockStyles, centerWrapperStyles, isInsideSyncBlock ? syncBlockRendererStyles : null, isInsideSyncBlock && tableFakeBorderStyles, isInsideSyncBlock && expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) ? roundedTableFakeBorderOverlayStyles : null, hideExtensionStyles],
|
|
2337
2304
|
"data-testid": testId
|
|
2338
2305
|
}, children);
|
|
2339
2306
|
};
|
|
@@ -69,7 +69,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
69
69
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
70
70
|
var RENDER_EVENT_SAMPLE_RATE = 0.1;
|
|
71
71
|
var packageName = "@atlaskit/renderer";
|
|
72
|
-
var packageVersion = "149.0.
|
|
72
|
+
var packageVersion = "149.0.7";
|
|
73
73
|
var setAsQueryContainerStyles = css({
|
|
74
74
|
containerName: 'ak-renderer-wrapper',
|
|
75
75
|
containerType: 'inline-size'
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "149.0.
|
|
3
|
+
"version": "149.0.8",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"@atlaskit/status": "^5.13.0",
|
|
74
74
|
"@atlaskit/task-decision": "^21.12.0",
|
|
75
75
|
"@atlaskit/theme": "^28.2.0",
|
|
76
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
76
|
+
"@atlaskit/tmp-editor-statsig": "^234.0.0",
|
|
77
77
|
"@atlaskit/tokens": "^20.4.0",
|
|
78
78
|
"@atlaskit/tooltip": "^24.4.0",
|
|
79
79
|
"@atlaskit/visually-hidden": "^4.4.0",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"uuid": "^11.1.1"
|
|
89
89
|
},
|
|
90
90
|
"peerDependencies": {
|
|
91
|
-
"@atlaskit/editor-common": "^130.
|
|
91
|
+
"@atlaskit/editor-common": "^130.5.0",
|
|
92
92
|
"@atlaskit/link-provider": "^6.0.0",
|
|
93
93
|
"@atlaskit/media-core": "^39.0.0",
|
|
94
94
|
"react": "^18.2.0 || ^19.2.0",
|
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
"@af/visual-regression": "workspace:^",
|
|
101
101
|
"@atlaskit/analytics-gas-types": "^6.2.0",
|
|
102
102
|
"@atlaskit/checkbox": "^19.3.0",
|
|
103
|
-
"@atlaskit/editor-plugin-media": "^28.
|
|
103
|
+
"@atlaskit/editor-plugin-media": "^28.1.0",
|
|
104
104
|
"@atlaskit/editor-test-helpers": "workspace:^",
|
|
105
105
|
"@atlaskit/inline-edit": "^16.4.0",
|
|
106
106
|
"@atlaskit/json-ld-types": "^2.0.0",
|
|
@@ -111,7 +111,7 @@
|
|
|
111
111
|
"@atlaskit/media-integration-test-helpers": "workspace:^",
|
|
112
112
|
"@atlaskit/media-state": "^4.0.0",
|
|
113
113
|
"@atlaskit/media-test-helpers": "^43.0.0",
|
|
114
|
-
"@atlaskit/mention": "^30.
|
|
114
|
+
"@atlaskit/mention": "^30.2.0",
|
|
115
115
|
"@atlaskit/modal-dialog": "^17.0.0",
|
|
116
116
|
"@atlaskit/navigation-system": "^11.2.0",
|
|
117
117
|
"@atlaskit/primitives": "^22.5.0",
|