@atlaskit/editor-plugin-table 7.31.2 → 7.31.3
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/insert.js +16 -19
- package/dist/cjs/commands-with-analytics.js +5 -7
- package/dist/cjs/plugin.js +2 -3
- package/dist/cjs/pm-plugins/keymap.js +9 -10
- package/dist/cjs/toolbar.js +9 -12
- package/dist/cjs/ui/FloatingContextualMenu/ContextualMenu.js +2 -4
- package/dist/cjs/ui/FloatingDragMenu/DragMenu.js +1 -2
- package/dist/cjs/ui/FloatingDragMenu/index.js +2 -4
- package/dist/cjs/ui/FloatingInsertButton/index.js +3 -7
- package/dist/cjs/utils/drag-menu.js +6 -7
- package/dist/es2019/commands/insert.js +10 -10
- package/dist/es2019/commands-with-analytics.js +4 -4
- package/dist/es2019/plugin.js +2 -3
- package/dist/es2019/pm-plugins/keymap.js +5 -5
- package/dist/es2019/toolbar.js +5 -6
- package/dist/es2019/ui/FloatingContextualMenu/ContextualMenu.js +2 -3
- package/dist/es2019/ui/FloatingDragMenu/DragMenu.js +1 -2
- package/dist/es2019/ui/FloatingDragMenu/index.js +2 -3
- package/dist/es2019/ui/FloatingInsertButton/index.js +3 -6
- package/dist/es2019/utils/drag-menu.js +3 -3
- package/dist/esm/commands/insert.js +16 -19
- package/dist/esm/commands-with-analytics.js +5 -7
- package/dist/esm/plugin.js +2 -3
- package/dist/esm/pm-plugins/keymap.js +9 -10
- package/dist/esm/toolbar.js +9 -12
- package/dist/esm/ui/FloatingContextualMenu/ContextualMenu.js +2 -4
- package/dist/esm/ui/FloatingDragMenu/DragMenu.js +1 -2
- package/dist/esm/ui/FloatingDragMenu/index.js +2 -4
- package/dist/esm/ui/FloatingInsertButton/index.js +3 -7
- package/dist/esm/utils/drag-menu.js +6 -7
- package/dist/types/commands/insert.d.ts +5 -5
- package/dist/types/commands-with-analytics.d.ts +3 -4
- package/dist/types/pm-plugins/keymap.d.ts +1 -1
- package/dist/types/toolbar.d.ts +1 -1
- package/dist/types/ui/FloatingDragMenu/DragMenu.d.ts +0 -1
- package/dist/types/utils/drag-menu.d.ts +1 -1
- package/dist/types-ts4.5/commands/insert.d.ts +5 -5
- package/dist/types-ts4.5/commands-with-analytics.d.ts +3 -4
- package/dist/types-ts4.5/pm-plugins/keymap.d.ts +1 -1
- package/dist/types-ts4.5/toolbar.d.ts +1 -1
- package/dist/types-ts4.5/ui/FloatingDragMenu/DragMenu.d.ts +0 -1
- package/dist/types-ts4.5/utils/drag-menu.d.ts +1 -1
- package/package.json +3 -3
- package/src/commands/insert.ts +3 -10
- package/src/commands-with-analytics.ts +7 -8
- package/src/plugin.tsx +0 -4
- package/src/pm-plugins/keymap.ts +0 -5
- package/src/toolbar.tsx +0 -8
- package/src/ui/FloatingContextualMenu/ContextualMenu.tsx +7 -10
- package/src/ui/FloatingDragMenu/DragMenu.tsx +0 -3
- package/src/ui/FloatingDragMenu/index.tsx +1 -3
- package/src/ui/FloatingInsertButton/index.tsx +5 -10
- package/src/utils/drag-menu.ts +4 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-table
|
|
2
2
|
|
|
3
|
+
## 7.31.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#165001](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165001)
|
|
8
|
+
[`d77bdbfe892ed`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d77bdbfe892ed) -
|
|
9
|
+
tidy table duplicate cell color experiment
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
3
12
|
## 7.31.2
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
|
@@ -30,10 +30,9 @@ function addColumnAtCustomStep(column) {
|
|
|
30
30
|
}
|
|
31
31
|
function addColumnAt(api) {
|
|
32
32
|
var isTableScalingEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
33
|
-
var
|
|
34
|
-
var
|
|
35
|
-
var
|
|
36
|
-
var isCommentEditor = arguments.length > 5 ? arguments[5] : undefined;
|
|
33
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 2 ? arguments[2] : undefined;
|
|
34
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 3 ? arguments[3] : undefined;
|
|
35
|
+
var isCommentEditor = arguments.length > 4 ? arguments[4] : undefined;
|
|
37
36
|
return function (column) {
|
|
38
37
|
var allowAddColumnCustomStep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
39
38
|
var view = arguments.length > 2 ? arguments[2] : undefined;
|
|
@@ -42,7 +41,7 @@ function addColumnAt(api) {
|
|
|
42
41
|
if (allowAddColumnCustomStep) {
|
|
43
42
|
updatedTr = addColumnAtCustomStep(column)(updatedTr);
|
|
44
43
|
} else {
|
|
45
|
-
updatedTr = (0, _utils2.addColumnAt)(column
|
|
44
|
+
updatedTr = (0, _utils2.addColumnAt)(column)(updatedTr);
|
|
46
45
|
}
|
|
47
46
|
var table = (0, _utils2.findTable)(updatedTr.selection);
|
|
48
47
|
if (table) {
|
|
@@ -66,10 +65,9 @@ function addColumnAt(api) {
|
|
|
66
65
|
// Command to add a column before the column with the selection.
|
|
67
66
|
var addColumnBefore = exports.addColumnBefore = function addColumnBefore(api) {
|
|
68
67
|
var isTableScalingEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
69
|
-
var
|
|
70
|
-
var
|
|
71
|
-
var
|
|
72
|
-
var isCommentEditor = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
68
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
69
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
70
|
+
var isCommentEditor = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
73
71
|
return function (state, dispatch, view) {
|
|
74
72
|
var table = (0, _utils2.findTable)(state.selection);
|
|
75
73
|
if (!table) {
|
|
@@ -77,7 +75,7 @@ var addColumnBefore = exports.addColumnBefore = function addColumnBefore(api) {
|
|
|
77
75
|
}
|
|
78
76
|
if (dispatch) {
|
|
79
77
|
var rect = (0, _utils2.selectedRect)(state);
|
|
80
|
-
dispatch(addColumnAt(api, isTableScalingEnabled,
|
|
78
|
+
dispatch(addColumnAt(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(rect.left, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
|
|
81
79
|
}
|
|
82
80
|
return true;
|
|
83
81
|
};
|
|
@@ -85,7 +83,7 @@ var addColumnBefore = exports.addColumnBefore = function addColumnBefore(api) {
|
|
|
85
83
|
|
|
86
84
|
// :: (EditorState, dispatch: ?(tr: Transaction)) → bool
|
|
87
85
|
// Command to add a column after the column with the selection.
|
|
88
|
-
var addColumnAfter = exports.addColumnAfter = function addColumnAfter(api, isTableScalingEnabled,
|
|
86
|
+
var addColumnAfter = exports.addColumnAfter = function addColumnAfter(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor) {
|
|
89
87
|
return function (state, dispatch, view) {
|
|
90
88
|
var table = (0, _utils2.findTable)(state.selection);
|
|
91
89
|
if (!table) {
|
|
@@ -93,20 +91,19 @@ var addColumnAfter = exports.addColumnAfter = function addColumnAfter(api, isTab
|
|
|
93
91
|
}
|
|
94
92
|
if (dispatch) {
|
|
95
93
|
var rect = (0, _utils2.selectedRect)(state);
|
|
96
|
-
dispatch(addColumnAt(api, isTableScalingEnabled,
|
|
94
|
+
dispatch(addColumnAt(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(rect.right, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr));
|
|
97
95
|
}
|
|
98
96
|
return true;
|
|
99
97
|
};
|
|
100
98
|
};
|
|
101
99
|
var insertColumn = exports.insertColumn = function insertColumn(api) {
|
|
102
100
|
var isTableScalingEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
103
|
-
var
|
|
104
|
-
var
|
|
105
|
-
var
|
|
106
|
-
var isCommentEditor = arguments.length > 5 ? arguments[5] : undefined;
|
|
101
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 2 ? arguments[2] : undefined;
|
|
102
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 3 ? arguments[3] : undefined;
|
|
103
|
+
var isCommentEditor = arguments.length > 4 ? arguments[4] : undefined;
|
|
107
104
|
return function (column) {
|
|
108
105
|
return function (state, dispatch, view) {
|
|
109
|
-
var tr = addColumnAt(api, isTableScalingEnabled,
|
|
106
|
+
var tr = addColumnAt(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(column, (0, _getAllowAddColumnCustomStep.getAllowAddColumnCustomStep)(state), view)(state.tr);
|
|
110
107
|
var table = (0, _utils2.findTable)(tr.selection);
|
|
111
108
|
if (!table) {
|
|
112
109
|
return false;
|
|
@@ -120,7 +117,7 @@ var insertColumn = exports.insertColumn = function insertColumn(api) {
|
|
|
120
117
|
};
|
|
121
118
|
};
|
|
122
119
|
};
|
|
123
|
-
var insertRow = exports.insertRow = function insertRow(row, moveCursorToTheNewRow
|
|
120
|
+
var insertRow = exports.insertRow = function insertRow(row, moveCursorToTheNewRow) {
|
|
124
121
|
return function (state, dispatch) {
|
|
125
122
|
// Don't clone the header row
|
|
126
123
|
var headerRowEnabled = (0, _utils3.checkIfHeaderRowEnabled)(state.selection);
|
|
@@ -131,7 +128,7 @@ var insertRow = exports.insertRow = function insertRow(row, moveCursorToTheNewRo
|
|
|
131
128
|
if (row === 0 && headerRowEnabled) {
|
|
132
129
|
return false;
|
|
133
130
|
}
|
|
134
|
-
var tr = clonePreviousRow ? (0, _utils3.copyPreviousRow)(state.schema)(row)(state.tr) : (0, _utils2.addRowAt)(row, undefined
|
|
131
|
+
var tr = clonePreviousRow ? (0, _utils3.copyPreviousRow)(state.schema)(row)(state.tr) : (0, _utils2.addRowAt)(row, undefined)(state.tr);
|
|
135
132
|
var table = (0, _utils2.findTable)(tr.selection);
|
|
136
133
|
if (!table) {
|
|
137
134
|
return false;
|
|
@@ -167,7 +167,6 @@ var addRowAroundSelection = exports.addRowAroundSelection = function addRowAroun
|
|
|
167
167
|
};
|
|
168
168
|
};
|
|
169
169
|
var insertRowWithAnalytics = exports.insertRowWithAnalytics = function insertRowWithAnalytics(editorAnalyticsAPI) {
|
|
170
|
-
var isCellbackgroundDuplicated = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
171
170
|
return function (inputMethod, options) {
|
|
172
171
|
return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
|
|
173
172
|
var _getSelectedTableInfo = (0, _utils2.getSelectedTableInfo)(state.selection),
|
|
@@ -185,7 +184,7 @@ var insertRowWithAnalytics = exports.insertRowWithAnalytics = function insertRow
|
|
|
185
184
|
},
|
|
186
185
|
eventType: _analytics.EVENT_TYPE.TRACK
|
|
187
186
|
};
|
|
188
|
-
})(editorAnalyticsAPI)((0, _insert.insertRow)(options.index, options.moveCursorToInsertedRow
|
|
187
|
+
})(editorAnalyticsAPI)((0, _insert.insertRow)(options.index, options.moveCursorToInsertedRow));
|
|
189
188
|
};
|
|
190
189
|
};
|
|
191
190
|
var changeColumnWidthByStepWithAnalytics = exports.changeColumnWidthByStepWithAnalytics = function changeColumnWidthByStepWithAnalytics(editorAnalyticsAPI, api) {
|
|
@@ -225,10 +224,9 @@ var changeColumnWidthByStepWithAnalytics = exports.changeColumnWidthByStepWithAn
|
|
|
225
224
|
};
|
|
226
225
|
var insertColumnWithAnalytics = exports.insertColumnWithAnalytics = function insertColumnWithAnalytics(api, editorAnalyticsAPI) {
|
|
227
226
|
var isTableScalingEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
228
|
-
var
|
|
229
|
-
var
|
|
230
|
-
var
|
|
231
|
-
var isCommentEditor = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
227
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
228
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
229
|
+
var isCommentEditor = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
232
230
|
return function (inputMethod, position) {
|
|
233
231
|
return (0, _analytics2.withEditorAnalyticsAPI)(function (state) {
|
|
234
232
|
var _getSelectedTableInfo3 = (0, _utils2.getSelectedTableInfo)(state.selection),
|
|
@@ -246,7 +244,7 @@ var insertColumnWithAnalytics = exports.insertColumnWithAnalytics = function ins
|
|
|
246
244
|
},
|
|
247
245
|
eventType: _analytics.EVENT_TYPE.TRACK
|
|
248
246
|
};
|
|
249
|
-
})(editorAnalyticsAPI)((0, _insert.insertColumn)(api, isTableScalingEnabled,
|
|
247
|
+
})(editorAnalyticsAPI)((0, _insert.insertColumn)(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(position));
|
|
250
248
|
};
|
|
251
249
|
};
|
|
252
250
|
var deleteRowsWithAnalytics = exports.deleteRowsWithAnalytics = function deleteRowsWithAnalytics(editorAnalyticsAPI) {
|
package/dist/cjs/plugin.js
CHANGED
|
@@ -66,7 +66,7 @@ var defaultGetEditorFeatureFlags = function defaultGetEditorFeatureFlags() {
|
|
|
66
66
|
* from `@atlaskit/editor-core`.
|
|
67
67
|
*/
|
|
68
68
|
var tablesPlugin = function tablesPlugin(_ref) {
|
|
69
|
-
var _api$analytics, _api$accessibilityUti, _options$getEditorFea,
|
|
69
|
+
var _api$analytics, _api$accessibilityUti, _options$getEditorFea, _api$analytics2;
|
|
70
70
|
var options = _ref.config,
|
|
71
71
|
api = _ref.api;
|
|
72
72
|
var editorViewRef = {
|
|
@@ -83,7 +83,6 @@ var tablesPlugin = function tablesPlugin(_ref) {
|
|
|
83
83
|
var isTableFixedColumnWidthsOptionEnabled = (options === null || options === void 0 || (_options$getEditorFea = options.getEditorFeatureFlags) === null || _options$getEditorFea === void 0 ? void 0 : _options$getEditorFea.call(options).tableWithFixedColumnWidthsOption) || false;
|
|
84
84
|
var shouldUseIncreasedScalingPercent = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) && (isTableFixedColumnWidthsOptionEnabled || ( // When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
85
85
|
options === null || options === void 0 ? void 0 : options.isCommentEditor));
|
|
86
|
-
var isCellBackgroundDuplicated = (options === null || options === void 0 || (_options$getEditorFea2 = options.getEditorFeatureFlags) === null || _options$getEditorFea2 === void 0 ? void 0 : _options$getEditorFea2.call(options).tableDuplicateCellColouring) || false;
|
|
87
86
|
return {
|
|
88
87
|
name: 'table',
|
|
89
88
|
// Use getSharedState to store fullWidthEnabled and wasFullWidthModeEnabled to guarantee access
|
|
@@ -269,7 +268,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
|
|
|
269
268
|
isChromelessEditor = _ref7$isChromelessEdi === void 0 ? false : _ref7$isChromelessEdi,
|
|
270
269
|
_ref7$tableResizingEn = _ref7.tableResizingEnabled,
|
|
271
270
|
tableResizingEnabled = _ref7$tableResizingEn === void 0 ? false : _ref7$tableResizingEn;
|
|
272
|
-
return (0, _keymap.keymapPlugin)(defaultGetEditorContainerWidth, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, dragAndDropEnabled, isTableScalingEnabled, isTableAlignmentEnabled, fullWidthEnabled, api, getIntl,
|
|
271
|
+
return (0, _keymap.keymapPlugin)(defaultGetEditorContainerWidth, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, dragAndDropEnabled, isTableScalingEnabled, isTableAlignmentEnabled, fullWidthEnabled, api, getIntl, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor, isChromelessEditor, tableResizingEnabled);
|
|
273
272
|
}
|
|
274
273
|
}, {
|
|
275
274
|
name: 'tableSelectionKeymap',
|
|
@@ -21,12 +21,11 @@ function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProviderAPI, e
|
|
|
21
21
|
var isFullWidthEnabled = arguments.length > 7 ? arguments[7] : undefined;
|
|
22
22
|
var pluginInjectionApi = arguments.length > 8 ? arguments[8] : undefined;
|
|
23
23
|
var getIntl = arguments.length > 9 ? arguments[9] : undefined;
|
|
24
|
-
var
|
|
25
|
-
var
|
|
26
|
-
var
|
|
27
|
-
var
|
|
28
|
-
var
|
|
29
|
-
var isTableResizingEnabled = arguments.length > 15 ? arguments[15] : undefined;
|
|
24
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
|
|
25
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 11 ? arguments[11] : undefined;
|
|
26
|
+
var isCommentEditor = arguments.length > 12 ? arguments[12] : undefined;
|
|
27
|
+
var isChromelessEditor = arguments.length > 13 ? arguments[13] : undefined;
|
|
28
|
+
var isTableResizingEnabled = arguments.length > 14 ? arguments[14] : undefined;
|
|
30
29
|
var list = {};
|
|
31
30
|
var ariaNotifyPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions.ariaNotify;
|
|
32
31
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.nextCell.common, (0, _commands2.goToNextCell)(editorAnalyticsAPI, ariaNotifyPlugin, getIntl)(1), list);
|
|
@@ -38,12 +37,12 @@ function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProviderAPI, e
|
|
|
38
37
|
// Add row/column shortcuts
|
|
39
38
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addRowBefore.common, (0, _commandsWithAnalytics.addRowAroundSelection)(editorAnalyticsAPI)('TOP'), list);
|
|
40
39
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addRowAfter.common, (0, _commandsWithAnalytics.addRowAroundSelection)(editorAnalyticsAPI)('BOTTOM'), list);
|
|
41
|
-
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addColumnBefore.common, (0, _insert.addColumnBefore)(api, isTableScalingEnabled,
|
|
42
|
-
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addColumnAfter.common, (0, _insert.addColumnAfter)(api, isTableScalingEnabled,
|
|
40
|
+
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addColumnBefore.common, (0, _insert.addColumnBefore)(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
|
|
41
|
+
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addColumnAfter.common, (0, _insert.addColumnAfter)(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
|
|
43
42
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addRowBeforeVO.common, (0, _commandsWithAnalytics.addRowAroundSelection)(editorAnalyticsAPI)('TOP'), list);
|
|
44
43
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addRowAfterVO.common, (0, _commandsWithAnalytics.addRowAroundSelection)(editorAnalyticsAPI)('BOTTOM'), list);
|
|
45
|
-
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addColumnBeforeVO.common, (0, _insert.addColumnBefore)(api, isTableScalingEnabled,
|
|
46
|
-
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addColumnAfterVO.common, (0, _insert.addColumnAfter)(api, isTableScalingEnabled,
|
|
44
|
+
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addColumnBeforeVO.common, (0, _insert.addColumnBefore)(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
|
|
45
|
+
(0, _keymaps.bindKeymapWithCommand)(_keymaps.addColumnAfterVO.common, (0, _insert.addColumnAfter)(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
|
|
47
46
|
if (dragAndDropEnabled) {
|
|
48
47
|
// Move row/column shortcuts
|
|
49
48
|
/**
|
package/dist/cjs/toolbar.js
CHANGED
|
@@ -143,10 +143,9 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
|
|
|
143
143
|
var _pluginState$pluginCo, _pluginState$pluginCo2;
|
|
144
144
|
var formatMessage = _ref2.formatMessage;
|
|
145
145
|
var isTableScalingEnabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
146
|
-
var
|
|
147
|
-
var
|
|
148
|
-
var
|
|
149
|
-
var isCommentEditor = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
|
|
146
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
|
|
147
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
|
|
148
|
+
var isCommentEditor = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
|
|
150
149
|
var top = initialSelectionRect.top,
|
|
151
150
|
bottom = initialSelectionRect.bottom,
|
|
152
151
|
right = initialSelectionRect.right,
|
|
@@ -161,7 +160,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
|
|
|
161
160
|
var selectionRect = getClosestSelectionRect(state);
|
|
162
161
|
var index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right;
|
|
163
162
|
if (index) {
|
|
164
|
-
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(api, editorAnalyticsAPI, isTableScalingEnabled,
|
|
163
|
+
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(_analytics.INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
|
|
165
164
|
}
|
|
166
165
|
return true;
|
|
167
166
|
},
|
|
@@ -389,8 +388,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
|
|
|
389
388
|
};
|
|
390
389
|
var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
|
|
391
390
|
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) : [];
|
|
392
|
-
var
|
|
393
|
-
var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
|
|
391
|
+
var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
|
|
394
392
|
var columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
|
|
395
393
|
var colorPicker = getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView);
|
|
396
394
|
|
|
@@ -477,15 +475,14 @@ var separator = function separator(hidden) {
|
|
|
477
475
|
var getCellItems = function getCellItems(state, view, _ref3, getEditorContainerWidth, api, editorAnalyticsAPI) {
|
|
478
476
|
var formatMessage = _ref3.formatMessage;
|
|
479
477
|
var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
480
|
-
var
|
|
481
|
-
var
|
|
482
|
-
var
|
|
483
|
-
var isCommentEditor = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
|
|
478
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
|
|
479
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
|
|
480
|
+
var isCommentEditor = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
|
|
484
481
|
var initialSelectionRect = getClosestSelectionRect(state);
|
|
485
482
|
if (initialSelectionRect) {
|
|
486
483
|
var cellOptions = getToolbarCellOptionsConfig(state, view, initialSelectionRect, {
|
|
487
484
|
formatMessage: formatMessage
|
|
488
|
-
}, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled,
|
|
485
|
+
}, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor);
|
|
489
486
|
return [cellOptions, separator(cellOptions.hidden)];
|
|
490
487
|
}
|
|
491
488
|
return [];
|
|
@@ -482,8 +482,6 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
482
482
|
_getPluginState11$isT = _getPluginState11.isTableScalingEnabled,
|
|
483
483
|
isTableScalingEnabled = _getPluginState11$isT === void 0 ? false : _getPluginState11$isT;
|
|
484
484
|
var _ref3 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
|
|
485
|
-
_ref3$tableDuplicateC = _ref3.tableDuplicateCellColouring,
|
|
486
|
-
tableDuplicateCellColouring = _ref3$tableDuplicateC === void 0 ? false : _ref3$tableDuplicateC,
|
|
487
485
|
_ref3$tableWithFixedC = _ref3.tableWithFixedColumnWidthsOption,
|
|
488
486
|
tableWithFixedColumnWidthsOption = _ref3$tableWithFixedC === void 0 ? false : _ref3$tableWithFixedC;
|
|
489
487
|
// context menu opened by keyboard and any item except 'background' activated
|
|
@@ -531,11 +529,11 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
|
|
|
531
529
|
_this.toggleOpen();
|
|
532
530
|
break;
|
|
533
531
|
case 'insert_column':
|
|
534
|
-
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(_this.props.api, editorAnalyticsAPI, isTableScalingEnabled,
|
|
532
|
+
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(_this.props.api, editorAnalyticsAPI, isTableScalingEnabled, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent, isCommentEditor)(_analytics.INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
|
|
535
533
|
_this.toggleOpen();
|
|
536
534
|
break;
|
|
537
535
|
case 'insert_row':
|
|
538
|
-
(0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI
|
|
536
|
+
(0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.CONTEXT_MENU, {
|
|
539
537
|
index: selectionRect.bottom,
|
|
540
538
|
moveCursorToInsertedRow: true
|
|
541
539
|
})(state, dispatch);
|
|
@@ -211,7 +211,6 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
211
211
|
scrollableElement = _ref.scrollableElement,
|
|
212
212
|
boundariesElement = _ref.boundariesElement,
|
|
213
213
|
isTableScalingEnabled = _ref.isTableScalingEnabled,
|
|
214
|
-
tableDuplicateCellColouring = _ref.tableDuplicateCellColouring,
|
|
215
214
|
shouldUseIncreasedScalingPercent = _ref.shouldUseIncreasedScalingPercent,
|
|
216
215
|
isTableFixedColumnWidthsOptionEnabled = _ref.isTableFixedColumnWidthsOptionEnabled,
|
|
217
216
|
ariaNotifyPlugin = _ref.ariaNotifyPlugin,
|
|
@@ -229,7 +228,7 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
229
228
|
var selectionRect = (0, _utils2.isSelectionType)(selection, 'cell') ? (0, _utils2.getSelectionRect)(selection) : (0, _utils2.findCellRectClosestToPos)(selection.$from);
|
|
230
229
|
var hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
|
|
231
230
|
var allowBackgroundColor = (_pluginConfig$allowBa = pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.allowBackgroundColor) !== null && _pluginConfig$allowBa !== void 0 ? _pluginConfig$allowBa : false;
|
|
232
|
-
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,
|
|
231
|
+
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, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, ariaNotifyPlugin, isCommentEditor);
|
|
233
232
|
var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect),
|
|
234
233
|
menuItems = _convertToDropdownIte.menuItems,
|
|
235
234
|
menuCallback = _convertToDropdownIte.menuCallback;
|
|
@@ -12,6 +12,7 @@ var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
|
|
|
12
12
|
var _consts = require("../consts");
|
|
13
13
|
var _DragMenu = _interopRequireDefault(require("./DragMenu"));
|
|
14
14
|
var FloatingDragMenu = function FloatingDragMenu(_ref) {
|
|
15
|
+
var _getEditorFeatureFlag;
|
|
15
16
|
var mountPoint = _ref.mountPoint,
|
|
16
17
|
boundariesElement = _ref.boundariesElement,
|
|
17
18
|
scrollableElement = _ref.scrollableElement,
|
|
@@ -39,9 +40,7 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
|
|
|
39
40
|
if (!targetHandleRef || !(editorView.state.selection instanceof _cellSelection.CellSelection)) {
|
|
40
41
|
return null;
|
|
41
42
|
}
|
|
42
|
-
var _ref2 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
|
|
43
|
-
_ref2$tableDuplicateC = _ref2.tableDuplicateCellColouring,
|
|
44
|
-
tableDuplicateCellColouring = _ref2$tableDuplicateC === void 0 ? false : _ref2$tableDuplicateC,
|
|
43
|
+
var _ref2 = (_getEditorFeatureFlag = getEditorFeatureFlags === null || getEditorFeatureFlags === void 0 ? void 0 : getEditorFeatureFlags()) !== null && _getEditorFeatureFlag !== void 0 ? _getEditorFeatureFlag : {},
|
|
45
44
|
_ref2$tableWithFixedC = _ref2.tableWithFixedColumnWidthsOption,
|
|
46
45
|
tableWithFixedColumnWidthsOption = _ref2$tableWithFixedC === void 0 ? false : _ref2$tableWithFixedC;
|
|
47
46
|
var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (tableWithFixedColumnWidthsOption || isCommentEditor);
|
|
@@ -79,7 +78,6 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
|
|
|
79
78
|
boundariesElement: boundariesElement,
|
|
80
79
|
scrollableElement: scrollableElement,
|
|
81
80
|
isTableScalingEnabled: isTableScalingEnabled,
|
|
82
|
-
tableDuplicateCellColouring: tableDuplicateCellColouring,
|
|
83
81
|
shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
|
|
84
82
|
isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption,
|
|
85
83
|
ariaNotifyPlugin: ariaNotifyPlugin,
|
|
@@ -180,14 +180,12 @@ var FloatingInsertButton = exports.FloatingInsertButton = /*#__PURE__*/function
|
|
|
180
180
|
var _this$props3 = this.props,
|
|
181
181
|
editorView = _this$props3.editorView,
|
|
182
182
|
insertRowButtonIndex = _this$props3.insertRowButtonIndex,
|
|
183
|
-
editorAnalyticsAPI = _this$props3.editorAnalyticsAPI
|
|
184
|
-
getEditorFeatureFlags = _this$props3.getEditorFeatureFlags;
|
|
183
|
+
editorAnalyticsAPI = _this$props3.editorAnalyticsAPI;
|
|
185
184
|
if (typeof insertRowButtonIndex !== 'undefined') {
|
|
186
185
|
event.preventDefault();
|
|
187
186
|
var state = editorView.state,
|
|
188
187
|
dispatch = editorView.dispatch;
|
|
189
|
-
|
|
190
|
-
(0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI, featureFlags && featureFlags.tableDuplicateCellColouring)(_analytics.INPUT_METHOD.BUTTON, {
|
|
188
|
+
(0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.BUTTON, {
|
|
191
189
|
index: insertRowButtonIndex,
|
|
192
190
|
moveCursorToInsertedRow: true
|
|
193
191
|
})(state, dispatch);
|
|
@@ -206,14 +204,12 @@ var FloatingInsertButton = exports.FloatingInsertButton = /*#__PURE__*/function
|
|
|
206
204
|
if (typeof insertColumnButtonIndex !== 'undefined') {
|
|
207
205
|
event.preventDefault();
|
|
208
206
|
var _ref = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
|
|
209
|
-
_ref$tableDuplicateCe = _ref.tableDuplicateCellColouring,
|
|
210
|
-
tableDuplicateCellColouring = _ref$tableDuplicateCe === void 0 ? false : _ref$tableDuplicateCe,
|
|
211
207
|
_ref$tableWithFixedCo = _ref.tableWithFixedColumnWidthsOption,
|
|
212
208
|
tableWithFixedColumnWidthsOption = _ref$tableWithFixedCo === void 0 ? false : _ref$tableWithFixedCo;
|
|
213
209
|
var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (tableWithFixedColumnWidthsOption || isCommentEditor);
|
|
214
210
|
var state = editorView.state,
|
|
215
211
|
dispatch = editorView.dispatch;
|
|
216
|
-
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(this.props.api, editorAnalyticsAPI, isTableScalingEnabled,
|
|
212
|
+
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(this.props.api, editorAnalyticsAPI, isTableScalingEnabled, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent, isCommentEditor)(_analytics.INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
|
|
217
213
|
}
|
|
218
214
|
}
|
|
219
215
|
}]);
|
|
@@ -85,11 +85,10 @@ var defaultSelectionRect = {
|
|
|
85
85
|
var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired) {
|
|
86
86
|
var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
|
|
87
87
|
var isTableScalingEnabled = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
|
|
88
|
-
var
|
|
89
|
-
var
|
|
90
|
-
var
|
|
91
|
-
var
|
|
92
|
-
var isCommentEditor = arguments.length > 16 && arguments[16] !== undefined ? arguments[16] : false;
|
|
88
|
+
var isTableFixedColumnWidthsOptionEnabled = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
|
|
89
|
+
var shouldUseIncreasedScalingPercent = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : false;
|
|
90
|
+
var ariaNotifyPlugin = arguments.length > 14 ? arguments[14] : undefined;
|
|
91
|
+
var isCommentEditor = arguments.length > 15 && arguments[15] !== undefined ? arguments[15] : false;
|
|
93
92
|
var selection = editorView.state.selection;
|
|
94
93
|
var _getTablePluginState = (0, _pluginFactory.getPluginState)(editorView.state),
|
|
95
94
|
getIntl = _getTablePluginState.getIntl;
|
|
@@ -200,12 +199,12 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
|
|
|
200
199
|
iconFallback: iconFallback,
|
|
201
200
|
onClick: function onClick(state, dispatch) {
|
|
202
201
|
if (direction === 'row') {
|
|
203
|
-
(0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI
|
|
202
|
+
(0, _commandsWithAnalytics.insertRowWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, {
|
|
204
203
|
index: (index !== null && index !== void 0 ? index : 0) + offset,
|
|
205
204
|
moveCursorToInsertedRow: true
|
|
206
205
|
})(state, dispatch);
|
|
207
206
|
} else {
|
|
208
|
-
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(api, editorAnalyticsAPI, isTableScalingEnabled,
|
|
207
|
+
(0, _commandsWithAnalytics.insertColumnWithAnalytics)(api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, (index !== null && index !== void 0 ? index : 0) + offset)(state, dispatch, editorView);
|
|
209
208
|
}
|
|
210
209
|
return true;
|
|
211
210
|
},
|
|
@@ -19,14 +19,14 @@ function addColumnAtCustomStep(column) {
|
|
|
19
19
|
return tr;
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
-
export function addColumnAt(api, isTableScalingEnabled = false,
|
|
22
|
+
export function addColumnAt(api, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor) {
|
|
23
23
|
return (column, allowAddColumnCustomStep = false, view) => {
|
|
24
24
|
return tr => {
|
|
25
25
|
let updatedTr = tr;
|
|
26
26
|
if (allowAddColumnCustomStep) {
|
|
27
27
|
updatedTr = addColumnAtCustomStep(column)(updatedTr);
|
|
28
28
|
} else {
|
|
29
|
-
updatedTr = addColumnAtPMUtils(column
|
|
29
|
+
updatedTr = addColumnAtPMUtils(column)(updatedTr);
|
|
30
30
|
}
|
|
31
31
|
const table = findTable(updatedTr.selection);
|
|
32
32
|
if (table) {
|
|
@@ -48,33 +48,33 @@ export function addColumnAt(api, isTableScalingEnabled = false, isCellBackground
|
|
|
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 = (api, isTableScalingEnabled = false,
|
|
51
|
+
export const addColumnBefore = (api, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, isCommentEditor = 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(api, isTableScalingEnabled,
|
|
58
|
+
dispatch(addColumnAt(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(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 = (api, isTableScalingEnabled,
|
|
65
|
+
export const addColumnAfter = (api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor) => (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(api, isTableScalingEnabled,
|
|
72
|
+
dispatch(addColumnAt(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(rect.right, getAllowAddColumnCustomStep(state), view)(state.tr));
|
|
73
73
|
}
|
|
74
74
|
return true;
|
|
75
75
|
};
|
|
76
|
-
export const insertColumn = (api, isTableScalingEnabled = false,
|
|
77
|
-
let tr = addColumnAt(api, isTableScalingEnabled,
|
|
76
|
+
export const insertColumn = (api, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor) => column => (state, dispatch, view) => {
|
|
77
|
+
let tr = addColumnAt(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(column, getAllowAddColumnCustomStep(state), view)(state.tr);
|
|
78
78
|
const table = findTable(tr.selection);
|
|
79
79
|
if (!table) {
|
|
80
80
|
return false;
|
|
@@ -86,7 +86,7 @@ export const insertColumn = (api, isTableScalingEnabled = false, isCellBackgroun
|
|
|
86
86
|
}
|
|
87
87
|
return true;
|
|
88
88
|
};
|
|
89
|
-
export const insertRow = (row, moveCursorToTheNewRow
|
|
89
|
+
export const insertRow = (row, moveCursorToTheNewRow) => (state, dispatch) => {
|
|
90
90
|
// Don't clone the header row
|
|
91
91
|
const headerRowEnabled = checkIfHeaderRowEnabled(state.selection);
|
|
92
92
|
const clonePreviousRow = headerRowEnabled && row > 1 || !headerRowEnabled && row > 0;
|
|
@@ -96,7 +96,7 @@ export const insertRow = (row, moveCursorToTheNewRow, isCellBackgroundDuplicated
|
|
|
96
96
|
if (row === 0 && headerRowEnabled) {
|
|
97
97
|
return false;
|
|
98
98
|
}
|
|
99
|
-
const tr = clonePreviousRow ? copyPreviousRow(state.schema)(row)(state.tr) : addRowAt(row, undefined
|
|
99
|
+
const tr = clonePreviousRow ? copyPreviousRow(state.schema)(row)(state.tr) : addRowAt(row, undefined)(state.tr);
|
|
100
100
|
const table = findTable(tr.selection);
|
|
101
101
|
if (!table) {
|
|
102
102
|
return false;
|
|
@@ -148,7 +148,7 @@ export const addRowAroundSelection = editorAnalyticsAPI => side => (state, dispa
|
|
|
148
148
|
moveCursorToInsertedRow: false
|
|
149
149
|
})(state, dispatch);
|
|
150
150
|
};
|
|
151
|
-
export const insertRowWithAnalytics =
|
|
151
|
+
export const insertRowWithAnalytics = editorAnalyticsAPI => (inputMethod, options) => withEditorAnalyticsAPI(state => {
|
|
152
152
|
const {
|
|
153
153
|
totalRowCount,
|
|
154
154
|
totalColumnCount
|
|
@@ -165,7 +165,7 @@ export const insertRowWithAnalytics = (editorAnalyticsAPI, isCellbackgroundDupli
|
|
|
165
165
|
},
|
|
166
166
|
eventType: EVENT_TYPE.TRACK
|
|
167
167
|
};
|
|
168
|
-
})(editorAnalyticsAPI)(insertRow(options.index, options.moveCursorToInsertedRow
|
|
168
|
+
})(editorAnalyticsAPI)(insertRow(options.index, options.moveCursorToInsertedRow));
|
|
169
169
|
export const changeColumnWidthByStepWithAnalytics = (editorAnalyticsAPI, api) => (stepSize, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor, inputMethod, ariaNotify, getIntl) => withEditorAnalyticsAPI(state => {
|
|
170
170
|
const {
|
|
171
171
|
table,
|
|
@@ -201,7 +201,7 @@ export const changeColumnWidthByStepWithAnalytics = (editorAnalyticsAPI, api) =>
|
|
|
201
201
|
getIntl: getIntl,
|
|
202
202
|
api
|
|
203
203
|
}));
|
|
204
|
-
export const insertColumnWithAnalytics = (api, editorAnalyticsAPI, isTableScalingEnabled = false,
|
|
204
|
+
export const insertColumnWithAnalytics = (api, editorAnalyticsAPI, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, isCommentEditor = false) => (inputMethod, position) => withEditorAnalyticsAPI(state => {
|
|
205
205
|
const {
|
|
206
206
|
totalRowCount,
|
|
207
207
|
totalColumnCount
|
|
@@ -218,7 +218,7 @@ export const insertColumnWithAnalytics = (api, editorAnalyticsAPI, isTableScalin
|
|
|
218
218
|
},
|
|
219
219
|
eventType: EVENT_TYPE.TRACK
|
|
220
220
|
};
|
|
221
|
-
})(editorAnalyticsAPI)(insertColumn(api, isTableScalingEnabled,
|
|
221
|
+
})(editorAnalyticsAPI)(insertColumn(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(position));
|
|
222
222
|
export const deleteRowsWithAnalytics = editorAnalyticsAPI => (inputMethod, rect, isHeaderRowRequired) => withEditorAnalyticsAPI(({
|
|
223
223
|
selection
|
|
224
224
|
}) => {
|
package/dist/es2019/plugin.js
CHANGED
|
@@ -57,7 +57,7 @@ const tablesPlugin = ({
|
|
|
57
57
|
config: options,
|
|
58
58
|
api
|
|
59
59
|
}) => {
|
|
60
|
-
var _api$analytics, _api$accessibilityUti, _options$getEditorFea,
|
|
60
|
+
var _api$analytics, _api$accessibilityUti, _options$getEditorFea, _api$analytics2;
|
|
61
61
|
const editorViewRef = {
|
|
62
62
|
current: null
|
|
63
63
|
};
|
|
@@ -72,7 +72,6 @@ const tablesPlugin = ({
|
|
|
72
72
|
const isTableFixedColumnWidthsOptionEnabled = (options === null || options === void 0 ? void 0 : (_options$getEditorFea = options.getEditorFeatureFlags) === null || _options$getEditorFea === void 0 ? void 0 : _options$getEditorFea.call(options).tableWithFixedColumnWidthsOption) || false;
|
|
73
73
|
const shouldUseIncreasedScalingPercent = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) && (isTableFixedColumnWidthsOptionEnabled || ( // When in comment editor, we need the scaling percent to be 40% while tableWithFixedColumnWidthsOption is not visible
|
|
74
74
|
options === null || options === void 0 ? void 0 : options.isCommentEditor));
|
|
75
|
-
const isCellBackgroundDuplicated = (options === null || options === void 0 ? void 0 : (_options$getEditorFea2 = options.getEditorFeatureFlags) === null || _options$getEditorFea2 === void 0 ? void 0 : _options$getEditorFea2.call(options).tableDuplicateCellColouring) || false;
|
|
76
75
|
return {
|
|
77
76
|
name: 'table',
|
|
78
77
|
// Use getSharedState to store fullWidthEnabled and wasFullWidthModeEnabled to guarantee access
|
|
@@ -258,7 +257,7 @@ const tablesPlugin = ({
|
|
|
258
257
|
isChromelessEditor = false,
|
|
259
258
|
tableResizingEnabled = false
|
|
260
259
|
} = options || {};
|
|
261
|
-
return keymapPlugin(defaultGetEditorContainerWidth, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, dragAndDropEnabled, isTableScalingEnabled, isTableAlignmentEnabled, fullWidthEnabled, api, getIntl,
|
|
260
|
+
return keymapPlugin(defaultGetEditorContainerWidth, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, dragAndDropEnabled, isTableScalingEnabled, isTableAlignmentEnabled, fullWidthEnabled, api, getIntl, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor, isChromelessEditor, tableResizingEnabled);
|
|
262
261
|
}
|
|
263
262
|
}, {
|
|
264
263
|
name: 'tableSelectionKeymap',
|
|
@@ -7,7 +7,7 @@ import { addRowAroundSelection, changeColumnWidthByStepWithAnalytics, deleteSele
|
|
|
7
7
|
import { activateNextResizeArea, initiateKeyboardColumnResizing, stopKeyboardColumnResizing } from '../commands/column-resize';
|
|
8
8
|
import { addColumnAfter as addColumnAfterCommand, addColumnBefore as addColumnBeforeCommand, createTable } from '../commands/insert';
|
|
9
9
|
import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/commands-with-analytics';
|
|
10
|
-
export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, dragAndDropEnabled, isTableScalingEnabled = false, isTableAlignmentEnabled = false, isFullWidthEnabled, pluginInjectionApi, getIntl,
|
|
10
|
+
export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, dragAndDropEnabled, isTableScalingEnabled = false, isTableAlignmentEnabled = false, isFullWidthEnabled, pluginInjectionApi, getIntl, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent, isCommentEditor, isChromelessEditor, isTableResizingEnabled) {
|
|
11
11
|
var _pluginInjectionApi$a;
|
|
12
12
|
const list = {};
|
|
13
13
|
const ariaNotifyPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions.ariaNotify;
|
|
@@ -20,12 +20,12 @@ export function keymapPlugin(getEditorContainerWidth, api, nodeViewPortalProvide
|
|
|
20
20
|
// Add row/column shortcuts
|
|
21
21
|
bindKeymapWithCommand(addRowBefore.common, addRowAroundSelection(editorAnalyticsAPI)('TOP'), list);
|
|
22
22
|
bindKeymapWithCommand(addRowAfter.common, addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'), list);
|
|
23
|
-
bindKeymapWithCommand(addColumnBefore.common, addColumnBeforeCommand(api, isTableScalingEnabled,
|
|
24
|
-
bindKeymapWithCommand(addColumnAfter.common, addColumnAfterCommand(api, isTableScalingEnabled,
|
|
23
|
+
bindKeymapWithCommand(addColumnBefore.common, addColumnBeforeCommand(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
|
|
24
|
+
bindKeymapWithCommand(addColumnAfter.common, addColumnAfterCommand(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
|
|
25
25
|
bindKeymapWithCommand(addRowBeforeVO.common, addRowAroundSelection(editorAnalyticsAPI)('TOP'), list);
|
|
26
26
|
bindKeymapWithCommand(addRowAfterVO.common, addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'), list);
|
|
27
|
-
bindKeymapWithCommand(addColumnBeforeVO.common, addColumnBeforeCommand(api, isTableScalingEnabled,
|
|
28
|
-
bindKeymapWithCommand(addColumnAfterVO.common, addColumnAfterCommand(api, isTableScalingEnabled,
|
|
27
|
+
bindKeymapWithCommand(addColumnBeforeVO.common, addColumnBeforeCommand(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
|
|
28
|
+
bindKeymapWithCommand(addColumnAfterVO.common, addColumnAfterCommand(api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
|
|
29
29
|
if (dragAndDropEnabled) {
|
|
30
30
|
// Move row/column shortcuts
|
|
31
31
|
/**
|