@atlaskit/renderer 149.0.6 → 150.0.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 +39 -0
- package/dist/cjs/react/index.js +3 -3
- package/dist/cjs/react/nodes/extension.js +5 -5
- package/dist/cjs/react/nodes/multiBodiedExtension.js +4 -4
- package/dist/cjs/ui/Renderer/RendererStyleContainer.js +2 -2
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/react/index.js +3 -3
- package/dist/es2019/react/nodes/extension.js +5 -5
- package/dist/es2019/react/nodes/multiBodiedExtension.js +4 -4
- package/dist/es2019/ui/Renderer/RendererStyleContainer.js +2 -2
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/react/index.js +3 -3
- package/dist/esm/react/nodes/extension.js +5 -5
- package/dist/esm/react/nodes/multiBodiedExtension.js +4 -4
- package/dist/esm/ui/Renderer/RendererStyleContainer.js +2 -2
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/package.json +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,44 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 150.0.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`d7ab3eac474b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d7ab3eac474b5) -
|
|
8
|
+
Revert cleanup of experiment `platform_editor_remove_important_in_render_ext` to restore previous
|
|
9
|
+
extension width and centering behaviour for non full-page appearances. The experiment is now
|
|
10
|
+
evaluated via `@atlaskit/platform-feature-experiments`.
|
|
11
|
+
|
|
12
|
+
## 150.0.0
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
|
|
18
|
+
## 149.0.9
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- Updated dependencies
|
|
23
|
+
|
|
24
|
+
## 149.0.8
|
|
25
|
+
|
|
26
|
+
### Patch Changes
|
|
27
|
+
|
|
28
|
+
- [`40a03b85a53bb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/40a03b85a53bb) -
|
|
29
|
+
Clean up experiment `platform_editor_remove_important_in_render_ext`
|
|
30
|
+
- [`de7a00d09c978`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/de7a00d09c978) -
|
|
31
|
+
Clean up experiment `platform_editor_blocktaskitem_node_tenantid`
|
|
32
|
+
- Updated dependencies
|
|
33
|
+
|
|
34
|
+
## 149.0.7
|
|
35
|
+
|
|
36
|
+
### Patch Changes
|
|
37
|
+
|
|
38
|
+
- [`2af9684026f37`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2af9684026f37) -
|
|
39
|
+
Clean up experiment `platform_editor_render_bodied_extension_as_inline`
|
|
40
|
+
- Updated dependencies
|
|
41
|
+
|
|
3
42
|
## 149.0.6
|
|
4
43
|
|
|
5
44
|
### 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) {
|
|
@@ -13,8 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
13
13
|
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
|
+
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
16
17
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
17
|
-
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
18
18
|
var _consts = require("../../consts");
|
|
19
19
|
var _context = require("../../ui/annotations/context");
|
|
20
20
|
var _AnnotationHoverContext = require("../../ui/annotations/contexts/AnnotationHoverContext");
|
|
@@ -105,7 +105,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
|
|
|
105
105
|
fireAnalyticsEvent = _ref2.fireAnalyticsEvent;
|
|
106
106
|
|
|
107
107
|
// we should only use custom layout for full-page appearance
|
|
108
|
-
var canUseCustomLayout = (0,
|
|
108
|
+
var canUseCustomLayout = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? rendererAppearance === 'full-page' : true;
|
|
109
109
|
var isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
110
110
|
var centerAlignClass = isCustomLayout ? _consts.RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
111
111
|
/**
|
|
@@ -141,7 +141,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
|
|
|
141
141
|
* blocks until the sibling marking works at depth.
|
|
142
142
|
*/
|
|
143
143
|
var isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
|
|
144
|
-
var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) &&
|
|
144
|
+
var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && !isNestedForgeInlineBodied;
|
|
145
145
|
var inlineClassName = isInline ? _consts.RendererCssClassName.EXTENSION_AS_INLINE : '';
|
|
146
146
|
/**
|
|
147
147
|
* A native Forge macro does not have its body rendered by the product — the body ADF is
|
|
@@ -167,9 +167,9 @@ var renderExtension = exports.renderExtension = function renderExtension(content
|
|
|
167
167
|
,
|
|
168
168
|
className: "".concat(_consts.RendererCssClassName.EXTENSION, " ").concat(inlineClassName, " ").concat(options.shadowClassNames, " ").concat(centerAlignClass),
|
|
169
169
|
style: {
|
|
170
|
-
width: isInline ? undefined : ((0,
|
|
170
|
+
width: isInline ? undefined : ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
|
|
171
171
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
172
|
-
(0, _breakout.calcBreakoutWidthCss)(layout) : (0,
|
|
172
|
+
(0, _breakout.calcBreakoutWidthCss)(layout) : (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? undefined : '100%',
|
|
173
173
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
174
174
|
minHeight: isInline ? undefined : extensionMinHeight
|
|
175
175
|
},
|
|
@@ -10,7 +10,7 @@ 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
|
|
13
|
+
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
14
14
|
var _analyticsContext = _interopRequireDefault(require("../../analytics/analyticsContext"));
|
|
15
15
|
var _consts = require("../../consts");
|
|
16
16
|
var _breakout = require("../utils/breakout");
|
|
@@ -63,7 +63,7 @@ var MultiBodiedExtensionWrapperNext = function MultiBodiedExtensionWrapperNext(_
|
|
|
63
63
|
children = _ref3.children;
|
|
64
64
|
var isTopLevel = path.length < 1;
|
|
65
65
|
// we should only use custom layout for full-page appearance
|
|
66
|
-
var canUseCustomLayout = (0,
|
|
66
|
+
var canUseCustomLayout = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? rendererAppearance === 'full-page' : true;
|
|
67
67
|
var isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
68
68
|
var centerAlignClass = isCustomLayout ? _consts.RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
69
69
|
|
|
@@ -72,9 +72,9 @@ var MultiBodiedExtensionWrapperNext = function MultiBodiedExtensionWrapperNext(_
|
|
|
72
72
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
73
73
|
className: "".concat(_consts.RendererCssClassName.EXTENSION, " ").concat(centerAlignClass),
|
|
74
74
|
style: {
|
|
75
|
-
width: ((0,
|
|
75
|
+
width: ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
|
|
76
76
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
77
|
-
(0, _breakout.calcBreakoutWidthCss)(layout) : (0,
|
|
77
|
+
(0, _breakout.calcBreakoutWidthCss)(layout) : (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? undefined : '100%'
|
|
78
78
|
},
|
|
79
79
|
"data-layout": layout,
|
|
80
80
|
"data-testid": "multiBodiedExtension--wrapper-renderer",
|
|
@@ -2334,13 +2334,13 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
|
|
|
2334
2334
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- CSS custom properties for UGC font tokens
|
|
2335
2335
|
'--ak-renderer-editor-font-small-text': _editorUgcTokenNames.editorUGCTokensRefreshed['editor.font.body.small']
|
|
2336
2336
|
},
|
|
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' && ((0,
|
|
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' && ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? rendererFullWidthStyles : oldRendererFullWidthStyles), (appearance === 'full-width' || appearance === 'max') && !(0, _table2.isTableResizingEnabled)(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? rendererMaxWidthStyles : oldRendererMaxWidthStyles), 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
2338
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2339
2339
|
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
2340
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
2341
2341
|
(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
2342
|
// this should be placed after baseOtherStyles
|
|
2343
|
-
(0,
|
|
2343
|
+
(0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_important_in_render_ext') ? extensionAsInlineStyle : oldExtensionAsInlineStyle, (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
2344
|
"data-testid": testId
|
|
2345
2345
|
}, children);
|
|
2346
2346
|
};
|
|
@@ -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 = "
|
|
82
|
+
var packageVersion = "150.0.0";
|
|
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: ({
|
|
@@ -10,8 +10,8 @@ import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'reac
|
|
|
10
10
|
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
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
13
14
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
14
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
15
15
|
import { RendererCssClassName } from '../../consts';
|
|
16
16
|
import { ProvidersContext } from '../../ui/annotations/context';
|
|
17
17
|
import { useAnnotationHoverDispatch } from '../../ui/annotations/contexts/AnnotationHoverContext';
|
|
@@ -83,7 +83,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
|
|
|
83
83
|
} = options || {};
|
|
84
84
|
|
|
85
85
|
// we should only use custom layout for full-page appearance
|
|
86
|
-
const canUseCustomLayout =
|
|
86
|
+
const canUseCustomLayout = isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? rendererAppearance === 'full-page' : true;
|
|
87
87
|
const isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
88
88
|
const centerAlignClass = isCustomLayout ? RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
89
89
|
/**
|
|
@@ -119,7 +119,7 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
|
|
|
119
119
|
* blocks until the sibling marking works at depth.
|
|
120
120
|
*/
|
|
121
121
|
const isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
|
|
122
|
-
const isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) &&
|
|
122
|
+
const isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && !isNestedForgeInlineBodied;
|
|
123
123
|
const inlineClassName = isInline ? RendererCssClassName.EXTENSION_AS_INLINE : '';
|
|
124
124
|
/**
|
|
125
125
|
* A native Forge macro does not have its body rendered by the product — the body ADF is
|
|
@@ -145,9 +145,9 @@ export const renderExtension = (content, layout, options = {}, removeOverflow, e
|
|
|
145
145
|
,
|
|
146
146
|
className: `${RendererCssClassName.EXTENSION} ${inlineClassName} ${options.shadowClassNames} ${centerAlignClass}`,
|
|
147
147
|
style: {
|
|
148
|
-
width: isInline ? undefined : (
|
|
148
|
+
width: isInline ? undefined : (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
|
|
149
149
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
150
|
-
calcBreakoutWidthCss(layout) :
|
|
150
|
+
calcBreakoutWidthCss(layout) : isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? undefined : '100%',
|
|
151
151
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
152
152
|
minHeight: isInline ? undefined : extensionMinHeight
|
|
153
153
|
},
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
|
|
9
9
|
import React, { useContext, useState } from 'react';
|
|
10
10
|
import { jsx, css } from '@emotion/react';
|
|
11
|
-
import {
|
|
11
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
12
12
|
import AnalyticsContext from '../../analytics/analyticsContext';
|
|
13
13
|
import { RendererCssClassName } from '../../consts';
|
|
14
14
|
import { calcBreakoutWidthCss } from '../utils/breakout';
|
|
@@ -60,7 +60,7 @@ const MultiBodiedExtensionWrapperNext = ({
|
|
|
60
60
|
}) => {
|
|
61
61
|
const isTopLevel = path.length < 1;
|
|
62
62
|
// we should only use custom layout for full-page appearance
|
|
63
|
-
const canUseCustomLayout =
|
|
63
|
+
const canUseCustomLayout = isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? rendererAppearance === 'full-page' : true;
|
|
64
64
|
const isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
65
65
|
const centerAlignClass = isCustomLayout ? RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
66
66
|
|
|
@@ -69,9 +69,9 @@ const MultiBodiedExtensionWrapperNext = ({
|
|
|
69
69
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
70
70
|
className: `${RendererCssClassName.EXTENSION} ${centerAlignClass}`,
|
|
71
71
|
style: {
|
|
72
|
-
width: (
|
|
72
|
+
width: (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
|
|
73
73
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
74
|
-
calcBreakoutWidthCss(layout) :
|
|
74
|
+
calcBreakoutWidthCss(layout) : isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? undefined : '100%'
|
|
75
75
|
},
|
|
76
76
|
"data-layout": layout,
|
|
77
77
|
"data-testid": "multiBodiedExtension--wrapper-renderer",
|
|
@@ -2970,13 +2970,13 @@ export const RendererStyleContainer = props => {
|
|
|
2970
2970
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- CSS custom properties for UGC font tokens
|
|
2971
2971
|
'--ak-renderer-editor-font-small-text': editorUGCTokensRefreshed['editor.font.body.small']
|
|
2972
2972
|
},
|
|
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' && (
|
|
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' && (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? rendererFullWidthStyles : oldRendererFullWidthStyles), (appearance === 'full-width' || appearance === 'max') && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? rendererMaxWidthStyles : oldRendererMaxWidthStyles), 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
2974
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2975
2975
|
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
2976
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
2977
2977
|
fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor, expandSsrMarginStyles,
|
|
2978
2978
|
// this should be placed after baseOtherStyles
|
|
2979
|
-
|
|
2979
|
+
isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? extensionAsInlineStyle : oldExtensionAsInlineStyle, 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
2980
|
"data-testid": testId
|
|
2981
2981
|
}, children);
|
|
2982
2982
|
};
|
|
@@ -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 = "
|
|
67
|
+
const packageVersion = "150.0.0";
|
|
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) {
|
|
@@ -15,8 +15,8 @@ import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'reac
|
|
|
15
15
|
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
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
18
19
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
19
|
-
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
20
20
|
import { RendererCssClassName } from '../../consts';
|
|
21
21
|
import { ProvidersContext } from '../../ui/annotations/context';
|
|
22
22
|
import { useAnnotationHoverDispatch } from '../../ui/annotations/contexts/AnnotationHoverContext';
|
|
@@ -98,7 +98,7 @@ export var renderExtension = function renderExtension(content, layout) {
|
|
|
98
98
|
fireAnalyticsEvent = _ref2.fireAnalyticsEvent;
|
|
99
99
|
|
|
100
100
|
// we should only use custom layout for full-page appearance
|
|
101
|
-
var canUseCustomLayout =
|
|
101
|
+
var canUseCustomLayout = isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? rendererAppearance === 'full-page' : true;
|
|
102
102
|
var isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
103
103
|
var centerAlignClass = isCustomLayout ? RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
104
104
|
/**
|
|
@@ -134,7 +134,7 @@ export var renderExtension = function renderExtension(content, layout) {
|
|
|
134
134
|
* blocks until the sibling marking works at depth.
|
|
135
135
|
*/
|
|
136
136
|
var isNestedForgeInlineBodied = !isTopLevel && (isForgeInlineBodiedEnabled || isInlineBodiedLayoutEnabled);
|
|
137
|
-
var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) &&
|
|
137
|
+
var isInline = (shouldDisplayExtensionAsInline === null || shouldDisplayExtensionAsInline === void 0 ? void 0 : shouldDisplayExtensionAsInline(node)) && !isNestedForgeInlineBodied;
|
|
138
138
|
var inlineClassName = isInline ? RendererCssClassName.EXTENSION_AS_INLINE : '';
|
|
139
139
|
/**
|
|
140
140
|
* A native Forge macro does not have its body rendered by the product — the body ADF is
|
|
@@ -160,9 +160,9 @@ export var renderExtension = function renderExtension(content, layout) {
|
|
|
160
160
|
,
|
|
161
161
|
className: "".concat(RendererCssClassName.EXTENSION, " ").concat(inlineClassName, " ").concat(options.shadowClassNames, " ").concat(centerAlignClass),
|
|
162
162
|
style: {
|
|
163
|
-
width: isInline ? undefined : (
|
|
163
|
+
width: isInline ? undefined : (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
|
|
164
164
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
165
|
-
calcBreakoutWidthCss(layout) :
|
|
165
|
+
calcBreakoutWidthCss(layout) : isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? undefined : '100%',
|
|
166
166
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
|
|
167
167
|
minHeight: isInline ? undefined : extensionMinHeight
|
|
168
168
|
},
|
|
@@ -11,7 +11,7 @@ var _templateObject;
|
|
|
11
11
|
|
|
12
12
|
import React, { useContext, useState } from 'react';
|
|
13
13
|
import { jsx, css } from '@emotion/react';
|
|
14
|
-
import {
|
|
14
|
+
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
15
15
|
import AnalyticsContext from '../../analytics/analyticsContext';
|
|
16
16
|
import { RendererCssClassName } from '../../consts';
|
|
17
17
|
import { calcBreakoutWidthCss } from '../utils/breakout';
|
|
@@ -56,7 +56,7 @@ var MultiBodiedExtensionWrapperNext = function MultiBodiedExtensionWrapperNext(_
|
|
|
56
56
|
children = _ref3.children;
|
|
57
57
|
var isTopLevel = path.length < 1;
|
|
58
58
|
// we should only use custom layout for full-page appearance
|
|
59
|
-
var canUseCustomLayout =
|
|
59
|
+
var canUseCustomLayout = isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? rendererAppearance === 'full-page' : true;
|
|
60
60
|
var isCustomLayout = isTopLevel && ['wide', 'full-width'].includes(layout) && canUseCustomLayout;
|
|
61
61
|
var centerAlignClass = isCustomLayout ? RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
|
|
62
62
|
|
|
@@ -65,9 +65,9 @@ var MultiBodiedExtensionWrapperNext = function MultiBodiedExtensionWrapperNext(_
|
|
|
65
65
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
66
66
|
className: "".concat(RendererCssClassName.EXTENSION, " ").concat(centerAlignClass),
|
|
67
67
|
style: {
|
|
68
|
-
width: (
|
|
68
|
+
width: (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? isCustomLayout : isTopLevel) ?
|
|
69
69
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
70
|
-
calcBreakoutWidthCss(layout) :
|
|
70
|
+
calcBreakoutWidthCss(layout) : isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? undefined : '100%'
|
|
71
71
|
},
|
|
72
72
|
"data-layout": layout,
|
|
73
73
|
"data-testid": "multiBodiedExtension--wrapper-renderer",
|
|
@@ -2327,13 +2327,13 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
|
|
|
2327
2327
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- CSS custom properties for UGC font tokens
|
|
2328
2328
|
'--ak-renderer-editor-font-small-text': editorUGCTokensRefreshed['editor.font.body.small']
|
|
2329
2329
|
},
|
|
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' && (
|
|
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' && (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? rendererFullWidthStyles : oldRendererFullWidthStyles), (appearance === 'full-width' || appearance === 'max') && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && (isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? rendererMaxWidthStyles : oldRendererMaxWidthStyles), 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
2331
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2332
2332
|
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
2333
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
2334
2334
|
fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? baseOtherStyles : baseOtherStylesDuplicateAnchor, expandSsrMarginStyles,
|
|
2335
2335
|
// this should be placed after baseOtherStyles
|
|
2336
|
-
|
|
2336
|
+
isExperimentEnabled('platform_editor_remove_important_in_render_ext') ? extensionAsInlineStyle : oldExtensionAsInlineStyle, 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
2337
|
"data-testid": testId
|
|
2338
2338
|
}, children);
|
|
2339
2339
|
};
|
|
@@ -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 = "
|
|
72
|
+
var packageVersion = "150.0.0";
|
|
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": "
|
|
3
|
+
"version": "150.0.1",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -73,8 +73,8 @@
|
|
|
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": "^
|
|
77
|
-
"@atlaskit/tokens": "^20.
|
|
76
|
+
"@atlaskit/tmp-editor-statsig": "^235.0.0",
|
|
77
|
+
"@atlaskit/tokens": "^20.5.0",
|
|
78
78
|
"@atlaskit/tooltip": "^24.4.0",
|
|
79
79
|
"@atlaskit/visually-hidden": "^4.4.0",
|
|
80
80
|
"@babel/runtime": "^7.0.0",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"uuid": "^11.1.1"
|
|
89
89
|
},
|
|
90
90
|
"peerDependencies": {
|
|
91
|
-
"@atlaskit/editor-common": "^
|
|
91
|
+
"@atlaskit/editor-common": "^131.0.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": "^
|
|
103
|
+
"@atlaskit/editor-plugin-media": "^29.0.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",
|