@atlaskit/renderer 125.2.0 → 125.3.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 +20 -0
- package/afm-cc/tsconfig.json +1 -1
- package/dist/cjs/react/nodes/heading-anchor.js +0 -1
- package/dist/cjs/react/nodes/task-item-with-providers.js +11 -6
- package/dist/cjs/ui/Renderer/RendererStyleContainer.js +15 -5
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/cjs/ui/annotations/element/mark.js +0 -1
- package/dist/es2019/react/nodes/heading-anchor.js +0 -1
- package/dist/es2019/react/nodes/task-item-with-providers.js +10 -5
- package/dist/es2019/ui/Renderer/RendererStyleContainer.js +16 -4
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/es2019/ui/annotations/element/mark.js +0 -1
- package/dist/esm/react/nodes/heading-anchor.js +0 -1
- package/dist/esm/react/nodes/task-item-with-providers.js +11 -6
- package/dist/esm/ui/Renderer/RendererStyleContainer.js +15 -5
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/esm/ui/annotations/element/mark.js +0 -1
- package/package.json +16 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 125.3.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`b5aad0477b7bb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b5aad0477b7bb) -
|
|
8
|
+
EDITOR-3433: Fix missing task item id when using progressive renderer.
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
11
|
+
## 125.3.0
|
|
12
|
+
|
|
13
|
+
### Minor Changes
|
|
14
|
+
|
|
15
|
+
- [`8702c4d80694c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8702c4d80694c) -
|
|
16
|
+
[https://hello.jira.atlassian.cloud/browse/EDITOR-4103](EDITOR-4103) - clean up
|
|
17
|
+
annotations_align_editor_and_renderer_styles
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- Updated dependencies
|
|
22
|
+
|
|
3
23
|
## 125.2.0
|
|
4
24
|
|
|
5
25
|
### Minor Changes
|
package/afm-cc/tsconfig.json
CHANGED
|
@@ -125,7 +125,6 @@ var HeadingAnchor = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
125
125
|
type: "button"
|
|
126
126
|
}, (0, _react2.jsx)(_link.default, {
|
|
127
127
|
label: _this.getCopyAriaLabel(),
|
|
128
|
-
LEGACY_size: _this.props.level > 3 ? 'small' : 'medium',
|
|
129
128
|
color: _this.state.isClicked ? "var(--ds-icon-selected, #1868DB)" : "var(--ds-icon-subtle, #505258)"
|
|
130
129
|
}));
|
|
131
130
|
});
|
|
@@ -12,10 +12,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
12
12
|
var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
|
|
13
13
|
var _react = _interopRequireDefault(require("react"));
|
|
14
14
|
var _taskDecision = require("@atlaskit/task-decision");
|
|
15
|
-
var
|
|
15
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
|
+
var _excluded = ["objectAri", "isRenderer"];
|
|
16
17
|
function TaskItemWithProviders(props) {
|
|
17
|
-
var
|
|
18
|
-
objectAri = props.objectAri,
|
|
18
|
+
var objectAri = props.objectAri,
|
|
19
19
|
isRenderer = props.isRenderer,
|
|
20
20
|
otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
21
21
|
var _React$useState = _react.default.useState(undefined),
|
|
@@ -58,10 +58,15 @@ function TaskItemWithProviders(props) {
|
|
|
58
58
|
updateContextIdentifierProvider(props.contextIdentifierProvider);
|
|
59
59
|
}, [props.contextIdentifierProvider, updateContextIdentifierProvider]);
|
|
60
60
|
var resolvedObjectId = resolvedContextProvider && resolvedContextProvider.objectId || objectAri;
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
return (0, _platformFeatureFlags.fg)('platform_editor_fix_missing_task_id') ? /*#__PURE__*/_react.default.createElement("div", {
|
|
62
|
+
"data-task-local-id": props.taskId || ''
|
|
63
|
+
}, /*#__PURE__*/_react.default.createElement(_taskDecision.ResourcedTaskItem, (0, _extends2.default)({}, otherProps, {
|
|
64
|
+
objectAri: resolvedObjectId,
|
|
65
|
+
isRenderer: isRenderer
|
|
66
|
+
}))) :
|
|
67
|
+
/*#__PURE__*/
|
|
63
68
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
64
|
-
|
|
69
|
+
_react.default.createElement(_taskDecision.ResourcedTaskItem, (0, _extends2.default)({}, otherProps, {
|
|
65
70
|
objectAri: resolvedObjectId,
|
|
66
71
|
isRenderer: isRenderer
|
|
67
72
|
}));
|
|
@@ -1624,11 +1624,21 @@ var denseStyles = (0, _react.css)((0, _defineProperty2.default)((0, _definePrope
|
|
|
1624
1624
|
marginTop: RENDERER_LIST_DENSE_GAP
|
|
1625
1625
|
}
|
|
1626
1626
|
}));
|
|
1627
|
-
var syncBlockStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.renderer, ", .").concat(_syncBlock.SyncBlockSharedCssClassName.error, ", .").concat(_syncBlock.SyncBlockSharedCssClassName.loading), {
|
|
1627
|
+
var syncBlockStyles = (0, _react.css)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer, ", .").concat(_syncBlock.BodiedSyncBlockSharedCssClassName.renderer, ", .").concat(_syncBlock.SyncBlockSharedCssClassName.error, ", .").concat(_syncBlock.SyncBlockSharedCssClassName.loading), {
|
|
1628
1628
|
borderRadius: "var(--ds-radius-small, 3px)",
|
|
1629
|
-
|
|
1630
|
-
|
|
1631
|
-
|
|
1629
|
+
paddingBlock: "var(--ds-space-150, 12px)"
|
|
1630
|
+
}), ".".concat(_syncBlock.SyncBlockSharedCssClassName.renderer), {
|
|
1631
|
+
// First child node in syncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
1632
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
1633
|
+
'.ak-renderer-document > :first-child': {
|
|
1634
|
+
marginTop: 0
|
|
1635
|
+
}
|
|
1636
|
+
}), ".".concat(_syncBlock.BodiedSyncBlockSharedCssClassName.renderer), {
|
|
1637
|
+
// First child node in bodiedSyncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
1638
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
1639
|
+
'> :first-child': {
|
|
1640
|
+
marginTop: 0
|
|
1641
|
+
}
|
|
1632
1642
|
}), ".".concat(_syncBlock.SyncBlockSharedCssClassName.error), {
|
|
1633
1643
|
backgroundColor: "var(--ds-background-disabled, #17171708)"
|
|
1634
1644
|
}), ".".concat(_syncBlock.SyncBlockSharedCssClassName.loading), {
|
|
@@ -1676,7 +1686,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
|
|
|
1676
1686
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
1677
1687
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, (0, _experiments.editorExperiment)('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
|
|
1678
1688
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
1679
|
-
(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') &&
|
|
1689
|
+
(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
|
|
1680
1690
|
// merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
|
|
1681
1691
|
(0, _platformFeatureFlags.fg)('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, (0, _platformFeatureFlags.fg)('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, (0, _table.isStickyScrollbarEnabled)(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, (0, _expValEquals.expValEquals)('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? isCompactModeEnabled ? scaledDenseEmojiStyles : scaledEmojiStyles : isCompactModeEnabled ? denseStyles : undefined, (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && syncBlockStyles],
|
|
1682
1692
|
"data-testid": testId
|
|
@@ -70,7 +70,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
70
70
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
71
71
|
var RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
72
72
|
var packageName = "@atlaskit/renderer";
|
|
73
|
-
var packageVersion = "125.
|
|
73
|
+
var packageVersion = "125.3.0";
|
|
74
74
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
75
75
|
containerName: 'ak-renderer-wrapper',
|
|
76
76
|
containerType: 'inline-size'
|
|
@@ -62,7 +62,6 @@ var markStylesWithInlineComments = (0, _react2.css)((0, _defineProperty2.default
|
|
|
62
62
|
borderBottom: "var(--ds-border-width-selected, 2px)".concat(" solid transparent"),
|
|
63
63
|
cursor: 'pointer',
|
|
64
64
|
padding: "1px 0 ".concat("var(--ds-space-025, 2px)"),
|
|
65
|
-
// it was under fg(annotations_align_editor_and_renderer_styles) from AnnotationSharedCSSByState().common, assume it's on as already rolled out
|
|
66
65
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
67
66
|
'&:has(.card), &:has([data-inline-card])': {
|
|
68
67
|
padding: '5px 0 3px 0'
|
|
@@ -90,7 +90,6 @@ class HeadingAnchor extends React.PureComponent {
|
|
|
90
90
|
type: "button"
|
|
91
91
|
}, jsx(LinkIcon, {
|
|
92
92
|
label: this.getCopyAriaLabel(),
|
|
93
|
-
LEGACY_size: this.props.level > 3 ? 'small' : 'medium',
|
|
94
93
|
color: this.state.isClicked ? "var(--ds-icon-selected, #1868DB)" : "var(--ds-icon-subtle, #505258)"
|
|
95
94
|
}));
|
|
96
95
|
});
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import { ResourcedTaskItem } from '@atlaskit/task-decision';
|
|
4
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
4
5
|
export default function TaskItemWithProviders(props) {
|
|
5
6
|
const {
|
|
6
|
-
contextIdentifierProvider,
|
|
7
7
|
objectAri,
|
|
8
8
|
isRenderer,
|
|
9
9
|
...otherProps
|
|
@@ -15,7 +15,7 @@ export default function TaskItemWithProviders(props) {
|
|
|
15
15
|
const resolvedContextProvider = await contextIdentifierProvider;
|
|
16
16
|
setResolvedContextProvider(resolvedContextProvider);
|
|
17
17
|
return;
|
|
18
|
-
} catch
|
|
18
|
+
} catch {}
|
|
19
19
|
}
|
|
20
20
|
setResolvedContextProvider(undefined);
|
|
21
21
|
}, []);
|
|
@@ -23,10 +23,15 @@ export default function TaskItemWithProviders(props) {
|
|
|
23
23
|
updateContextIdentifierProvider(props.contextIdentifierProvider);
|
|
24
24
|
}, [props.contextIdentifierProvider, updateContextIdentifierProvider]);
|
|
25
25
|
const resolvedObjectId = resolvedContextProvider && resolvedContextProvider.objectId || objectAri;
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
return fg('platform_editor_fix_missing_task_id') ? /*#__PURE__*/React.createElement("div", {
|
|
27
|
+
"data-task-local-id": props.taskId || ''
|
|
28
|
+
}, /*#__PURE__*/React.createElement(ResourcedTaskItem, _extends({}, otherProps, {
|
|
29
|
+
objectAri: resolvedObjectId,
|
|
30
|
+
isRenderer: isRenderer
|
|
31
|
+
}))) :
|
|
32
|
+
/*#__PURE__*/
|
|
28
33
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
29
|
-
|
|
34
|
+
React.createElement(ResourcedTaskItem, _extends({}, otherProps, {
|
|
30
35
|
objectAri: resolvedObjectId,
|
|
31
36
|
isRenderer: isRenderer
|
|
32
37
|
}));
|
|
@@ -2050,9 +2050,21 @@ const denseStyles = css({
|
|
|
2050
2050
|
const syncBlockStyles = css({
|
|
2051
2051
|
[`.${SyncBlockSharedCssClassName.renderer}, .${BodiedSyncBlockSharedCssClassName.renderer}, .${SyncBlockSharedCssClassName.error}, .${SyncBlockSharedCssClassName.loading}`]: {
|
|
2052
2052
|
borderRadius: "var(--ds-radius-small, 3px)",
|
|
2053
|
-
|
|
2054
|
-
|
|
2055
|
-
|
|
2053
|
+
paddingBlock: "var(--ds-space-150, 12px)"
|
|
2054
|
+
},
|
|
2055
|
+
[`.${SyncBlockSharedCssClassName.renderer}`]: {
|
|
2056
|
+
// First child node in syncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
2057
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
2058
|
+
'.ak-renderer-document > :first-child': {
|
|
2059
|
+
marginTop: 0
|
|
2060
|
+
}
|
|
2061
|
+
},
|
|
2062
|
+
[`.${BodiedSyncBlockSharedCssClassName.renderer}`]: {
|
|
2063
|
+
// First child node in bodiedSyncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
2064
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
2065
|
+
'> :first-child': {
|
|
2066
|
+
marginTop: 0
|
|
2067
|
+
}
|
|
2056
2068
|
},
|
|
2057
2069
|
[`.${SyncBlockSharedCssClassName.error}`]: {
|
|
2058
2070
|
backgroundColor: "var(--ds-background-disabled, #17171708)"
|
|
@@ -2105,7 +2117,7 @@ export const RendererStyleContainer = props => {
|
|
|
2105
2117
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2106
2118
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, editorExperiment('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
|
|
2107
2119
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
2108
|
-
fg('editor_inline_comments_on_inline_nodes') &&
|
|
2120
|
+
fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
|
|
2109
2121
|
// merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
|
|
2110
2122
|
fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, fg('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, isStickyScrollbarEnabled(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? isCompactModeEnabled ? scaledDenseEmojiStyles : scaledEmojiStyles : isCompactModeEnabled ? denseStyles : undefined, expValEquals('platform_synced_block', 'isEnabled', true) && syncBlockStyles],
|
|
2111
2123
|
"data-testid": testId
|
|
@@ -56,7 +56,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
56
56
|
const TABLE_INFO_TIMEOUT = 10000;
|
|
57
57
|
const RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
58
58
|
const packageName = "@atlaskit/renderer";
|
|
59
|
-
const packageVersion = "125.
|
|
59
|
+
const packageVersion = "125.3.0";
|
|
60
60
|
const setAsQueryContainerStyles = css({
|
|
61
61
|
containerName: 'ak-renderer-wrapper',
|
|
62
62
|
containerType: 'inline-size'
|
|
@@ -64,7 +64,6 @@ const markStylesWithInlineComments = css({
|
|
|
64
64
|
borderBottom: `${"var(--ds-border-width-selected, 2px)"} solid transparent`,
|
|
65
65
|
cursor: 'pointer',
|
|
66
66
|
padding: `1px 0 ${"var(--ds-space-025, 2px)"}`,
|
|
67
|
-
// it was under fg(annotations_align_editor_and_renderer_styles) from AnnotationSharedCSSByState().common, assume it's on as already rolled out
|
|
68
67
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
69
68
|
'&:has(.card), &:has([data-inline-card])': {
|
|
70
69
|
padding: '5px 0 3px 0'
|
|
@@ -119,7 +119,6 @@ var HeadingAnchor = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
119
119
|
type: "button"
|
|
120
120
|
}, jsx(LinkIcon, {
|
|
121
121
|
label: _this.getCopyAriaLabel(),
|
|
122
|
-
LEGACY_size: _this.props.level > 3 ? 'small' : 'medium',
|
|
123
122
|
color: _this.state.isClicked ? "var(--ds-icon-selected, #1868DB)" : "var(--ds-icon-subtle, #505258)"
|
|
124
123
|
}));
|
|
125
124
|
});
|
|
@@ -2,13 +2,13 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
3
3
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
4
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
|
|
5
|
-
var _excluded = ["
|
|
5
|
+
var _excluded = ["objectAri", "isRenderer"];
|
|
6
6
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
7
7
|
import React from 'react';
|
|
8
8
|
import { ResourcedTaskItem } from '@atlaskit/task-decision';
|
|
9
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
10
|
export default function TaskItemWithProviders(props) {
|
|
10
|
-
var
|
|
11
|
-
objectAri = props.objectAri,
|
|
11
|
+
var objectAri = props.objectAri,
|
|
12
12
|
isRenderer = props.isRenderer,
|
|
13
13
|
otherProps = _objectWithoutProperties(props, _excluded);
|
|
14
14
|
var _React$useState = React.useState(undefined),
|
|
@@ -51,10 +51,15 @@ export default function TaskItemWithProviders(props) {
|
|
|
51
51
|
updateContextIdentifierProvider(props.contextIdentifierProvider);
|
|
52
52
|
}, [props.contextIdentifierProvider, updateContextIdentifierProvider]);
|
|
53
53
|
var resolvedObjectId = resolvedContextProvider && resolvedContextProvider.objectId || objectAri;
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
return fg('platform_editor_fix_missing_task_id') ? /*#__PURE__*/React.createElement("div", {
|
|
55
|
+
"data-task-local-id": props.taskId || ''
|
|
56
|
+
}, /*#__PURE__*/React.createElement(ResourcedTaskItem, _extends({}, otherProps, {
|
|
57
|
+
objectAri: resolvedObjectId,
|
|
58
|
+
isRenderer: isRenderer
|
|
59
|
+
}))) :
|
|
60
|
+
/*#__PURE__*/
|
|
56
61
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
|
57
|
-
|
|
62
|
+
React.createElement(ResourcedTaskItem, _extends({}, otherProps, {
|
|
58
63
|
objectAri: resolvedObjectId,
|
|
59
64
|
isRenderer: isRenderer
|
|
60
65
|
}));
|
|
@@ -1617,11 +1617,21 @@ var denseStyles = css(_defineProperty(_defineProperty(_defineProperty({}, ".".co
|
|
|
1617
1617
|
marginTop: RENDERER_LIST_DENSE_GAP
|
|
1618
1618
|
}
|
|
1619
1619
|
}));
|
|
1620
|
-
var syncBlockStyles = css(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(SyncBlockSharedCssClassName.renderer, ", .").concat(BodiedSyncBlockSharedCssClassName.renderer, ", .").concat(SyncBlockSharedCssClassName.error, ", .").concat(SyncBlockSharedCssClassName.loading), {
|
|
1620
|
+
var syncBlockStyles = css(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ".".concat(SyncBlockSharedCssClassName.renderer, ", .").concat(BodiedSyncBlockSharedCssClassName.renderer, ", .").concat(SyncBlockSharedCssClassName.error, ", .").concat(SyncBlockSharedCssClassName.loading), {
|
|
1621
1621
|
borderRadius: "var(--ds-radius-small, 3px)",
|
|
1622
|
-
|
|
1623
|
-
|
|
1624
|
-
|
|
1622
|
+
paddingBlock: "var(--ds-space-150, 12px)"
|
|
1623
|
+
}), ".".concat(SyncBlockSharedCssClassName.renderer), {
|
|
1624
|
+
// First child node in syncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
1625
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
1626
|
+
'.ak-renderer-document > :first-child': {
|
|
1627
|
+
marginTop: 0
|
|
1628
|
+
}
|
|
1629
|
+
}), ".".concat(BodiedSyncBlockSharedCssClassName.renderer), {
|
|
1630
|
+
// First child node in bodiedSyncBlock in editor is overridden with marginTop: 0, hence apply the same style in renderer for consistency
|
|
1631
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors, @atlaskit/ui-styling-standard/no-nested-selectors
|
|
1632
|
+
'> :first-child': {
|
|
1633
|
+
marginTop: 0
|
|
1634
|
+
}
|
|
1625
1635
|
}), ".".concat(SyncBlockSharedCssClassName.error), {
|
|
1626
1636
|
backgroundColor: "var(--ds-background-disabled, #17171708)"
|
|
1627
1637
|
}), ".".concat(SyncBlockSharedCssClassName.loading), {
|
|
@@ -1669,7 +1679,7 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
|
|
|
1669
1679
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
1670
1680
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, smartCardStyles, smartCardStylesAvatarFix, editorExperiment('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
|
|
1671
1681
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
1672
|
-
fg('editor_inline_comments_on_inline_nodes') &&
|
|
1682
|
+
fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
|
|
1673
1683
|
// merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
|
|
1674
1684
|
fg('platform_editor_fix_media_in_renderer') && firstWrappedMediaStyles, tableSharedStyle, tableRendererHeaderStylesForTableCellOnly, fg('platform_editor_bordered_panel_nested_in_table') && tableRendererNestedPanelStyles, isBackgroundClipBrowserFixNeeded() && tableStylesBackGroundClipForGeckoForTableCellOnly, fg('platform_editor_nested_dnd_styles_changes') ? firstNodeWithNotMarginTopWithNestedDnD : firstNodeWithNotMarginTop, rendererTableStyles, isStickyScrollbarEnabled(appearance) && stickyScrollbarStyles, rendererTableHeaderEqualHeightStylesForTableCellOnly, allowColumnSorting && rendererTableSortableColumnStyles, allowColumnSorting && allowNestedHeaderLinks && rendererTableHeaderEqualHeightStylesAllowNestedHeaderLinks, rendererTableColumnStyles, stickyHeaderStyles, codeBlockAndLayoutStyles, columnLayoutSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveSharedStyle, isAdvancedLayoutsOn && columnLayoutResponsiveRendererStyles, isAdvancedLayoutsOn && layoutSectionForAdvancedLayoutsStyles, !useBlockRenderForCodeBlock && gridRenderForCodeBlockStyles, browser.safari && codeBlockInListSafariFixStyles, appearance === 'full-page' && !isPreviewPanelResponsivenessOn && responsiveBreakoutWidth, appearance === 'full-page' && isPreviewPanelResponsivenessOn && responsiveBreakoutWidthWithReducedPadding, (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && responsiveBreakoutWidthFullWidth, expValEquals('platform_editor_lovability_emoji_scaling', 'isEnabled', true) ? isCompactModeEnabled ? scaledDenseEmojiStyles : scaledEmojiStyles : isCompactModeEnabled ? denseStyles : undefined, expValEquals('platform_synced_block', 'isEnabled', true) && syncBlockStyles],
|
|
1675
1685
|
"data-testid": testId
|
|
@@ -61,7 +61,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
61
61
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
62
62
|
var RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
63
63
|
var packageName = "@atlaskit/renderer";
|
|
64
|
-
var packageVersion = "125.
|
|
64
|
+
var packageVersion = "125.3.0";
|
|
65
65
|
var setAsQueryContainerStyles = css({
|
|
66
66
|
containerName: 'ak-renderer-wrapper',
|
|
67
67
|
containerType: 'inline-size'
|
|
@@ -58,7 +58,6 @@ var markStylesWithInlineComments = css(_defineProperty({}, "&[data-mark-annotati
|
|
|
58
58
|
borderBottom: "var(--ds-border-width-selected, 2px)".concat(" solid transparent"),
|
|
59
59
|
cursor: 'pointer',
|
|
60
60
|
padding: "1px 0 ".concat("var(--ds-space-025, 2px)"),
|
|
61
|
-
// it was under fg(annotations_align_editor_and_renderer_styles) from AnnotationSharedCSSByState().common, assume it's on as already rolled out
|
|
62
61
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
63
62
|
'&:has(.card), &:has([data-inline-card])': {
|
|
64
63
|
padding: '5px 0 3px 0'
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "125.
|
|
3
|
+
"version": "125.3.1",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -36,30 +36,30 @@
|
|
|
36
36
|
"@atlaskit/editor-palette": "^2.1.0",
|
|
37
37
|
"@atlaskit/editor-prosemirror": "^7.2.0",
|
|
38
38
|
"@atlaskit/editor-shared-styles": "^3.10.0",
|
|
39
|
-
"@atlaskit/emoji": "^69.
|
|
39
|
+
"@atlaskit/emoji": "^69.10.0",
|
|
40
40
|
"@atlaskit/feature-gate-js-client": "^5.5.0",
|
|
41
|
-
"@atlaskit/icon": "^29.
|
|
41
|
+
"@atlaskit/icon": "^29.4.0",
|
|
42
42
|
"@atlaskit/link": "^3.3.0",
|
|
43
|
-
"@atlaskit/link-datasource": "^4.
|
|
43
|
+
"@atlaskit/link-datasource": "^4.32.0",
|
|
44
44
|
"@atlaskit/link-extractors": "^2.4.0",
|
|
45
45
|
"@atlaskit/linking-common": "^9.9.0",
|
|
46
|
-
"@atlaskit/media-card": "^79.
|
|
46
|
+
"@atlaskit/media-card": "^79.13.0",
|
|
47
47
|
"@atlaskit/media-client": "^35.7.0",
|
|
48
48
|
"@atlaskit/media-client-react": "^4.1.0",
|
|
49
49
|
"@atlaskit/media-common": "^12.3.0",
|
|
50
50
|
"@atlaskit/media-filmstrip": "^51.1.0",
|
|
51
51
|
"@atlaskit/media-ui": "^28.7.0",
|
|
52
|
-
"@atlaskit/media-viewer": "^52.
|
|
52
|
+
"@atlaskit/media-viewer": "^52.6.0",
|
|
53
53
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
54
54
|
"@atlaskit/platform-feature-flags-react": "^0.4.0",
|
|
55
|
-
"@atlaskit/react-ufo": "^4.
|
|
56
|
-
"@atlaskit/smart-card": "^43.
|
|
55
|
+
"@atlaskit/react-ufo": "^4.17.0",
|
|
56
|
+
"@atlaskit/smart-card": "^43.20.0",
|
|
57
57
|
"@atlaskit/status": "^3.0.0",
|
|
58
58
|
"@atlaskit/task-decision": "^19.2.0",
|
|
59
59
|
"@atlaskit/theme": "^21.0.0",
|
|
60
|
-
"@atlaskit/tmp-editor-statsig": "^16.
|
|
60
|
+
"@atlaskit/tmp-editor-statsig": "^16.14.0",
|
|
61
61
|
"@atlaskit/tokens": "^9.1.0",
|
|
62
|
-
"@atlaskit/tooltip": "^20.
|
|
62
|
+
"@atlaskit/tooltip": "^20.13.0",
|
|
63
63
|
"@atlaskit/visually-hidden": "^3.0.0",
|
|
64
64
|
"@babel/runtime": "^7.0.0",
|
|
65
65
|
"@emotion/react": "^11.7.1",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"uuid": "^3.1.0"
|
|
72
72
|
},
|
|
73
73
|
"peerDependencies": {
|
|
74
|
-
"@atlaskit/editor-common": "^111.
|
|
74
|
+
"@atlaskit/editor-common": "^111.7.0",
|
|
75
75
|
"@atlaskit/link-provider": "^4.1.0",
|
|
76
76
|
"@atlaskit/media-core": "^37.0.0",
|
|
77
77
|
"react": "^18.2.0",
|
|
@@ -90,8 +90,8 @@
|
|
|
90
90
|
"@atlaskit/mention": "^24.4.0",
|
|
91
91
|
"@atlaskit/modal-dialog": "^14.9.0",
|
|
92
92
|
"@atlaskit/navigation-next": "patch:@atlaskit/navigation-next@npm%3A9.0.17#~/.yarn/patches/@atlaskit-navigation-next-npm-9.0.17-958ca0ab9d.patch",
|
|
93
|
-
"@atlaskit/profilecard": "^24.
|
|
94
|
-
"@atlaskit/util-data-test": "^18.
|
|
93
|
+
"@atlaskit/profilecard": "^24.29.0",
|
|
94
|
+
"@atlaskit/util-data-test": "^18.4.0",
|
|
95
95
|
"@atlassian/feature-flags-test-utils": "^1.0.0",
|
|
96
96
|
"@testing-library/react": "^16.3.0",
|
|
97
97
|
"@testing-library/user-event": "^14.4.3",
|
|
@@ -143,9 +143,6 @@
|
|
|
143
143
|
"editor_inline_comments_on_inline_nodes": {
|
|
144
144
|
"type": "boolean"
|
|
145
145
|
},
|
|
146
|
-
"annotations_align_editor_and_renderer_styles": {
|
|
147
|
-
"type": "boolean"
|
|
148
|
-
},
|
|
149
146
|
"platform-fix-table-ssr-resizing": {
|
|
150
147
|
"type": "boolean"
|
|
151
148
|
},
|
|
@@ -244,6 +241,9 @@
|
|
|
244
241
|
},
|
|
245
242
|
"platform_editor_dec_a11y_fixes": {
|
|
246
243
|
"type": "boolean"
|
|
244
|
+
},
|
|
245
|
+
"platform_editor_fix_missing_task_id": {
|
|
246
|
+
"type": "boolean"
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
249
|
}
|