@atlaskit/editor-plugin-table 7.25.7 → 7.25.8
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 +9 -0
- package/dist/cjs/commands/column-resize.js +2 -1
- package/dist/cjs/commands/delete.js +5 -5
- package/dist/cjs/commands/insert.js +20 -20
- package/dist/cjs/commands-with-analytics.js +18 -17
- package/dist/cjs/event-handlers.js +5 -5
- package/dist/cjs/nodeviews/TableComponent.js +1 -1
- package/dist/cjs/nodeviews/TableResizer.js +1 -1
- package/dist/cjs/plugin.js +11 -7
- package/dist/cjs/pm-plugins/keymap.js +19 -19
- package/dist/cjs/pm-plugins/main.js +1 -1
- package/dist/cjs/pm-plugins/table-resizing/commands.js +5 -4
- package/dist/cjs/pm-plugins/table-resizing/event-handlers.js +5 -4
- package/dist/cjs/pm-plugins/table-resizing/plugin.js +2 -2
- package/dist/cjs/pm-plugins/table-resizing/utils/scale-table.js +4 -4
- package/dist/cjs/toolbar.js +31 -31
- package/dist/cjs/transforms/column-width.js +4 -3
- package/dist/cjs/transforms/delete-columns.js +5 -5
- package/dist/cjs/ui/FloatingContextualMenu/ContextualMenu.js +3 -3
- package/dist/cjs/ui/FloatingContextualMenu/index.js +4 -2
- package/dist/cjs/ui/FloatingDeleteButton/index.js +1 -1
- package/dist/cjs/ui/FloatingDragMenu/DragMenu.js +2 -1
- package/dist/cjs/ui/FloatingDragMenu/index.js +4 -2
- package/dist/cjs/ui/FloatingInsertButton/index.js +1 -1
- package/dist/cjs/utils/drag-menu.js +10 -10
- package/dist/es2019/commands/column-resize.js +2 -1
- package/dist/es2019/commands/delete.js +2 -2
- package/dist/es2019/commands/insert.js +8 -8
- package/dist/es2019/commands-with-analytics.js +11 -10
- package/dist/es2019/event-handlers.js +2 -2
- package/dist/es2019/nodeviews/TableComponent.js +1 -1
- package/dist/es2019/nodeviews/TableResizer.js +1 -1
- package/dist/es2019/plugin.js +11 -7
- package/dist/es2019/pm-plugins/keymap.js +9 -9
- package/dist/es2019/pm-plugins/main.js +1 -1
- package/dist/es2019/pm-plugins/table-resizing/commands.js +5 -4
- package/dist/es2019/pm-plugins/table-resizing/event-handlers.js +5 -4
- package/dist/es2019/pm-plugins/table-resizing/plugin.js +2 -2
- package/dist/es2019/pm-plugins/table-resizing/utils/scale-table.js +2 -2
- package/dist/es2019/toolbar.js +13 -13
- package/dist/es2019/transforms/column-width.js +4 -5
- package/dist/es2019/transforms/delete-columns.js +2 -2
- package/dist/es2019/ui/FloatingContextualMenu/ContextualMenu.js +3 -3
- package/dist/es2019/ui/FloatingContextualMenu/index.js +4 -2
- package/dist/es2019/ui/FloatingDeleteButton/index.js +1 -1
- package/dist/es2019/ui/FloatingDragMenu/DragMenu.js +2 -1
- package/dist/es2019/ui/FloatingDragMenu/index.js +4 -2
- package/dist/es2019/ui/FloatingInsertButton/index.js +1 -1
- package/dist/es2019/utils/drag-menu.js +4 -4
- package/dist/esm/commands/column-resize.js +2 -1
- package/dist/esm/commands/delete.js +5 -5
- package/dist/esm/commands/insert.js +20 -20
- package/dist/esm/commands-with-analytics.js +18 -17
- package/dist/esm/event-handlers.js +5 -5
- package/dist/esm/nodeviews/TableComponent.js +1 -1
- package/dist/esm/nodeviews/TableResizer.js +1 -1
- package/dist/esm/plugin.js +11 -7
- package/dist/esm/pm-plugins/keymap.js +19 -19
- package/dist/esm/pm-plugins/main.js +1 -1
- package/dist/esm/pm-plugins/table-resizing/commands.js +5 -4
- package/dist/esm/pm-plugins/table-resizing/event-handlers.js +5 -4
- package/dist/esm/pm-plugins/table-resizing/plugin.js +2 -2
- package/dist/esm/pm-plugins/table-resizing/utils/scale-table.js +4 -4
- package/dist/esm/toolbar.js +31 -31
- package/dist/esm/transforms/column-width.js +4 -4
- package/dist/esm/transforms/delete-columns.js +5 -5
- package/dist/esm/ui/FloatingContextualMenu/ContextualMenu.js +3 -3
- package/dist/esm/ui/FloatingContextualMenu/index.js +4 -2
- package/dist/esm/ui/FloatingDeleteButton/index.js +1 -1
- package/dist/esm/ui/FloatingDragMenu/DragMenu.js +2 -1
- package/dist/esm/ui/FloatingDragMenu/index.js +4 -2
- package/dist/esm/ui/FloatingInsertButton/index.js +1 -1
- package/dist/esm/utils/drag-menu.js +10 -10
- package/dist/types/commands/column-resize.d.ts +3 -1
- package/dist/types/commands/delete.d.ts +2 -1
- package/dist/types/commands/insert.d.ts +5 -4
- package/dist/types/commands-with-analytics.d.ts +6 -6
- package/dist/types/event-handlers.d.ts +2 -1
- package/dist/types/pm-plugins/keymap.d.ts +2 -2
- package/dist/types/pm-plugins/table-resizing/commands.d.ts +4 -2
- package/dist/types/pm-plugins/table-resizing/event-handlers.d.ts +2 -1
- package/dist/types/pm-plugins/table-resizing/plugin.d.ts +2 -2
- package/dist/types/pm-plugins/table-resizing/utils/scale-table.d.ts +2 -1
- package/dist/types/toolbar.d.ts +4 -4
- package/dist/types/transforms/column-width.d.ts +3 -2
- package/dist/types/transforms/delete-columns.d.ts +2 -1
- package/dist/types/ui/FloatingContextualMenu/ContextualMenu.d.ts +2 -0
- package/dist/types/ui/FloatingContextualMenu/index.d.ts +3 -2
- package/dist/types/ui/FloatingDeleteButton/index.d.ts +2 -1
- package/dist/types/ui/FloatingDragMenu/DragMenu.d.ts +3 -2
- package/dist/types/ui/FloatingDragMenu/index.d.ts +3 -2
- package/dist/types/ui/FloatingInsertButton/index.d.ts +2 -0
- package/dist/types/utils/drag-menu.d.ts +2 -2
- package/dist/types-ts4.5/commands/column-resize.d.ts +3 -1
- package/dist/types-ts4.5/commands/delete.d.ts +2 -1
- package/dist/types-ts4.5/commands/insert.d.ts +5 -4
- package/dist/types-ts4.5/commands-with-analytics.d.ts +6 -6
- package/dist/types-ts4.5/event-handlers.d.ts +2 -1
- package/dist/types-ts4.5/pm-plugins/keymap.d.ts +2 -2
- package/dist/types-ts4.5/pm-plugins/table-resizing/commands.d.ts +4 -2
- package/dist/types-ts4.5/pm-plugins/table-resizing/event-handlers.d.ts +2 -1
- package/dist/types-ts4.5/pm-plugins/table-resizing/plugin.d.ts +2 -2
- package/dist/types-ts4.5/pm-plugins/table-resizing/utils/scale-table.d.ts +2 -1
- package/dist/types-ts4.5/toolbar.d.ts +4 -4
- package/dist/types-ts4.5/transforms/column-width.d.ts +3 -2
- package/dist/types-ts4.5/transforms/delete-columns.d.ts +2 -1
- package/dist/types-ts4.5/ui/FloatingContextualMenu/ContextualMenu.d.ts +2 -0
- package/dist/types-ts4.5/ui/FloatingContextualMenu/index.d.ts +3 -2
- package/dist/types-ts4.5/ui/FloatingDeleteButton/index.d.ts +2 -1
- package/dist/types-ts4.5/ui/FloatingDragMenu/DragMenu.d.ts +3 -2
- package/dist/types-ts4.5/ui/FloatingDragMenu/index.d.ts +3 -2
- package/dist/types-ts4.5/ui/FloatingInsertButton/index.d.ts +2 -0
- package/dist/types-ts4.5/utils/drag-menu.d.ts +2 -2
- package/package.json +7 -7
- package/src/commands/column-resize.ts +4 -2
- package/src/commands/delete.ts +3 -0
- package/src/commands/insert.ts +9 -0
- package/src/commands-with-analytics.ts +17 -3
- package/src/event-handlers.ts +3 -0
- package/src/nodeviews/TableComponent.tsx +1 -0
- package/src/nodeviews/TableResizer.tsx +1 -0
- package/src/plugin.tsx +7 -0
- package/src/pm-plugins/keymap.ts +10 -3
- package/src/pm-plugins/main.ts +1 -0
- package/src/pm-plugins/table-resizing/commands.ts +13 -3
- package/src/pm-plugins/table-resizing/event-handlers.ts +5 -2
- package/src/pm-plugins/table-resizing/plugin.ts +3 -1
- package/src/pm-plugins/table-resizing/utils/scale-table.ts +3 -1
- package/src/toolbar.tsx +14 -2
- package/src/transforms/column-width.ts +11 -3
- package/src/transforms/delete-columns.ts +3 -0
- package/src/ui/FloatingContextualMenu/ContextualMenu.tsx +5 -1
- package/src/ui/FloatingContextualMenu/index.tsx +4 -1
- package/src/ui/FloatingDeleteButton/index.tsx +3 -2
- package/src/ui/FloatingDragMenu/DragMenu.tsx +4 -1
- package/src/ui/FloatingDragMenu/index.tsx +4 -1
- package/src/ui/FloatingInsertButton/index.tsx +3 -0
- package/src/utils/drag-menu.ts +5 -2
package/dist/cjs/toolbar.js
CHANGED
|
@@ -130,14 +130,14 @@ var getToolbarMenuConfig = exports.getToolbarMenuConfig = function getToolbarMen
|
|
|
130
130
|
// Added these options for mobile. Mobile bridge translates this menu and
|
|
131
131
|
// relay it to the native mobile. Native mobile displays the menu
|
|
132
132
|
// with native widgets. It's enabled via a plugin config.
|
|
133
|
-
var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(editorState, editorView, initialSelectionRect, _ref2, getEditorContainerWidth, editorAnalyticsAPI) {
|
|
133
|
+
var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(editorState, editorView, initialSelectionRect, _ref2, getEditorContainerWidth, api, editorAnalyticsAPI) {
|
|
134
134
|
var _pluginState$pluginCo, _pluginState$pluginCo2;
|
|
135
135
|
var formatMessage = _ref2.formatMessage;
|
|
136
|
-
var isTableScalingEnabled = arguments.length >
|
|
137
|
-
var isCellBackgroundDuplicated = arguments.length >
|
|
138
|
-
var isTableFixedColumnWidthsOptionEnabled = arguments.length >
|
|
139
|
-
var shouldUseIncreasedScalingPercent = arguments.length >
|
|
140
|
-
var isCommentEditor = arguments.length >
|
|
136
|
+
var isTableScalingEnabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
137
|
+
var isCellBackgroundDuplicated = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
|
|
138
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
|
|
139
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
|
|
140
|
+
var isCommentEditor = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
|
|
141
141
|
var top = initialSelectionRect.top,
|
|
142
142
|
bottom = initialSelectionRect.bottom,
|
|
143
143
|
right = initialSelectionRect.right,
|
|
@@ -152,7 +152,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
|
|
|
152
152
|
var selectionRect = getClosestSelectionRect(state);
|
|
153
153
|
var index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right;
|
|
154
154
|
if (index) {
|
|
155
|
-
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
|
|
155
|
+
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(api, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
|
|
156
156
|
}
|
|
157
157
|
return true;
|
|
158
158
|
},
|
|
@@ -190,7 +190,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
|
|
|
190
190
|
onClick: function onClick(state, dispatch, view) {
|
|
191
191
|
var selectionRect = getClosestSelectionRect(state);
|
|
192
192
|
if (selectionRect) {
|
|
193
|
-
(0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
|
|
193
|
+
(0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
|
|
194
194
|
}
|
|
195
195
|
return true;
|
|
196
196
|
},
|
|
@@ -240,7 +240,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
|
|
|
240
240
|
var wouldChange = (_newResizeStateWithAn = newResizeStateWithAnalytics === null || newResizeStateWithAnalytics === void 0 ? void 0 : newResizeStateWithAnalytics.changed) !== null && _newResizeStateWithAn !== void 0 ? _newResizeStateWithAn : false;
|
|
241
241
|
var distributeColumnWidths = function distributeColumnWidths(state, dispatch) {
|
|
242
242
|
if (newResizeStateWithAnalytics) {
|
|
243
|
-
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
|
|
243
|
+
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI, api)(_analytics.INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
|
|
244
244
|
return true;
|
|
245
245
|
}
|
|
246
246
|
return false;
|
|
@@ -344,9 +344,9 @@ var getClosestSelectionOrTableRect = exports.getClosestSelectionOrTableRect = fu
|
|
|
344
344
|
var tableRect = new _tableMap.Rect(0, 0, map.width, map.height);
|
|
345
345
|
return (0, _utils3.isSelectionType)(selection, 'cell') ? (0, _utils3.getSelectionRect)(selection) : tableRect;
|
|
346
346
|
};
|
|
347
|
-
var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, editorAnalyticsAPI, getEditorFeatureFlags, getEditorView, options) {
|
|
348
|
-
var isTableFixedColumnWidthsOptionEnabled = arguments.length >
|
|
349
|
-
var shouldUseIncreasedScalingPercent = arguments.length >
|
|
347
|
+
var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, api, editorAnalyticsAPI, getEditorFeatureFlags, getEditorView, options) {
|
|
348
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
349
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
350
350
|
return function (config) {
|
|
351
351
|
return function (state, intl) {
|
|
352
352
|
var tableObject = (0, _utils3.findTable)(state.selection);
|
|
@@ -381,8 +381,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
|
|
|
381
381
|
var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
|
|
382
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) : [];
|
|
383
383
|
var isCellBackgroundDuplicated = getEditorFeatureFlags().tableDuplicateCellColouring || false;
|
|
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) : [];
|
|
384
|
+
var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
|
|
385
|
+
var columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
|
|
386
386
|
var colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView);
|
|
387
387
|
|
|
388
388
|
// Check if we need to show confirm dialog for delete button
|
|
@@ -468,26 +468,26 @@ var separator = function separator(hidden) {
|
|
|
468
468
|
hidden: hidden
|
|
469
469
|
};
|
|
470
470
|
};
|
|
471
|
-
var getCellItems = function getCellItems(state, view, _ref3, getEditorContainerWidth, editorAnalyticsAPI) {
|
|
471
|
+
var getCellItems = function getCellItems(state, view, _ref3, getEditorContainerWidth, api, editorAnalyticsAPI) {
|
|
472
472
|
var formatMessage = _ref3.formatMessage;
|
|
473
|
-
var isTableScalingEnabled = arguments.length >
|
|
474
|
-
var isCellBackgroundDuplicated = arguments.length >
|
|
475
|
-
var isTableFixedColumnWidthsOptionEnabled = arguments.length >
|
|
476
|
-
var shouldUseIncreasedScalingPercent = arguments.length >
|
|
477
|
-
var isCommentEditor = arguments.length >
|
|
473
|
+
var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
474
|
+
var isCellBackgroundDuplicated = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
475
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
|
|
476
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
|
|
477
|
+
var isCommentEditor = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
|
|
478
478
|
var initialSelectionRect = getClosestSelectionRect(state);
|
|
479
479
|
if (initialSelectionRect) {
|
|
480
480
|
var cellOptions = getToolbarCellOptionsConfig(state, view, initialSelectionRect, {
|
|
481
481
|
formatMessage: formatMessage
|
|
482
|
-
}, getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor);
|
|
482
|
+
}, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor);
|
|
483
483
|
return [cellOptions, separator(cellOptions.hidden)];
|
|
484
484
|
}
|
|
485
485
|
return [];
|
|
486
486
|
};
|
|
487
|
-
var getDistributeConfig = exports.getDistributeConfig = function getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI) {
|
|
488
|
-
var isTableScalingEnabled = arguments.length >
|
|
489
|
-
var isTableFixedColumnWidthsOptionEnabled = arguments.length >
|
|
490
|
-
var isCommentEditor = arguments.length >
|
|
487
|
+
var getDistributeConfig = exports.getDistributeConfig = function getDistributeConfig(getEditorContainerWidth, api, editorAnalyticsAPI) {
|
|
488
|
+
var isTableScalingEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
489
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
490
|
+
var isCommentEditor = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
491
491
|
return function (state, dispatch, editorView) {
|
|
492
492
|
var selectionOrTableRect = getClosestSelectionOrTableRect(state);
|
|
493
493
|
if (!editorView || !selectionOrTableRect) {
|
|
@@ -495,7 +495,7 @@ var getDistributeConfig = exports.getDistributeConfig = function getDistributeCo
|
|
|
495
495
|
}
|
|
496
496
|
var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionOrTableRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
|
|
497
497
|
if (newResizeStateWithAnalytics) {
|
|
498
|
-
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
|
|
498
|
+
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI, api)(_analytics.INPUT_METHOD.FLOATING_TB, newResizeStateWithAnalytics)(state, dispatch);
|
|
499
499
|
return true;
|
|
500
500
|
}
|
|
501
501
|
return false;
|
|
@@ -504,12 +504,12 @@ var getDistributeConfig = exports.getDistributeConfig = function getDistributeCo
|
|
|
504
504
|
|
|
505
505
|
// this create the button group for distribute column and also fixed column width
|
|
506
506
|
// fixed column button should be in this function call in the future
|
|
507
|
-
var getColumnSettingItems = function getColumnSettingItems(editorState, editorView, _ref4, getEditorContainerWidth, editorAnalyticsAPI) {
|
|
507
|
+
var getColumnSettingItems = function getColumnSettingItems(editorState, editorView, _ref4, getEditorContainerWidth, api, editorAnalyticsAPI) {
|
|
508
508
|
var _newResizeStateWithAn2, _pluginState$pluginCo3;
|
|
509
509
|
var formatMessage = _ref4.formatMessage;
|
|
510
|
-
var isTableScalingEnabled = arguments.length >
|
|
511
|
-
var isTableFixedColumnWidthsOptionEnabled = arguments.length >
|
|
512
|
-
var isCommentEditor = arguments.length >
|
|
510
|
+
var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
511
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
512
|
+
var isCommentEditor = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
|
|
513
513
|
var pluginState = (0, _pluginFactory.getPluginState)(editorState);
|
|
514
514
|
var selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
|
|
515
515
|
if (!selectionOrTableRect || !editorView) {
|
|
@@ -525,7 +525,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
|
|
|
525
525
|
title: formatMessage(_messages.tableMessages.distributeColumns),
|
|
526
526
|
icon: _layoutThreeEqual.default,
|
|
527
527
|
onClick: function onClick(state, dispatch, view) {
|
|
528
|
-
return getDistributeConfig(getEditorContainerWidth, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor)(state, dispatch, view);
|
|
528
|
+
return getDistributeConfig(getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor)(state, dispatch, view);
|
|
529
529
|
},
|
|
530
530
|
disabled: !wouldChange
|
|
531
531
|
});
|
|
@@ -22,7 +22,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
22
22
|
* @param start
|
|
23
23
|
* @returns
|
|
24
24
|
*/
|
|
25
|
-
var updateColumnWidths = exports.updateColumnWidths = function updateColumnWidths(resizeState, table, start) {
|
|
25
|
+
var updateColumnWidths = exports.updateColumnWidths = function updateColumnWidths(resizeState, table, start, _api) {
|
|
26
26
|
return function (tr) {
|
|
27
27
|
var map = _tableMap.TableMap.get(table);
|
|
28
28
|
var updatedCellsAttrs = {};
|
|
@@ -99,6 +99,7 @@ var rescaleColumns = exports.rescaleColumns = function rescaleColumns() {
|
|
|
99
99
|
var isTableScalingEnabled = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
|
|
100
100
|
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
101
101
|
var shouldUseIncreasedScalingPercent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
102
|
+
var api = arguments.length > 3 ? arguments[3] : undefined;
|
|
102
103
|
return function (table, view) {
|
|
103
104
|
return function (tr) {
|
|
104
105
|
if (!view) {
|
|
@@ -175,7 +176,7 @@ var rescaleColumns = exports.rescaleColumns = function rescaleColumns() {
|
|
|
175
176
|
tableWidth: previousTableInfo.width,
|
|
176
177
|
overflow: wasTableInOverflow
|
|
177
178
|
};
|
|
178
|
-
return updateColumnWidths(minWidthResizeState, table.node, table.start)(tr);
|
|
179
|
+
return updateColumnWidths(minWidthResizeState, table.node, table.start, api)(tr);
|
|
179
180
|
}
|
|
180
181
|
var resizeState = (0, _resizeState.getResizeState)({
|
|
181
182
|
minWidth: _styles.tableCellMinWidth,
|
|
@@ -194,7 +195,7 @@ var rescaleColumns = exports.rescaleColumns = function rescaleColumns() {
|
|
|
194
195
|
if (!wasTableInOverflow && resizeState.overflow || resizeState.tableWidth < resizeState.maxSize) {
|
|
195
196
|
resizeState = (0, _scaleTable.scaleTableTo)(resizeState, previousTableInfo.possibleMaxWidth);
|
|
196
197
|
}
|
|
197
|
-
return updateColumnWidths(resizeState, table.node, table.start)(tr);
|
|
198
|
+
return updateColumnWidths(resizeState, table.node, table.start, api)(tr);
|
|
198
199
|
};
|
|
199
200
|
};
|
|
200
201
|
};
|
|
@@ -211,10 +211,10 @@ function fixRowSpans(table) {
|
|
|
211
211
|
}
|
|
212
212
|
return table.type.createChecked(table.attrs, rows, table.marks);
|
|
213
213
|
}
|
|
214
|
-
var deleteColumns = exports.deleteColumns = function deleteColumns(rect, allowCustomStep, view) {
|
|
215
|
-
var isTableScalingEnabled = arguments.length >
|
|
216
|
-
var isTableFixedColumnWidthsOptionEnabled = arguments.length >
|
|
217
|
-
var shouldUseIncreasedScalingPercent = arguments.length >
|
|
214
|
+
var deleteColumns = exports.deleteColumns = function deleteColumns(rect, allowCustomStep, api, view) {
|
|
215
|
+
var isTableScalingEnabled = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
216
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
217
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
218
218
|
return function (tr) {
|
|
219
219
|
var updatedTr = tr;
|
|
220
220
|
updatedTr.setMeta(_tableAnalytics.META_KEYS.OVERFLOW_TRIGGER, {
|
|
@@ -227,7 +227,7 @@ var deleteColumns = exports.deleteColumns = function deleteColumns(rect, allowCu
|
|
|
227
227
|
}
|
|
228
228
|
var table = (0, _utils.findTable)(updatedTr.selection);
|
|
229
229
|
if (table) {
|
|
230
|
-
updatedTr = (0, _columnWidth.rescaleColumns)(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(table, view)(updatedTr);
|
|
230
|
+
updatedTr = (0, _columnWidth.rescaleColumns)(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, api)(table, view)(updatedTr);
|
|
231
231
|
}
|
|
232
232
|
return updatedTr;
|
|
233
233
|
};
|
|
@@ -513,7 +513,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
513
513
|
case 'distribute_columns':
|
|
514
514
|
var newResizeStateWithAnalytics = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, tableWithFixedColumnWidthsOption);
|
|
515
515
|
if (newResizeStateWithAnalytics) {
|
|
516
|
-
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, newResizeStateWithAnalytics)(state, dispatch);
|
|
516
|
+
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI, _this.props.api)(_analytics.INPUT_METHOD.CONTEXT_MENU, newResizeStateWithAnalytics)(state, dispatch);
|
|
517
517
|
_this.toggleOpen();
|
|
518
518
|
}
|
|
519
519
|
break;
|
|
@@ -522,7 +522,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
522
522
|
_this.toggleOpen();
|
|
523
523
|
break;
|
|
524
524
|
case 'insert_column':
|
|
525
|
-
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
|
|
525
|
+
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(_this.props.api, editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
|
|
526
526
|
_this.toggleOpen();
|
|
527
527
|
break;
|
|
528
528
|
case 'insert_row':
|
|
@@ -533,7 +533,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
533
533
|
_this.toggleOpen();
|
|
534
534
|
break;
|
|
535
535
|
case 'delete_column':
|
|
536
|
-
(0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect)(state, dispatch, editorView);
|
|
536
|
+
(0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, _this.props.api, isTableScalingEnabled, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect)(state, dispatch, editorView);
|
|
537
537
|
_this.toggleOpen();
|
|
538
538
|
break;
|
|
539
539
|
case 'delete_row':
|
|
@@ -31,7 +31,8 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
|
|
|
31
31
|
getEditorContainerWidth = _ref.getEditorContainerWidth,
|
|
32
32
|
getEditorFeatureFlags = _ref.getEditorFeatureFlags,
|
|
33
33
|
isCellMenuOpenByKeyboard = _ref.isCellMenuOpenByKeyboard,
|
|
34
|
-
isCommentEditor = _ref.isCommentEditor
|
|
34
|
+
isCommentEditor = _ref.isCommentEditor,
|
|
35
|
+
api = _ref.api;
|
|
35
36
|
// TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
|
|
36
37
|
var _getPluginState = (0, _pluginFactory.getPluginState)(editorView.state),
|
|
37
38
|
targetCellPosition = _getPluginState.targetCellPosition,
|
|
@@ -82,7 +83,8 @@ var FloatingContextualMenu = function FloatingContextualMenu(_ref) {
|
|
|
82
83
|
getEditorContainerWidth: getEditorContainerWidth,
|
|
83
84
|
getEditorFeatureFlags: getEditorFeatureFlags,
|
|
84
85
|
isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard,
|
|
85
|
-
isCommentEditor: isCommentEditor
|
|
86
|
+
isCommentEditor: isCommentEditor,
|
|
87
|
+
api: api
|
|
86
88
|
})));
|
|
87
89
|
};
|
|
88
90
|
FloatingContextualMenu.displayName = 'FloatingContextualMenu';
|
|
@@ -125,7 +125,7 @@ var FloatingDeleteButton = /*#__PURE__*/function (_Component) {
|
|
|
125
125
|
switch (_this.state.selectionType) {
|
|
126
126
|
case 'column':
|
|
127
127
|
{
|
|
128
|
-
(0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.BUTTON, rect)(state, dispatch, _this.props.editorView);
|
|
128
|
+
(0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, _this.props.api)(_analytics.INPUT_METHOD.BUTTON, rect)(state, dispatch, _this.props.editorView);
|
|
129
129
|
return;
|
|
130
130
|
}
|
|
131
131
|
case 'row':
|
|
@@ -198,6 +198,7 @@ var DragMenu = exports.DragMenu = /*#__PURE__*/_react.default.memo(function (_re
|
|
|
198
198
|
tableNode = _ref.tableNode,
|
|
199
199
|
targetCellPosition = _ref.targetCellPosition,
|
|
200
200
|
getEditorContainerWidth = _ref.getEditorContainerWidth,
|
|
201
|
+
api = _ref.api,
|
|
201
202
|
editorAnalyticsAPI = _ref.editorAnalyticsAPI,
|
|
202
203
|
pluginConfig = _ref.pluginConfig,
|
|
203
204
|
formatMessage = _ref.intl.formatMessage,
|
|
@@ -225,7 +226,7 @@ var DragMenu = exports.DragMenu = /*#__PURE__*/_react.default.memo(function (_re
|
|
|
225
226
|
var selectionRect = (0, _utils2.isSelectionType)(selection, 'cell') ? (0, _utils2.getSelectionRect)(selection) : (0, _utils2.findCellRectClosestToPos)(selection.$from);
|
|
226
227
|
var hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
|
|
227
228
|
var allowBackgroundColor = (_pluginConfig$allowBa = pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.allowBackgroundColor) !== null && _pluginConfig$allowBa !== void 0 ? _pluginConfig$allowBa : false;
|
|
228
|
-
var dragMenuConfig = (0, _dragMenu.getDragMenuConfig)(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder, ariaNotifyPlugin);
|
|
229
|
+
var dragMenuConfig = (0, _dragMenu.getDragMenuConfig)(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder, ariaNotifyPlugin);
|
|
229
230
|
var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, tableSortColumnReorder, selectionRect),
|
|
230
231
|
menuItems = _convertToDropdownIte.menuItems,
|
|
231
232
|
menuCallback = _convertToDropdownIte.menuCallback;
|
|
@@ -28,7 +28,8 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
|
|
|
28
28
|
pluginConfig = _ref.pluginConfig,
|
|
29
29
|
isTableScalingEnabled = _ref.isTableScalingEnabled,
|
|
30
30
|
getEditorFeatureFlags = _ref.getEditorFeatureFlags,
|
|
31
|
-
ariaNotifyPlugin = _ref.ariaNotifyPlugin
|
|
31
|
+
ariaNotifyPlugin = _ref.ariaNotifyPlugin,
|
|
32
|
+
api = _ref.api;
|
|
32
33
|
if (!isOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
|
|
33
34
|
return null;
|
|
34
35
|
}
|
|
@@ -84,7 +85,8 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
|
|
|
84
85
|
shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
|
|
85
86
|
isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption,
|
|
86
87
|
tableSortColumnReorder: tableSortColumnReorder,
|
|
87
|
-
ariaNotifyPlugin: ariaNotifyPlugin
|
|
88
|
+
ariaNotifyPlugin: ariaNotifyPlugin,
|
|
89
|
+
api: api
|
|
88
90
|
}));
|
|
89
91
|
};
|
|
90
92
|
FloatingDragMenu.displayName = 'FloatingDragMenu';
|
|
@@ -213,7 +213,7 @@ var FloatingInsertButton = exports.FloatingInsertButton = /*#__PURE__*/function
|
|
|
213
213
|
var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && (0, _platformFeatureFlags.fg)('platform.editor.table.use-increased-scaling-percent');
|
|
214
214
|
var state = editorView.state,
|
|
215
215
|
dispatch = editorView.dispatch;
|
|
216
|
-
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
|
|
216
|
+
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(this.props.api, editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
|
|
217
217
|
}
|
|
218
218
|
}
|
|
219
219
|
}]);
|
|
@@ -68,14 +68,14 @@ var defaultSelectionRect = {
|
|
|
68
68
|
right: 0,
|
|
69
69
|
bottom: 0
|
|
70
70
|
};
|
|
71
|
-
var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired) {
|
|
71
|
+
var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired) {
|
|
72
72
|
var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
|
|
73
|
-
var isTableScalingEnabled = arguments.length >
|
|
74
|
-
var tableDuplicateCellColouring = arguments.length >
|
|
75
|
-
var isTableFixedColumnWidthsOptionEnabled = arguments.length >
|
|
76
|
-
var shouldUseIncreasedScalingPercent = arguments.length >
|
|
77
|
-
var tableSortColumnReorder = arguments.length >
|
|
78
|
-
var ariaNotifyPlugin = arguments.length >
|
|
73
|
+
var isTableScalingEnabled = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
|
|
74
|
+
var tableDuplicateCellColouring = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
|
|
75
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : false;
|
|
76
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 14 && arguments[14] !== undefined ? arguments[14] : false;
|
|
77
|
+
var tableSortColumnReorder = arguments.length > 15 && arguments[15] !== undefined ? arguments[15] : false;
|
|
78
|
+
var ariaNotifyPlugin = arguments.length > 16 ? arguments[16] : undefined;
|
|
79
79
|
var selection = editorView.state.selection;
|
|
80
80
|
var _getTablePluginState = (0, _pluginFactory.getPluginState)(editorView.state),
|
|
81
81
|
getIntl = _getTablePluginState.getIntl;
|
|
@@ -177,7 +177,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
177
177
|
moveCursorToInsertedRow: true
|
|
178
178
|
})(state, dispatch);
|
|
179
179
|
} else {
|
|
180
|
-
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, (index !== null && index !== void 0 ? index : 0) + offset)(state, dispatch, editorView);
|
|
180
|
+
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(api, editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, (index !== null && index !== void 0 ? index : 0) + offset)(state, dispatch, editorView);
|
|
181
181
|
}
|
|
182
182
|
return true;
|
|
183
183
|
},
|
|
@@ -192,7 +192,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
192
192
|
if (selectionRect) {
|
|
193
193
|
var newResizeState = (0, _resizeState.getNewResizeStateFromSelectedColumns)(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled);
|
|
194
194
|
if (newResizeState) {
|
|
195
|
-
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, newResizeState)(state, dispatch);
|
|
195
|
+
(0, _commandsWithAnalytics.distributeColumnsWidthsWithAnalytics)(editorAnalyticsAPI, api)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, newResizeState)(state, dispatch);
|
|
196
196
|
return true;
|
|
197
197
|
}
|
|
198
198
|
return false;
|
|
@@ -216,7 +216,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
216
216
|
if (direction === 'row') {
|
|
217
217
|
(0, _commandsWithAnalytics.deleteRowsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect, !!isHeaderRowRequired)(state, dispatch);
|
|
218
218
|
} else {
|
|
219
|
-
(0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect)(state, dispatch, editorView);
|
|
219
|
+
(0, _commandsWithAnalytics.deleteColumnsWithAnalytics)(editorAnalyticsAPI, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect)(state, dispatch, editorView);
|
|
220
220
|
}
|
|
221
221
|
return true;
|
|
222
222
|
},
|
|
@@ -151,6 +151,7 @@ export const changeColumnWidthByStep = ({
|
|
|
151
151
|
isTableFixedColumnWidthsOptionEnabled,
|
|
152
152
|
isCommentEditor,
|
|
153
153
|
ariaNotify,
|
|
154
|
+
api,
|
|
154
155
|
getIntl
|
|
155
156
|
}) => (state, dispatch, view) => {
|
|
156
157
|
let customTr = state.tr;
|
|
@@ -218,7 +219,7 @@ export const changeColumnWidthByStep = ({
|
|
|
218
219
|
// only selected (or selected - 1) columns should be distributed
|
|
219
220
|
const resizingSelectedColumns = selectedColumns.indexOf(colIndex) > -1 || selectedColumns.indexOf(colIndex + 1) > -1;
|
|
220
221
|
let newResizeState = resizeColumn(initialResizeState, colIndex, stepSize, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, isTableScalingEnabled, shouldUseIncreasedScalingPercent);
|
|
221
|
-
customTr = updateColumnWidths(newResizeState, originalTable, tableStartPosition)(customTr);
|
|
222
|
+
customTr = updateColumnWidths(newResizeState, originalTable, tableStartPosition, api)(customTr);
|
|
222
223
|
if (dispatch) {
|
|
223
224
|
dispatch(customTr);
|
|
224
225
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { deleteColumns } from '../transforms/delete-columns';
|
|
2
2
|
import { getAllowAddColumnCustomStep } from '../utils/get-allow-add-column-custom-step';
|
|
3
|
-
export const deleteColumnsCommand = (rect, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => (state, dispatch, view) => {
|
|
4
|
-
const tr = deleteColumns(rect, getAllowAddColumnCustomStep(state), view, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(state.tr);
|
|
3
|
+
export const deleteColumnsCommand = (rect, api, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => (state, dispatch, view) => {
|
|
4
|
+
const tr = deleteColumns(rect, getAllowAddColumnCustomStep(state), api, view, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(state.tr);
|
|
5
5
|
if (dispatch) {
|
|
6
6
|
dispatch(tr);
|
|
7
7
|
return true;
|
|
@@ -19,7 +19,7 @@ function addColumnAtCustomStep(column) {
|
|
|
19
19
|
return tr;
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
-
export function addColumnAt(isTableScalingEnabled = false, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) {
|
|
22
|
+
export function addColumnAt(api, isTableScalingEnabled = false, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) {
|
|
23
23
|
return (column, allowAddColumnCustomStep = false, view) => {
|
|
24
24
|
return tr => {
|
|
25
25
|
let updatedTr = tr;
|
|
@@ -31,7 +31,7 @@ export function addColumnAt(isTableScalingEnabled = false, isCellBackgroundDupli
|
|
|
31
31
|
const table = findTable(updatedTr.selection);
|
|
32
32
|
if (table) {
|
|
33
33
|
// [ED-8288] Update colwidths manually to avoid multiple dispatch in TableComponent
|
|
34
|
-
updatedTr = rescaleColumns(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(table, view)(updatedTr);
|
|
34
|
+
updatedTr = rescaleColumns(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, api)(table, view)(updatedTr);
|
|
35
35
|
}
|
|
36
36
|
if (view) {
|
|
37
37
|
updatedTr = updateRowOrColumnMovedTransform({
|
|
@@ -48,33 +48,33 @@ export function addColumnAt(isTableScalingEnabled = false, isCellBackgroundDupli
|
|
|
48
48
|
|
|
49
49
|
// :: (EditorState, dispatch: ?(tr: Transaction)) → bool
|
|
50
50
|
// Command to add a column before the column with the selection.
|
|
51
|
-
export const addColumnBefore = (isTableScalingEnabled = false, isCellBackgroundDuplicated = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => (state, dispatch, view) => {
|
|
51
|
+
export const addColumnBefore = (api, isTableScalingEnabled = false, isCellBackgroundDuplicated = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => (state, dispatch, view) => {
|
|
52
52
|
const table = findTable(state.selection);
|
|
53
53
|
if (!table) {
|
|
54
54
|
return false;
|
|
55
55
|
}
|
|
56
56
|
if (dispatch) {
|
|
57
57
|
let rect = selectedRect(state);
|
|
58
|
-
dispatch(addColumnAt(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(rect.left, getAllowAddColumnCustomStep(state), view)(state.tr));
|
|
58
|
+
dispatch(addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(rect.left, getAllowAddColumnCustomStep(state), view)(state.tr));
|
|
59
59
|
}
|
|
60
60
|
return true;
|
|
61
61
|
};
|
|
62
62
|
|
|
63
63
|
// :: (EditorState, dispatch: ?(tr: Transaction)) → bool
|
|
64
64
|
// Command to add a column after the column with the selection.
|
|
65
|
-
export const addColumnAfter = (isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) => (state, dispatch, view) => {
|
|
65
|
+
export const addColumnAfter = (api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) => (state, dispatch, view) => {
|
|
66
66
|
const table = findTable(state.selection);
|
|
67
67
|
if (!table) {
|
|
68
68
|
return false;
|
|
69
69
|
}
|
|
70
70
|
if (dispatch) {
|
|
71
71
|
let rect = selectedRect(state);
|
|
72
|
-
dispatch(addColumnAt(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(rect.right, getAllowAddColumnCustomStep(state), view)(state.tr));
|
|
72
|
+
dispatch(addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(rect.right, getAllowAddColumnCustomStep(state), view)(state.tr));
|
|
73
73
|
}
|
|
74
74
|
return true;
|
|
75
75
|
};
|
|
76
|
-
export const insertColumn = (isTableScalingEnabled = false, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) => column => (state, dispatch, view) => {
|
|
77
|
-
let tr = addColumnAt(isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(column, getAllowAddColumnCustomStep(state), view)(state.tr);
|
|
76
|
+
export const insertColumn = (api, isTableScalingEnabled = false, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) => column => (state, dispatch, view) => {
|
|
77
|
+
let tr = addColumnAt(api, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(column, getAllowAddColumnCustomStep(state), view)(state.tr);
|
|
78
78
|
const table = findTable(tr.selection);
|
|
79
79
|
if (!table) {
|
|
80
80
|
return false;
|
|
@@ -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, isCommentEditor, inputMethod, ariaNotify, getIntl) => withEditorAnalyticsAPI(state => {
|
|
174
|
+
export const changeColumnWidthByStepWithAnalytics = (editorAnalyticsAPI, api) => (stepSize, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor, inputMethod, ariaNotify, getIntl) => withEditorAnalyticsAPI(state => {
|
|
175
175
|
const {
|
|
176
176
|
table,
|
|
177
177
|
totalRowCount,
|
|
@@ -203,9 +203,10 @@ export const changeColumnWidthByStepWithAnalytics = editorAnalyticsAPI => (stepS
|
|
|
203
203
|
isTableFixedColumnWidthsOptionEnabled,
|
|
204
204
|
isCommentEditor,
|
|
205
205
|
ariaNotify: ariaNotify,
|
|
206
|
-
getIntl: getIntl
|
|
206
|
+
getIntl: getIntl,
|
|
207
|
+
api
|
|
207
208
|
}));
|
|
208
|
-
export const insertColumnWithAnalytics = (editorAnalyticsAPI, isTableScalingEnabled = false, isCellbackgroundDuplicated = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => (inputMethod, position) => withEditorAnalyticsAPI(state => {
|
|
209
|
+
export const insertColumnWithAnalytics = (api, editorAnalyticsAPI, isTableScalingEnabled = false, isCellbackgroundDuplicated = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => (inputMethod, position) => withEditorAnalyticsAPI(state => {
|
|
209
210
|
const {
|
|
210
211
|
totalRowCount,
|
|
211
212
|
totalColumnCount
|
|
@@ -222,7 +223,7 @@ export const insertColumnWithAnalytics = (editorAnalyticsAPI, isTableScalingEnab
|
|
|
222
223
|
},
|
|
223
224
|
eventType: EVENT_TYPE.TRACK
|
|
224
225
|
};
|
|
225
|
-
})(editorAnalyticsAPI)(insertColumn(isTableScalingEnabled, isCellbackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(position));
|
|
226
|
+
})(editorAnalyticsAPI)(insertColumn(api, isTableScalingEnabled, isCellbackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(position));
|
|
226
227
|
export const deleteRowsWithAnalytics = editorAnalyticsAPI => (inputMethod, rect, isHeaderRowRequired) => withEditorAnalyticsAPI(({
|
|
227
228
|
selection
|
|
228
229
|
}) => {
|
|
@@ -249,7 +250,7 @@ export const deleteRowsWithAnalytics = editorAnalyticsAPI => (inputMethod, rect,
|
|
|
249
250
|
}
|
|
250
251
|
return true;
|
|
251
252
|
});
|
|
252
|
-
export const deleteColumnsWithAnalytics = (editorAnalyticsAPI, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => (inputMethod, rect) => withEditorAnalyticsAPI(({
|
|
253
|
+
export const deleteColumnsWithAnalytics = (editorAnalyticsAPI, api, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => (inputMethod, rect) => withEditorAnalyticsAPI(({
|
|
253
254
|
selection
|
|
254
255
|
}) => {
|
|
255
256
|
const {
|
|
@@ -269,8 +270,8 @@ export const deleteColumnsWithAnalytics = (editorAnalyticsAPI, isTableScalingEna
|
|
|
269
270
|
},
|
|
270
271
|
eventType: EVENT_TYPE.TRACK
|
|
271
272
|
};
|
|
272
|
-
})(editorAnalyticsAPI)(deleteColumnsCommand(rect, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent));
|
|
273
|
-
export const deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = (editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) => (state, dispatch) => {
|
|
273
|
+
})(editorAnalyticsAPI)(deleteColumnsCommand(rect, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent));
|
|
274
|
+
export const deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = (editorAnalyticsAPI, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent) => (state, dispatch) => {
|
|
274
275
|
const {
|
|
275
276
|
selection
|
|
276
277
|
} = state;
|
|
@@ -290,7 +291,7 @@ export const deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = (editorAnalyt
|
|
|
290
291
|
const isHeaderRowRequired = pluginConfig.isHeaderRowRequired || false;
|
|
291
292
|
return deleteRowsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, rect, isHeaderRowRequired)(state, dispatch);
|
|
292
293
|
} else if (selectionType === 'column') {
|
|
293
|
-
return deleteColumnsWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(INPUT_METHOD.SHORTCUT, rect)(state, dispatch);
|
|
294
|
+
return deleteColumnsWithAnalytics(editorAnalyticsAPI, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(INPUT_METHOD.SHORTCUT, rect)(state, dispatch);
|
|
294
295
|
} else {
|
|
295
296
|
return false;
|
|
296
297
|
}
|
|
@@ -418,7 +419,7 @@ export const sortColumnWithAnalytics = editorAnalyticsAPI => (inputMethod, colum
|
|
|
418
419
|
eventType: EVENT_TYPE.TRACK
|
|
419
420
|
};
|
|
420
421
|
})(editorAnalyticsAPI)(sortByColumn(columnIndex, sortOrder));
|
|
421
|
-
export const distributeColumnsWidthsWithAnalytics = editorAnalyticsAPI => (inputMethod, {
|
|
422
|
+
export const distributeColumnsWidthsWithAnalytics = (editorAnalyticsAPI, api) => (inputMethod, {
|
|
422
423
|
resizeState,
|
|
423
424
|
table,
|
|
424
425
|
attributes
|
|
@@ -436,7 +437,7 @@ export const distributeColumnsWidthsWithAnalytics = editorAnalyticsAPI => (input
|
|
|
436
437
|
};
|
|
437
438
|
})(editorAnalyticsAPI)((state, dispatch) => {
|
|
438
439
|
if (dispatch) {
|
|
439
|
-
distributeColumnsWidths(resizeState, table)(state, dispatch);
|
|
440
|
+
distributeColumnsWidths(resizeState, table, api)(state, dispatch);
|
|
440
441
|
}
|
|
441
442
|
return true;
|
|
442
443
|
});
|
|
@@ -353,7 +353,7 @@ export function handleTripleClick(view, pos) {
|
|
|
353
353
|
}
|
|
354
354
|
return false;
|
|
355
355
|
}
|
|
356
|
-
export const handleCut = (oldTr, oldState, newState, editorAnalyticsAPI, editorView, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => {
|
|
356
|
+
export const handleCut = (oldTr, oldState, newState, api, editorAnalyticsAPI, editorView, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => {
|
|
357
357
|
const oldSelection = oldState.tr.selection;
|
|
358
358
|
let {
|
|
359
359
|
tr
|
|
@@ -402,7 +402,7 @@ export const handleCut = (oldTr, oldState, newState, editorAnalyticsAPI, editorV
|
|
|
402
402
|
} = getPluginState(newState);
|
|
403
403
|
tr = deleteRows(rect, isHeaderRowRequired)(tr);
|
|
404
404
|
} else if (tr.selection.isColSelection()) {
|
|
405
|
-
tr = deleteColumns(rect, getAllowAddColumnCustomStep(oldState), editorView, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(tr);
|
|
405
|
+
tr = deleteColumns(rect, getAllowAddColumnCustomStep(oldState), api, editorView, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(tr);
|
|
406
406
|
}
|
|
407
407
|
}
|
|
408
408
|
}
|
|
@@ -210,7 +210,7 @@ class TableComponent extends React.Component {
|
|
|
210
210
|
containerWidth: width,
|
|
211
211
|
previousContainerWidth: this.containerWidth.width || width,
|
|
212
212
|
...options
|
|
213
|
-
}, domAtPos, false,
|
|
213
|
+
}, domAtPos, this.props.pluginInjectionApi, false,
|
|
214
214
|
// isTableScalingEnabled doesn't change the behavior of nested tables
|
|
215
215
|
false // shouldUseIncreasedScalingPercent set to false for nested tables
|
|
216
216
|
)(state.tr);
|
|
@@ -325,7 +325,7 @@ export const TableResizer = ({
|
|
|
325
325
|
prevNode: node,
|
|
326
326
|
start: pos + 1,
|
|
327
327
|
parentWidth: newWidth
|
|
328
|
-
}, editorView.domAtPos.bind(editorView), isTableScalingEnabled, shouldUseIncreasedScalingPercent || false)(tr);
|
|
328
|
+
}, editorView.domAtPos.bind(editorView), pluginInjectionApi, isTableScalingEnabled, shouldUseIncreasedScalingPercent || false)(tr);
|
|
329
329
|
const scaledNode = tr.doc.nodeAt(pos);
|
|
330
330
|
(_attachAnalyticsEvent2 = attachAnalyticsEvent(generateResizedPayload({
|
|
331
331
|
originalNode: node,
|