@atlaskit/editor-plugin-table 7.25.3 → 7.25.4
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 +11 -0
- package/dist/cjs/commands/column-resize.js +4 -1
- package/dist/cjs/commands-with-analytics.js +2 -1
- package/dist/cjs/event-handlers.js +3 -2
- package/dist/cjs/nodeviews/TableComponent.js +14 -10
- package/dist/cjs/nodeviews/TableResizer.js +1 -1
- package/dist/cjs/nodeviews/lazy-node-views.js +1 -5
- package/dist/cjs/nodeviews/table.js +18 -8
- package/dist/cjs/plugin.js +6 -4
- package/dist/cjs/pm-plugins/drag-and-drop/plugin.js +10 -5
- package/dist/cjs/pm-plugins/keymap.js +2 -2
- package/dist/cjs/pm-plugins/table-resizing/event-handlers.js +6 -4
- package/dist/cjs/pm-plugins/table-resizing/plugin.js +2 -2
- package/dist/cjs/pm-plugins/table-resizing/utils/resize-state.js +2 -1
- package/dist/cjs/pm-plugins/table-resizing/utils/scale-table.js +4 -1
- package/dist/cjs/toolbar.js +10 -6
- package/dist/cjs/ui/DragHandle/index.js +2 -1
- package/dist/cjs/ui/FloatingContextualMenu/ContextualMenu.js +5 -2
- package/dist/cjs/ui/FloatingContextualMenu/index.js +4 -2
- package/dist/es2019/commands/column-resize.js +4 -1
- package/dist/es2019/commands-with-analytics.js +2 -1
- package/dist/es2019/event-handlers.js +2 -2
- package/dist/es2019/nodeviews/TableComponent.js +13 -10
- package/dist/es2019/nodeviews/TableResizer.js +1 -1
- package/dist/es2019/nodeviews/lazy-node-views.js +1 -5
- package/dist/es2019/nodeviews/table.js +21 -8
- package/dist/es2019/plugin.js +6 -4
- package/dist/es2019/pm-plugins/drag-and-drop/plugin.js +8 -6
- package/dist/es2019/pm-plugins/keymap.js +2 -2
- package/dist/es2019/pm-plugins/table-resizing/event-handlers.js +6 -4
- package/dist/es2019/pm-plugins/table-resizing/plugin.js +2 -2
- package/dist/es2019/pm-plugins/table-resizing/utils/resize-state.js +3 -3
- package/dist/es2019/pm-plugins/table-resizing/utils/scale-table.js +5 -3
- package/dist/es2019/toolbar.js +10 -10
- package/dist/es2019/ui/DragHandle/index.js +1 -1
- package/dist/es2019/ui/FloatingContextualMenu/ContextualMenu.js +5 -2
- package/dist/es2019/ui/FloatingContextualMenu/index.js +4 -2
- package/dist/esm/commands/column-resize.js +4 -1
- package/dist/esm/commands-with-analytics.js +2 -1
- package/dist/esm/event-handlers.js +3 -2
- package/dist/esm/nodeviews/TableComponent.js +14 -10
- package/dist/esm/nodeviews/TableResizer.js +1 -1
- package/dist/esm/nodeviews/lazy-node-views.js +1 -5
- package/dist/esm/nodeviews/table.js +18 -8
- package/dist/esm/plugin.js +6 -4
- package/dist/esm/pm-plugins/drag-and-drop/plugin.js +10 -5
- package/dist/esm/pm-plugins/keymap.js +2 -2
- package/dist/esm/pm-plugins/table-resizing/event-handlers.js +6 -4
- package/dist/esm/pm-plugins/table-resizing/plugin.js +2 -2
- package/dist/esm/pm-plugins/table-resizing/utils/resize-state.js +3 -2
- package/dist/esm/pm-plugins/table-resizing/utils/scale-table.js +5 -2
- package/dist/esm/toolbar.js +10 -6
- package/dist/esm/ui/DragHandle/index.js +2 -1
- package/dist/esm/ui/FloatingContextualMenu/ContextualMenu.js +5 -2
- package/dist/esm/ui/FloatingContextualMenu/index.js +4 -2
- package/dist/types/commands/column-resize.d.ts +2 -1
- package/dist/types/commands-with-analytics.d.ts +1 -1
- package/dist/types/pm-plugins/drag-and-drop/plugin.d.ts +1 -1
- package/dist/types/pm-plugins/table-resizing/event-handlers.d.ts +1 -1
- package/dist/types/pm-plugins/table-resizing/plugin.d.ts +1 -1
- package/dist/types/pm-plugins/table-resizing/utils/resize-state.d.ts +1 -1
- package/dist/types/pm-plugins/table-resizing/utils/scale-table.d.ts +1 -1
- package/dist/types/toolbar.d.ts +2 -2
- package/dist/types/ui/FloatingContextualMenu/ContextualMenu.d.ts +1 -0
- package/dist/types/ui/FloatingContextualMenu/index.d.ts +2 -1
- package/dist/types-ts4.5/commands/column-resize.d.ts +2 -1
- package/dist/types-ts4.5/commands-with-analytics.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/drag-and-drop/plugin.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/table-resizing/event-handlers.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/table-resizing/plugin.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/resize-state.d.ts +1 -1
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/scale-table.d.ts +1 -1
- package/dist/types-ts4.5/toolbar.d.ts +2 -2
- package/dist/types-ts4.5/ui/FloatingContextualMenu/ContextualMenu.d.ts +1 -0
- package/dist/types-ts4.5/ui/FloatingContextualMenu/index.d.ts +2 -1
- package/package.json +3 -3
- package/src/commands/column-resize.ts +7 -2
- package/src/commands-with-analytics.ts +2 -0
- package/src/event-handlers.ts +2 -1
- package/src/nodeviews/TableComponent.tsx +11 -8
- package/src/nodeviews/TableResizer.tsx +1 -0
- package/src/nodeviews/lazy-node-views.ts +0 -4
- package/src/nodeviews/table.tsx +30 -8
- package/src/plugin.tsx +8 -2
- package/src/pm-plugins/drag-and-drop/plugin.ts +9 -4
- package/src/pm-plugins/keymap.ts +2 -0
- package/src/pm-plugins/table-resizing/event-handlers.ts +11 -6
- package/src/pm-plugins/table-resizing/plugin.ts +2 -0
- package/src/pm-plugins/table-resizing/utils/resize-state.ts +5 -3
- package/src/pm-plugins/table-resizing/utils/scale-table.ts +6 -3
- package/src/toolbar.tsx +10 -1
- package/src/ui/DragHandle/index.tsx +1 -1
- package/src/ui/FloatingContextualMenu/ContextualMenu.tsx +6 -2
- package/src/ui/FloatingContextualMenu/index.tsx +3 -0
- package/dist/cjs/nodeviews/ignore-mutation-delegate.js +0 -23
- package/dist/es2019/nodeviews/ignore-mutation-delegate.js +0 -20
- package/dist/esm/nodeviews/ignore-mutation-delegate.js +0 -17
- package/dist/types/nodeviews/ignore-mutation-delegate.d.ts +0 -5
- package/dist/types-ts4.5/nodeviews/ignore-mutation-delegate.d.ts +0 -5
- package/src/nodeviews/ignore-mutation-delegate.ts +0 -28
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-table
|
|
2
2
|
|
|
3
|
+
## 7.25.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#129411](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129411)
|
|
8
|
+
[`080325d254926`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/080325d254926) -
|
|
9
|
+
Added PTW 40% scale to comment editor and renderer in confluence
|
|
10
|
+
- [`79a3024b0907a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/79a3024b0907a) -
|
|
11
|
+
ED-24535 Reverted ignoreMutation changes for table as we will use a blanket approach
|
|
12
|
+
- Updated dependencies
|
|
13
|
+
|
|
3
14
|
## 7.25.3
|
|
4
15
|
|
|
5
16
|
### Patch Changes
|
|
@@ -155,6 +155,7 @@ var changeColumnWidthByStep = exports.changeColumnWidthByStep = function changeC
|
|
|
155
155
|
getEditorContainerWidth = _ref4.getEditorContainerWidth,
|
|
156
156
|
isTableScalingEnabled = _ref4.isTableScalingEnabled,
|
|
157
157
|
isTableFixedColumnWidthsOptionEnabled = _ref4.isTableFixedColumnWidthsOptionEnabled,
|
|
158
|
+
isCommentEditor = _ref4.isCommentEditor,
|
|
158
159
|
ariaNotify = _ref4.ariaNotify,
|
|
159
160
|
getIntl = _ref4.getIntl;
|
|
160
161
|
return function (state, dispatch, view) {
|
|
@@ -203,7 +204,9 @@ var changeColumnWidthByStep = exports.changeColumnWidthByStep = function changeC
|
|
|
203
204
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
|
|
204
205
|
isTableScalingEnabledOnCurrentTable = originalTable.attrs.displayMode !== 'fixed';
|
|
205
206
|
}
|
|
206
|
-
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent')
|
|
207
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ||
|
|
208
|
+
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
209
|
+
isTableScalingEnabled && isCommentEditor;
|
|
207
210
|
var initialResizeState = (0, _utils3.getResizeState)({
|
|
208
211
|
minWidth: _styles.tableCellMinWidth,
|
|
209
212
|
maxSize: maxSize,
|
|
@@ -195,7 +195,7 @@ var insertRowWithAnalytics = exports.insertRowWithAnalytics = function insertRow
|
|
|
195
195
|
};
|
|
196
196
|
};
|
|
197
197
|
var changeColumnWidthByStepWithAnalytics = exports.changeColumnWidthByStepWithAnalytics = function changeColumnWidthByStepWithAnalytics(editorAnalyticsAPI) {
|
|
198
|
-
return function (stepSize, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, inputMethod, ariaNotify, getIntl) {
|
|
198
|
+
return function (stepSize, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor, inputMethod, ariaNotify, getIntl) {
|
|
199
199
|
return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
|
|
200
200
|
var _getSelectedTableInfo2 = (0, _utils2.getSelectedTableInfo)(state.selection),
|
|
201
201
|
table = _getSelectedTableInfo2.table,
|
|
@@ -222,6 +222,7 @@ var changeColumnWidthByStepWithAnalytics = exports.changeColumnWidthByStepWithAn
|
|
|
222
222
|
getEditorContainerWidth: getEditorContainerWidth,
|
|
223
223
|
isTableScalingEnabled: isTableScalingEnabled,
|
|
224
224
|
isTableFixedColumnWidthsOptionEnabled: isTableFixedColumnWidthsOptionEnabled,
|
|
225
|
+
isCommentEditor: isCommentEditor,
|
|
225
226
|
ariaNotify: ariaNotify,
|
|
226
227
|
getIntl: getIntl
|
|
227
228
|
}));
|
|
@@ -229,7 +229,8 @@ var handleMouseLeave = exports.handleMouseLeave = function handleMouseLeave(view
|
|
|
229
229
|
if (isTableHovered) {
|
|
230
230
|
if (isDragAndDropEnabled) {
|
|
231
231
|
var _getDragDropPluginSta = (0, _pluginFactory.getPluginState)(state),
|
|
232
|
-
|
|
232
|
+
_getDragDropPluginSta2 = _getDragDropPluginSta.isDragMenuOpen,
|
|
233
|
+
isDragMenuOpen = _getDragDropPluginSta2 === void 0 ? false : _getDragDropPluginSta2;
|
|
233
234
|
!isDragMenuOpen && (0, _commands.setTableHovered)(false)(state, dispatch);
|
|
234
235
|
} else {
|
|
235
236
|
(0, _commands.setTableHovered)(false)(state, dispatch);
|
|
@@ -439,7 +440,7 @@ var trackCellLocation = function trackCellLocation(view, mouseEvent) {
|
|
|
439
440
|
};
|
|
440
441
|
var withCellTracking = exports.withCellTracking = function withCellTracking(eventHandler) {
|
|
441
442
|
return function (view, mouseEvent) {
|
|
442
|
-
if ((0, _pluginFactory2.getPluginState)(view.state).isDragAndDropEnabled && !(0, _pluginFactory.getPluginState)(view.state).isDragging) {
|
|
443
|
+
if ((0, _pluginFactory2.getPluginState)(view.state).isDragAndDropEnabled && (0, _pluginFactory.getPluginState)(view.state) && !(0, _pluginFactory.getPluginState)(view.state).isDragging) {
|
|
443
444
|
trackCellLocation(view, mouseEvent);
|
|
444
445
|
}
|
|
445
446
|
return eventHandler(view, mouseEvent);
|
|
@@ -539,7 +539,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
539
539
|
var isNumberOfColumnsChanged = (0, _utils5.tablesHaveDifferentNoOfColumns)(tableNode, this.node);
|
|
540
540
|
var maybeScale = isTableSquashed || isTableWidthChanged || isTableResizedFullWidth || isNumberColumnChanged || isNumberOfColumnsChanged;
|
|
541
541
|
if (force || maybeScale) {
|
|
542
|
-
var _this$containerWidth, _this$props$options;
|
|
542
|
+
var _this$containerWidth, _this$props$options, _this$props$options2, _this$props$options3;
|
|
543
543
|
var containerWidthValue = containerWidth.width;
|
|
544
544
|
var isWidthChanged = ((_this$containerWidth = this.containerWidth) === null || _this$containerWidth === void 0 ? void 0 : _this$containerWidth.width) !== containerWidthValue;
|
|
545
545
|
var wasTableResized = (0, _colgroup.hasTableBeenResized)(this.node);
|
|
@@ -550,10 +550,12 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
550
550
|
var _getEditorFeatureFlag4 = getEditorFeatureFlags(),
|
|
551
551
|
_getEditorFeatureFlag5 = _getEditorFeatureFlag4.tableWithFixedColumnWidthsOption,
|
|
552
552
|
tableWithFixedColumnWidthsOption = _getEditorFeatureFlag5 === void 0 ? false : _getEditorFeatureFlag5;
|
|
553
|
-
var isTableScalingWithFixedColumnWidthsOptionEnabled = ((_this$props$options = this.props.options)
|
|
554
|
-
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ||
|
|
553
|
+
var isTableScalingWithFixedColumnWidthsOptionEnabled = !!((_this$props$options = this.props.options) !== null && _this$props$options !== void 0 && _this$props$options.isTableScalingEnabled) && tableWithFixedColumnWidthsOption;
|
|
554
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ||
|
|
555
|
+
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
556
|
+
!!((_this$props$options2 = this.props.options) !== null && _this$props$options2 !== void 0 && _this$props$options2.isTableScalingEnabled) && !!((_this$props$options3 = this.props.options) !== null && _this$props$options3 !== void 0 && _this$props$options3.isCommentEditor);
|
|
555
557
|
if (force || !isResizing && shouldUpdateColgroup) {
|
|
556
|
-
var _this$props$
|
|
558
|
+
var _this$props$options4;
|
|
557
559
|
var resizeState = (0, _utils4.getResizeState)({
|
|
558
560
|
minWidth: _utils4.COLUMN_MIN_WIDTH,
|
|
559
561
|
maxSize: tableRenderWidth,
|
|
@@ -565,7 +567,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
565
567
|
shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent
|
|
566
568
|
});
|
|
567
569
|
var shouldScaleOnColgroupUpdate = false;
|
|
568
|
-
if ((_this$props$
|
|
570
|
+
if ((_this$props$options4 = this.props.options) !== null && _this$props$options4 !== void 0 && _this$props$options4.isTableScalingEnabled && !tableWithFixedColumnWidthsOption) {
|
|
569
571
|
shouldScaleOnColgroupUpdate = true;
|
|
570
572
|
}
|
|
571
573
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled && tableNode.attrs.displayMode !== 'fixed') {
|
|
@@ -585,7 +587,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
585
587
|
}, {
|
|
586
588
|
key: "componentDidUpdate",
|
|
587
589
|
value: function componentDidUpdate(_, prevState) {
|
|
588
|
-
var _this$props$
|
|
590
|
+
var _this$props$options5,
|
|
591
|
+
_this$props$options6,
|
|
589
592
|
_this$wrapper,
|
|
590
593
|
_this3 = this;
|
|
591
594
|
var _this$props11 = this.props,
|
|
@@ -613,8 +616,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
613
616
|
shouldScale = true;
|
|
614
617
|
shouldHandleColgroupUpdates = true;
|
|
615
618
|
}
|
|
616
|
-
var isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && tableWithFixedColumnWidthsOption;
|
|
617
|
-
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent');
|
|
619
|
+
var isTableScalingWithFixedColumnWidthsOptionEnabled = !!isTableScalingEnabled && tableWithFixedColumnWidthsOption;
|
|
620
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || !!isTableScalingEnabled && !!((_this$props$options5 = this.props.options) !== null && _this$props$options5 !== void 0 && _this$props$options5.isCommentEditor);
|
|
618
621
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled && getNode().attrs.displayMode !== 'fixed') {
|
|
619
622
|
shouldScale = true;
|
|
620
623
|
shouldHandleColgroupUpdates = true;
|
|
@@ -625,7 +628,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
625
628
|
if (isInDanger && !table) {
|
|
626
629
|
(0, _commands.clearHoverSelection)()(view.state, view.dispatch);
|
|
627
630
|
}
|
|
628
|
-
if ((_this$props$
|
|
631
|
+
if ((_this$props$options6 = this.props.options) !== null && _this$props$options6 !== void 0 && _this$props$options6.isCommentEditor && options !== null && options !== void 0 && options.isTableResizingEnabled) {
|
|
629
632
|
this.removeInlineTableWidth();
|
|
630
633
|
}
|
|
631
634
|
if ((_this$wrapper = this.wrapper) !== null && _this$wrapper !== void 0 && _this$wrapper.parentElement && this.table && !this.overflowShadowsObserver) {
|
|
@@ -712,6 +715,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
712
715
|
key: "render",
|
|
713
716
|
value: function render() {
|
|
714
717
|
var _this4 = this,
|
|
718
|
+
_this$props$options7,
|
|
715
719
|
_classnames;
|
|
716
720
|
var _this$props12 = this.props,
|
|
717
721
|
view = _this$props12.view,
|
|
@@ -830,7 +834,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
830
834
|
stickyScrollbar = _getEditorFeatureFlag8.stickyScrollbar,
|
|
831
835
|
_getEditorFeatureFlag9 = _getEditorFeatureFlag8.tableWithFixedColumnWidthsOption,
|
|
832
836
|
tableWithFixedColumnWidthsOption = _getEditorFeatureFlag9 === void 0 ? false : _getEditorFeatureFlag9;
|
|
833
|
-
var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent');
|
|
837
|
+
var shouldUseIncreasedScalingPercent = !!isTableScalingEnabled && (tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || !!((_this$props$options7 = this.props.options) !== null && _this$props$options7 !== void 0 && _this$props$options7.isCommentEditor));
|
|
834
838
|
return /*#__PURE__*/_react.default.createElement(_TableContainer.TableContainer
|
|
835
839
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
836
840
|
, {
|
|
@@ -265,7 +265,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
|
|
|
265
265
|
prevNode: node,
|
|
266
266
|
start: pos + 1,
|
|
267
267
|
parentWidth: newWidth
|
|
268
|
-
}, editorView.domAtPos.bind(editorView), isTableScalingEnabled, isTableWithFixedColumnWidthsOptionEnabled);
|
|
268
|
+
}, editorView.domAtPos.bind(editorView), isTableScalingEnabled, isTableWithFixedColumnWidthsOptionEnabled, isCommentEditor);
|
|
269
269
|
var editorContainerWidth = isFullWidthModeEnabled ? lineLength + 2 * (0, _editorSharedStyles.akEditorGutterPaddingDynamic)() : containerWidth;
|
|
270
270
|
var closestSnap = (0, _snapping.findClosestSnap)(newWidth, isTableScalingEnabled ? (0, _snapping.defaultTablePreserveSnappingWidths)(_snapping.PRESERVE_TABLE_SNAPPING_LENGTH_OFFSET, editorContainerWidth, excludeGuidelineConfig) : _snapping.defaultSnappingWidths, isTableScalingEnabled ? (0, _guidelines.defaultGuidelinesForPreserveTable)(_guidelines.PRESERVE_TABLE_GUIDELINES_LENGTH_OFFSET, editorContainerWidth, excludeGuidelineConfig) : _guidelines.defaultGuidelines, _consts.TABLE_HIGHLIGHT_GAP, _consts.TABLE_HIGHLIGHT_TOLERANCE);
|
|
271
271
|
updateActiveGuidelines(closestSnap);
|
|
@@ -8,7 +8,6 @@ exports.lazyTableView = exports.lazyTableRowView = exports.lazyTableHeaderView =
|
|
|
8
8
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
9
9
|
var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
|
|
10
10
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
11
|
-
var _ignoreMutationDelegate = _interopRequireDefault(require("./ignore-mutation-delegate"));
|
|
12
11
|
var _table = require("./table");
|
|
13
12
|
var _TableCell = _interopRequireDefault(require("./TableCell"));
|
|
14
13
|
var _TableRow = _interopRequireDefault(require("./TableRow"));
|
|
@@ -47,10 +46,7 @@ var lazyTableView = exports.lazyTableView = function lazyTableView(options) {
|
|
|
47
46
|
getNodeViewOptions: function getNodeViewOptions() {
|
|
48
47
|
return options;
|
|
49
48
|
},
|
|
50
|
-
loader: loader
|
|
51
|
-
lazyNodeViewOptions: {
|
|
52
|
-
ignoreMutationDelegate: _ignoreMutationDelegate.default
|
|
53
|
-
}
|
|
49
|
+
loader: loader
|
|
54
50
|
});
|
|
55
51
|
};
|
|
56
52
|
var lazyTableCellView = exports.lazyTableCellView = function lazyTableCellView(options) {
|
|
@@ -31,7 +31,6 @@ var _tableResizing = require("../pm-plugins/table-resizing");
|
|
|
31
31
|
var _utils = require("../pm-plugins/table-resizing/utils");
|
|
32
32
|
var _tableWidth = require("../pm-plugins/table-width");
|
|
33
33
|
var _utils2 = require("../utils");
|
|
34
|
-
var _ignoreMutationDelegate = _interopRequireDefault(require("./ignore-mutation-delegate"));
|
|
35
34
|
var _TableComponent = _interopRequireDefault(require("./TableComponent"));
|
|
36
35
|
var _TableComponentWithSharedState = require("./TableComponentWithSharedState");
|
|
37
36
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
@@ -262,16 +261,27 @@ var TableView = exports.default = /*#__PURE__*/function (_ReactNodeView) {
|
|
|
262
261
|
}, {
|
|
263
262
|
key: "ignoreMutation",
|
|
264
263
|
value: function ignoreMutation(mutation) {
|
|
265
|
-
var
|
|
264
|
+
var type = mutation.type,
|
|
265
|
+
_mutation$target = mutation.target,
|
|
266
|
+
nodeName = _mutation$target.nodeName,
|
|
267
|
+
firstChild = _mutation$target.firstChild;
|
|
268
|
+
if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'DIV' && (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'TABLE') {
|
|
269
|
+
return false;
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
// ED-16668
|
|
273
|
+
// Do not remove this fixes an issue with windows firefox that relates to
|
|
274
|
+
// the addition of the shadow sentinels
|
|
275
|
+
if (type === 'selection' && (nodeName === null || nodeName === void 0 ? void 0 : nodeName.toUpperCase()) === 'TABLE' && ((firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'COLGROUP' || (firstChild === null || firstChild === void 0 ? void 0 : firstChild.nodeName.toUpperCase()) === 'SPAN')) {
|
|
276
|
+
return false;
|
|
277
|
+
}
|
|
266
278
|
if ((0, _platformFeatureFlags.fg)('platform_editor_react_18_table_insertion_cursor')) {
|
|
267
|
-
if (
|
|
268
|
-
|
|
269
|
-
return true;
|
|
270
|
-
}
|
|
271
|
-
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
279
|
+
if (!this.contentDOM) {
|
|
280
|
+
return true;
|
|
272
281
|
}
|
|
282
|
+
return !this.contentDOM.contains(mutation.target) && mutation.type !== 'selection';
|
|
273
283
|
}
|
|
274
|
-
return
|
|
284
|
+
return true;
|
|
275
285
|
}
|
|
276
286
|
}, {
|
|
277
287
|
key: "destroy",
|
package/dist/cjs/plugin.js
CHANGED
|
@@ -75,7 +75,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
|
|
|
75
75
|
var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
|
|
76
76
|
var ariaNotifyPlugin = api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 ? void 0 : _api$accessibilityUti.actions.ariaNotify;
|
|
77
77
|
var isTableFixedColumnWidthsOptionEnabled = (options === null || options === void 0 || (_options$getEditorFea = options.getEditorFeatureFlags) === null || _options$getEditorFea === void 0 ? void 0 : _options$getEditorFea.call(options).tableWithFixedColumnWidthsOption) || false;
|
|
78
|
-
var shouldUseIncreasedScalingPercent = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) && isTableFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent')
|
|
78
|
+
var shouldUseIncreasedScalingPercent = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) && (isTableFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || ( // When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
79
|
+
options === null || options === void 0 ? void 0 : options.isCommentEditor));
|
|
79
80
|
var isCellBackgroundDuplicated = (options === null || options === void 0 || (_options$getEditorFea2 = options.getEditorFeatureFlags) === null || _options$getEditorFea2 === void 0 ? void 0 : _options$getEditorFea2.call(options).tableDuplicateCellColouring) || false;
|
|
80
81
|
return {
|
|
81
82
|
name: 'table',
|
|
@@ -194,7 +195,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
|
|
|
194
195
|
allowColumnResizing = _pluginConfig2.allowColumnResizing;
|
|
195
196
|
return allowColumnResizing ? (0, _tableResizing.createPlugin)(dispatch, {
|
|
196
197
|
lastColumnResizable: !fullWidthEnabled
|
|
197
|
-
}, defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, editorAnalyticsAPI, isTableScalingEnabled || false, isNewColumnResizingEnabled, isTableAlignmentEnabled) : undefined;
|
|
198
|
+
}, defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, editorAnalyticsAPI, isTableScalingEnabled || false, isNewColumnResizingEnabled, isTableAlignmentEnabled, !!(options !== null && options !== void 0 && options.isCommentEditor)) : undefined;
|
|
198
199
|
}
|
|
199
200
|
}, {
|
|
200
201
|
name: 'tableEditing',
|
|
@@ -263,7 +264,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
|
|
|
263
264
|
name: 'tableDragAndDrop',
|
|
264
265
|
plugin: function plugin(_ref12) {
|
|
265
266
|
var dispatch = _ref12.dispatch;
|
|
266
|
-
return options !== null && options !== void 0 && options.dragAndDropEnabled ? (0, _dragAndDrop.createPlugin)(dispatch, editorAnalyticsAPI, options === null || options === void 0 ? void 0 : options.isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled) : undefined;
|
|
267
|
+
return options !== null && options !== void 0 && options.dragAndDropEnabled ? (0, _dragAndDrop.createPlugin)(dispatch, editorAnalyticsAPI, options === null || options === void 0 ? void 0 : options.isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, options.isCommentEditor) : undefined;
|
|
267
268
|
}
|
|
268
269
|
}, {
|
|
269
270
|
name: 'tableViewModeSort',
|
|
@@ -417,7 +418,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
|
|
|
417
418
|
editorAnalyticsAPI: editorAnalyticsAPI,
|
|
418
419
|
getEditorContainerWidth: defaultGetEditorContainerWidth,
|
|
419
420
|
getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags,
|
|
420
|
-
isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard
|
|
421
|
+
isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard,
|
|
422
|
+
isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor
|
|
421
423
|
}), isDragAndDropEnabled && /*#__PURE__*/_react.default.createElement(_FloatingDragMenu.default, {
|
|
422
424
|
editorView: editorView,
|
|
423
425
|
mountPoint: popupsMountPoint,
|
|
@@ -24,7 +24,7 @@ var _consts = require("./consts");
|
|
|
24
24
|
var _pluginFactory2 = require("./plugin-factory");
|
|
25
25
|
var _pluginKey2 = require("./plugin-key");
|
|
26
26
|
var _monitor = require("./utils/monitor");
|
|
27
|
-
var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled) {
|
|
27
|
+
var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor) {
|
|
28
28
|
var editorPageScrollContainer = document.querySelector('.fabric-editor-popup-scroll-parent');
|
|
29
29
|
var rowAutoScrollers = editorPageScrollContainer ? [(0, _adapter.monitorForElements)({
|
|
30
30
|
canMonitor: function canMonitor(_ref) {
|
|
@@ -165,7 +165,9 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, isTableScalin
|
|
|
165
165
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
|
|
166
166
|
isTableScalingEnabledOnCurrentTable = tableNode.attrs.displayMode !== 'fixed';
|
|
167
167
|
}
|
|
168
|
-
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent')
|
|
168
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ||
|
|
169
|
+
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
170
|
+
isTableScalingEnabled && isCommentEditor;
|
|
169
171
|
(0, _utils3.insertColgroupFromNode)(tableRef, tableNode, isTableScalingEnabledOnCurrentTable, undefined, shouldUseIncreasedScalingPercent);
|
|
170
172
|
}
|
|
171
173
|
}
|
|
@@ -177,6 +179,7 @@ var destroyFn = function destroyFn(editorView, editorAnalyticsAPI, isTableScalin
|
|
|
177
179
|
var createPlugin = exports.createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
|
|
178
180
|
var isTableScalingEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
179
181
|
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
182
|
+
var isCommentEditor = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
180
183
|
return new _safePlugin.SafePlugin({
|
|
181
184
|
state: (0, _pluginFactory2.createPluginState)(dispatch, function (state) {
|
|
182
185
|
return {
|
|
@@ -196,7 +199,8 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
|
|
|
196
199
|
var _getTablePluginState5 = (0, _pluginFactory.getPluginState)(newState),
|
|
197
200
|
newTargetCellPosition = _getTablePluginState5.targetCellPosition;
|
|
198
201
|
var _getPluginState = (0, _pluginFactory2.getPluginState)(newState),
|
|
199
|
-
|
|
202
|
+
_getPluginState$isDra = _getPluginState.isDragMenuOpen,
|
|
203
|
+
isDragMenuOpen = _getPluginState$isDra === void 0 ? false : _getPluginState$isDra,
|
|
200
204
|
dragMenuIndex = _getPluginState.dragMenuIndex;
|
|
201
205
|
transactions.forEach(function (transaction) {
|
|
202
206
|
if (transaction.getMeta('selectedRowViaKeyboard')) {
|
|
@@ -244,7 +248,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
|
|
|
244
248
|
},
|
|
245
249
|
view: function view(editorView) {
|
|
246
250
|
return {
|
|
247
|
-
destroy: destroyFn(editorView, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled)
|
|
251
|
+
destroy: destroyFn(editorView, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor)
|
|
248
252
|
};
|
|
249
253
|
},
|
|
250
254
|
props: {
|
|
@@ -278,7 +282,8 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
|
|
|
278
282
|
var isDragHandleFocused = ['drag-handle-button-row', 'drag-handle-button-column'].includes((_ref8 = event.target || null) === null || _ref8 === void 0 ? void 0 : _ref8.id);
|
|
279
283
|
var keysToTrap = ['Enter', ' '];
|
|
280
284
|
var _getPluginState3 = (0, _pluginFactory2.getPluginState)(view.state),
|
|
281
|
-
|
|
285
|
+
_getPluginState3$isDr = _getPluginState3.isDragMenuOpen,
|
|
286
|
+
isDragMenuOpen = _getPluginState3$isDr === void 0 ? false : _getPluginState3$isDr;
|
|
282
287
|
|
|
283
288
|
// drag handle is focused, and user presses any key return them back to editing
|
|
284
289
|
if (isDragHandleFocused && !isDragMenuOpen && !keysToTrap.includes(event.key)) {
|
|
@@ -76,8 +76,8 @@ function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, dragAndDropEn
|
|
|
76
76
|
ariaNotify: ariaNotifyPlugin,
|
|
77
77
|
getIntl: getIntl
|
|
78
78
|
}), list);
|
|
79
|
-
(0, _keymaps.bindKeymapWithCommand)(_keymaps.decreaseMediaSize.common, (0, _commandsWithAnalytics.changeColumnWidthByStepWithAnalytics)(editorAnalyticsAPI)(-10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, _analytics.INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
|
|
80
|
-
(0, _keymaps.bindKeymapWithCommand)(_keymaps.increaseMediaSize.common, (0, _commandsWithAnalytics.changeColumnWidthByStepWithAnalytics)(editorAnalyticsAPI)(10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, _analytics.INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
|
|
79
|
+
(0, _keymaps.bindKeymapWithCommand)(_keymaps.decreaseMediaSize.common, (0, _commandsWithAnalytics.changeColumnWidthByStepWithAnalytics)(editorAnalyticsAPI)(-10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, !!isCommentEditor, _analytics.INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
|
|
80
|
+
(0, _keymaps.bindKeymapWithCommand)(_keymaps.increaseMediaSize.common, (0, _commandsWithAnalytics.changeColumnWidthByStepWithAnalytics)(editorAnalyticsAPI)(10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, !!isCommentEditor, _analytics.INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
|
|
81
81
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.escape.common, (0, _columnResize.stopKeyboardColumnResizing)({
|
|
82
82
|
ariaNotify: ariaNotifyPlugin,
|
|
83
83
|
getIntl: getIntl
|
|
@@ -24,7 +24,7 @@ var _utils3 = require("./utils");
|
|
|
24
24
|
var _resizeColumn = require("./utils/resize-column");
|
|
25
25
|
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; }
|
|
26
26
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
27
|
-
var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, event, localResizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled, editorAnalyticsAPI, isNewColumnResizingEnabled, isTableAlignmentEnabled) {
|
|
27
|
+
var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, event, localResizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled, editorAnalyticsAPI, isNewColumnResizingEnabled, isTableAlignmentEnabled, isCommentEditor) {
|
|
28
28
|
var state = view.state,
|
|
29
29
|
dispatch = view.dispatch;
|
|
30
30
|
var editorDisabled = !view.editable;
|
|
@@ -77,7 +77,9 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
|
|
|
77
77
|
start: start,
|
|
78
78
|
domAtPos: domAtPos,
|
|
79
79
|
isTableScalingEnabled: shouldScale,
|
|
80
|
-
shouldUseIncreasedScalingPercent: isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent')
|
|
80
|
+
shouldUseIncreasedScalingPercent: isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ||
|
|
81
|
+
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
82
|
+
isTableScalingEnabled && !!isCommentEditor
|
|
81
83
|
});
|
|
82
84
|
if ((0, _commands.evenColumns)({
|
|
83
85
|
resizeState: resizeState,
|
|
@@ -165,7 +167,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
|
|
|
165
167
|
_shouldScale = _shouldScale && originalTable.attrs.displayMode !== 'fixed';
|
|
166
168
|
}
|
|
167
169
|
var resizedDelta = clientX - startX;
|
|
168
|
-
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent');
|
|
170
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || isTableScalingEnabled && !!isCommentEditor;
|
|
169
171
|
if (isNewColumnResizingEnabled && !(0, _utils2.isTableNested)(state, tablePos)) {
|
|
170
172
|
var newResizeState = (0, _utils3.resizeColumnAndTable)({
|
|
171
173
|
resizeState: resizeState,
|
|
@@ -270,7 +272,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
|
|
|
270
272
|
var map = _tableMap.TableMap.get(table);
|
|
271
273
|
var colIndex = map.colCount($cell.pos - $cell.start(-1)) + $cell.nodeAfter.attrs.colspan - 1;
|
|
272
274
|
var shouldScale = tableDepth === 0 && isTableScalingEnabled;
|
|
273
|
-
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent');
|
|
275
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || isTableScalingEnabled && isCommentEditor;
|
|
274
276
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
|
|
275
277
|
shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
|
|
276
278
|
}
|
|
@@ -15,7 +15,7 @@ var _eventHandlers = require("./event-handlers");
|
|
|
15
15
|
var _pluginFactory2 = require("./plugin-factory");
|
|
16
16
|
var _pluginKey = require("./plugin-key");
|
|
17
17
|
var _utils = require("./utils");
|
|
18
|
-
function createPlugin(dispatch, _ref, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI, isTableScalingEnabled, isNewColumnResizingEnabled, isTableAlignmentEnabled) {
|
|
18
|
+
function createPlugin(dispatch, _ref, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI, isTableScalingEnabled, isNewColumnResizingEnabled, isTableAlignmentEnabled, isCommentEditor) {
|
|
19
19
|
var _ref$lastColumnResiza = _ref.lastColumnResizable,
|
|
20
20
|
lastColumnResizable = _ref$lastColumnResiza === void 0 ? true : _ref$lastColumnResiza;
|
|
21
21
|
return new _safePlugin.SafePlugin({
|
|
@@ -53,7 +53,7 @@ function createPlugin(dispatch, _ref, getEditorContainerWidth, getEditorFeatureF
|
|
|
53
53
|
isColumnKeyboardResizeStarted = isKeyboardResize;
|
|
54
54
|
}
|
|
55
55
|
if (resizeHandlePos !== null && (!dragging || isColumnKeyboardResizeStarted)) {
|
|
56
|
-
if ((0, _eventHandlers.handleMouseDown)(view, event, resizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled || false, editorAnalyticsAPI, isNewColumnResizingEnabled, isTableAlignmentEnabled)) {
|
|
56
|
+
if ((0, _eventHandlers.handleMouseDown)(view, event, resizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled || false, editorAnalyticsAPI, isNewColumnResizingEnabled, isTableAlignmentEnabled, isCommentEditor)) {
|
|
57
57
|
var _state = view.state,
|
|
58
58
|
_dispatch = view.dispatch;
|
|
59
59
|
return (0, _commands.setResizeHandlePos)(resizeHandlePos)(_state, _dispatch);
|
|
@@ -306,6 +306,7 @@ var normaliseTableLayout = exports.normaliseTableLayout = function normaliseTabl
|
|
|
306
306
|
var getNewResizeStateFromSelectedColumns = exports.getNewResizeStateFromSelectedColumns = function getNewResizeStateFromSelectedColumns(rect, state, domAtPos, getEditorContainerWidth) {
|
|
307
307
|
var isTableScalingEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
308
308
|
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
309
|
+
var isCommentEditor = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
309
310
|
// Fail early so that we don't do complex calculations for no reason
|
|
310
311
|
var numColumnsSelected = rect.right - rect.left;
|
|
311
312
|
if (numColumnsSelected <= 1) {
|
|
@@ -351,7 +352,7 @@ var getNewResizeStateFromSelectedColumns = exports.getNewResizeStateFromSelected
|
|
|
351
352
|
start: table.start,
|
|
352
353
|
domAtPos: domAtPos,
|
|
353
354
|
isTableScalingEnabled: isTableScalingEnabledOnCurrentTable,
|
|
354
|
-
shouldUseIncreasedScalingPercent: isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.
|
|
355
|
+
shouldUseIncreasedScalingPercent: isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') || isTableScalingEnabled && isCommentEditor
|
|
355
356
|
});
|
|
356
357
|
var newResizeState = evenSelectedColumnsWidths(resizeState, rect);
|
|
357
358
|
var widthsBefore = resizeState.widths;
|
|
@@ -111,6 +111,7 @@ function scaleTableTo(state, maxSize) {
|
|
|
111
111
|
var previewScaleTable = exports.previewScaleTable = function previewScaleTable(tableRef, options, domAtPos) {
|
|
112
112
|
var isTableScalingEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
113
113
|
var isTableWithFixedColumnWidthsOptionEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
114
|
+
var isCommentEditor = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
114
115
|
var node = options.node,
|
|
115
116
|
start = options.start,
|
|
116
117
|
parentWidth = options.parentWidth;
|
|
@@ -133,7 +134,9 @@ var previewScaleTable = exports.previewScaleTable = function previewScaleTable(t
|
|
|
133
134
|
(0, _dom.syncStickyRowToTable)(tableRef);
|
|
134
135
|
return;
|
|
135
136
|
}
|
|
136
|
-
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.
|
|
137
|
+
var shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ||
|
|
138
|
+
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
139
|
+
isTableScalingEnabled && isCommentEditor;
|
|
137
140
|
var resizeState = parentWidth ? scaleWithParent(tableRef, parentWidth, node, start, domAtPos, false,
|
|
138
141
|
// Here isTableScalingEnabled = false
|
|
139
142
|
shouldUseIncreasedScalingPercent) : scale(tableRef, options, domAtPos, false, shouldUseIncreasedScalingPercent);
|
package/dist/cjs/toolbar.js
CHANGED
|
@@ -137,6 +137,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
|
|
|
137
137
|
var isCellBackgroundDuplicated = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
138
138
|
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
|
|
139
139
|
var shouldUseIncreasedScalingPercent = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
|
|
140
|
+
var isCommentEditor = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
|
|
140
141
|
var top = initialSelectionRect.top,
|
|
141
142
|
bottom = initialSelectionRect.bottom,
|
|
142
143
|
right = initialSelectionRect.right,
|
|
@@ -235,7 +236,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
|
|
|
235
236
|
}
|
|
236
237
|
if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo = pluginState.pluginConfig) !== null && _pluginState$pluginCo !== void 0 && _pluginState$pluginCo.allowDistributeColumns) {
|
|
237
238
|
var _newResizeStateWithAn;
|
|
238
|
-
var newResizeStateWithAnalytics = editorView ? (0, _resizeState.getNewResizeStateFromSelectedColumns)(initialSelectionRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled) : undefined;
|
|
239
|
+
var newResizeStateWithAnalytics = editorView ? (0, _resizeState.getNewResizeStateFromSelectedColumns)(initialSelectionRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor) : undefined;
|
|
239
240
|
var wouldChange = (_newResizeStateWithAn = newResizeStateWithAnalytics === null || newResizeStateWithAnalytics === void 0 ? void 0 : newResizeStateWithAnalytics.changed) !== null && _newResizeStateWithAn !== void 0 ? _newResizeStateWithAn : false;
|
|
240
241
|
var distributeColumnWidths = function distributeColumnWidths(state, dispatch) {
|
|
241
242
|
if (newResizeStateWithAnalytics) {
|
|
@@ -380,8 +381,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
|
|
|
380
381
|
var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
|
|
381
382
|
var alignmentMenu = options !== null && options !== void 0 && options.isTableAlignmentEnabled && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, getDomRef, editorView, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
|
|
382
383
|
var isCellBackgroundDuplicated = getEditorFeatureFlags().tableDuplicateCellColouring || false;
|
|
383
|
-
var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent);
|
|
384
|
-
var columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled) : [];
|
|
384
|
+
var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
|
|
385
|
+
var columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
|
|
385
386
|
var colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView);
|
|
386
387
|
|
|
387
388
|
// Check if we need to show confirm dialog for delete button
|
|
@@ -473,11 +474,12 @@ var getCellItems = function getCellItems(state, view, _ref3, getEditorContainerW
|
|
|
473
474
|
var isCellBackgroundDuplicated = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
474
475
|
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
475
476
|
var shouldUseIncreasedScalingPercent = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
|
|
477
|
+
var isCommentEditor = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
|
|
476
478
|
var initialSelectionRect = getClosestSelectionRect(state);
|
|
477
479
|
if (initialSelectionRect) {
|
|
478
480
|
var cellOptions = getToolbarCellOptionsConfig(state, view, initialSelectionRect, {
|
|
479
481
|
formatMessage: formatMessage
|
|
480
|
-
}, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent);
|
|
482
|
+
}, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor);
|
|
481
483
|
return [cellOptions, separator(cellOptions.hidden)];
|
|
482
484
|
}
|
|
483
485
|
return [];
|
|
@@ -485,12 +487,13 @@ var getCellItems = function getCellItems(state, view, _ref3, getEditorContainerW
|
|
|
485
487
|
var getDistributeConfig = exports.getDistributeConfig = function getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI) {
|
|
486
488
|
var isTableScalingEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
487
489
|
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
490
|
+
var isCommentEditor = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
488
491
|
return function (state, dispatch, editorView) {
|
|
489
492
|
var selectionOrTableRect = getClosestSelectionOrTableRect(state);
|
|
490
493
|
if (!editorView || !selectionOrTableRect) {
|
|
491
494
|
return false;
|
|
492
495
|
}
|
|
493
|
-
var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionOrTableRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled);
|
|
496
|
+
var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionOrTableRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
|
|
494
497
|
if (newResizeStateWithAnalytics) {
|
|
495
498
|
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
|
|
496
499
|
return true;
|
|
@@ -506,6 +509,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
|
|
|
506
509
|
var formatMessage = _ref4.formatMessage;
|
|
507
510
|
var isTableScalingEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
508
511
|
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
512
|
+
var isCommentEditor = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
509
513
|
var pluginState = (0, _pluginFactory.getPluginState)(editorState);
|
|
510
514
|
var selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
|
|
511
515
|
if (!selectionOrTableRect || !editorView) {
|
|
@@ -521,7 +525,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
|
|
|
521
525
|
title: formatMessage(_messages.tableMessages.distributeColumns),
|
|
522
526
|
icon: _layoutThreeEqual.default,
|
|
523
527
|
onClick: function onClick(state, dispatch, view) {
|
|
524
|
-
return getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled)(state, dispatch, view);
|
|
528
|
+
return getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor)(state, dispatch, view);
|
|
525
529
|
},
|
|
526
530
|
disabled: !wouldChange
|
|
527
531
|
});
|
|
@@ -57,7 +57,8 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
|
|
|
57
57
|
hoveredColumns = _getPluginState.hoveredColumns,
|
|
58
58
|
hoveredRows = _getPluginState.hoveredRows;
|
|
59
59
|
var _getDnDPluginState = (0, _pluginFactory.getPluginState)(state),
|
|
60
|
-
|
|
60
|
+
_getDnDPluginState$is = _getDnDPluginState.isDragMenuOpen,
|
|
61
|
+
isDragMenuOpen = _getDnDPluginState$is === void 0 ? false : _getDnDPluginState$is;
|
|
61
62
|
var isRow = direction === 'row';
|
|
62
63
|
var isColumn = direction === 'column';
|
|
63
64
|
|
|
@@ -463,7 +463,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
463
463
|
editorAnalyticsAPI = _this$props10.editorAnalyticsAPI,
|
|
464
464
|
getEditorContainerWidth = _this$props10.getEditorContainerWidth,
|
|
465
465
|
getEditorFeatureFlags = _this$props10.getEditorFeatureFlags,
|
|
466
|
-
isCellMenuOpenByKeyboard = _this$props10.isCellMenuOpenByKeyboard
|
|
466
|
+
isCellMenuOpenByKeyboard = _this$props10.isCellMenuOpenByKeyboard,
|
|
467
|
+
isCommentEditor = _this$props10.isCommentEditor;
|
|
467
468
|
// TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
|
|
468
469
|
var state = editorView.state,
|
|
469
470
|
dispatch = editorView.dispatch;
|
|
@@ -489,7 +490,9 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
489
490
|
dispatch(tr);
|
|
490
491
|
editorView.dom.focus(); // otherwise cursor disappears from cell
|
|
491
492
|
}
|
|
492
|
-
var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent')
|
|
493
|
+
var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent') ||
|
|
494
|
+
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
495
|
+
isCommentEditor);
|
|
493
496
|
switch (item.value.name) {
|
|
494
497
|
case 'sort_column_desc':
|
|
495
498
|
(0, _commandsWithAnalytics.sortColumnWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.left, _customSteps.TableSortOrder.DESC)(state, dispatch);
|
|
@@ -30,7 +30,8 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
|
|
|
30
30
|
editorAnalyticsAPI = _ref.editorAnalyticsAPI,
|
|
31
31
|
getEditorContainerWidth = _ref.getEditorContainerWidth,
|
|
32
32
|
getEditorFeatureFlags = _ref.getEditorFeatureFlags,
|
|
33
|
-
isCellMenuOpenByKeyboard = _ref.isCellMenuOpenByKeyboard
|
|
33
|
+
isCellMenuOpenByKeyboard = _ref.isCellMenuOpenByKeyboard,
|
|
34
|
+
isCommentEditor = _ref.isCommentEditor;
|
|
34
35
|
// TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
|
|
35
36
|
var _getPluginState = (0, _pluginFactory.getPluginState)(editorView.state),
|
|
36
37
|
targetCellPosition = _getPluginState.targetCellPosition,
|
|
@@ -80,7 +81,8 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
|
|
|
80
81
|
editorAnalyticsAPI: editorAnalyticsAPI,
|
|
81
82
|
getEditorContainerWidth: getEditorContainerWidth,
|
|
82
83
|
getEditorFeatureFlags: getEditorFeatureFlags,
|
|
83
|
-
isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard
|
|
84
|
+
isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard,
|
|
85
|
+
isCommentEditor: isCommentEditor
|
|
84
86
|
})));
|
|
85
87
|
};
|
|
86
88
|
FloatingContextualMenu.displayName = 'FloatingContextualMenu';
|
|
@@ -149,6 +149,7 @@ export const changeColumnWidthByStep = ({
|
|
|
149
149
|
getEditorContainerWidth,
|
|
150
150
|
isTableScalingEnabled,
|
|
151
151
|
isTableFixedColumnWidthsOptionEnabled,
|
|
152
|
+
isCommentEditor,
|
|
152
153
|
ariaNotify,
|
|
153
154
|
getIntl
|
|
154
155
|
}) => (state, dispatch, view) => {
|
|
@@ -198,7 +199,9 @@ export const changeColumnWidthByStep = ({
|
|
|
198
199
|
if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
|
|
199
200
|
isTableScalingEnabledOnCurrentTable = originalTable.attrs.displayMode !== 'fixed';
|
|
200
201
|
}
|
|
201
|
-
const shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent')
|
|
202
|
+
const shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent') ||
|
|
203
|
+
// When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
204
|
+
isTableScalingEnabled && isCommentEditor;
|
|
202
205
|
const initialResizeState = getResizeState({
|
|
203
206
|
minWidth: tableCellMinWidth,
|
|
204
207
|
maxSize,
|
|
@@ -171,7 +171,7 @@ export const insertRowWithAnalytics = (editorAnalyticsAPI, isCellbackgroundDupli
|
|
|
171
171
|
eventType: EVENT_TYPE.TRACK
|
|
172
172
|
};
|
|
173
173
|
})(editorAnalyticsAPI)(insertRow(options.index, options.moveCursorToInsertedRow, isCellbackgroundDuplicated));
|
|
174
|
-
export const changeColumnWidthByStepWithAnalytics = editorAnalyticsAPI => (stepSize, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, inputMethod, ariaNotify, getIntl) => withEditorAnalyticsAPI(state => {
|
|
174
|
+
export const changeColumnWidthByStepWithAnalytics = editorAnalyticsAPI => (stepSize, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor, inputMethod, ariaNotify, getIntl) => withEditorAnalyticsAPI(state => {
|
|
175
175
|
const {
|
|
176
176
|
table,
|
|
177
177
|
totalRowCount,
|
|
@@ -201,6 +201,7 @@ export const changeColumnWidthByStepWithAnalytics = editorAnalyticsAPI => (stepS
|
|
|
201
201
|
getEditorContainerWidth: getEditorContainerWidth,
|
|
202
202
|
isTableScalingEnabled,
|
|
203
203
|
isTableFixedColumnWidthsOptionEnabled,
|
|
204
|
+
isCommentEditor,
|
|
204
205
|
ariaNotify: ariaNotify,
|
|
205
206
|
getIntl: getIntl
|
|
206
207
|
}));
|