@atlaskit/renderer 109.51.0 → 109.51.2
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 +22 -0
- package/afm-cc/tsconfig.json +3 -0
- package/afm-jira/tsconfig.json +3 -0
- package/afm-post-office/tsconfig.json +3 -0
- package/dist/cjs/react/index.js +3 -1
- package/dist/cjs/react/nodes/table/colgroup.js +17 -12
- package/dist/cjs/react/nodes/table/sticky.js +9 -9
- package/dist/cjs/react/nodes/table/table.js +8 -4
- package/dist/cjs/react/nodes/table.js +12 -10
- package/dist/cjs/ui/Renderer/index.js +7 -4
- package/dist/cjs/ui/Renderer/style.js +2 -1
- package/dist/es2019/react/index.js +3 -1
- package/dist/es2019/react/nodes/table/colgroup.js +17 -12
- package/dist/es2019/react/nodes/table/sticky.js +9 -9
- package/dist/es2019/react/nodes/table/table.js +8 -4
- package/dist/es2019/react/nodes/table.js +12 -10
- package/dist/es2019/ui/Renderer/index.js +7 -4
- package/dist/es2019/ui/Renderer/style.js +2 -1
- package/dist/esm/react/index.js +3 -1
- package/dist/esm/react/nodes/table/colgroup.js +17 -12
- package/dist/esm/react/nodes/table/sticky.js +9 -9
- package/dist/esm/react/nodes/table/table.js +8 -4
- package/dist/esm/react/nodes/table.js +12 -10
- package/dist/esm/ui/Renderer/index.js +7 -4
- package/dist/esm/ui/Renderer/style.js +2 -1
- package/dist/types/react/index.d.ts +2 -0
- package/dist/types/react/nodes/table/sticky.d.ts +2 -1
- package/dist/types/react/nodes/table/table.d.ts +1 -1
- package/dist/types/react/nodes/table/types.d.ts +1 -0
- package/dist/types/react/nodes/table.d.ts +22 -0
- package/dist/types/ui/Renderer/style.d.ts +1 -0
- package/dist/types/ui/renderer-props.d.ts +1 -0
- package/dist/types-ts4.5/react/index.d.ts +2 -0
- package/dist/types-ts4.5/react/nodes/table/sticky.d.ts +2 -1
- package/dist/types-ts4.5/react/nodes/table/table.d.ts +1 -1
- package/dist/types-ts4.5/react/nodes/table/types.d.ts +1 -0
- package/dist/types-ts4.5/react/nodes/table.d.ts +22 -0
- package/dist/types-ts4.5/ui/Renderer/style.d.ts +1 -0
- package/dist/types-ts4.5/ui/renderer-props.d.ts +1 -0
- package/package.json +7 -13
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 109.51.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#136078](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136078)
|
|
8
|
+
[`09414d7233497`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/09414d7233497) -
|
|
9
|
+
ED-24507 Switch nested dnd FG to experiment and include padding changes"
|
|
10
|
+
- [#135911](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/135911)
|
|
11
|
+
[`554309ca8fbe5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/554309ca8fbe5) -
|
|
12
|
+
ED-24371: Support new 100% scaling and 40%PTW scaling in Comment Renderer
|
|
13
|
+
- [#135954](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/135954)
|
|
14
|
+
[`62ec64be9ed01`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/62ec64be9ed01) -
|
|
15
|
+
Table alignment feature flag cleanup
|
|
16
|
+
|
|
17
|
+
## 109.51.1
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- [#134066](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134066)
|
|
22
|
+
[`43a1d7aed352b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/43a1d7aed352b) -
|
|
23
|
+
UNSTABLE_allowTableResizing in renderer added
|
|
24
|
+
|
|
3
25
|
## 109.51.0
|
|
4
26
|
|
|
5
27
|
### Minor Changes
|
package/afm-cc/tsconfig.json
CHANGED
package/afm-jira/tsconfig.json
CHANGED
package/dist/cjs/react/index.js
CHANGED
|
@@ -192,6 +192,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
|
|
|
192
192
|
this.textHighlighter = init.textHighlighter;
|
|
193
193
|
this.isCommentsOnMediaMediaInlineBugFixEnabled = init.isCommentsOnMediaMediaInlineBugFixEnabled;
|
|
194
194
|
this.allowTableAlignment = init.allowTableAlignment;
|
|
195
|
+
this.allowTableResizing = init.allowTableResizing;
|
|
195
196
|
}
|
|
196
197
|
(0, _createClass2.default)(ReactSerializer, [{
|
|
197
198
|
key: "resetState",
|
|
@@ -365,7 +366,8 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
|
|
|
365
366
|
stickyHeaders: stickyHeaders,
|
|
366
367
|
isInsideOfBlockNode: isInsideOfBlockNode,
|
|
367
368
|
isInsideMultiBodiedExtension: isInsideMultiBodiedExtension,
|
|
368
|
-
allowTableAlignment: this.allowTableAlignment
|
|
369
|
+
allowTableAlignment: this.allowTableAlignment,
|
|
370
|
+
allowTableResizing: this.allowTableResizing
|
|
369
371
|
});
|
|
370
372
|
}
|
|
371
373
|
}, {
|
|
@@ -10,7 +10,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
10
10
|
var _styles = require("@atlaskit/editor-common/styles");
|
|
11
11
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
12
12
|
var _nodeWidth = require("@atlaskit/editor-common/node-width");
|
|
13
|
-
var _table = require("../table");
|
|
14
13
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
14
|
var _useFeatureFlags = require("../../../use-feature-flags");
|
|
16
15
|
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; }
|
|
@@ -21,7 +20,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
21
20
|
// User A creates a table with column widths → User A views it with reduced viewport space (eg. Confluence sidebar is open)
|
|
22
21
|
var MAX_SCALING_PERCENT = 0.3;
|
|
23
22
|
var MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION = 0.4;
|
|
24
|
-
var
|
|
23
|
+
var isTableColumnResized = function isTableColumnResized(columnWidths) {
|
|
25
24
|
var filteredWidths = columnWidths.filter(function (width) {
|
|
26
25
|
return width !== 0;
|
|
27
26
|
});
|
|
@@ -63,23 +62,27 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
|
|
|
63
62
|
isInsideOfBlockNode = props.isInsideOfBlockNode,
|
|
64
63
|
isinsideMultiBodiedExtension = props.isinsideMultiBodiedExtension,
|
|
65
64
|
isTableScalingEnabled = props.isTableScalingEnabled,
|
|
66
|
-
isTableFixedColumnWidthsOptionEnabled = props.isTableFixedColumnWidthsOptionEnabled
|
|
65
|
+
isTableFixedColumnWidthsOptionEnabled = props.isTableFixedColumnWidthsOptionEnabled,
|
|
66
|
+
allowTableResizing = props.allowTableResizing;
|
|
67
67
|
if (!columnWidths) {
|
|
68
68
|
return [];
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
-
//
|
|
72
|
-
var
|
|
71
|
+
// isTableColumnResized checks if table columns were resized
|
|
72
|
+
var tableColumnResized = isTableColumnResized(columnWidths);
|
|
73
73
|
var noOfColumns = columnWidths.length;
|
|
74
74
|
var targetWidths;
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
75
|
+
|
|
76
|
+
// appearance == comment && allowTableResizing && !tableNode?.attrs.width, means it is a comment
|
|
77
|
+
// appearance == comment && !allowTableResizing && !tableNode?.attrs.width, means it is a inline comment
|
|
78
|
+
// When comment and inline comment table width inherits from the parent container, we want tableContainerWidth === renderWidth
|
|
79
|
+
var tableContainerWidth = rendererAppearance === 'comment' && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) ? renderWidth : (0, _nodeWidth.getTableContainerWidth)(tableNode);
|
|
80
|
+
if (allowTableResizing && !isInsideOfBlockNode && !isinsideMultiBodiedExtension && !tableColumnResized) {
|
|
81
|
+
// when no columns are resized, each column should have equal width, equals to tableWidth / noOfColumns
|
|
79
82
|
var _tableWidth2 = (isNumberColumnEnabled ? tableContainerWidth - _editorSharedStyles.akEditorTableNumberColumnWidth : tableContainerWidth) - 1;
|
|
80
83
|
var defaultColumnWidth = _tableWidth2 / noOfColumns;
|
|
81
84
|
targetWidths = new Array(noOfColumns).fill(defaultColumnWidth);
|
|
82
|
-
} else if (!
|
|
85
|
+
} else if (!tableColumnResized) {
|
|
83
86
|
return null;
|
|
84
87
|
}
|
|
85
88
|
var sumOfColumns = colWidthSum(columnWidths);
|
|
@@ -87,7 +90,8 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
|
|
|
87
90
|
// tables in the wild may be smaller than table container width (col resizing bugs, created before custom widths etc.)
|
|
88
91
|
// this causes issues with num column scaling as we add a new table column in renderer
|
|
89
92
|
var isTableSmallerThanContainer = sumOfColumns < tableContainerWidth - 1;
|
|
90
|
-
var forceScaleForNumColumn = isTableScalingEnabled && isNumberColumnEnabled &&
|
|
93
|
+
var forceScaleForNumColumn = isTableScalingEnabled && isNumberColumnEnabled && tableColumnResized;
|
|
94
|
+
|
|
91
95
|
// when table resized and number column is enabled, we need to scale down the table in render
|
|
92
96
|
if (forceScaleForNumColumn) {
|
|
93
97
|
var scalePercentage = +((tableContainerWidth - _editorSharedStyles.akEditorTableNumberColumnWidth) / tableContainerWidth);
|
|
@@ -143,10 +147,11 @@ var renderScaleDownColgroup = function renderScaleDownColgroup(props) {
|
|
|
143
147
|
}
|
|
144
148
|
// scaling down
|
|
145
149
|
else if (renderWidth < tableWidth && !isTableWidthFixed) {
|
|
150
|
+
var shouldTable100ScaleDown = rendererAppearance === 'comment' && allowTableResizing && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width);
|
|
146
151
|
scaleDownPercent = calcScalePercent({
|
|
147
152
|
renderWidth: renderWidth,
|
|
148
153
|
tableWidth: tableWidth,
|
|
149
|
-
maxScale: maxScalingPercent
|
|
154
|
+
maxScale: shouldTable100ScaleDown ? 1 : maxScalingPercent
|
|
150
155
|
});
|
|
151
156
|
}
|
|
152
157
|
return targetWidths.map(function (colWidth) {
|
|
@@ -16,7 +16,6 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
|
16
16
|
var _colors = require("@atlaskit/theme/colors");
|
|
17
17
|
var _table = require("./table");
|
|
18
18
|
var _injectProps = require("../../utils/inject-props");
|
|
19
|
-
var _table2 = require("../table");
|
|
20
19
|
/**
|
|
21
20
|
* @jsxRuntime classic
|
|
22
21
|
* @jsx jsx
|
|
@@ -40,10 +39,10 @@ var modeSpecficStyles = {
|
|
|
40
39
|
};
|
|
41
40
|
|
|
42
41
|
// TODO: Quality ticket: https://product-fabric.atlassian.net/browse/DSP-4123
|
|
43
|
-
var fixedTableDivStaticStyles = function fixedTableDivStaticStyles(top, width,
|
|
42
|
+
var fixedTableDivStaticStyles = function fixedTableDivStaticStyles(top, width, allowTableResizing) {
|
|
44
43
|
var _css;
|
|
45
44
|
var stickyHeaderZIndex;
|
|
46
|
-
if (
|
|
45
|
+
if (allowTableResizing) {
|
|
47
46
|
stickyHeaderZIndex = 13;
|
|
48
47
|
} else {
|
|
49
48
|
stickyHeaderZIndex = _editorSharedStyles.akEditorStickyHeaderZIndex;
|
|
@@ -76,8 +75,8 @@ var FixedTableDiv = function FixedTableDiv(props) {
|
|
|
76
75
|
var top = props.top,
|
|
77
76
|
wrapperWidth = props.wrapperWidth,
|
|
78
77
|
mode = props.mode,
|
|
79
|
-
|
|
80
|
-
var fixedTableCss = [fixedTableDivStaticStyles(top, wrapperWidth,
|
|
78
|
+
allowTableResizing = props.allowTableResizing;
|
|
79
|
+
var fixedTableCss = [fixedTableDivStaticStyles(top, wrapperWidth, allowTableResizing), modeSpecficStyles === null || modeSpecficStyles === void 0 ? void 0 : modeSpecficStyles[mode]];
|
|
81
80
|
var attrs = {
|
|
82
81
|
mode: mode
|
|
83
82
|
};
|
|
@@ -85,7 +84,7 @@ var FixedTableDiv = function FixedTableDiv(props) {
|
|
|
85
84
|
"data-testid": "sticky-table-fixed"
|
|
86
85
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
87
86
|
,
|
|
88
|
-
className:
|
|
87
|
+
className: allowTableResizing ? 'fixed-table-div-custom-table-resizing' : ''
|
|
89
88
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
90
89
|
,
|
|
91
90
|
css: fixedTableCss
|
|
@@ -106,10 +105,11 @@ var StickyTable = exports.StickyTable = function StickyTable(_ref) {
|
|
|
106
105
|
renderWidth = _ref.renderWidth,
|
|
107
106
|
rowHeight = _ref.rowHeight,
|
|
108
107
|
tableNode = _ref.tableNode,
|
|
109
|
-
rendererAppearance = _ref.rendererAppearance
|
|
108
|
+
rendererAppearance = _ref.rendererAppearance,
|
|
109
|
+
allowTableResizing = _ref.allowTableResizing;
|
|
110
110
|
var styles;
|
|
111
111
|
/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
|
|
112
|
-
if (
|
|
112
|
+
if (allowTableResizing) {
|
|
113
113
|
styles = (0, _react2.css)({
|
|
114
114
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
115
115
|
top: mode === 'pin-bottom' ? top : undefined,
|
|
@@ -133,7 +133,7 @@ var StickyTable = exports.StickyTable = function StickyTable(_ref) {
|
|
|
133
133
|
top: mode === 'stick' ? top : undefined,
|
|
134
134
|
mode: rowHeight > 300 ? 'none' : mode,
|
|
135
135
|
wrapperWidth: wrapperWidth,
|
|
136
|
-
|
|
136
|
+
allowTableResizing: allowTableResizing
|
|
137
137
|
}, (0, _react2.jsx)("div", {
|
|
138
138
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
139
139
|
className: "".concat(_styles.TableSharedCssClassName.TABLE_CONTAINER, " is-sticky ").concat(shadowClassNames || ''),
|
|
@@ -9,7 +9,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
var _colgroup = require("./colgroup");
|
|
10
10
|
var _nodeWidth = require("@atlaskit/editor-common/node-width");
|
|
11
11
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
12
|
-
var _table = require("../table");
|
|
13
12
|
var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
14
13
|
var _tableNode$attrs;
|
|
15
14
|
var innerRef = _ref.innerRef,
|
|
@@ -21,11 +20,15 @@ var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
21
20
|
tableNode = _ref.tableNode,
|
|
22
21
|
rendererAppearance = _ref.rendererAppearance,
|
|
23
22
|
isInsideOfBlockNode = _ref.isInsideOfBlockNode,
|
|
24
|
-
isinsideMultiBodiedExtension = _ref.isinsideMultiBodiedExtension
|
|
23
|
+
isinsideMultiBodiedExtension = _ref.isinsideMultiBodiedExtension,
|
|
24
|
+
allowTableResizing = _ref.allowTableResizing;
|
|
25
25
|
var tableWidth = tableNode ? (0, _nodeWidth.getTableContainerWidth)(tableNode) : _editorSharedStyles.akEditorDefaultLayoutWidth;
|
|
26
|
-
if (rendererAppearance === 'comment' &&
|
|
26
|
+
if (rendererAppearance === 'comment' && allowTableResizing && tableNode && !((_tableNode$attrs = tableNode.attrs) !== null && _tableNode$attrs !== void 0 && _tableNode$attrs.width)) {
|
|
27
27
|
tableWidth = 'inherit';
|
|
28
28
|
}
|
|
29
|
+
if (rendererAppearance === 'comment' && !allowTableResizing) {
|
|
30
|
+
tableWidth = renderWidth;
|
|
31
|
+
}
|
|
29
32
|
var tableLayout = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.layout;
|
|
30
33
|
var tableDisplayMode = tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.displayMode;
|
|
31
34
|
return /*#__PURE__*/_react.default.createElement("table", {
|
|
@@ -43,6 +46,7 @@ var Table = exports.Table = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
43
46
|
tableNode: tableNode,
|
|
44
47
|
rendererAppearance: rendererAppearance,
|
|
45
48
|
isInsideOfBlockNode: isInsideOfBlockNode,
|
|
46
|
-
isinsideMultiBodiedExtension: isinsideMultiBodiedExtension
|
|
49
|
+
isinsideMultiBodiedExtension: isinsideMultiBodiedExtension,
|
|
50
|
+
allowTableResizing: allowTableResizing
|
|
47
51
|
}), /*#__PURE__*/_react.default.createElement("tbody", null, children));
|
|
48
52
|
});
|
|
@@ -297,7 +297,8 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
297
297
|
rendererAppearance = _this$props.rendererAppearance,
|
|
298
298
|
isInsideOfBlockNode = _this$props.isInsideOfBlockNode,
|
|
299
299
|
isinsideMultiBodiedExtension = _this$props.isinsideMultiBodiedExtension,
|
|
300
|
-
allowTableAlignment = _this$props.allowTableAlignment
|
|
300
|
+
allowTableAlignment = _this$props.allowTableAlignment,
|
|
301
|
+
allowTableResizing = _this$props.allowTableResizing;
|
|
301
302
|
var stickyMode = this.state.stickyMode;
|
|
302
303
|
var lineLengthFixedWidth = _editorSharedStyles.akEditorDefaultLayoutWidth;
|
|
303
304
|
var left;
|
|
@@ -310,7 +311,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
310
311
|
var calcDefaultLayoutWidthByAppearance = function calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode) {
|
|
311
312
|
if (rendererAppearance === 'full-width' && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width)) {
|
|
312
313
|
return isRenderWidthValid ? Math.min(_editorSharedStyles.akEditorFullWidthLayoutWidth, renderWidth) : _editorSharedStyles.akEditorFullWidthLayoutWidth;
|
|
313
|
-
} else if (rendererAppearance === 'comment' &&
|
|
314
|
+
} else if (rendererAppearance === 'comment' && allowTableResizing && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width)) {
|
|
314
315
|
var tableContainerWidth = (0, _nodeWidth.getTableContainerWidth)(tableNode);
|
|
315
316
|
return isRenderWidthValid ? renderWidth : tableContainerWidth;
|
|
316
317
|
} else {
|
|
@@ -320,13 +321,12 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
320
321
|
}
|
|
321
322
|
};
|
|
322
323
|
var tableWidth = calcDefaultLayoutWidthByAppearance(rendererAppearance, tableNode);
|
|
323
|
-
var isCommentAppearanceAndTableAlignmentEnabled = allowTableAlignment && (0, _platformFeatureFlags.fg)('platform_editor_table_support_in_comment');
|
|
324
324
|
|
|
325
325
|
// Logic for table alignment in renderer
|
|
326
|
-
var isTableAlignStart =
|
|
327
|
-
|
|
326
|
+
var isTableAlignStart = tableNode && tableNode.attrs && tableNode.attrs.layout === 'align-start' && allowTableAlignment;
|
|
328
327
|
var fullWidthLineLength = isRenderWidthValid ? Math.min(_editorSharedStyles.akEditorFullWidthLayoutWidth, renderWidth) : _editorSharedStyles.akEditorFullWidthLayoutWidth;
|
|
329
328
|
var commentLineLength = isRenderWidthValid ? renderWidth : lineLengthFixedWidth;
|
|
329
|
+
var isCommentAppearanceAndTableAlignmentEnabled = (0, _appearance.isCommentAppearance)(rendererAppearance) && allowTableAlignment;
|
|
330
330
|
var lineLength = (0, _appearance.isFullWidthAppearance)(rendererAppearance) ? fullWidthLineLength : isCommentAppearanceAndTableAlignmentEnabled ? commentLineLength : lineLengthFixedWidth;
|
|
331
331
|
var shouldCalculateLeftForAlignment = !isInsideOfBlockNode && isTableAlignStart && ((0, _appearance.isFullPageAppearance)(rendererAppearance) && tableWidth <= lineLengthFixedWidth || (0, _appearance.isFullWidthAppearance)(rendererAppearance) || isCommentAppearanceAndTableAlignmentEnabled);
|
|
332
332
|
if (shouldCalculateLeftForAlignment) {
|
|
@@ -348,8 +348,8 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
348
348
|
} else {
|
|
349
349
|
updatedLayout = layout;
|
|
350
350
|
}
|
|
351
|
-
var finalTableContainerWidth =
|
|
352
|
-
if (rendererAppearance === 'comment' &&
|
|
351
|
+
var finalTableContainerWidth = allowTableResizing ? tableWidth : 'inherit';
|
|
352
|
+
if (rendererAppearance === 'comment' && allowTableResizing) {
|
|
353
353
|
finalTableContainerWidth = tableNode !== null && tableNode !== void 0 && tableNode.attrs.width ? tableWidth : 'inherit';
|
|
354
354
|
}
|
|
355
355
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -376,7 +376,8 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
376
376
|
columnWidths: columnWidths,
|
|
377
377
|
rowHeight: this.state.headerRowHeight,
|
|
378
378
|
tableNode: tableNode,
|
|
379
|
-
rendererAppearance: rendererAppearance
|
|
379
|
+
rendererAppearance: rendererAppearance,
|
|
380
|
+
allowTableResizing: allowTableResizing
|
|
380
381
|
}, [children && children[0]]), /*#__PURE__*/_react.default.createElement("div", {
|
|
381
382
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
382
383
|
className: _styles.TableSharedCssClassName.TABLE_NODE_WRAPPER,
|
|
@@ -391,7 +392,8 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
391
392
|
tableNode: tableNode,
|
|
392
393
|
rendererAppearance: rendererAppearance,
|
|
393
394
|
isInsideOfBlockNode: isInsideOfBlockNode,
|
|
394
|
-
isinsideMultiBodiedExtension: isinsideMultiBodiedExtension
|
|
395
|
+
isinsideMultiBodiedExtension: isinsideMultiBodiedExtension,
|
|
396
|
+
allowTableResizing: allowTableResizing
|
|
395
397
|
}, this.grabFirstRowRef(children)))));
|
|
396
398
|
}
|
|
397
399
|
}]);
|
|
@@ -471,7 +473,7 @@ var TableWithWidth = function TableWithWidth(props) {
|
|
|
471
473
|
var colWidthsSum = ((_props$columnWidths = props.columnWidths) === null || _props$columnWidths === void 0 ? void 0 : _props$columnWidths.reduce(function (total, val) {
|
|
472
474
|
return total + val;
|
|
473
475
|
}, 0)) || 0;
|
|
474
|
-
if (colWidthsSum ||
|
|
476
|
+
if (colWidthsSum || props.allowTableResizing) {
|
|
475
477
|
return /*#__PURE__*/_react.default.createElement(TableWithShadows, (0, _extends2.default)({
|
|
476
478
|
renderWidth: renderWidth
|
|
477
479
|
}, props));
|
|
@@ -60,7 +60,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
60
60
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
61
61
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
62
62
|
var packageName = "@atlaskit/renderer";
|
|
63
|
-
var packageVersion = "109.51.
|
|
63
|
+
var packageVersion = "109.51.2";
|
|
64
64
|
var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
|
|
65
65
|
var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
66
66
|
(0, _inherits2.default)(Renderer, _PureComponent);
|
|
@@ -290,7 +290,8 @@ var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
|
|
|
290
290
|
isInsideOfInlineExtension: (0, _platformFeatureFlags.fg)('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
|
|
291
291
|
textHighlighter: props.UNSTABLE_textHighlighter,
|
|
292
292
|
isCommentsOnMediaMediaInlineBugFixEnabled: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMediaMediaInlineBugFix,
|
|
293
|
-
allowTableAlignment: props.UNSTABLE_allowTableAlignment
|
|
293
|
+
allowTableAlignment: props.UNSTABLE_allowTableAlignment,
|
|
294
|
+
allowTableResizing: props.UNSTABLE_allowTableResizing
|
|
294
295
|
};
|
|
295
296
|
}
|
|
296
297
|
}, {
|
|
@@ -488,7 +489,8 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
|
|
|
488
489
|
useBlockRenderForCodeBlock = props.useBlockRenderForCodeBlock,
|
|
489
490
|
addTelepointer = props.addTelepointer,
|
|
490
491
|
ssr = props.ssr,
|
|
491
|
-
isInsideOfInlineExtension = props.isInsideOfInlineExtension
|
|
492
|
+
isInsideOfInlineExtension = props.isInsideOfInlineExtension,
|
|
493
|
+
allowTableResizing = props.allowTableResizing;
|
|
492
494
|
var createTelepointer = function createTelepointer() {
|
|
493
495
|
var telepointer = document.createElement('span');
|
|
494
496
|
telepointer.textContent = "\u200B";
|
|
@@ -561,7 +563,8 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
|
|
|
561
563
|
allowNestedHeaderLinks: allowNestedHeaderLinks,
|
|
562
564
|
allowColumnSorting: !!allowColumnSorting,
|
|
563
565
|
useBlockRenderForCodeBlock: useBlockRenderForCodeBlock,
|
|
564
|
-
allowAnnotations: props.allowAnnotations
|
|
566
|
+
allowAnnotations: props.allowAnnotations,
|
|
567
|
+
allowTableResizing: allowTableResizing
|
|
565
568
|
})
|
|
566
569
|
}, children))));
|
|
567
570
|
});
|
|
@@ -24,6 +24,7 @@ var _headingAnchor = require("../../react/nodes/heading-anchor");
|
|
|
24
24
|
var _lightWeightCodeBlock = require("../../react/nodes/codeBlock/components/lightWeightCodeBlock");
|
|
25
25
|
var _table = require("../../react/nodes/table");
|
|
26
26
|
var _table2 = require("@atlaskit/editor-common/table");
|
|
27
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
27
28
|
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
|
|
28
29
|
/* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation */
|
|
29
30
|
/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
|
|
@@ -155,7 +156,7 @@ var rendererStyles = exports.rendererStyles = function rendererStyles(wrapperPro
|
|
|
155
156
|
var useBlockRenderForCodeBlock = wrapperProps.useBlockRenderForCodeBlock;
|
|
156
157
|
|
|
157
158
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/design-system/no-css-tagged-template-expression
|
|
158
|
-
return (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n\t\tfont-size: ", "px;\n\t\tline-height: 1.5rem;\n\t\tcolor: ", ";\n\n\t\t.", "::after {\n\t\t\t// we add a clearfix after ak-renderer-document in order to\n\t\t\t// contain internal floats (such as media images that are \"wrap-left\")\n\t\t\t// to just the renderer (and not spill outside of it)\n\t\t\tcontent: '';\n\t\t\tvisibility: hidden;\n\t\t\tdisplay: block;\n\t\t\theight: 0;\n\t\t\tclear: both;\n\t\t}\n\n\t\t", "\n\t\t", "\n\n .", " {\n\t\t\t", "\n\t\t}\n\n\t\t& h1 {\n\t\t\t", "\n\t\t}\n\n\t\t& h2 {\n\t\t\t", "\n\t\t}\n\n\t\t& h3 {\n\t\t\t", "\n\t\t}\n\n\t\t& h4 {\n\t\t\t", "\n\t\t}\n\n\t\t& h5 {\n\t\t\t", "\n\t\t}\n\n\t\t& h6 {\n\t\t\t", "\n\t\t}\n\n\t\t& span.akActionMark {\n\t\t\tcolor: ", ";\n\t\t\ttext-decoration: none;\n\n\t\t\t&:hover {\n\t\t\t\tcolor: ", ";\n\t\t\t\ttext-decoration: underline;\n\t\t\t}\n\n\t\t\t&:active {\n\t\t\t\tcolor: ", ";\n\t\t\t}\n\t\t}\n\n\t\t& span.akActionMark {\n\t\t\tcursor: pointer;\n\t\t}\n\n\t\t& span[data-placeholder] {\n\t\t\tcolor: ", ";\n\t\t}\n\n\t\t", "\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", "\n\t\t", "\n\n\t\t& .UnknownBlock {\n\t\t\tfont-family: ", ";\n\t\t\tfont-size: ", ";\n\t\t\tfont-weight: 400;\n\t\t\twhite-space: pre-wrap;\n\t\t\tword-wrap: break-word;\n\t\t}\n\n\t\t& span.date-node {\n\t\t\tbackground: ", ";\n\t\t\tborder-radius: ", ";\n\t\t\tcolor: ", ";\n\t\t\tpadding: ", " ", ";\n\t\t\tmargin: 0 1px;\n\t\t\ttransition: background 0.3s;\n\t\t}\n\n\t\t& span.date-node-highlighted {\n\t\t\tbackground: ", ";\n\t\t\tcolor: ", ";\n\t\t}\n\n\t\t& .renderer-image {\n\t\t\tmax-width: 100%;\n\t\t\tdisplay: block;\n\t\t\tmargin: ", " 0;\n\t\t}\n\n\t\t.", ".rich-media-wrapped + .", ":not(.rich-media-wrapped) {\n\t\t\tclear: both;\n\t\t}\n\n\t\t& .code-block,\n\t\t& blockquote,\n\t\t& hr,\n\t\t& > div > div:not(.rich-media-wrapped),\n\t\t.", ".rich-media-wrapped + .rich-media-wrapped + *:not(.rich-media-wrapped),\n\t\t.", ".rich-media-wrapped + div:not(.rich-media-wrapped),\n\t\t.", ".image-align-start,\n\t\t\t.", ".image-center,\n\t\t\t.", ".image-align-end {\n\t\t\tclear: both;\n\t\t}\n\n\t\t& .rich-media-wrapped {\n\t\t\t& + h1,\n\t\t\t& + h2,\n\t\t\t& + h3,\n\t\t\t& + h4,\n\t\t\t& + h5,\n\t\t\t& + h6 {\n\t\t\t\tmargin-top: ", ";\n\t\t\t}\n\t\t}\n\n\t\t", "\n\t\t/* plugin styles */\n ", " &\n div[class^='image-wrap-'] + div[class^='image-wrap-'] {\n\t\t\tmargin-left: 0;\n\t\t\tmargin-right: 0;\n\t\t}\n\n\t\t/* Breakout for tables and extensions */\n\t\t.", " > {\n\t\t\t", "\n\n\t\t\t* .", " {\n\t\t\t\toverflow-x: auto;\n\t\t\t}\n\n\t\t\t& .", ":first-child {\n\t\t\t\tmargin-top: 0;\n\t\t\t}\n\t\t}\n\n\t\t.", " {\n\t\t\t.", " {\n\t\t\t\tmargin-top: ", ";\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\tmargin-left: 50%;\n\t\t\t\ttransform: translateX(-50%);\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\toverflow-x: auto;\n\t\t\t}\n\n\t\t\t.", " .", " {\n\t\t\t\tdisplay: flex;\n\t\t\t}\n\t\t}\n\n\t\t", "\n\n\t\t.", " .", " {\n\t\t\tz-index: 0;\n\t\t\ttransition: all 0.1s linear;\n\t\t\tdisplay: flex; /* needed to avoid position: fixed jumpiness in Chrome */\n\n\t\t\t/** Shadow overrides */\n\t\t\t&.", "::after, &.", "::before {\n\t\t\t\ttop: ", "px;\n\t\t\t\theight: calc(100% - ", "px);\n\t\t\t\tz-index: ", ";\n\t\t\t}\n\n\t\t\t", "\n\n\t\t\t&\n .", ",\n &\n .", " {\n\t\t\t\theight: calc(100% - ", "px);\n\t\t\t}\n\n\t\t\t/**\n * A hack for making all the <th /> heights equal in case some have shorter\n * content than others.\n *\n * This is done to make sort buttons fill entire <th />.\n */\n\t\t\ttable {\n\t\t\t\theight: 1px; /* will be ignored */\n\t\t\t\t", ";\n\t\t\t\tmargin-left: 0;\n\t\t\t\tmargin-right: 0;\n\t\t\t}\n\n\t\t\ttable tr:first-of-type {\n\t\t\t\theight: 100%;\n\n\t\t\t\ttd,\n\t\t\t\tth {\n\t\t\t\t\tposition: relative;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\ttable[data-number-column='true'] {\n\t\t\t\t.", " {\n\t\t\t\t\tbackground-color: ", ";\n\t\t\t\t\tborder-right: 1px solid\n\t\t\t\t\t\t", ";\n\t\t\t\t\twidth: ", "px;\n\t\t\t\t\ttext-align: center;\n\t\t\t\t\tcolor: ", ";\n\t\t\t\t\tfont-size: ", ";\n\t\t\t\t}\n\n\t\t\t\t.fixed .", " {\n\t\t\t\t\tborder-right: 0px none;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\ttr[data-header-row].fixed {\n\t\t\tposition: fixed !important;\n\t\t\tdisplay: flex;\n\t\t\toverflow: hidden;\n\t\t\tz-index: ", ";\n\n\t\t\tborder-right: 1px solid ", ";\n\t\t\tborder-bottom: 1px solid ", ";\n\n\t\t\t/* this is to compensate for the table border */\n\t\t\ttransform: translateX(-1px);\n\t\t}\n\n\t\t.sticky > th {\n\t\t\tz-index: ", ";\n\t\t\tposition: sticky !important;\n\t\t\ttop: 0;\n\t\t}\n\n\t\t/* Make the number column header sticky */\n\t\t.sticky > td {\n\t\t\tposition: sticky !important;\n\t\t\ttop: 0;\n\t\t}\n\n\t\t/* add border for position: sticky\n and work around background-clip: padding-box\n bug for FF causing box-shadow bug in Chrome */\n\t\t.sticky th,\n\t\t.sticky td {\n\t\t\tbox-shadow:\n\t\t\t\t0px 1px ", ",\n\t\t\t\t0px -0.5px ", ",\n\t\t\t\tinset -1px 0px ", ",\n\t\t\t\t0px -1px ", ";\n\t\t}\n\n\t\t/* this will remove jumpiness caused in Chrome for sticky headers */\n\t\t.fixed + tr {\n\t\t\tmin-height: 0px;\n\t\t}\n\n\t\t/*\n * We wrap CodeBlock in a grid to prevent it from overflowing the container of the renderer.\n * See ED-4159.\n */\n\t\t& .code-block {\n\t\t\tmax-width: 100%;\n\t\t\t/* -ms- properties are necessary until MS supports the latest version of the grid spec */\n\t\t\t/* stylelint-disable value-no-vendor-prefix, declaration-block-no-duplicate-properties */\n\t\t\tdisplay: block;\n\t\t\t/* stylelint-enable */\n\n\t\t\tposition: relative;\n\t\t\tborder-radius: ", ";\n\n\t\t\t/*\n * The overall renderer has word-wrap: break; which causes issues with\n * code block line numbers in Safari / iOS.\n */\n\t\t\tword-wrap: normal;\n\t\t}\n\n\t\t& .MediaGroup,\n\t\t& .code-block {\n\t\t\tmargin-top: ", ";\n\n\t\t\t&:first-child {\n\t\t\t\tmargin-top: 0;\n\t\t\t}\n\t\t}\n\n\t\t", "\n\n\t\t", "\n\n ", ";\n\t\t& [data-layout-section] {\n\t\t\tmargin-top: ", ";\n\t\t\t& > div + div {\n\t\t\t\tmargin-left: ", ";\n\t\t\t}\n\n\t\t\t@media screen and (max-width: ", "px) {\n\t\t\t\t& > div + div {\n\t\t\t\t\tmargin-left: 0;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t& .MediaGroup,\n\t\t\t& .code-block {\n\t\t\t\tmargin-top: ", ";\n\n\t\t\t\t&:first-child {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\t& li {\n\t\t\t> .code-block {\n\t\t\t\tmargin: ", " 0 0 0;\n\t\t\t}\n\t\t\t> .code-block:first-child {\n\t\t\t\tmargin-top: 0;\n\t\t\t}\n\n\t\t\t> div:last-of-type.code-block {\n\t\t\t\tmargin-bottom: ", ";\n\t\t\t}\n\t\t}\n\n\t\t&:not([data-node-type='decisionList']) > li,\n // This prevents https://product-fabric.atlassian.net/browse/ED-20924\n &:not(.", ") > li {\n\t\t\t", "\n\t\t}\n\t"])), (0, _editorSharedStyles.editorFontSize)(themeProps), "var(--ds-text, ".concat(colors.N800, ")"), _consts.RendererCssClassName.DOCUMENT, fullPageStyles(wrapperProps, themeProps), fullWidthStyles(wrapperProps), _consts.RendererCssClassName.DOCUMENT, _mediaInline.mediaInlineImageStyles, headingAnchorStyle('h1'), headingAnchorStyle('h2'), headingAnchorStyle('h3'), headingAnchorStyle('h4'), headingAnchorStyle('h5'), headingAnchorStyle('h6'), "var(--ds-link, ".concat(colors.B400, ")"), "var(--ds-link, ".concat(colors.B300, ")"), "var(--ds-link-pressed, ".concat(colors.B500, ")"), "var(--ds-text-subtlest, ".concat(colors.N200, ")"), telepointerStyles(colorMode), _styles.whitespaceSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor_element_padding_changes_gate') ? _styles.blockquoteSharedStylesNew : _styles.blockquoteSharedStyles, (0, _styles.headingsSharedStyles)(), (0, _styles.ruleSharedStyles)(), _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.blockMarksSharedStyles, (0, _styles.codeMarkSharedStyles)(), _styles.shadowSharedStyle, _styles.dateSharedStyle, _styles.textColorStyles, (0, _styles.backgroundColorStyles)(), _styles.tasksAndDecisionsStyles, _styles.smartCardSharedStyles, getAnnotationStyles(wrapperProps), (0, _constants.fontFamily)(), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), "var(--ds-background-neutral, ".concat(colors.N30A, ")"), "var(--ds-border-radius-100, 3px)", "var(--ds-text, ".concat(colors.N800, ")"), "var(--ds-space-025, 2px)", "var(--ds-space-050, 4px)", "var(--ds-background-danger, ".concat(colors.R50, ")"), "var(--ds-text-danger, ".concat(colors.R500, ")"), "var(--ds-space-300, 24px)", _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, "var(--ds-space-100, 8px)", alignedHeadingAnchorStyle(wrapperProps), _styles.mediaSingleSharedStyle, _consts.RendererCssClassName.DOCUMENT, breakoutWidthStyle(), _consts.RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER, _consts.RendererCssClassName.EXTENSION, _consts.RendererCssClassName.DOCUMENT, _consts.RendererCssClassName.EXTENSION, _editorSharedStyles.blockNodesVerticalMargin, _consts.RendererCssClassName.EXTENSION_CENTER_ALIGN, _styles.TableSharedCssClassName.TABLE_NODE_WRAPPER, _ui.shadowObserverClassNames.SHADOW_CONTAINER, _styles.TableSharedCssClassName.TABLE_NODE_WRAPPER, (0, _styles.tableSharedStyle)(), _consts.RendererCssClassName.DOCUMENT, _styles.TableSharedCssClassName.TABLE_CONTAINER, _ui.shadowClassNames.RIGHT_SHADOW, _ui.shadowClassNames.LEFT_SHADOW, _styles.tableMarginTop - 1, _styles.tableMarginTop, _editorSharedStyles.akEditorStickyHeaderZIndex, getShadowOverrides(), _ui.shadowObserverClassNames.SENTINEL_LEFT, _ui.shadowObserverClassNames.SENTINEL_RIGHT, _styles.tableMarginTop, tableSortableColumnStyle(wrapperProps), _consts.RendererCssClassName.NUMBER_COLUMN, "var(--ds-background-neutral, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), _editorSharedStyles.akEditorTableNumberColumnWidth, "var(--ds-text-subtlest, ".concat(colors.N200, ")"), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), _consts.RendererCssClassName.NUMBER_COLUMN, _editorSharedStyles.akEditorStickyHeaderZIndex, "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), _editorSharedStyles.akEditorStickyHeaderZIndex, "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"), "var(--ds-border-radius-100, 3px)", _editorSharedStyles.blockNodesVerticalMargin, useGridRenderForCodeBlock(useBlockRenderForCodeBlock), (0, _lightWeightCodeBlock.getLightWeightCodeBlockStylesForRootRendererStyleSheet)(), _styles.columnLayoutSharedStyle, "var(--ds-space-250, 20px)", "var(--ds-space-400, 32px)", _editorSharedStyles.gridMediumMaxWidth, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _utils.browser.safari ? _styles.codeBlockInListSafariFix : '');
|
|
159
|
+
return (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n\t\tfont-size: ", "px;\n\t\tline-height: 1.5rem;\n\t\tcolor: ", ";\n\n\t\t.", "::after {\n\t\t\t// we add a clearfix after ak-renderer-document in order to\n\t\t\t// contain internal floats (such as media images that are \"wrap-left\")\n\t\t\t// to just the renderer (and not spill outside of it)\n\t\t\tcontent: '';\n\t\t\tvisibility: hidden;\n\t\t\tdisplay: block;\n\t\t\theight: 0;\n\t\t\tclear: both;\n\t\t}\n\n\t\t", "\n\t\t", "\n\n .", " {\n\t\t\t", "\n\t\t}\n\n\t\t& h1 {\n\t\t\t", "\n\t\t}\n\n\t\t& h2 {\n\t\t\t", "\n\t\t}\n\n\t\t& h3 {\n\t\t\t", "\n\t\t}\n\n\t\t& h4 {\n\t\t\t", "\n\t\t}\n\n\t\t& h5 {\n\t\t\t", "\n\t\t}\n\n\t\t& h6 {\n\t\t\t", "\n\t\t}\n\n\t\t& span.akActionMark {\n\t\t\tcolor: ", ";\n\t\t\ttext-decoration: none;\n\n\t\t\t&:hover {\n\t\t\t\tcolor: ", ";\n\t\t\t\ttext-decoration: underline;\n\t\t\t}\n\n\t\t\t&:active {\n\t\t\t\tcolor: ", ";\n\t\t\t}\n\t\t}\n\n\t\t& span.akActionMark {\n\t\t\tcursor: pointer;\n\t\t}\n\n\t\t& span[data-placeholder] {\n\t\t\tcolor: ", ";\n\t\t}\n\n\t\t", "\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", ";\n\t\t", "\n\t\t", "\n\n\t\t& .UnknownBlock {\n\t\t\tfont-family: ", ";\n\t\t\tfont-size: ", ";\n\t\t\tfont-weight: 400;\n\t\t\twhite-space: pre-wrap;\n\t\t\tword-wrap: break-word;\n\t\t}\n\n\t\t& span.date-node {\n\t\t\tbackground: ", ";\n\t\t\tborder-radius: ", ";\n\t\t\tcolor: ", ";\n\t\t\tpadding: ", " ", ";\n\t\t\tmargin: 0 1px;\n\t\t\ttransition: background 0.3s;\n\t\t}\n\n\t\t& span.date-node-highlighted {\n\t\t\tbackground: ", ";\n\t\t\tcolor: ", ";\n\t\t}\n\n\t\t& .renderer-image {\n\t\t\tmax-width: 100%;\n\t\t\tdisplay: block;\n\t\t\tmargin: ", " 0;\n\t\t}\n\n\t\t.", ".rich-media-wrapped + .", ":not(.rich-media-wrapped) {\n\t\t\tclear: both;\n\t\t}\n\n\t\t& .code-block,\n\t\t& blockquote,\n\t\t& hr,\n\t\t& > div > div:not(.rich-media-wrapped),\n\t\t.", ".rich-media-wrapped + .rich-media-wrapped + *:not(.rich-media-wrapped),\n\t\t.", ".rich-media-wrapped + div:not(.rich-media-wrapped),\n\t\t.", ".image-align-start,\n\t\t\t.", ".image-center,\n\t\t\t.", ".image-align-end {\n\t\t\tclear: both;\n\t\t}\n\n\t\t& .rich-media-wrapped {\n\t\t\t& + h1,\n\t\t\t& + h2,\n\t\t\t& + h3,\n\t\t\t& + h4,\n\t\t\t& + h5,\n\t\t\t& + h6 {\n\t\t\t\tmargin-top: ", ";\n\t\t\t}\n\t\t}\n\n\t\t", "\n\t\t/* plugin styles */\n ", " &\n div[class^='image-wrap-'] + div[class^='image-wrap-'] {\n\t\t\tmargin-left: 0;\n\t\t\tmargin-right: 0;\n\t\t}\n\n\t\t/* Breakout for tables and extensions */\n\t\t.", " > {\n\t\t\t", "\n\n\t\t\t* .", " {\n\t\t\t\toverflow-x: auto;\n\t\t\t}\n\n\t\t\t& .", ":first-child {\n\t\t\t\tmargin-top: 0;\n\t\t\t}\n\t\t}\n\n\t\t.", " {\n\t\t\t.", " {\n\t\t\t\tmargin-top: ", ";\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\tmargin-left: 50%;\n\t\t\t\ttransform: translateX(-50%);\n\t\t\t}\n\n\t\t\t.", " {\n\t\t\t\toverflow-x: auto;\n\t\t\t}\n\n\t\t\t.", " .", " {\n\t\t\t\tdisplay: flex;\n\t\t\t}\n\t\t}\n\n\t\t", "\n\n\t\t.", " .", " {\n\t\t\tz-index: 0;\n\t\t\ttransition: all 0.1s linear;\n\t\t\tdisplay: flex; /* needed to avoid position: fixed jumpiness in Chrome */\n\n\t\t\t/** Shadow overrides */\n\t\t\t&.", "::after, &.", "::before {\n\t\t\t\ttop: ", "px;\n\t\t\t\theight: calc(100% - ", "px);\n\t\t\t\tz-index: ", ";\n\t\t\t}\n\n\t\t\t", "\n\n\t\t\t&\n .", ",\n &\n .", " {\n\t\t\t\theight: calc(100% - ", "px);\n\t\t\t}\n\n\t\t\t/**\n * A hack for making all the <th /> heights equal in case some have shorter\n * content than others.\n *\n * This is done to make sort buttons fill entire <th />.\n */\n\t\t\ttable {\n\t\t\t\theight: 1px; /* will be ignored */\n\t\t\t\t", ";\n\t\t\t\tmargin-left: 0;\n\t\t\t\tmargin-right: 0;\n\t\t\t}\n\n\t\t\ttable tr:first-of-type {\n\t\t\t\theight: 100%;\n\n\t\t\t\ttd,\n\t\t\t\tth {\n\t\t\t\t\tposition: relative;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\ttable[data-number-column='true'] {\n\t\t\t\t.", " {\n\t\t\t\t\tbackground-color: ", ";\n\t\t\t\t\tborder-right: 1px solid\n\t\t\t\t\t\t", ";\n\t\t\t\t\twidth: ", "px;\n\t\t\t\t\ttext-align: center;\n\t\t\t\t\tcolor: ", ";\n\t\t\t\t\tfont-size: ", ";\n\t\t\t\t}\n\n\t\t\t\t.fixed .", " {\n\t\t\t\t\tborder-right: 0px none;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\ttr[data-header-row].fixed {\n\t\t\tposition: fixed !important;\n\t\t\tdisplay: flex;\n\t\t\toverflow: hidden;\n\t\t\tz-index: ", ";\n\n\t\t\tborder-right: 1px solid ", ";\n\t\t\tborder-bottom: 1px solid ", ";\n\n\t\t\t/* this is to compensate for the table border */\n\t\t\ttransform: translateX(-1px);\n\t\t}\n\n\t\t.sticky > th {\n\t\t\tz-index: ", ";\n\t\t\tposition: sticky !important;\n\t\t\ttop: 0;\n\t\t}\n\n\t\t/* Make the number column header sticky */\n\t\t.sticky > td {\n\t\t\tposition: sticky !important;\n\t\t\ttop: 0;\n\t\t}\n\n\t\t/* add border for position: sticky\n and work around background-clip: padding-box\n bug for FF causing box-shadow bug in Chrome */\n\t\t.sticky th,\n\t\t.sticky td {\n\t\t\tbox-shadow:\n\t\t\t\t0px 1px ", ",\n\t\t\t\t0px -0.5px ", ",\n\t\t\t\tinset -1px 0px ", ",\n\t\t\t\t0px -1px ", ";\n\t\t}\n\n\t\t/* this will remove jumpiness caused in Chrome for sticky headers */\n\t\t.fixed + tr {\n\t\t\tmin-height: 0px;\n\t\t}\n\n\t\t/*\n * We wrap CodeBlock in a grid to prevent it from overflowing the container of the renderer.\n * See ED-4159.\n */\n\t\t& .code-block {\n\t\t\tmax-width: 100%;\n\t\t\t/* -ms- properties are necessary until MS supports the latest version of the grid spec */\n\t\t\t/* stylelint-disable value-no-vendor-prefix, declaration-block-no-duplicate-properties */\n\t\t\tdisplay: block;\n\t\t\t/* stylelint-enable */\n\n\t\t\tposition: relative;\n\t\t\tborder-radius: ", ";\n\n\t\t\t/*\n * The overall renderer has word-wrap: break; which causes issues with\n * code block line numbers in Safari / iOS.\n */\n\t\t\tword-wrap: normal;\n\t\t}\n\n\t\t& .MediaGroup,\n\t\t& .code-block {\n\t\t\tmargin-top: ", ";\n\n\t\t\t&:first-child {\n\t\t\t\tmargin-top: 0;\n\t\t\t}\n\t\t}\n\n\t\t", "\n\n\t\t", "\n\n ", ";\n\t\t& [data-layout-section] {\n\t\t\tmargin-top: ", ";\n\t\t\t& > div + div {\n\t\t\t\tmargin-left: ", ";\n\t\t\t}\n\n\t\t\t@media screen and (max-width: ", "px) {\n\t\t\t\t& > div + div {\n\t\t\t\t\tmargin-left: 0;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t& .MediaGroup,\n\t\t\t& .code-block {\n\t\t\t\tmargin-top: ", ";\n\n\t\t\t\t&:first-child {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\t& li {\n\t\t\t> .code-block {\n\t\t\t\tmargin: ", " 0 0 0;\n\t\t\t}\n\t\t\t> .code-block:first-child {\n\t\t\t\tmargin-top: 0;\n\t\t\t}\n\n\t\t\t> div:last-of-type.code-block {\n\t\t\t\tmargin-bottom: ", ";\n\t\t\t}\n\t\t}\n\n\t\t&:not([data-node-type='decisionList']) > li,\n // This prevents https://product-fabric.atlassian.net/browse/ED-20924\n &:not(.", ") > li {\n\t\t\t", "\n\t\t}\n\t"])), (0, _editorSharedStyles.editorFontSize)(themeProps), "var(--ds-text, ".concat(colors.N800, ")"), _consts.RendererCssClassName.DOCUMENT, fullPageStyles(wrapperProps, themeProps), fullWidthStyles(wrapperProps), _consts.RendererCssClassName.DOCUMENT, _mediaInline.mediaInlineImageStyles, headingAnchorStyle('h1'), headingAnchorStyle('h2'), headingAnchorStyle('h3'), headingAnchorStyle('h4'), headingAnchorStyle('h5'), headingAnchorStyle('h6'), "var(--ds-link, ".concat(colors.B400, ")"), "var(--ds-link, ".concat(colors.B300, ")"), "var(--ds-link-pressed, ".concat(colors.B500, ")"), "var(--ds-text-subtlest, ".concat(colors.N200, ")"), telepointerStyles(colorMode), _styles.whitespaceSharedStyles, (0, _experiments.editorExperiment)('nested-dnd', true) ? _styles.blockquoteSharedStylesNew : _styles.blockquoteSharedStyles, (0, _styles.headingsSharedStyles)(), (0, _styles.ruleSharedStyles)(), _styles.paragraphSharedStyles, _styles.listsSharedStyles, _styles.indentationSharedStyles, _styles.blockMarksSharedStyles, (0, _styles.codeMarkSharedStyles)(), _styles.shadowSharedStyle, _styles.dateSharedStyle, _styles.textColorStyles, (0, _styles.backgroundColorStyles)(), _styles.tasksAndDecisionsStyles, _styles.smartCardSharedStyles, getAnnotationStyles(wrapperProps), (0, _constants.fontFamily)(), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), "var(--ds-background-neutral, ".concat(colors.N30A, ")"), "var(--ds-border-radius-100, 3px)", "var(--ds-text, ".concat(colors.N800, ")"), "var(--ds-space-025, 2px)", "var(--ds-space-050, 4px)", "var(--ds-background-danger, ".concat(colors.R50, ")"), "var(--ds-text-danger, ".concat(colors.R500, ")"), "var(--ds-space-300, 24px)", _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, _styles.richMediaClassName, "var(--ds-space-100, 8px)", alignedHeadingAnchorStyle(wrapperProps), _styles.mediaSingleSharedStyle, _consts.RendererCssClassName.DOCUMENT, breakoutWidthStyle(), _consts.RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER, _consts.RendererCssClassName.EXTENSION, _consts.RendererCssClassName.DOCUMENT, _consts.RendererCssClassName.EXTENSION, _editorSharedStyles.blockNodesVerticalMargin, _consts.RendererCssClassName.EXTENSION_CENTER_ALIGN, _styles.TableSharedCssClassName.TABLE_NODE_WRAPPER, _ui.shadowObserverClassNames.SHADOW_CONTAINER, _styles.TableSharedCssClassName.TABLE_NODE_WRAPPER, (0, _styles.tableSharedStyle)(), _consts.RendererCssClassName.DOCUMENT, _styles.TableSharedCssClassName.TABLE_CONTAINER, _ui.shadowClassNames.RIGHT_SHADOW, _ui.shadowClassNames.LEFT_SHADOW, _styles.tableMarginTop - 1, _styles.tableMarginTop, _editorSharedStyles.akEditorStickyHeaderZIndex, getShadowOverrides(), _ui.shadowObserverClassNames.SENTINEL_LEFT, _ui.shadowObserverClassNames.SENTINEL_RIGHT, _styles.tableMarginTop, tableSortableColumnStyle(wrapperProps), _consts.RendererCssClassName.NUMBER_COLUMN, "var(--ds-background-neutral, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), _editorSharedStyles.akEditorTableNumberColumnWidth, "var(--ds-text-subtlest, ".concat(colors.N200, ")"), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), _consts.RendererCssClassName.NUMBER_COLUMN, _editorSharedStyles.akEditorStickyHeaderZIndex, "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), _editorSharedStyles.akEditorStickyHeaderZIndex, "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableBorder, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"), "var(--ds-background-accent-gray-subtler, ".concat(_editorSharedStyles.akEditorTableToolbar, ")"), "var(--ds-border-radius-100, 3px)", _editorSharedStyles.blockNodesVerticalMargin, useGridRenderForCodeBlock(useBlockRenderForCodeBlock), (0, _lightWeightCodeBlock.getLightWeightCodeBlockStylesForRootRendererStyleSheet)(), _styles.columnLayoutSharedStyle, "var(--ds-space-250, 20px)", "var(--ds-space-400, 32px)", _editorSharedStyles.gridMediumMaxWidth, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.blockNodesVerticalMargin, _styles.SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, _utils.browser.safari ? _styles.codeBlockInListSafariFix : '');
|
|
159
160
|
};
|
|
160
161
|
};
|
|
161
162
|
var useGridRenderForCodeBlock = function useGridRenderForCodeBlock(codeBlockRenderAsBlock) {
|
|
@@ -178,6 +178,7 @@ export default class ReactSerializer {
|
|
|
178
178
|
this.textHighlighter = init.textHighlighter;
|
|
179
179
|
this.isCommentsOnMediaMediaInlineBugFixEnabled = init.isCommentsOnMediaMediaInlineBugFixEnabled;
|
|
180
180
|
this.allowTableAlignment = init.allowTableAlignment;
|
|
181
|
+
this.allowTableResizing = init.allowTableResizing;
|
|
181
182
|
}
|
|
182
183
|
resetState() {
|
|
183
184
|
this.headingIds = [];
|
|
@@ -327,7 +328,8 @@ export default class ReactSerializer {
|
|
|
327
328
|
stickyHeaders,
|
|
328
329
|
isInsideOfBlockNode,
|
|
329
330
|
isInsideMultiBodiedExtension,
|
|
330
|
-
allowTableAlignment: this.allowTableAlignment
|
|
331
|
+
allowTableAlignment: this.allowTableAlignment,
|
|
332
|
+
allowTableResizing: this.allowTableResizing
|
|
331
333
|
};
|
|
332
334
|
}
|
|
333
335
|
getDateProps(node, parentInfo, path = []) {
|
|
@@ -2,7 +2,6 @@ import React from 'react';
|
|
|
2
2
|
import { tableCellBorderWidth, tableCellMinWidth } from '@atlaskit/editor-common/styles';
|
|
3
3
|
import { akEditorTableNumberColumnWidth, akEditorTableLegacyCellMinWidth } from '@atlaskit/editor-shared-styles';
|
|
4
4
|
import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
|
|
5
|
-
import { isTableResizingEnabled } from '../table';
|
|
6
5
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { useFeatureFlags } from '../../../use-feature-flags';
|
|
8
7
|
// we allow scaling down column widths by no more than 30%
|
|
@@ -11,7 +10,7 @@ import { useFeatureFlags } from '../../../use-feature-flags';
|
|
|
11
10
|
// User A creates a table with column widths → User A views it with reduced viewport space (eg. Confluence sidebar is open)
|
|
12
11
|
const MAX_SCALING_PERCENT = 0.3;
|
|
13
12
|
const MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION = 0.4;
|
|
14
|
-
const
|
|
13
|
+
const isTableColumnResized = columnWidths => {
|
|
15
14
|
const filteredWidths = columnWidths.filter(width => width !== 0);
|
|
16
15
|
return !!filteredWidths.length;
|
|
17
16
|
};
|
|
@@ -49,24 +48,28 @@ const renderScaleDownColgroup = props => {
|
|
|
49
48
|
isInsideOfBlockNode,
|
|
50
49
|
isinsideMultiBodiedExtension,
|
|
51
50
|
isTableScalingEnabled,
|
|
52
|
-
isTableFixedColumnWidthsOptionEnabled
|
|
51
|
+
isTableFixedColumnWidthsOptionEnabled,
|
|
52
|
+
allowTableResizing
|
|
53
53
|
} = props;
|
|
54
54
|
if (!columnWidths) {
|
|
55
55
|
return [];
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
//
|
|
59
|
-
const
|
|
58
|
+
// isTableColumnResized checks if table columns were resized
|
|
59
|
+
const tableColumnResized = isTableColumnResized(columnWidths);
|
|
60
60
|
const noOfColumns = columnWidths.length;
|
|
61
61
|
let targetWidths;
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
62
|
+
|
|
63
|
+
// appearance == comment && allowTableResizing && !tableNode?.attrs.width, means it is a comment
|
|
64
|
+
// appearance == comment && !allowTableResizing && !tableNode?.attrs.width, means it is a inline comment
|
|
65
|
+
// When comment and inline comment table width inherits from the parent container, we want tableContainerWidth === renderWidth
|
|
66
|
+
const tableContainerWidth = rendererAppearance === 'comment' && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width) ? renderWidth : getTableContainerWidth(tableNode);
|
|
67
|
+
if (allowTableResizing && !isInsideOfBlockNode && !isinsideMultiBodiedExtension && !tableColumnResized) {
|
|
68
|
+
// when no columns are resized, each column should have equal width, equals to tableWidth / noOfColumns
|
|
66
69
|
const tableWidth = (isNumberColumnEnabled ? tableContainerWidth - akEditorTableNumberColumnWidth : tableContainerWidth) - 1;
|
|
67
70
|
const defaultColumnWidth = tableWidth / noOfColumns;
|
|
68
71
|
targetWidths = new Array(noOfColumns).fill(defaultColumnWidth);
|
|
69
|
-
} else if (!
|
|
72
|
+
} else if (!tableColumnResized) {
|
|
70
73
|
return null;
|
|
71
74
|
}
|
|
72
75
|
const sumOfColumns = colWidthSum(columnWidths);
|
|
@@ -74,7 +77,8 @@ const renderScaleDownColgroup = props => {
|
|
|
74
77
|
// tables in the wild may be smaller than table container width (col resizing bugs, created before custom widths etc.)
|
|
75
78
|
// this causes issues with num column scaling as we add a new table column in renderer
|
|
76
79
|
const isTableSmallerThanContainer = sumOfColumns < tableContainerWidth - 1;
|
|
77
|
-
const forceScaleForNumColumn = isTableScalingEnabled && isNumberColumnEnabled &&
|
|
80
|
+
const forceScaleForNumColumn = isTableScalingEnabled && isNumberColumnEnabled && tableColumnResized;
|
|
81
|
+
|
|
78
82
|
// when table resized and number column is enabled, we need to scale down the table in render
|
|
79
83
|
if (forceScaleForNumColumn) {
|
|
80
84
|
const scalePercentage = +((tableContainerWidth - akEditorTableNumberColumnWidth) / tableContainerWidth);
|
|
@@ -130,10 +134,11 @@ const renderScaleDownColgroup = props => {
|
|
|
130
134
|
}
|
|
131
135
|
// scaling down
|
|
132
136
|
else if (renderWidth < tableWidth && !isTableWidthFixed) {
|
|
137
|
+
const shouldTable100ScaleDown = rendererAppearance === 'comment' && allowTableResizing && !(tableNode !== null && tableNode !== void 0 && tableNode.attrs.width);
|
|
133
138
|
scaleDownPercent = calcScalePercent({
|
|
134
139
|
renderWidth,
|
|
135
140
|
tableWidth,
|
|
136
|
-
maxScale: maxScalingPercent
|
|
141
|
+
maxScale: shouldTable100ScaleDown ? 1 : maxScalingPercent
|
|
137
142
|
});
|
|
138
143
|
}
|
|
139
144
|
return targetWidths.map(colWidth => {
|
|
@@ -13,7 +13,6 @@ import { akEditorStickyHeaderZIndex } from '@atlaskit/editor-shared-styles';
|
|
|
13
13
|
import { N40A } from '@atlaskit/theme/colors';
|
|
14
14
|
import { Table } from './table';
|
|
15
15
|
import { recursivelyInjectProps } from '../../utils/inject-props';
|
|
16
|
-
import { isTableResizingEnabled } from '../table';
|
|
17
16
|
export const tableStickyPadding = 8;
|
|
18
17
|
const modeSpecficStyles = {
|
|
19
18
|
none: css({
|
|
@@ -28,9 +27,9 @@ const modeSpecficStyles = {
|
|
|
28
27
|
};
|
|
29
28
|
|
|
30
29
|
// TODO: Quality ticket: https://product-fabric.atlassian.net/browse/DSP-4123
|
|
31
|
-
const fixedTableDivStaticStyles = (top, width,
|
|
30
|
+
const fixedTableDivStaticStyles = (top, width, allowTableResizing) => {
|
|
32
31
|
let stickyHeaderZIndex;
|
|
33
|
-
if (
|
|
32
|
+
if (allowTableResizing) {
|
|
34
33
|
stickyHeaderZIndex = 13;
|
|
35
34
|
} else {
|
|
36
35
|
stickyHeaderZIndex = akEditorStickyHeaderZIndex;
|
|
@@ -75,9 +74,9 @@ const FixedTableDiv = props => {
|
|
|
75
74
|
top,
|
|
76
75
|
wrapperWidth,
|
|
77
76
|
mode,
|
|
78
|
-
|
|
77
|
+
allowTableResizing
|
|
79
78
|
} = props;
|
|
80
|
-
const fixedTableCss = [fixedTableDivStaticStyles(top, wrapperWidth,
|
|
79
|
+
const fixedTableCss = [fixedTableDivStaticStyles(top, wrapperWidth, allowTableResizing), modeSpecficStyles === null || modeSpecficStyles === void 0 ? void 0 : modeSpecficStyles[mode]];
|
|
81
80
|
const attrs = {
|
|
82
81
|
mode
|
|
83
82
|
};
|
|
@@ -85,7 +84,7 @@ const FixedTableDiv = props => {
|
|
|
85
84
|
"data-testid": "sticky-table-fixed"
|
|
86
85
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
87
86
|
,
|
|
88
|
-
className:
|
|
87
|
+
className: allowTableResizing ? 'fixed-table-div-custom-table-resizing' : ''
|
|
89
88
|
// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
90
89
|
,
|
|
91
90
|
css: fixedTableCss
|
|
@@ -106,11 +105,12 @@ export const StickyTable = ({
|
|
|
106
105
|
renderWidth,
|
|
107
106
|
rowHeight,
|
|
108
107
|
tableNode,
|
|
109
|
-
rendererAppearance
|
|
108
|
+
rendererAppearance,
|
|
109
|
+
allowTableResizing
|
|
110
110
|
}) => {
|
|
111
111
|
let styles;
|
|
112
112
|
/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
|
|
113
|
-
if (
|
|
113
|
+
if (allowTableResizing) {
|
|
114
114
|
styles = css({
|
|
115
115
|
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
116
116
|
top: mode === 'pin-bottom' ? top : undefined,
|
|
@@ -134,7 +134,7 @@ export const StickyTable = ({
|
|
|
134
134
|
top: mode === 'stick' ? top : undefined,
|
|
135
135
|
mode: rowHeight > 300 ? 'none' : mode,
|
|
136
136
|
wrapperWidth: wrapperWidth,
|
|
137
|
-
|
|
137
|
+
allowTableResizing: allowTableResizing
|
|
138
138
|
}, jsx("div", {
|
|
139
139
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
140
140
|
className: `${TableSharedCssClassName.TABLE_CONTAINER} is-sticky ${shadowClassNames || ''}`,
|