@atlaskit/editor-plugin-table 15.4.24 → 15.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/dist/cjs/nodeviews/TableComponent.js +0 -6
- package/dist/cjs/nodeviews/TableContainer.js +1 -1
- package/dist/cjs/nodeviews/TableResizer.js +4 -4
- package/dist/cjs/nodeviews/toDOM.js +1 -1
- package/dist/cjs/pm-plugins/table-resizing/utils/colgroup.js +1 -2
- package/dist/cjs/pm-plugins/table-resizing/utils/misc.js +1 -1
- package/dist/cjs/pm-plugins/table-width.js +2 -2
- package/dist/cjs/pm-plugins/utils/create.js +2 -2
- package/dist/cjs/pm-plugins/utils/snapping.js +1 -1
- package/dist/es2019/nodeviews/TableComponent.js +0 -6
- package/dist/es2019/nodeviews/TableContainer.js +1 -1
- package/dist/es2019/nodeviews/TableResizer.js +4 -4
- package/dist/es2019/nodeviews/toDOM.js +1 -1
- package/dist/es2019/pm-plugins/table-resizing/utils/colgroup.js +1 -2
- package/dist/es2019/pm-plugins/table-resizing/utils/misc.js +1 -1
- package/dist/es2019/pm-plugins/table-width.js +3 -3
- package/dist/es2019/pm-plugins/utils/create.js +2 -2
- package/dist/es2019/pm-plugins/utils/snapping.js +1 -1
- package/dist/esm/nodeviews/TableComponent.js +0 -6
- package/dist/esm/nodeviews/TableContainer.js +1 -1
- package/dist/esm/nodeviews/TableResizer.js +4 -4
- package/dist/esm/nodeviews/toDOM.js +1 -1
- package/dist/esm/pm-plugins/table-resizing/utils/colgroup.js +1 -2
- package/dist/esm/pm-plugins/table-resizing/utils/misc.js +1 -1
- package/dist/esm/pm-plugins/table-width.js +2 -2
- package/dist/esm/pm-plugins/utils/create.js +2 -2
- package/dist/esm/pm-plugins/utils/snapping.js +1 -1
- package/package.json +3 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-table
|
|
2
2
|
|
|
3
|
+
## 15.5.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 15.5.0
|
|
10
|
+
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- [`8677e7b660127`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8677e7b660127) -
|
|
14
|
+
EDITOR-3792 Rollup max width changes previously gated with editor_tinymce_full_width_mode into
|
|
15
|
+
combined frontend/backend flag confluence_max_width_content_appearance
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- [`0882d69646f51`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0882d69646f51) -
|
|
20
|
+
tidy up fg platform_editor_table_width_refactor
|
|
21
|
+
- Updated dependencies
|
|
22
|
+
|
|
3
23
|
## 15.4.24
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -24,7 +24,6 @@ var _nodeWidth = require("@atlaskit/editor-common/node-width");
|
|
|
24
24
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
25
25
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
26
26
|
var _utils2 = require("@atlaskit/editor-tables/utils");
|
|
27
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
28
27
|
var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
|
|
29
28
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
30
29
|
var _commands = require("../pm-plugins/commands");
|
|
@@ -719,11 +718,6 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
719
718
|
shouldScale = true;
|
|
720
719
|
shouldHandleColgroupUpdates = true;
|
|
721
720
|
}
|
|
722
|
-
if (!(0, _platformFeatureFlags.fg)('platform_editor_table_width_refactor')) {
|
|
723
|
-
if (this.state.windowResized) {
|
|
724
|
-
shouldHandleColgroupUpdates = true;
|
|
725
|
-
}
|
|
726
|
-
}
|
|
727
721
|
if (shouldHandleColgroupUpdates) {
|
|
728
722
|
this.handleColgroupUpdates();
|
|
729
723
|
}
|
|
@@ -258,7 +258,7 @@ var ResizableTableContainer = exports.ResizableTableContainer = /*#__PURE__*/_re
|
|
|
258
258
|
|
|
259
259
|
// Ensure minimum width for usability while respecting container constraints
|
|
260
260
|
var width = Math.max(calculatedWidth, Math.min(responsiveContainerWidth * 0.5, 300));
|
|
261
|
-
var maxResizerWidth = isCommentEditor ? responsiveContainerWidth : Math.min(responsiveContainerWidth, (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH);
|
|
261
|
+
var maxResizerWidth = isCommentEditor ? responsiveContainerWidth : Math.min(responsiveContainerWidth, (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH);
|
|
262
262
|
return {
|
|
263
263
|
width: width,
|
|
264
264
|
maxResizerWidth: maxResizerWidth
|
|
@@ -289,7 +289,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
|
|
|
289
289
|
var pos;
|
|
290
290
|
try {
|
|
291
291
|
pos = getPos();
|
|
292
|
-
} catch (
|
|
292
|
+
} catch (_unused) {
|
|
293
293
|
return;
|
|
294
294
|
}
|
|
295
295
|
if (typeof pos !== 'number') {
|
|
@@ -306,8 +306,8 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
|
|
|
306
306
|
var fullWidthGuideline = (0, _guidelines.defaultGuidelinesForPreserveTable)(_guidelines.PRESERVE_TABLE_GUIDELINES_LENGTH_OFFSET, editorContainerWidth, excludeGuidelineConfig).filter(function (guideline) {
|
|
307
307
|
return guideline.isFullWidth;
|
|
308
308
|
})[0];
|
|
309
|
-
var isFullWidthGuidelineActive = (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? closestSnap && fullWidthGuideline && closestSnap.keys.includes(fullWidthGuideline.key) : closestSnap && closestSnap.keys.includes(fullWidthGuideline.key);
|
|
310
|
-
var tableMaxWidth = isCommentEditor ? Math.floor(containerWidth - _consts.TABLE_OFFSET_IN_COMMENT_EDITOR) : (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH;
|
|
309
|
+
var isFullWidthGuidelineActive = (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? closestSnap && fullWidthGuideline && closestSnap.keys.includes(fullWidthGuideline.key) : closestSnap && closestSnap.keys.includes(fullWidthGuideline.key);
|
|
310
|
+
var tableMaxWidth = isCommentEditor ? Math.floor(containerWidth - _consts.TABLE_OFFSET_IN_COMMENT_EDITOR) : (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH;
|
|
311
311
|
var shouldUpdateWidthToWidest = isCommentEditor ? tableMaxWidth <= newWidth : !!isTableScalingEnabled && isFullWidthGuidelineActive;
|
|
312
312
|
var previewParentWidth = isCommentEditor && shouldUpdateWidthToWidest ? tableMaxWidth : newWidth;
|
|
313
313
|
(0, _scaleTable.previewScaleTable)(tableRef, {
|
|
@@ -335,7 +335,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
|
|
|
335
335
|
var pos = getPos();
|
|
336
336
|
var currentTableNodeLocalId = (_node$attrs$localId2 = node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.localId) !== null && _node$attrs$localId2 !== void 0 ? _node$attrs$localId2 : '';
|
|
337
337
|
var tableMaxWidth = isCommentEditor ? undefined // Table's full-width in comment appearance inherit the width of the Editor/Renderer
|
|
338
|
-
: (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH;
|
|
338
|
+
: (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH;
|
|
339
339
|
newWidth = widthToWidest && currentTableNodeLocalId && widthToWidest[currentTableNodeLocalId] ? tableMaxWidth : newWidth;
|
|
340
340
|
var tr = state.tr.setMeta(_tableWidth.pluginKey, {
|
|
341
341
|
resizing: false,
|
|
@@ -88,7 +88,7 @@ var tableNodeSpecWithFixedToDOM = exports.tableNodeSpecWithFixedToDOM = function
|
|
|
88
88
|
position: 'relative',
|
|
89
89
|
userSelect: 'auto',
|
|
90
90
|
boxSizing: 'border-box',
|
|
91
|
-
'--ak-editor-table-max-width': "".concat((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH, "px"),
|
|
91
|
+
'--ak-editor-table-max-width': "".concat((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH, "px"),
|
|
92
92
|
'--ak-editor-table-min-width': "".concat(tableMinWidth, "px"),
|
|
93
93
|
minWidth: 'var(--ak-editor-table-min-width)',
|
|
94
94
|
maxWidth: (0, _misc.getTableResizerContainerMaxWidthInCSS)(config.isCommentEditor, config.isChromelessEditor, config.isTableScalingEnabled),
|
|
@@ -11,7 +11,6 @@ var _utils = require("@atlaskit/editor-common/utils");
|
|
|
11
11
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
12
12
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
13
13
|
var _tableMap = require("@atlaskit/editor-tables/table-map");
|
|
14
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
14
|
var _consts = require("./consts");
|
|
16
15
|
var _misc = require("./misc");
|
|
17
16
|
/**
|
|
@@ -77,7 +76,7 @@ var generateColgroupFromNode = exports.generateColgroupFromNode = function gener
|
|
|
77
76
|
}
|
|
78
77
|
});
|
|
79
78
|
} else {
|
|
80
|
-
if (!isTableScalingEnabled
|
|
79
|
+
if (!isTableScalingEnabled) {
|
|
81
80
|
cols.push.apply(cols, (0, _toConsumableArray2.default)(Array.from({
|
|
82
81
|
length: colspan
|
|
83
82
|
}, function (_) {
|
|
@@ -106,7 +106,7 @@ var getTableContainerElementWidth = exports.getTableContainerElementWidth = func
|
|
|
106
106
|
* @returns The CSS max-width value
|
|
107
107
|
*/
|
|
108
108
|
var getTableResizerContainerMaxWidthInCSS = exports.getTableResizerContainerMaxWidthInCSS = function getTableResizerContainerMaxWidthInCSS(isCommentEditor, isChromelessEditor, isTableScalingEnabled) {
|
|
109
|
-
var maxResizerWidthForNonCommentEditor = isTableScalingEnabled ? "min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2)), ".concat((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH, "px)") : "min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2) - var(--ak-editor--resizer-handle-spacing)), ".concat((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH, "px)");
|
|
109
|
+
var maxResizerWidthForNonCommentEditor = isTableScalingEnabled ? "min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2)), ".concat((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH, "px)") : "min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2) - var(--ak-editor--resizer-handle-spacing)), ".concat((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH, "px)");
|
|
110
110
|
return isCommentEditor || isChromelessEditor ? '100%' : maxResizerWidthForNonCommentEditor;
|
|
111
111
|
};
|
|
112
112
|
|
|
@@ -109,8 +109,8 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, dispat
|
|
|
109
109
|
step.getMap().forEach(function (_, __, newStart, newEnd) {
|
|
110
110
|
newState.doc.nodesBetween(newStart, newEnd, function (node, pos) {
|
|
111
111
|
if (node.type === table) {
|
|
112
|
-
if (shouldPatchTableWidth && node.attrs.width !== (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH) {
|
|
113
|
-
tr.setNodeAttribute(pos, 'width', (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH);
|
|
112
|
+
if (shouldPatchTableWidth && node.attrs.width !== ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH)) {
|
|
113
|
+
tr.setNodeAttribute(pos, 'width', (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true) ? _consts.TABLE_MAX_WIDTH : _consts.TABLE_FULL_WIDTH);
|
|
114
114
|
}
|
|
115
115
|
if (shouldPatchTableAlignment) {
|
|
116
116
|
tr.setNodeAttribute(pos, 'layout', _alignment.ALIGN_START);
|
|
@@ -30,13 +30,13 @@ var createTableWithWidth = exports.createTableWithWidth = function createTableWi
|
|
|
30
30
|
attrsOverrides.colsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.colsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.colsCount : NESTED_TABLE_DEFAULT_COLS;
|
|
31
31
|
}
|
|
32
32
|
if (isTableScalingEnabled && !isCommentEditor) {
|
|
33
|
-
if ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) && isMaxWidthModeEnabled) {
|
|
33
|
+
if (((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true)) && isMaxWidthModeEnabled) {
|
|
34
34
|
attrsOverrides.tableWidth = _consts.TABLE_MAX_WIDTH;
|
|
35
35
|
} else if (isFullWidthModeEnabled) {
|
|
36
36
|
attrsOverrides.tableWidth = _consts.TABLE_FULL_WIDTH;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
if (isTableAlignmentEnabled && (isFullWidthModeEnabled || (0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) && isMaxWidthModeEnabled || isCommentEditor)) {
|
|
39
|
+
if (isTableAlignmentEnabled && (isFullWidthModeEnabled || ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true)) && isMaxWidthModeEnabled || isCommentEditor)) {
|
|
40
40
|
attrsOverrides.layout = 'align-start';
|
|
41
41
|
}
|
|
42
42
|
if (isCommentEditor && isTableResizingEnabled || isChromelessEditor) {
|
|
@@ -38,7 +38,7 @@ var calculateDefaultTablePreserveSnappings = exports.calculateDefaultTablePreser
|
|
|
38
38
|
var dynamicFullWidthLine = editorContainerWidth - padding * 2 >= _editorSharedStyles.akEditorFullWidthLayoutWidth ? _editorSharedStyles.akEditorFullWidthLayoutWidth : editorContainerWidth - padding * 2;
|
|
39
39
|
var dynamicMaxWidthLine = editorContainerWidth - padding * 2 >= _editorSharedStyles.akEditorMaxWidthLayoutWidth ? _editorSharedStyles.akEditorMaxWidthLayoutWidth : editorContainerWidth - padding * 2;
|
|
40
40
|
var guides = [dynamicFullWidthLine - lengthOffset];
|
|
41
|
-
if ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true)) {
|
|
41
|
+
if ((0, _expValEquals.expValEquals)('editor_tinymce_full_width_mode', 'isEnabled', true) || (0, _expValEquals.expValEquals)('confluence_max_width_content_appearance', 'isEnabled', true)) {
|
|
42
42
|
guides.push(dynamicMaxWidthLine - lengthOffset);
|
|
43
43
|
}
|
|
44
44
|
if (!exclude.breakoutPoints) {
|
|
@@ -11,7 +11,6 @@ import { getParentNodeWidth, getTableContainerWidth } from '@atlaskit/editor-com
|
|
|
11
11
|
import { isValidPosition } from '@atlaskit/editor-common/utils';
|
|
12
12
|
import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
|
|
13
13
|
import { isTableSelected } from '@atlaskit/editor-tables/utils';
|
|
14
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
14
|
import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
|
|
16
15
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
17
16
|
import { autoSizeTable, clearHoverSelection } from '../pm-plugins/commands';
|
|
@@ -680,11 +679,6 @@ class TableComponent extends React.Component {
|
|
|
680
679
|
shouldScale = true;
|
|
681
680
|
shouldHandleColgroupUpdates = true;
|
|
682
681
|
}
|
|
683
|
-
if (!fg('platform_editor_table_width_refactor')) {
|
|
684
|
-
if (this.state.windowResized) {
|
|
685
|
-
shouldHandleColgroupUpdates = true;
|
|
686
|
-
}
|
|
687
|
-
}
|
|
688
682
|
if (shouldHandleColgroupUpdates) {
|
|
689
683
|
this.handleColgroupUpdates();
|
|
690
684
|
}
|
|
@@ -254,7 +254,7 @@ export const ResizableTableContainer = /*#__PURE__*/React.memo(({
|
|
|
254
254
|
|
|
255
255
|
// Ensure minimum width for usability while respecting container constraints
|
|
256
256
|
const width = Math.max(calculatedWidth, Math.min(responsiveContainerWidth * 0.5, 300));
|
|
257
|
-
const maxResizerWidth = isCommentEditor ? responsiveContainerWidth : Math.min(responsiveContainerWidth, expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH);
|
|
257
|
+
const maxResizerWidth = isCommentEditor ? responsiveContainerWidth : Math.min(responsiveContainerWidth, expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH);
|
|
258
258
|
return {
|
|
259
259
|
width,
|
|
260
260
|
maxResizerWidth
|
|
@@ -282,7 +282,7 @@ export const TableResizer = ({
|
|
|
282
282
|
let pos;
|
|
283
283
|
try {
|
|
284
284
|
pos = getPos();
|
|
285
|
-
} catch
|
|
285
|
+
} catch {
|
|
286
286
|
return;
|
|
287
287
|
}
|
|
288
288
|
if (typeof pos !== 'number') {
|
|
@@ -299,8 +299,8 @@ export const TableResizer = ({
|
|
|
299
299
|
} = editorView;
|
|
300
300
|
const currentTableNodeLocalId = (_node$attrs$localId = node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.localId) !== null && _node$attrs$localId !== void 0 ? _node$attrs$localId : '';
|
|
301
301
|
const fullWidthGuideline = defaultGuidelinesForPreserveTable(PRESERVE_TABLE_GUIDELINES_LENGTH_OFFSET, editorContainerWidth, excludeGuidelineConfig).filter(guideline => guideline.isFullWidth)[0];
|
|
302
|
-
const isFullWidthGuidelineActive = expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? closestSnap && fullWidthGuideline && closestSnap.keys.includes(fullWidthGuideline.key) : closestSnap && closestSnap.keys.includes(fullWidthGuideline.key);
|
|
303
|
-
const tableMaxWidth = isCommentEditor ? Math.floor(containerWidth - TABLE_OFFSET_IN_COMMENT_EDITOR) : expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH;
|
|
302
|
+
const isFullWidthGuidelineActive = expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? closestSnap && fullWidthGuideline && closestSnap.keys.includes(fullWidthGuideline.key) : closestSnap && closestSnap.keys.includes(fullWidthGuideline.key);
|
|
303
|
+
const tableMaxWidth = isCommentEditor ? Math.floor(containerWidth - TABLE_OFFSET_IN_COMMENT_EDITOR) : expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH;
|
|
304
304
|
const shouldUpdateWidthToWidest = isCommentEditor ? tableMaxWidth <= newWidth : !!isTableScalingEnabled && isFullWidthGuidelineActive;
|
|
305
305
|
const previewParentWidth = isCommentEditor && shouldUpdateWidthToWidest ? tableMaxWidth : newWidth;
|
|
306
306
|
previewScaleTable(tableRef, {
|
|
@@ -330,7 +330,7 @@ export const TableResizer = ({
|
|
|
330
330
|
const pos = getPos();
|
|
331
331
|
const currentTableNodeLocalId = (_node$attrs$localId2 = node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.localId) !== null && _node$attrs$localId2 !== void 0 ? _node$attrs$localId2 : '';
|
|
332
332
|
const tableMaxWidth = isCommentEditor ? undefined // Table's full-width in comment appearance inherit the width of the Editor/Renderer
|
|
333
|
-
: expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH;
|
|
333
|
+
: expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH;
|
|
334
334
|
newWidth = widthToWidest && currentTableNodeLocalId && widthToWidest[currentTableNodeLocalId] ? tableMaxWidth : newWidth;
|
|
335
335
|
let tr = state.tr.setMeta(tableWidthPluginKey, {
|
|
336
336
|
resizing: false,
|
|
@@ -72,7 +72,7 @@ export const tableNodeSpecWithFixedToDOM = config => {
|
|
|
72
72
|
position: 'relative',
|
|
73
73
|
userSelect: 'auto',
|
|
74
74
|
boxSizing: 'border-box',
|
|
75
|
-
'--ak-editor-table-max-width': `${expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH}px`,
|
|
75
|
+
'--ak-editor-table-max-width': `${expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH}px`,
|
|
76
76
|
'--ak-editor-table-min-width': `${tableMinWidth}px`,
|
|
77
77
|
minWidth: 'var(--ak-editor-table-min-width)',
|
|
78
78
|
maxWidth: getTableResizerContainerMaxWidthInCSS(config.isCommentEditor, config.isChromelessEditor, config.isTableScalingEnabled),
|
|
@@ -3,7 +3,6 @@ import { calcTableColumnWidths, getFragmentBackingArray } from '@atlaskit/editor
|
|
|
3
3
|
import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
|
|
4
4
|
import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
|
|
5
5
|
import { TableMap } from '@atlaskit/editor-tables/table-map';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { COLUMN_MIN_WIDTH, MAX_SCALING_PERCENT, MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION } from './consts';
|
|
8
7
|
import { getScalingPercentForTableWithoutWidth, getTableContainerElementWidth, getTableScalingPercent } from './misc';
|
|
9
8
|
/**
|
|
@@ -65,7 +64,7 @@ export const generateColgroupFromNode = (table, isCommentEditor, isChromelessEdi
|
|
|
65
64
|
}
|
|
66
65
|
});
|
|
67
66
|
} else {
|
|
68
|
-
if (!isTableScalingEnabled
|
|
67
|
+
if (!isTableScalingEnabled) {
|
|
69
68
|
cols.push(...Array.from({
|
|
70
69
|
length: colspan
|
|
71
70
|
}, _ => ['col', {
|
|
@@ -98,7 +98,7 @@ export const getTableContainerElementWidth = table => {
|
|
|
98
98
|
* @returns The CSS max-width value
|
|
99
99
|
*/
|
|
100
100
|
export const getTableResizerContainerMaxWidthInCSS = (isCommentEditor, isChromelessEditor, isTableScalingEnabled) => {
|
|
101
|
-
const maxResizerWidthForNonCommentEditor = isTableScalingEnabled ? `min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2)), ${expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH}px)` : `min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2) - var(--ak-editor--resizer-handle-spacing)), ${expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH}px)`;
|
|
101
|
+
const maxResizerWidthForNonCommentEditor = isTableScalingEnabled ? `min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2)), ${expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH}px)` : `min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2) - var(--ak-editor--resizer-handle-spacing)), ${expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH}px)`;
|
|
102
102
|
return isCommentEditor || isChromelessEditor ? '100%' : maxResizerWidthForNonCommentEditor;
|
|
103
103
|
};
|
|
104
104
|
|
|
@@ -86,7 +86,7 @@ const createPlugin = (dispatch, dispatchAnalyticsEvent, fullWidthEnabled, maxWid
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
const {
|
|
89
|
-
width,
|
|
89
|
+
width: _width,
|
|
90
90
|
...rest
|
|
91
91
|
} = node.attrs;
|
|
92
92
|
if (tableWidthCal) {
|
|
@@ -104,8 +104,8 @@ const createPlugin = (dispatch, dispatchAnalyticsEvent, fullWidthEnabled, maxWid
|
|
|
104
104
|
step.getMap().forEach((_, __, newStart, newEnd) => {
|
|
105
105
|
newState.doc.nodesBetween(newStart, newEnd, (node, pos) => {
|
|
106
106
|
if (node.type === table) {
|
|
107
|
-
if (shouldPatchTableWidth && node.attrs.width !== expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH) {
|
|
108
|
-
tr.setNodeAttribute(pos, 'width', expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH);
|
|
107
|
+
if (shouldPatchTableWidth && node.attrs.width !== (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH)) {
|
|
108
|
+
tr.setNodeAttribute(pos, 'width', expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH);
|
|
109
109
|
}
|
|
110
110
|
if (shouldPatchTableAlignment) {
|
|
111
111
|
tr.setNodeAttribute(pos, 'layout', ALIGN_START);
|
|
@@ -20,13 +20,13 @@ export const createTableWithWidth = ({
|
|
|
20
20
|
attrsOverrides.colsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.colsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.colsCount : NESTED_TABLE_DEFAULT_COLS;
|
|
21
21
|
}
|
|
22
22
|
if (isTableScalingEnabled && !isCommentEditor) {
|
|
23
|
-
if (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) && isMaxWidthModeEnabled) {
|
|
23
|
+
if ((expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && isMaxWidthModeEnabled) {
|
|
24
24
|
attrsOverrides.tableWidth = TABLE_MAX_WIDTH;
|
|
25
25
|
} else if (isFullWidthModeEnabled) {
|
|
26
26
|
attrsOverrides.tableWidth = TABLE_FULL_WIDTH;
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
if (isTableAlignmentEnabled && (isFullWidthModeEnabled || expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) && isMaxWidthModeEnabled || isCommentEditor)) {
|
|
29
|
+
if (isTableAlignmentEnabled && (isFullWidthModeEnabled || (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && isMaxWidthModeEnabled || isCommentEditor)) {
|
|
30
30
|
attrsOverrides.layout = 'align-start';
|
|
31
31
|
}
|
|
32
32
|
if (isCommentEditor && isTableResizingEnabled || isChromelessEditor) {
|
|
@@ -20,7 +20,7 @@ export const calculateDefaultTablePreserveSnappings = (lengthOffset = 0, editorC
|
|
|
20
20
|
const dynamicFullWidthLine = editorContainerWidth - padding * 2 >= akEditorFullWidthLayoutWidth ? akEditorFullWidthLayoutWidth : editorContainerWidth - padding * 2;
|
|
21
21
|
const dynamicMaxWidthLine = editorContainerWidth - padding * 2 >= akEditorMaxWidthLayoutWidth ? akEditorMaxWidthLayoutWidth : editorContainerWidth - padding * 2;
|
|
22
22
|
const guides = [dynamicFullWidthLine - lengthOffset];
|
|
23
|
-
if (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true)) {
|
|
23
|
+
if (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) {
|
|
24
24
|
guides.push(dynamicMaxWidthLine - lengthOffset);
|
|
25
25
|
}
|
|
26
26
|
if (!exclude.breakoutPoints) {
|
|
@@ -24,7 +24,6 @@ import { getParentNodeWidth, getTableContainerWidth } from '@atlaskit/editor-com
|
|
|
24
24
|
import { isValidPosition } from '@atlaskit/editor-common/utils';
|
|
25
25
|
import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
|
|
26
26
|
import { isTableSelected } from '@atlaskit/editor-tables/utils';
|
|
27
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
28
27
|
import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
|
|
29
28
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
30
29
|
import { autoSizeTable, clearHoverSelection } from '../pm-plugins/commands';
|
|
@@ -713,11 +712,6 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
713
712
|
shouldScale = true;
|
|
714
713
|
shouldHandleColgroupUpdates = true;
|
|
715
714
|
}
|
|
716
|
-
if (!fg('platform_editor_table_width_refactor')) {
|
|
717
|
-
if (this.state.windowResized) {
|
|
718
|
-
shouldHandleColgroupUpdates = true;
|
|
719
|
-
}
|
|
720
|
-
}
|
|
721
715
|
if (shouldHandleColgroupUpdates) {
|
|
722
716
|
this.handleColgroupUpdates();
|
|
723
717
|
}
|
|
@@ -249,7 +249,7 @@ export var ResizableTableContainer = /*#__PURE__*/React.memo(function (_ref4) {
|
|
|
249
249
|
|
|
250
250
|
// Ensure minimum width for usability while respecting container constraints
|
|
251
251
|
var width = Math.max(calculatedWidth, Math.min(responsiveContainerWidth * 0.5, 300));
|
|
252
|
-
var maxResizerWidth = isCommentEditor ? responsiveContainerWidth : Math.min(responsiveContainerWidth, expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH);
|
|
252
|
+
var maxResizerWidth = isCommentEditor ? responsiveContainerWidth : Math.min(responsiveContainerWidth, expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH);
|
|
253
253
|
return {
|
|
254
254
|
width: width,
|
|
255
255
|
maxResizerWidth: maxResizerWidth
|
|
@@ -280,7 +280,7 @@ export var TableResizer = function TableResizer(_ref) {
|
|
|
280
280
|
var pos;
|
|
281
281
|
try {
|
|
282
282
|
pos = getPos();
|
|
283
|
-
} catch (
|
|
283
|
+
} catch (_unused) {
|
|
284
284
|
return;
|
|
285
285
|
}
|
|
286
286
|
if (typeof pos !== 'number') {
|
|
@@ -297,8 +297,8 @@ export var TableResizer = function TableResizer(_ref) {
|
|
|
297
297
|
var fullWidthGuideline = defaultGuidelinesForPreserveTable(PRESERVE_TABLE_GUIDELINES_LENGTH_OFFSET, editorContainerWidth, excludeGuidelineConfig).filter(function (guideline) {
|
|
298
298
|
return guideline.isFullWidth;
|
|
299
299
|
})[0];
|
|
300
|
-
var isFullWidthGuidelineActive = expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? closestSnap && fullWidthGuideline && closestSnap.keys.includes(fullWidthGuideline.key) : closestSnap && closestSnap.keys.includes(fullWidthGuideline.key);
|
|
301
|
-
var tableMaxWidth = isCommentEditor ? Math.floor(containerWidth - TABLE_OFFSET_IN_COMMENT_EDITOR) : expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH;
|
|
300
|
+
var isFullWidthGuidelineActive = expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? closestSnap && fullWidthGuideline && closestSnap.keys.includes(fullWidthGuideline.key) : closestSnap && closestSnap.keys.includes(fullWidthGuideline.key);
|
|
301
|
+
var tableMaxWidth = isCommentEditor ? Math.floor(containerWidth - TABLE_OFFSET_IN_COMMENT_EDITOR) : expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH;
|
|
302
302
|
var shouldUpdateWidthToWidest = isCommentEditor ? tableMaxWidth <= newWidth : !!isTableScalingEnabled && isFullWidthGuidelineActive;
|
|
303
303
|
var previewParentWidth = isCommentEditor && shouldUpdateWidthToWidest ? tableMaxWidth : newWidth;
|
|
304
304
|
previewScaleTable(tableRef, {
|
|
@@ -326,7 +326,7 @@ export var TableResizer = function TableResizer(_ref) {
|
|
|
326
326
|
var pos = getPos();
|
|
327
327
|
var currentTableNodeLocalId = (_node$attrs$localId2 = node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.localId) !== null && _node$attrs$localId2 !== void 0 ? _node$attrs$localId2 : '';
|
|
328
328
|
var tableMaxWidth = isCommentEditor ? undefined // Table's full-width in comment appearance inherit the width of the Editor/Renderer
|
|
329
|
-
: expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH;
|
|
329
|
+
: expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH;
|
|
330
330
|
newWidth = widthToWidest && currentTableNodeLocalId && widthToWidest[currentTableNodeLocalId] ? tableMaxWidth : newWidth;
|
|
331
331
|
var tr = state.tr.setMeta(tableWidthPluginKey, {
|
|
332
332
|
resizing: false,
|
|
@@ -81,7 +81,7 @@ export var tableNodeSpecWithFixedToDOM = function tableNodeSpecWithFixedToDOM(co
|
|
|
81
81
|
position: 'relative',
|
|
82
82
|
userSelect: 'auto',
|
|
83
83
|
boxSizing: 'border-box',
|
|
84
|
-
'--ak-editor-table-max-width': "".concat(expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH, "px"),
|
|
84
|
+
'--ak-editor-table-max-width': "".concat(expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH, "px"),
|
|
85
85
|
'--ak-editor-table-min-width': "".concat(tableMinWidth, "px"),
|
|
86
86
|
minWidth: 'var(--ak-editor-table-min-width)',
|
|
87
87
|
maxWidth: getTableResizerContainerMaxWidthInCSS(config.isCommentEditor, config.isChromelessEditor, config.isTableScalingEnabled),
|
|
@@ -4,7 +4,6 @@ import { calcTableColumnWidths, getFragmentBackingArray } from '@atlaskit/editor
|
|
|
4
4
|
import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
|
|
5
5
|
import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
|
|
6
6
|
import { TableMap } from '@atlaskit/editor-tables/table-map';
|
|
7
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
7
|
import { COLUMN_MIN_WIDTH, MAX_SCALING_PERCENT, MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION } from './consts';
|
|
9
8
|
import { getScalingPercentForTableWithoutWidth, getTableContainerElementWidth, getTableScalingPercent } from './misc';
|
|
10
9
|
/**
|
|
@@ -70,7 +69,7 @@ export var generateColgroupFromNode = function generateColgroupFromNode(table, i
|
|
|
70
69
|
}
|
|
71
70
|
});
|
|
72
71
|
} else {
|
|
73
|
-
if (!isTableScalingEnabled
|
|
72
|
+
if (!isTableScalingEnabled) {
|
|
74
73
|
cols.push.apply(cols, _toConsumableArray(Array.from({
|
|
75
74
|
length: colspan
|
|
76
75
|
}, function (_) {
|
|
@@ -98,7 +98,7 @@ export var getTableContainerElementWidth = function getTableContainerElementWidt
|
|
|
98
98
|
* @returns The CSS max-width value
|
|
99
99
|
*/
|
|
100
100
|
export var getTableResizerContainerMaxWidthInCSS = function getTableResizerContainerMaxWidthInCSS(isCommentEditor, isChromelessEditor, isTableScalingEnabled) {
|
|
101
|
-
var maxResizerWidthForNonCommentEditor = isTableScalingEnabled ? "min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2)), ".concat(expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH, "px)") : "min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2) - var(--ak-editor--resizer-handle-spacing)), ".concat(expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH, "px)");
|
|
101
|
+
var maxResizerWidthForNonCommentEditor = isTableScalingEnabled ? "min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2)), ".concat(expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH, "px)") : "min(calc(100cqw - calc(var(--ak-editor--large-gutter-padding) * 2) - var(--ak-editor--resizer-handle-spacing)), ".concat(expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH, "px)");
|
|
102
102
|
return isCommentEditor || isChromelessEditor ? '100%' : maxResizerWidthForNonCommentEditor;
|
|
103
103
|
};
|
|
104
104
|
|
|
@@ -104,8 +104,8 @@ var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent, fullW
|
|
|
104
104
|
step.getMap().forEach(function (_, __, newStart, newEnd) {
|
|
105
105
|
newState.doc.nodesBetween(newStart, newEnd, function (node, pos) {
|
|
106
106
|
if (node.type === table) {
|
|
107
|
-
if (shouldPatchTableWidth && node.attrs.width !== expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH) {
|
|
108
|
-
tr.setNodeAttribute(pos, 'width', expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH);
|
|
107
|
+
if (shouldPatchTableWidth && node.attrs.width !== (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH)) {
|
|
108
|
+
tr.setNodeAttribute(pos, 'width', expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true) ? TABLE_MAX_WIDTH : TABLE_FULL_WIDTH);
|
|
109
109
|
}
|
|
110
110
|
if (shouldPatchTableAlignment) {
|
|
111
111
|
tr.setNodeAttribute(pos, 'layout', ALIGN_START);
|
|
@@ -23,13 +23,13 @@ export var createTableWithWidth = function createTableWithWidth(_ref) {
|
|
|
23
23
|
attrsOverrides.colsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.colsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.colsCount : NESTED_TABLE_DEFAULT_COLS;
|
|
24
24
|
}
|
|
25
25
|
if (isTableScalingEnabled && !isCommentEditor) {
|
|
26
|
-
if (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) && isMaxWidthModeEnabled) {
|
|
26
|
+
if ((expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && isMaxWidthModeEnabled) {
|
|
27
27
|
attrsOverrides.tableWidth = TABLE_MAX_WIDTH;
|
|
28
28
|
} else if (isFullWidthModeEnabled) {
|
|
29
29
|
attrsOverrides.tableWidth = TABLE_FULL_WIDTH;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
if (isTableAlignmentEnabled && (isFullWidthModeEnabled || expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) && isMaxWidthModeEnabled || isCommentEditor)) {
|
|
32
|
+
if (isTableAlignmentEnabled && (isFullWidthModeEnabled || (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) && isMaxWidthModeEnabled || isCommentEditor)) {
|
|
33
33
|
attrsOverrides.layout = 'align-start';
|
|
34
34
|
}
|
|
35
35
|
if (isCommentEditor && isTableResizingEnabled || isChromelessEditor) {
|
|
@@ -31,7 +31,7 @@ export var calculateDefaultTablePreserveSnappings = function calculateDefaultTab
|
|
|
31
31
|
var dynamicFullWidthLine = editorContainerWidth - padding * 2 >= akEditorFullWidthLayoutWidth ? akEditorFullWidthLayoutWidth : editorContainerWidth - padding * 2;
|
|
32
32
|
var dynamicMaxWidthLine = editorContainerWidth - padding * 2 >= akEditorMaxWidthLayoutWidth ? akEditorMaxWidthLayoutWidth : editorContainerWidth - padding * 2;
|
|
33
33
|
var guides = [dynamicFullWidthLine - lengthOffset];
|
|
34
|
-
if (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true)) {
|
|
34
|
+
if (expValEquals('editor_tinymce_full_width_mode', 'isEnabled', true) || expValEquals('confluence_max_width_content_appearance', 'isEnabled', true)) {
|
|
35
35
|
guides.push(dynamicMaxWidthLine - lengthOffset);
|
|
36
36
|
}
|
|
37
37
|
if (!exclude.breakoutPoints) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-table",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.5.1",
|
|
4
4
|
"description": "Table plugin for the @atlaskit/editor",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"@atlaskit/editor-plugin-batch-attribute-updates": "^6.1.0",
|
|
38
38
|
"@atlaskit/editor-plugin-content-insertion": "^6.0.0",
|
|
39
39
|
"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
|
|
40
|
-
"@atlaskit/editor-plugin-extension": "9.2.
|
|
40
|
+
"@atlaskit/editor-plugin-extension": "9.2.12",
|
|
41
41
|
"@atlaskit/editor-plugin-guideline": "^6.0.0",
|
|
42
42
|
"@atlaskit/editor-plugin-interaction": "^10.0.0",
|
|
43
43
|
"@atlaskit/editor-plugin-limited-mode": "^3.1.0",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
|
|
58
58
|
"@atlaskit/primitives": "^16.4.0",
|
|
59
59
|
"@atlaskit/theme": "^21.0.0",
|
|
60
|
-
"@atlaskit/tmp-editor-statsig": "^15.
|
|
60
|
+
"@atlaskit/tmp-editor-statsig": "^15.9.0",
|
|
61
61
|
"@atlaskit/toggle": "^15.2.0",
|
|
62
62
|
"@atlaskit/tokens": "^8.4.0",
|
|
63
63
|
"@atlaskit/tooltip": "^20.11.0",
|
|
@@ -137,9 +137,6 @@
|
|
|
137
137
|
"platform_editor_content_mode_button_mvp": {
|
|
138
138
|
"type": "boolean"
|
|
139
139
|
},
|
|
140
|
-
"platform_editor_table_width_refactor": {
|
|
141
|
-
"type": "boolean"
|
|
142
|
-
},
|
|
143
140
|
"platform_editor_table_height_analytics": {
|
|
144
141
|
"type": "boolean"
|
|
145
142
|
},
|