@atlaskit/renderer 124.9.7 → 124.9.9

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 CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 124.9.9
4
+
5
+ ### Patch Changes
6
+
7
+ - [`7f5f1ce3e4c0d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7f5f1ce3e4c0d) -
8
+ Add marginTop spacing to datasourceContainerStyle to match editor styling
9
+ - Updated dependencies
10
+
11
+ ## 124.9.8
12
+
13
+ ### Patch Changes
14
+
15
+ - [`6cb21d13010a3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6cb21d13010a3) -
16
+ Exclude SLLV (and keep only block card) element when applying list (ul/ol) css override
17
+ - Updated dependencies
18
+
3
19
  ## 124.9.7
4
20
 
5
21
  ### Patch Changes
@@ -34,6 +34,16 @@ var datasourceContainerStyle = (0, _react.css)({
34
34
  marginBottom: "var(--ds-space-150, 0.75rem)",
35
35
  transform: 'translateX(-50%)'
36
36
  });
37
+ var datasourceContainerStyleWithMarginTop = (0, _react.css)({
38
+ borderRadius: "var(--ds-radius-large, 8px)",
39
+ border: "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border, ".concat(_colors.N40, ")")),
40
+ overflow: 'hidden',
41
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
42
+ marginLeft: '50%',
43
+ marginBottom: "var(--ds-space-150, 0.75rem)",
44
+ transform: 'translateX(-50%)',
45
+ marginTop: "var(--ds-space-150, 0.75rem)"
46
+ });
37
47
  function BlockCard(props) {
38
48
  var url = props.url,
39
49
  data = props.data,
@@ -106,7 +116,7 @@ function BlockCard(props) {
106
116
  }, cardProps), (0, _react.jsx)(_ui.WidthConsumer, null, function (_ref5) {
107
117
  var width = _ref5.width;
108
118
  return (0, _react.jsx)("div", {
109
- css: datasourceContainerStyle,
119
+ css: (0, _platformFeatureFlags.fg)('platform_editor_fix_sllv_margin_renderer') ? datasourceContainerStyleWithMarginTop : datasourceContainerStyle,
110
120
  "data-testid": "renderer-datasource-table",
111
121
  "data-local-id": localId,
112
122
  style: {
@@ -856,19 +856,19 @@ var smartCardStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".".conc
856
856
  margin: "".concat(_editorSharedStyles.blockNodesVerticalMargin, " 0 0"),
857
857
  maxWidth: "".concat(8 * 95, "px")
858
858
  }));
859
- var smartCardStylesAvatarFix = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER), {
859
+ var smartCardStylesAvatarFix = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, ":not(.").concat(_styles.SmartCardSharedCssClassName.DATASOURCE_CONTAINER, ")"), {
860
860
  /* EDM-11991: Fix list plugin adding padding to ADS AvatarGroup start */
861
861
  'ul, ol': {
862
862
  paddingLeft: 'inherit'
863
863
  }
864
864
  /* EDM-11991: Fix list plugin add padding to ADS AvatarGroup end */
865
865
  }));
866
- var smartCardStylesAvatarMarginFix = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER), {
866
+ var smartCardStylesAvatarMarginFix = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, ":not(.").concat(_styles.SmartCardSharedCssClassName.DATASOURCE_CONTAINER, ")"), {
867
867
  'ul, ol': {
868
868
  marginRight: 'inherit'
869
869
  }
870
870
  }));
871
- var smartCardStylesAvatarListZeroMarginTop = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER), {
871
+ var smartCardStylesAvatarListZeroMarginTop = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, ":not(.").concat(_styles.SmartCardSharedCssClassName.DATASOURCE_CONTAINER, ")"), {
872
872
  'ul, ol': {
873
873
  marginTop: 0
874
874
  }
@@ -1298,21 +1298,6 @@ var rendererTableSortableColumnStyles = (0, _react.css)((0, _defineProperty2.def
1298
1298
  })), "&:hover:not(\n\t\t\t\t\t\t\t:has(\n\t\t\t\t\t\t\t\t\t.".concat(_consts.RendererCssClassName.SORTABLE_COLUMN_WRAPPER, "\n\t\t\t\t\t\t\t\t\t\t.").concat(_consts.RendererCssClassName.SORTABLE_COLUMN, ":hover\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t> .").concat(_consts.RendererCssClassName.SORTABLE_COLUMN, "\n\t\t\t\t\t\t> .").concat(_consts.RendererCssClassName.SORTABLE_COLUMN_NO_ORDER), (0, _defineProperty2.default)({}, ".".concat(_table2.SORTABLE_COLUMN_ICON_CLASSNAME), {
1299
1299
  opacity: 1
1300
1300
  }))))));
1301
-
1302
- // TODO: ED-27229 - Cleanup with `platform_editor_tables_numbered_column_correction`
1303
- var rendererTableColumnStylesOld = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_consts.RendererCssClassName.DOCUMENT, " .").concat(_styles.TableSharedCssClassName.TABLE_CONTAINER), {
1304
- 'table[data-number-column="true"]': (0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_consts.RendererCssClassName.NUMBER_COLUMN), {
1305
- backgroundColor: "".concat("var(--ds-background-neutral, ".concat(_editorSharedStyles.akEditorTableToolbar, ")")),
1306
- borderRight: "var(--ds-border-width, 1px)".concat(" solid\n\t\t\t\t\t\t\t\t", "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")")),
1307
- width: "".concat(_editorSharedStyles.akEditorTableNumberColumnWidth, "px"),
1308
- textAlign: 'center',
1309
- color: "".concat("var(--ds-text-subtlest, ".concat(_colors.N200, ")")),
1310
- // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
1311
- fontSize: "".concat(14 / 16, " rem")
1312
- }), ".fixed .".concat(_consts.RendererCssClassName.NUMBER_COLUMN), {
1313
- borderRight: "0px none"
1314
- })
1315
- }));
1316
1301
  var rendererTableColumnStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".".concat(_consts.RendererCssClassName.DOCUMENT, " .").concat(_styles.TableSharedCssClassName.TABLE_CONTAINER), {
1317
1302
  'table[data-number-column="true"]': (0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(_consts.RendererCssClassName.NUMBER_COLUMN), {
1318
1303
  backgroundColor: "var(--ds-background-accent-gray-subtlest, #F1F2F4)",
@@ -1614,7 +1599,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
1614
1599
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
1615
1600
  (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes') && (0, _platformFeatureFlags.fg)('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
1616
1601
  // merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
1617
- (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, (0, _platformFeatureFlags.fg)('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, 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' && responsiveBreakoutWidthFullWidth, (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') && denseStyles],
1602
+ (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' && responsiveBreakoutWidthFullWidth, (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') && denseStyles],
1618
1603
  "data-testid": testId
1619
1604
  }, children)
1620
1605
  );
@@ -68,7 +68,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
68
68
  // we want to calculate all the table widths (which causes reflows) after the renderer has finished loading to mitigate performance impact
69
69
  var TABLE_WIDTH_INFO_TIMEOUT = 10000;
70
70
  var packageName = "@atlaskit/renderer";
71
- var packageVersion = "124.9.6";
71
+ var packageVersion = "124.9.8";
72
72
  var setAsQueryContainerStyles = (0, _react2.css)({
73
73
  containerName: 'ak-renderer-wrapper',
74
74
  containerType: 'inline-size'
@@ -26,6 +26,16 @@ const datasourceContainerStyle = css({
26
26
  marginBottom: `${"var(--ds-space-150, 0.75rem)"}`,
27
27
  transform: 'translateX(-50%)'
28
28
  });
29
+ const datasourceContainerStyleWithMarginTop = css({
30
+ borderRadius: `${"var(--ds-radius-large, 8px)"}`,
31
+ border: `${"var(--ds-border-width, 1px)"} solid ${`var(--ds-border, ${N40})`}`,
32
+ overflow: 'hidden',
33
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
34
+ marginLeft: '50%',
35
+ marginBottom: `${"var(--ds-space-150, 0.75rem)"}`,
36
+ transform: 'translateX(-50%)',
37
+ marginTop: `${"var(--ds-space-150, 0.75rem)"}`
38
+ });
29
39
  export default function BlockCard(props) {
30
40
  const {
31
41
  url,
@@ -94,7 +104,7 @@ export default function BlockCard(props) {
94
104
  }, cardProps), jsx(WidthConsumer, null, ({
95
105
  width
96
106
  }) => jsx("div", {
97
- css: datasourceContainerStyle,
107
+ css: fg('platform_editor_fix_sllv_margin_renderer') ? datasourceContainerStyleWithMarginTop : datasourceContainerStyle,
98
108
  "data-testid": "renderer-datasource-table",
99
109
  "data-local-id": localId,
100
110
  style: {
@@ -990,7 +990,7 @@ const smartCardStyles = css({
990
990
  }
991
991
  });
992
992
  const smartCardStylesAvatarFix = css({
993
- [`.${SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER}`]: {
993
+ [`.${SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER}:not(.${SmartCardSharedCssClassName.DATASOURCE_CONTAINER})`]: {
994
994
  /* EDM-11991: Fix list plugin adding padding to ADS AvatarGroup start */
995
995
  'ul, ol': {
996
996
  paddingLeft: 'inherit'
@@ -999,14 +999,14 @@ const smartCardStylesAvatarFix = css({
999
999
  }
1000
1000
  });
1001
1001
  const smartCardStylesAvatarMarginFix = css({
1002
- [`.${SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER}`]: {
1002
+ [`.${SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER}:not(.${SmartCardSharedCssClassName.DATASOURCE_CONTAINER})`]: {
1003
1003
  'ul, ol': {
1004
1004
  marginRight: 'inherit'
1005
1005
  }
1006
1006
  }
1007
1007
  });
1008
1008
  const smartCardStylesAvatarListZeroMarginTop = css({
1009
- [`.${SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER}`]: {
1009
+ [`.${SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER}:not(.${SmartCardSharedCssClassName.DATASOURCE_CONTAINER})`]: {
1010
1010
  'ul, ol': {
1011
1011
  marginTop: 0
1012
1012
  }
@@ -1653,27 +1653,6 @@ const rendererTableSortableColumnStyles = css({
1653
1653
  }
1654
1654
  }
1655
1655
  });
1656
-
1657
- // TODO: ED-27229 - Cleanup with `platform_editor_tables_numbered_column_correction`
1658
- const rendererTableColumnStylesOld = css({
1659
- [`.${RendererCssClassName.DOCUMENT} .${TableSharedCssClassName.TABLE_CONTAINER}`]: {
1660
- 'table[data-number-column="true"]': {
1661
- [`.${RendererCssClassName.NUMBER_COLUMN}`]: {
1662
- backgroundColor: `${`var(--ds-background-neutral, ${akEditorTableToolbar})`}`,
1663
- borderRight: `${"var(--ds-border-width, 1px)"} solid
1664
- ${`var(--ds-background-accent-gray-subtler, ${akEditorTableBorder})`}`,
1665
- width: `${akEditorTableNumberColumnWidth}px`,
1666
- textAlign: 'center',
1667
- color: `${`var(--ds-text-subtlest, ${N200})`}`,
1668
- // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
1669
- fontSize: `${14 / 16} rem`
1670
- },
1671
- [`.fixed .${RendererCssClassName.NUMBER_COLUMN}`]: {
1672
- borderRight: `0px none`
1673
- }
1674
- }
1675
- }
1676
- });
1677
1656
  const rendererTableColumnStyles = css({
1678
1657
  [`.${RendererCssClassName.DOCUMENT} .${TableSharedCssClassName.TABLE_CONTAINER}`]: {
1679
1658
  'table[data-number-column="true"]': {
@@ -2031,7 +2010,7 @@ export const RendererStyleContainer = props => {
2031
2010
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
2032
2011
  fg('editor_inline_comments_on_inline_nodes') && fg('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
2033
2012
  // merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
2034
- 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, fg('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, 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' && responsiveBreakoutWidthFullWidth, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') && denseStyles],
2013
+ 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' && responsiveBreakoutWidthFullWidth, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') && denseStyles],
2035
2014
  "data-testid": testId
2036
2015
  }, children)
2037
2016
  );
@@ -54,7 +54,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
54
54
  // we want to calculate all the table widths (which causes reflows) after the renderer has finished loading to mitigate performance impact
55
55
  const TABLE_WIDTH_INFO_TIMEOUT = 10000;
56
56
  const packageName = "@atlaskit/renderer";
57
- const packageVersion = "124.9.6";
57
+ const packageVersion = "124.9.8";
58
58
  const setAsQueryContainerStyles = css({
59
59
  containerName: 'ak-renderer-wrapper',
60
60
  containerType: 'inline-size'
@@ -26,6 +26,16 @@ var datasourceContainerStyle = css({
26
26
  marginBottom: "var(--ds-space-150, 0.75rem)",
27
27
  transform: 'translateX(-50%)'
28
28
  });
29
+ var datasourceContainerStyleWithMarginTop = css({
30
+ borderRadius: "var(--ds-radius-large, 8px)",
31
+ border: "var(--ds-border-width, 1px)".concat(" solid ", "var(--ds-border, ".concat(N40, ")")),
32
+ overflow: 'hidden',
33
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-space
34
+ marginLeft: '50%',
35
+ marginBottom: "var(--ds-space-150, 0.75rem)",
36
+ transform: 'translateX(-50%)',
37
+ marginTop: "var(--ds-space-150, 0.75rem)"
38
+ });
29
39
  export default function BlockCard(props) {
30
40
  var url = props.url,
31
41
  data = props.data,
@@ -98,7 +108,7 @@ export default function BlockCard(props) {
98
108
  }, cardProps), jsx(WidthConsumer, null, function (_ref5) {
99
109
  var width = _ref5.width;
100
110
  return jsx("div", {
101
- css: datasourceContainerStyle,
111
+ css: fg('platform_editor_fix_sllv_margin_renderer') ? datasourceContainerStyleWithMarginTop : datasourceContainerStyle,
102
112
  "data-testid": "renderer-datasource-table",
103
113
  "data-local-id": localId,
104
114
  style: {
@@ -849,19 +849,19 @@ var smartCardStyles = css(_defineProperty({}, ".".concat(SmartCardSharedCssClass
849
849
  margin: "".concat(blockNodesVerticalMargin, " 0 0"),
850
850
  maxWidth: "".concat(8 * 95, "px")
851
851
  }));
852
- var smartCardStylesAvatarFix = css(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER), {
852
+ var smartCardStylesAvatarFix = css(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, ":not(.").concat(SmartCardSharedCssClassName.DATASOURCE_CONTAINER, ")"), {
853
853
  /* EDM-11991: Fix list plugin adding padding to ADS AvatarGroup start */
854
854
  'ul, ol': {
855
855
  paddingLeft: 'inherit'
856
856
  }
857
857
  /* EDM-11991: Fix list plugin add padding to ADS AvatarGroup end */
858
858
  }));
859
- var smartCardStylesAvatarMarginFix = css(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER), {
859
+ var smartCardStylesAvatarMarginFix = css(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, ":not(.").concat(SmartCardSharedCssClassName.DATASOURCE_CONTAINER, ")"), {
860
860
  'ul, ol': {
861
861
  marginRight: 'inherit'
862
862
  }
863
863
  }));
864
- var smartCardStylesAvatarListZeroMarginTop = css(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER), {
864
+ var smartCardStylesAvatarListZeroMarginTop = css(_defineProperty({}, ".".concat(SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, ":not(.").concat(SmartCardSharedCssClassName.DATASOURCE_CONTAINER, ")"), {
865
865
  'ul, ol': {
866
866
  marginTop: 0
867
867
  }
@@ -1291,21 +1291,6 @@ var rendererTableSortableColumnStyles = css(_defineProperty({}, ".".concat(Rende
1291
1291
  })), "&:hover:not(\n\t\t\t\t\t\t\t:has(\n\t\t\t\t\t\t\t\t\t.".concat(RendererCssClassName.SORTABLE_COLUMN_WRAPPER, "\n\t\t\t\t\t\t\t\t\t\t.").concat(RendererCssClassName.SORTABLE_COLUMN, ":hover\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t> .").concat(RendererCssClassName.SORTABLE_COLUMN, "\n\t\t\t\t\t\t> .").concat(RendererCssClassName.SORTABLE_COLUMN_NO_ORDER), _defineProperty({}, ".".concat(SORTABLE_COLUMN_ICON_CLASSNAME), {
1292
1292
  opacity: 1
1293
1293
  }))))));
1294
-
1295
- // TODO: ED-27229 - Cleanup with `platform_editor_tables_numbered_column_correction`
1296
- var rendererTableColumnStylesOld = css(_defineProperty({}, ".".concat(RendererCssClassName.DOCUMENT, " .").concat(TableSharedCssClassName.TABLE_CONTAINER), {
1297
- 'table[data-number-column="true"]': _defineProperty(_defineProperty({}, ".".concat(RendererCssClassName.NUMBER_COLUMN), {
1298
- backgroundColor: "".concat("var(--ds-background-neutral, ".concat(akEditorTableToolbar, ")")),
1299
- borderRight: "var(--ds-border-width, 1px)".concat(" solid\n\t\t\t\t\t\t\t\t", "var(--ds-background-accent-gray-subtler, ".concat(akEditorTableBorder, ")")),
1300
- width: "".concat(akEditorTableNumberColumnWidth, "px"),
1301
- textAlign: 'center',
1302
- color: "".concat("var(--ds-text-subtlest, ".concat(N200, ")")),
1303
- // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
1304
- fontSize: "".concat(14 / 16, " rem")
1305
- }), ".fixed .".concat(RendererCssClassName.NUMBER_COLUMN), {
1306
- borderRight: "0px none"
1307
- })
1308
- }));
1309
1294
  var rendererTableColumnStyles = css(_defineProperty({}, ".".concat(RendererCssClassName.DOCUMENT, " .").concat(TableSharedCssClassName.TABLE_CONTAINER), {
1310
1295
  'table[data-number-column="true"]': _defineProperty(_defineProperty({}, ".".concat(RendererCssClassName.NUMBER_COLUMN), {
1311
1296
  backgroundColor: "var(--ds-background-accent-gray-subtlest, #F1F2F4)",
@@ -1607,7 +1592,7 @@ export var RendererStyleContainer = function RendererStyleContainer(props) {
1607
1592
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
1608
1593
  fg('editor_inline_comments_on_inline_nodes') && fg('annotations_align_editor_and_renderer_styles') && rendererAnnotationStylesCommentHeightFix, baseOtherStyles, allowNestedHeaderLinks && alignedHeadingAnchorStyle, mediaSingleSharedStyle,
1609
1594
  // merge firstWrappedMediaStyles with mediaSingleSharedStyle when clean up platform_editor_fix_media_in_renderer
1610
- 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, fg('platform_editor_tables_numbered_column_correction') ? rendererTableColumnStyles : rendererTableColumnStylesOld, 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' && responsiveBreakoutWidthFullWidth, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') && denseStyles],
1595
+ 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' && responsiveBreakoutWidthFullWidth, expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') && denseStyles],
1611
1596
  "data-testid": testId
1612
1597
  }, children)
1613
1598
  );
@@ -59,7 +59,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
59
59
  // we want to calculate all the table widths (which causes reflows) after the renderer has finished loading to mitigate performance impact
60
60
  var TABLE_WIDTH_INFO_TIMEOUT = 10000;
61
61
  var packageName = "@atlaskit/renderer";
62
- var packageVersion = "124.9.6";
62
+ var packageVersion = "124.9.8";
63
63
  var setAsQueryContainerStyles = css({
64
64
  containerName: 'ak-renderer-wrapper',
65
65
  containerType: 'inline-size'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "124.9.7",
3
+ "version": "124.9.9",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -41,7 +41,7 @@
41
41
  "@atlaskit/feature-gate-js-client": "^5.5.0",
42
42
  "@atlaskit/icon": "^28.5.0",
43
43
  "@atlaskit/link": "^3.2.0",
44
- "@atlaskit/link-datasource": "^4.27.0",
44
+ "@atlaskit/link-datasource": "^4.28.0",
45
45
  "@atlaskit/link-extractors": "^2.4.0",
46
46
  "@atlaskit/media-card": "^79.6.0",
47
47
  "@atlaskit/media-client": "^35.5.0",
@@ -57,8 +57,8 @@
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": "^13.23.0",
61
- "@atlaskit/tokens": "^7.0.0",
60
+ "@atlaskit/tmp-editor-statsig": "^13.26.0",
61
+ "@atlaskit/tokens": "^7.1.0",
62
62
  "@atlaskit/tooltip": "^20.7.0",
63
63
  "@atlaskit/visually-hidden": "^3.0.0",
64
64
  "@babel/runtime": "^7.0.0",
@@ -71,7 +71,7 @@
71
71
  "uuid": "^3.1.0"
72
72
  },
73
73
  "peerDependencies": {
74
- "@atlaskit/editor-common": "^110.20.0",
74
+ "@atlaskit/editor-common": "^110.21.0",
75
75
  "@atlaskit/link-provider": "^4.0.0",
76
76
  "@atlaskit/media-core": "^37.0.0",
77
77
  "react": "^18.2.0",
@@ -170,9 +170,6 @@
170
170
  "platform_editor_content_mode_button_mvp": {
171
171
  "type": "boolean"
172
172
  },
173
- "platform_editor_tables_numbered_column_correction": {
174
- "type": "boolean"
175
- },
176
173
  "platform_editor_nested_dnd_styles_changes": {
177
174
  "type": "boolean"
178
175
  },
@@ -244,6 +241,9 @@
244
241
  },
245
242
  "media-perf-uplift-mutation-fix": {
246
243
  "type": "boolean"
244
+ },
245
+ "platform_editor_fix_sllv_margin_renderer": {
246
+ "type": "boolean"
247
247
  }
248
248
  }
249
249
  }
@@ -1,141 +0,0 @@
1
- {
2
- "extends": "../../../../tsconfig.entry-points.post-office.json",
3
- "compilerOptions": {
4
- "declaration": true,
5
- "target": "es5",
6
- "outDir": "../../../../../post-office/tsDist/@atlaskit__renderer/app",
7
- "rootDir": "../",
8
- "composite": true
9
- },
10
- "include": [
11
- "../src/**/*.ts",
12
- "../src/**/*.tsx"
13
- ],
14
- "exclude": [
15
- "../src/**/__tests__/*",
16
- "../src/**/*.test.*",
17
- "../src/**/test.*",
18
- "../src/**/examples.*",
19
- "../src/**/examples/*",
20
- "../src/**/examples/**/*",
21
- "../src/**/*.stories.*",
22
- "../src/**/stories/*",
23
- "../src/**/stories/**/*"
24
- ],
25
- "references": [
26
- {
27
- "path": "../../adf-utils/afm-post-office/tsconfig.json"
28
- },
29
- {
30
- "path": "../../../analytics/analytics-listeners/afm-post-office/tsconfig.json"
31
- },
32
- {
33
- "path": "../../../analytics/analytics-namespaced-context/afm-post-office/tsconfig.json"
34
- },
35
- {
36
- "path": "../../../analytics/analytics-next/afm-post-office/tsconfig.json"
37
- },
38
- {
39
- "path": "../../../helpers/browser-apis/afm-post-office/tsconfig.json"
40
- },
41
- {
42
- "path": "../../../design-system/button/afm-post-office/tsconfig.json"
43
- },
44
- {
45
- "path": "../../../design-system/code/afm-post-office/tsconfig.json"
46
- },
47
- {
48
- "path": "../../editor-json-transformer/afm-post-office/tsconfig.json"
49
- },
50
- {
51
- "path": "../../editor-palette/afm-post-office/tsconfig.json"
52
- },
53
- {
54
- "path": "../../editor-shared-styles/afm-post-office/tsconfig.json"
55
- },
56
- {
57
- "path": "../../editor-tables/afm-post-office/tsconfig.json"
58
- },
59
- {
60
- "path": "../../../elements/emoji/afm-post-office/tsconfig.json"
61
- },
62
- {
63
- "path": "../../../measurement/feature-gate-js-client/afm-post-office/tsconfig.json"
64
- },
65
- {
66
- "path": "../../../design-system/icon/afm-post-office/tsconfig.json"
67
- },
68
- {
69
- "path": "../../../design-system/link/afm-post-office/tsconfig.json"
70
- },
71
- {
72
- "path": "../../../linking-platform/link-datasource/afm-post-office/tsconfig.json"
73
- },
74
- {
75
- "path": "../../../linking-platform/link-extractors/afm-post-office/tsconfig.json"
76
- },
77
- {
78
- "path": "../../../media/media-card/afm-post-office/tsconfig.json"
79
- },
80
- {
81
- "path": "../../../media/media-client/afm-post-office/tsconfig.json"
82
- },
83
- {
84
- "path": "../../../media/media-client-react/afm-post-office/tsconfig.json"
85
- },
86
- {
87
- "path": "../../../media/media-common/afm-post-office/tsconfig.json"
88
- },
89
- {
90
- "path": "../../../media/media-filmstrip/afm-post-office/tsconfig.json"
91
- },
92
- {
93
- "path": "../../../media/media-ui/afm-post-office/tsconfig.json"
94
- },
95
- {
96
- "path": "../../../media/media-viewer/afm-post-office/tsconfig.json"
97
- },
98
- {
99
- "path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
100
- },
101
- {
102
- "path": "../../../platform/feature-flags-react/afm-post-office/tsconfig.json"
103
- },
104
- {
105
- "path": "../../../react-ufo/atlaskit/afm-post-office/tsconfig.json"
106
- },
107
- {
108
- "path": "../../../linking-platform/smart-card/afm-post-office/tsconfig.json"
109
- },
110
- {
111
- "path": "../../../elements/status/afm-post-office/tsconfig.json"
112
- },
113
- {
114
- "path": "../../../elements/task-decision/afm-post-office/tsconfig.json"
115
- },
116
- {
117
- "path": "../../../design-system/theme/afm-post-office/tsconfig.json"
118
- },
119
- {
120
- "path": "../../tmp-editor-statsig/afm-post-office/tsconfig.json"
121
- },
122
- {
123
- "path": "../../../design-system/tokens/afm-post-office/tsconfig.json"
124
- },
125
- {
126
- "path": "../../../design-system/tooltip/afm-post-office/tsconfig.json"
127
- },
128
- {
129
- "path": "../../../design-system/visually-hidden/afm-post-office/tsconfig.json"
130
- },
131
- {
132
- "path": "../../editor-common/afm-post-office/tsconfig.json"
133
- },
134
- {
135
- "path": "../../../linking-platform/link-provider/afm-post-office/tsconfig.json"
136
- },
137
- {
138
- "path": "../../../media/media-core/afm-post-office/tsconfig.json"
139
- }
140
- ]
141
- }