@atlaskit/renderer 128.3.8 → 128.4.0
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 +25 -0
- package/dist/cjs/ui/Renderer/RendererStyleContainer.js +17 -8
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/ui/Renderer/RendererStyleContainer.js +16 -5
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/ui/Renderer/RendererStyleContainer.js +17 -8
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,30 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 128.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`f30780a78f02c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f30780a78f02c) -
|
|
8
|
+
Fix list item markers not inheriting font-size when small text is applied. Propagate font-size to
|
|
9
|
+
li and blockTaskItem elements via CSS :has() so the ::marker pseudo-element renders at the correct
|
|
10
|
+
size, while resetting the inner block mark to prevent double-application.
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- Updated dependencies
|
|
15
|
+
|
|
16
|
+
## 128.3.9
|
|
17
|
+
|
|
18
|
+
### Patch Changes
|
|
19
|
+
|
|
20
|
+
- [`a5d5b5c29ef5d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a5d5b5c29ef5d) -
|
|
21
|
+
Move smallTextStyle CSS custom property from css prop to style prop for consistency with other UGC
|
|
22
|
+
font tokens
|
|
23
|
+
|
|
24
|
+
Fix extra top margin for small text in nested renderer blocks
|
|
25
|
+
|
|
26
|
+
- Updated dependencies
|
|
27
|
+
|
|
3
28
|
## 128.3.8
|
|
4
29
|
|
|
5
30
|
### Patch Changes
|
|
@@ -35,6 +35,8 @@ var _css8, _$concat3, _$concat6;
|
|
|
35
35
|
* @jsx jsx
|
|
36
36
|
*/
|
|
37
37
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
38
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
39
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
38
40
|
var wrappedMediaBreakoutPoint = 410;
|
|
39
41
|
var TELEPOINTER_ID = 'ai-streaming-telepointer';
|
|
40
42
|
var tableShadowWidth = 32;
|
|
@@ -51,9 +53,6 @@ var isBackgroundClipBrowserFixNeeded = function isBackgroundClipBrowserFixNeeded
|
|
|
51
53
|
var baseFontStyle = (0, _react.css)({
|
|
52
54
|
font: (0, _ugcTokens.editorUGCToken)('editor.font.body')
|
|
53
55
|
});
|
|
54
|
-
var smallTextStyle = (0, _react.css)({
|
|
55
|
-
'--ak-renderer-editor-font-small-text': (0, _ugcTokens.editorUGCToken)('editor.font.body.small')
|
|
56
|
-
});
|
|
57
56
|
var fontSizeStyles = (0, _react.css)({
|
|
58
57
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
59
58
|
'.fabric-editor-font-size': {
|
|
@@ -62,6 +61,14 @@ var fontSizeStyles = (0, _react.css)({
|
|
|
62
61
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
63
62
|
font: 'var(--ak-renderer-editor-font-small-text)'
|
|
64
63
|
}
|
|
64
|
+
},
|
|
65
|
+
// Apply font-size to the ::marker pseudo-element of list items that have a font-size mark.
|
|
66
|
+
// Targeting ::marker directly avoids setting font on the <li> itself, which would cascade
|
|
67
|
+
// into nested lists and compound the sizing at each nesting level.
|
|
68
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
69
|
+
"li:has(> .fabric-editor-font-size[data-font-size='small'])::marker": {
|
|
70
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
71
|
+
font: 'var(--ak-renderer-editor-font-small-text)'
|
|
65
72
|
}
|
|
66
73
|
});
|
|
67
74
|
var originalBaseFontLineHeight = (0, _react.css)({
|
|
@@ -773,7 +780,7 @@ var indentationSharedStylesWithMarginFix = (0, _react.css)({
|
|
|
773
780
|
}
|
|
774
781
|
}
|
|
775
782
|
});
|
|
776
|
-
var blockMarksSharedStylesDuplicateAnchor = (0, _react.css)((0, _defineProperty2.default)({}, "*:not(.fabric-editor-block-mark) >,\n \t*:not(.fabric-editor-block-mark) >\n div.fabric-editor-block-mark:first-of-type\n\t:not(.fabric-editor-indentation-mark)\n\t:not(.fabric-editor-alignment),\n \t.fabric-editor-alignment:first-of-type:first-child,\n \t.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child", {
|
|
783
|
+
var blockMarksSharedStylesDuplicateAnchor = (0, _react.css)((0, _defineProperty2.default)({}, "*:not(.fabric-editor-block-mark) >,\n \t*:not(.fabric-editor-block-mark) >\n div.fabric-editor-block-mark:first-of-type\n\t:not(.fabric-editor-indentation-mark)\n\t:not(.fabric-editor-alignment),\n \t.fabric-editor-alignment:first-of-type:first-child,\n \t.fabric-editor-font-size:first-of-type:first-child,\n \t.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child", {
|
|
777
784
|
'p, h1, h2, h3, h4, h5, h6, .heading-wrapper': {
|
|
778
785
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
779
786
|
':first-child:not(style), style:first-child + *': {
|
|
@@ -781,7 +788,7 @@ var blockMarksSharedStylesDuplicateAnchor = (0, _react.css)((0, _defineProperty2
|
|
|
781
788
|
}
|
|
782
789
|
}
|
|
783
790
|
}));
|
|
784
|
-
var blockMarksSharedStyles = (0, _react.css)((0, _defineProperty2.default)({}, "*:not(.fabric-editor-block-mark) >,\n \t*:not(.fabric-editor-block-mark) >\n div.fabric-editor-block-mark:first-of-type\n\t:not(.fabric-editor-indentation-mark)\n\t:not(.fabric-editor-alignment),\n \t.fabric-editor-alignment:first-of-type:first-child,\n \t.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child", {
|
|
791
|
+
var blockMarksSharedStyles = (0, _react.css)((0, _defineProperty2.default)({}, "*:not(.fabric-editor-block-mark) >,\n \t*:not(.fabric-editor-block-mark) >\n div.fabric-editor-block-mark:first-of-type\n\t:not(.fabric-editor-indentation-mark)\n\t:not(.fabric-editor-alignment),\n \t.fabric-editor-alignment:first-of-type:first-child,\n \t.fabric-editor-font-size:first-of-type:first-child,\n \t.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child", {
|
|
785
792
|
'p, .heading-wrapper': {
|
|
786
793
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
787
794
|
':first-child:not(style), style:first-child + *': {
|
|
@@ -2018,7 +2025,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
|
|
|
2018
2025
|
ref: innerRef,
|
|
2019
2026
|
onClick: onClick,
|
|
2020
2027
|
onMouseDown: onMouseDown,
|
|
2021
|
-
style: {
|
|
2028
|
+
style: _objectSpread({
|
|
2022
2029
|
'--ak-renderer-base-font-size': "".concat(baseFontSize, "px"),
|
|
2023
2030
|
'--ak-renderer-editor-font-heading-h1': "".concat((0, _ugcTokens.editorUGCToken)('editor.font.heading.h1')),
|
|
2024
2031
|
'--ak-renderer-editor-font-heading-h2': "".concat((0, _ugcTokens.editorUGCToken)('editor.font.heading.h2')),
|
|
@@ -2027,8 +2034,10 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
|
|
|
2027
2034
|
'--ak-renderer-editor-font-heading-h5': "".concat((0, _ugcTokens.editorUGCToken)('editor.font.heading.h5')),
|
|
2028
2035
|
'--ak-renderer-editor-font-heading-h6': "".concat((0, _ugcTokens.editorUGCToken)('editor.font.heading.h6')),
|
|
2029
2036
|
'--ak-renderer-editor-font-normal-text': "".concat((0, _ugcTokens.editorUGCToken)('editor.font.body'))
|
|
2030
|
-
},
|
|
2031
|
-
|
|
2037
|
+
}, (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) && {
|
|
2038
|
+
'--ak-renderer-editor-font-small-text': (0, _ugcTokens.editorUGCToken)('editor.font.body.small')
|
|
2039
|
+
}),
|
|
2040
|
+
css: [(0, _expValEquals.expValEquals)('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) && fontSizeStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, (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, _expValEquals.expValEquals)('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? rendererFullWidthStyles : oldRendererFullWidthStyles), (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))) && !(0, _table.isTableResizingEnabled)(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true)) && ((0, _expValEquals.expValEquals)('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? rendererMaxWidthStyles : oldRendererMaxWidthStyles), rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, headingsSharedStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingWrapperInlineFlowStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingWithAlignmentStyles : headingWithAlignmentStylesDuplicateAnchor, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, (0, _expValEquals.expValEquals)('platform_editor_flexible_list_schema', 'isEnabled', true) && listItemHiddenMarkerStyles, indentationSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? blockMarksSharedStyles : blockMarksSharedStylesDuplicateAnchor, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles,
|
|
2032
2041
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2033
2042
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, (0, _expValEquals.expValEquals)('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingPanelStyles, smartCardStyles, smartCardStylesAvatarFix, (0, _experiments.editorExperiment)('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && ((0, _expValEquals.expValEquals)('confluence_fe_renderer_inline_node_mark_color_fix', 'isEnabled', true) ? rendererAnnotationStyles : rendererAnnotationStylesOld),
|
|
2034
2043
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -71,7 +71,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
71
71
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
72
72
|
var RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
73
73
|
var packageName = "@atlaskit/renderer";
|
|
74
|
-
var packageVersion = "128.3.
|
|
74
|
+
var packageVersion = "128.3.9";
|
|
75
75
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
76
76
|
containerName: 'ak-renderer-wrapper',
|
|
77
77
|
containerType: 'inline-size'
|
|
@@ -42,9 +42,6 @@ const isBackgroundClipBrowserFixNeeded = () => {
|
|
|
42
42
|
const baseFontStyle = css({
|
|
43
43
|
font: editorUGCToken('editor.font.body')
|
|
44
44
|
});
|
|
45
|
-
const smallTextStyle = css({
|
|
46
|
-
'--ak-renderer-editor-font-small-text': editorUGCToken('editor.font.body.small')
|
|
47
|
-
});
|
|
48
45
|
const fontSizeStyles = css({
|
|
49
46
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
50
47
|
'.fabric-editor-font-size': {
|
|
@@ -53,6 +50,14 @@ const fontSizeStyles = css({
|
|
|
53
50
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
54
51
|
font: 'var(--ak-renderer-editor-font-small-text)'
|
|
55
52
|
}
|
|
53
|
+
},
|
|
54
|
+
// Apply font-size to the ::marker pseudo-element of list items that have a font-size mark.
|
|
55
|
+
// Targeting ::marker directly avoids setting font on the <li> itself, which would cascade
|
|
56
|
+
// into nested lists and compound the sizing at each nesting level.
|
|
57
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
58
|
+
"li:has(> .fabric-editor-font-size[data-font-size='small'])::marker": {
|
|
59
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
60
|
+
font: 'var(--ak-renderer-editor-font-small-text)'
|
|
56
61
|
}
|
|
57
62
|
});
|
|
58
63
|
const originalBaseFontLineHeight = css({
|
|
@@ -907,6 +912,7 @@ const blockMarksSharedStylesDuplicateAnchor = css({
|
|
|
907
912
|
:not(.fabric-editor-indentation-mark)
|
|
908
913
|
:not(.fabric-editor-alignment),
|
|
909
914
|
.fabric-editor-alignment:first-of-type:first-child,
|
|
915
|
+
.fabric-editor-font-size:first-of-type:first-child,
|
|
910
916
|
.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child`]: {
|
|
911
917
|
'p, h1, h2, h3, h4, h5, h6, .heading-wrapper': {
|
|
912
918
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
@@ -927,6 +933,7 @@ const blockMarksSharedStyles = css({
|
|
|
927
933
|
:not(.fabric-editor-indentation-mark)
|
|
928
934
|
:not(.fabric-editor-alignment),
|
|
929
935
|
.fabric-editor-alignment:first-of-type:first-child,
|
|
936
|
+
.fabric-editor-font-size:first-of-type:first-child,
|
|
930
937
|
.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child`]: {
|
|
931
938
|
'p, .heading-wrapper': {
|
|
932
939
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
@@ -2569,9 +2576,13 @@ export const RendererStyleContainer = props => {
|
|
|
2569
2576
|
'--ak-renderer-editor-font-heading-h4': `${editorUGCToken('editor.font.heading.h4')}`,
|
|
2570
2577
|
'--ak-renderer-editor-font-heading-h5': `${editorUGCToken('editor.font.heading.h5')}`,
|
|
2571
2578
|
'--ak-renderer-editor-font-heading-h6': `${editorUGCToken('editor.font.heading.h6')}`,
|
|
2572
|
-
'--ak-renderer-editor-font-normal-text': `${editorUGCToken('editor.font.body')}
|
|
2579
|
+
'--ak-renderer-editor-font-normal-text': `${editorUGCToken('editor.font.body')}`,
|
|
2580
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- CSS custom properties for UGC font tokens
|
|
2581
|
+
...(expValEquals('platform_editor_small_font_size', 'isEnabled', true) && {
|
|
2582
|
+
'--ak-renderer-editor-font-small-text': editorUGCToken('editor.font.body.small')
|
|
2583
|
+
})
|
|
2573
2584
|
},
|
|
2574
|
-
css: [expValEquals('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, expValEquals('platform_editor_small_font_size', 'isEnabled', true) &&
|
|
2585
|
+
css: [expValEquals('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, expValEquals('platform_editor_small_font_size', 'isEnabled', true) && fontSizeStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, 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' && (expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? rendererFullWidthStyles : oldRendererFullWidthStyles), (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && (expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? rendererMaxWidthStyles : oldRendererMaxWidthStyles), rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, headingsSharedStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingWrapperInlineFlowStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingWithAlignmentStyles : headingWithAlignmentStylesDuplicateAnchor, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, fg('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, expValEquals('platform_editor_flexible_list_schema', 'isEnabled', true) && listItemHiddenMarkerStyles, indentationSharedStyles, fg('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? blockMarksSharedStyles : blockMarksSharedStylesDuplicateAnchor, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles,
|
|
2575
2586
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2576
2587
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingPanelStyles, smartCardStyles, smartCardStylesAvatarFix, editorExperiment('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && (expValEquals('confluence_fe_renderer_inline_node_mark_color_fix', 'isEnabled', true) ? rendererAnnotationStyles : rendererAnnotationStylesOld),
|
|
2577
2588
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -57,7 +57,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
57
57
|
const TABLE_INFO_TIMEOUT = 10000;
|
|
58
58
|
const RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
59
59
|
const packageName = "@atlaskit/renderer";
|
|
60
|
-
const packageVersion = "128.3.
|
|
60
|
+
const packageVersion = "128.3.9";
|
|
61
61
|
const setAsQueryContainerStyles = css({
|
|
62
62
|
containerName: 'ak-renderer-wrapper',
|
|
63
63
|
containerType: 'inline-size'
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
var _css8, _$concat3, _$concat6;
|
|
3
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
4
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
3
5
|
/* eslint-disable @atlaskit/ui-styling-standard/no-important-styles, @atlaskit/ui-styling-standard/no-unsafe-selectors */
|
|
4
6
|
/* eslint-disable @atlaskit/ui-styling-standard/no-imported-style-values */
|
|
5
7
|
/* eslint-disable @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values */
|
|
@@ -44,9 +46,6 @@ var isBackgroundClipBrowserFixNeeded = function isBackgroundClipBrowserFixNeeded
|
|
|
44
46
|
var baseFontStyle = css({
|
|
45
47
|
font: editorUGCToken('editor.font.body')
|
|
46
48
|
});
|
|
47
|
-
var smallTextStyle = css({
|
|
48
|
-
'--ak-renderer-editor-font-small-text': editorUGCToken('editor.font.body.small')
|
|
49
|
-
});
|
|
50
49
|
var fontSizeStyles = css({
|
|
51
50
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
|
|
52
51
|
'.fabric-editor-font-size': {
|
|
@@ -55,6 +54,14 @@ var fontSizeStyles = css({
|
|
|
55
54
|
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
56
55
|
font: 'var(--ak-renderer-editor-font-small-text)'
|
|
57
56
|
}
|
|
57
|
+
},
|
|
58
|
+
// Apply font-size to the ::marker pseudo-element of list items that have a font-size mark.
|
|
59
|
+
// Targeting ::marker directly avoids setting font on the <li> itself, which would cascade
|
|
60
|
+
// into nested lists and compound the sizing at each nesting level.
|
|
61
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
62
|
+
"li:has(> .fabric-editor-font-size[data-font-size='small'])::marker": {
|
|
63
|
+
// eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
|
|
64
|
+
font: 'var(--ak-renderer-editor-font-small-text)'
|
|
58
65
|
}
|
|
59
66
|
});
|
|
60
67
|
var originalBaseFontLineHeight = css({
|
|
@@ -766,7 +773,7 @@ var indentationSharedStylesWithMarginFix = css({
|
|
|
766
773
|
}
|
|
767
774
|
}
|
|
768
775
|
});
|
|
769
|
-
var blockMarksSharedStylesDuplicateAnchor = css(_defineProperty({}, "*:not(.fabric-editor-block-mark) >,\n \t*:not(.fabric-editor-block-mark) >\n div.fabric-editor-block-mark:first-of-type\n\t:not(.fabric-editor-indentation-mark)\n\t:not(.fabric-editor-alignment),\n \t.fabric-editor-alignment:first-of-type:first-child,\n \t.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child", {
|
|
776
|
+
var blockMarksSharedStylesDuplicateAnchor = css(_defineProperty({}, "*:not(.fabric-editor-block-mark) >,\n \t*:not(.fabric-editor-block-mark) >\n div.fabric-editor-block-mark:first-of-type\n\t:not(.fabric-editor-indentation-mark)\n\t:not(.fabric-editor-alignment),\n \t.fabric-editor-alignment:first-of-type:first-child,\n \t.fabric-editor-font-size:first-of-type:first-child,\n \t.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child", {
|
|
770
777
|
'p, h1, h2, h3, h4, h5, h6, .heading-wrapper': {
|
|
771
778
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
772
779
|
':first-child:not(style), style:first-child + *': {
|
|
@@ -774,7 +781,7 @@ var blockMarksSharedStylesDuplicateAnchor = css(_defineProperty({}, "*:not(.fabr
|
|
|
774
781
|
}
|
|
775
782
|
}
|
|
776
783
|
}));
|
|
777
|
-
var blockMarksSharedStyles = css(_defineProperty({}, "*:not(.fabric-editor-block-mark) >,\n \t*:not(.fabric-editor-block-mark) >\n div.fabric-editor-block-mark:first-of-type\n\t:not(.fabric-editor-indentation-mark)\n\t:not(.fabric-editor-alignment),\n \t.fabric-editor-alignment:first-of-type:first-child,\n \t.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child", {
|
|
784
|
+
var blockMarksSharedStyles = css(_defineProperty({}, "*:not(.fabric-editor-block-mark) >,\n \t*:not(.fabric-editor-block-mark) >\n div.fabric-editor-block-mark:first-of-type\n\t:not(.fabric-editor-indentation-mark)\n\t:not(.fabric-editor-alignment),\n \t.fabric-editor-alignment:first-of-type:first-child,\n \t.fabric-editor-font-size:first-of-type:first-child,\n \t.ProseMirror .fabric-editor-indentation-mark:first-of-type:first-child", {
|
|
778
785
|
'p, .heading-wrapper': {
|
|
779
786
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
|
|
780
787
|
':first-child:not(style), style:first-child + *': {
|
|
@@ -2011,7 +2018,7 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
|
|
|
2011
2018
|
ref: innerRef,
|
|
2012
2019
|
onClick: onClick,
|
|
2013
2020
|
onMouseDown: onMouseDown,
|
|
2014
|
-
style: {
|
|
2021
|
+
style: _objectSpread({
|
|
2015
2022
|
'--ak-renderer-base-font-size': "".concat(baseFontSize, "px"),
|
|
2016
2023
|
'--ak-renderer-editor-font-heading-h1': "".concat(editorUGCToken('editor.font.heading.h1')),
|
|
2017
2024
|
'--ak-renderer-editor-font-heading-h2': "".concat(editorUGCToken('editor.font.heading.h2')),
|
|
@@ -2020,8 +2027,10 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
|
|
|
2020
2027
|
'--ak-renderer-editor-font-heading-h5': "".concat(editorUGCToken('editor.font.heading.h5')),
|
|
2021
2028
|
'--ak-renderer-editor-font-heading-h6': "".concat(editorUGCToken('editor.font.heading.h6')),
|
|
2022
2029
|
'--ak-renderer-editor-font-normal-text': "".concat(editorUGCToken('editor.font.body'))
|
|
2023
|
-
},
|
|
2024
|
-
|
|
2030
|
+
}, expValEquals('platform_editor_small_font_size', 'isEnabled', true) && {
|
|
2031
|
+
'--ak-renderer-editor-font-small-text': editorUGCToken('editor.font.body.small')
|
|
2032
|
+
}),
|
|
2033
|
+
css: [expValEquals('confluence_ttvc_inline_extensions', 'isEnabled', true) ? baseFontStyle : originalBaseFontLineHeight, baseStyles, expValEquals('platform_editor_small_font_size', 'isEnabled', true) && fontSizeStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingAnchorStyles : headingAnchorStylesDuplicateAnchor, 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' && (expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? rendererFullWidthStyles : oldRendererFullWidthStyles), (appearance === 'full-width' || appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true))) && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, appearance === 'max' && (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && (expValEquals('platform_editor_remove_important_in_render_ext', 'isEnabled', true) ? rendererMaxWidthStyles : oldRendererMaxWidthStyles), rovoTelepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, headingsSharedStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingWrapperInlineFlowStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? headingWithAlignmentStyles : headingWithAlignmentStylesDuplicateAnchor, ruleSharedStyles, contentMode === 'compact' && isCompactModeSupported && extensionStyle, fg('platform_editor_typography_ugc') ? isCompactModeSupported ? paragraphStylesUGCScaledMargin : paragraphSharedStylesWithEditorUGC : isCompactModeSupported ? paragraphSharedStyleScaledMargin : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, expValEquals('platform_editor_flexible_list_schema', 'isEnabled', true) && listItemHiddenMarkerStyles, indentationSharedStyles, fg('platform_editor__renderer_indentation_text_margin') && indentationSharedStylesWithMarginFix, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) ? blockMarksSharedStyles : blockMarksSharedStylesDuplicateAnchor, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles,
|
|
2025
2034
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
2026
2035
|
textHighlightPaddingStyles, tasksAndDecisionsStyles, expValEquals('platform_editor_copy_link_a11y_inconsistency_fix', 'isEnabled', true) && headingPanelStyles, smartCardStyles, smartCardStylesAvatarFix, editorExperiment('platform_editor_preview_panel_linking_exp', true) && headerSmartCardStyles, smartCardStylesAvatarMarginFix, smartCardStylesAvatarListZeroMarginTop, fg('editor_inline_comments_on_inline_nodes') && (expValEquals('confluence_fe_renderer_inline_node_mark_color_fix', 'isEnabled', true) ? rendererAnnotationStyles : rendererAnnotationStylesOld),
|
|
2027
2036
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -62,7 +62,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
|
62
62
|
var TABLE_INFO_TIMEOUT = 10000;
|
|
63
63
|
var RENDER_EVENT_SAMPLE_RATE = 0.2;
|
|
64
64
|
var packageName = "@atlaskit/renderer";
|
|
65
|
-
var packageVersion = "128.3.
|
|
65
|
+
var packageVersion = "128.3.9";
|
|
66
66
|
var setAsQueryContainerStyles = css({
|
|
67
67
|
containerName: 'ak-renderer-wrapper',
|
|
68
68
|
containerType: 'inline-size'
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "128.
|
|
3
|
+
"version": "128.4.0",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"@atlaskit/mention": "^24.6.0",
|
|
93
93
|
"@atlaskit/modal-dialog": "^14.13.0",
|
|
94
94
|
"@atlaskit/navigation-system": "^7.1.0",
|
|
95
|
-
"@atlaskit/profilecard": "^24.
|
|
95
|
+
"@atlaskit/profilecard": "^24.45.0",
|
|
96
96
|
"@atlaskit/side-nav-items": "^1.12.0",
|
|
97
97
|
"@atlaskit/util-data-test": "^18.5.0",
|
|
98
98
|
"@atlassian/a11y-jest-testing": "^0.10.0",
|