@atlaskit/editor-plugin-table 5.5.3 → 5.5.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-table
 
+## 5.5.5
+
+### Patch Changes
+
+- [#59951](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59951) [`a42a17e8af1b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a42a17e8af1b) - ED-21106: Remove nonPrivacySafeAttributes from editor operational events
+- [#59453](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/59453) [`e23de3e96559`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e23de3e96559) - Fix drop table row/column next to merged cells
+
+## 5.5.4
+
+### Patch Changes
+
+- [#60278](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60278) [`bc2785a02329`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc2785a02329) - Selection of multiple rows / column should remain when clicking the drag handle
+- [#60323](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60323) [`e0c900d97140`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e0c900d97140) - Fix undo of drag and drop using keyboard
+
 ## 5.5.3
 
 ### Patch Changes

package/dist/cjs/plugins/table/commands/index.js

@@ -135,12 +135,24 @@ Object.defineProperty(exports, "selectColumn", {
     return _misc.selectColumn;
   }
 });
+Object.defineProperty(exports, "selectColumns", {
+  enumerable: true,
+  get: function get() {
+    return _misc.selectColumns;
+  }
+});
 Object.defineProperty(exports, "selectRow", {
   enumerable: true,
   get: function get() {
     return _misc.selectRow;
   }
 });
+Object.defineProperty(exports, "selectRows", {
+  enumerable: true,
+  get: function get() {
+    return _misc.selectRows;
+  }
+});
 Object.defineProperty(exports, "setCellAttr", {
   enumerable: true,
   get: function get() {

package/dist/cjs/plugins/table/commands/misc.js

@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateResizeHandleDecorations = exports.triggerUnlessTableHeader = exports.transformSliceToRemoveColumnsWidths = exports.transformSliceToAddTableHeaders = exports.transformSliceRemoveCellBackgroundColor = exports.showInsertRowButton = exports.showInsertColumnButton = exports.setTableRef = exports.setMultipleCellAttrs = exports.setEditorFocus = exports.setCellAttr = exports.selectRow = exports.selectColumn = exports.removeResizeHandleDecorations = exports.moveCursorBackward = exports.isInsideFirstCellOfRowOrColumn = exports.hideInsertColumnOrRowButton = exports.getTableSelectionType = exports.getTableElementMoveTypeBySlice = exports.deleteTableIfSelected = exports.deleteTable = exports.countCellsInSlice = exports.convertFirstRowToHeader = exports.autoSizeTable = exports.addResizeHandleDecorations = exports.addBoldInEmptyHeaderCells = void 0;
+exports.updateResizeHandleDecorations = exports.triggerUnlessTableHeader = exports.transformSliceToRemoveColumnsWidths = exports.transformSliceToAddTableHeaders = exports.transformSliceRemoveCellBackgroundColor = exports.showInsertRowButton = exports.showInsertColumnButton = exports.setTableRef = exports.setMultipleCellAttrs = exports.setEditorFocus = exports.setCellAttr = exports.selectRows = exports.selectRow = exports.selectColumns = exports.selectColumn = exports.removeResizeHandleDecorations = exports.moveCursorBackward = exports.isInsideFirstCellOfRowOrColumn = exports.hideInsertColumnOrRowButton = exports.getTableSelectionType = exports.getTableElementMoveTypeBySlice = exports.deleteTableIfSelected = exports.deleteTable = exports.countCellsInSlice = exports.convertFirstRowToHeader = exports.autoSizeTable = exports.addResizeHandleDecorations = exports.addBoldInEmptyHeaderCells = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -346,6 +347,37 @@ var selectColumn = exports.selectColumn = function selectColumn(column, expand)
     return (0, _utils2.selectColumn)(column, expand)(tr).setMeta('addToHistory', false);
   });
 };
+var selectColumns = exports.selectColumns = function selectColumns(columnIndexes) {
+  return (0, _pluginFactory.createCommand)(function (state) {
+    if (!columnIndexes) {
+      return false;
+    }
+    var cells = columnIndexes.map(function (column) {
+      return (0, _utils2.getCellsInColumn)(column)(state.tr.selection);
+    }).flat();
+    if (!cells || !cells.length || cells.some(function (cell) {
+      return cell && typeof cell.pos !== 'number';
+    })) {
+      return false;
+    }
+    var decorations = (0, _decoration.createColumnSelectedDecoration)((0, _utils2.selectColumns)(columnIndexes)(state.tr));
+    var decorationSet = (0, _updatePluginStateDecorations.updatePluginStateDecorations)(state, decorations, _types.TableDecorations.COLUMN_SELECTED);
+    var cellsInFirstColumn = (0, _utils2.getCellsInColumn)(Math.min.apply(Math, (0, _toConsumableArray2.default)(columnIndexes)))(state.tr.selection);
+    if (!cellsInFirstColumn || cellsInFirstColumn.length === 0) {
+      return false;
+    }
+    var targetCellPosition = cellsInFirstColumn[0].pos;
+    return {
+      type: 'SELECT_COLUMN',
+      data: {
+        targetCellPosition: targetCellPosition,
+        decorationSet: decorationSet
+      }
+    };
+  }, function (tr) {
+    return (0, _utils2.selectColumns)(columnIndexes)(tr).setMeta('addToHistory', false);
+  });
+};
 var selectRow = exports.selectRow = function selectRow(row, expand) {
   return (0, _pluginFactory.createCommand)(function (state) {
     var targetCellPosition;
@@ -363,6 +395,34 @@ var selectRow = exports.selectRow = function selectRow(row, expand) {
     return (0, _utils2.selectRow)(row, expand)(tr).setMeta('addToHistory', false);
   });
 };
+var selectRows = exports.selectRows = function selectRows(rowIndexes) {
+  return (0, _pluginFactory.createCommand)(function (state) {
+    if (rowIndexes.length === 0) {
+      return false;
+    }
+    var cells = rowIndexes.map(function (row) {
+      return (0, _utils2.getCellsInRow)(row)(state.tr.selection);
+    }).flat();
+    if (!cells || !cells.length || cells.some(function (cell) {
+      return cell && typeof cell.pos !== 'number';
+    })) {
+      return false;
+    }
+    var cellsInFirstRow = (0, _utils2.getCellsInRow)(Math.min.apply(Math, (0, _toConsumableArray2.default)(rowIndexes)))(state.tr.selection);
+    if (!cellsInFirstRow || cellsInFirstRow.length === 0) {
+      return false;
+    }
+    var targetCellPosition = cellsInFirstRow[0].pos;
+    return {
+      type: 'SET_TARGET_CELL_POSITION',
+      data: {
+        targetCellPosition: targetCellPosition
+      }
+    };
+  }, function (tr) {
+    return (0, _utils2.selectRows)(rowIndexes)(tr).setMeta('addToHistory', false);
+  });
+};
 var showInsertColumnButton = exports.showInsertColumnButton = function showInsertColumnButton(columnIndex) {
   return (0, _pluginFactory.createCommand)(function (_) {
     return columnIndex > -1 ? {

package/dist/cjs/plugins/table/pm-plugins/drag-and-drop/plugin.js

@@ -13,7 +13,6 @@ var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
 var _utils2 = require("../../utils");
-var _mergedCells = require("../../utils/merged-cells");
 var _pluginFactory = require("../plugin-factory");
 var _pluginKey = require("../plugin-key");
 var _actions = require("./actions");
@@ -182,8 +181,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, eventD
             }
 
             // If the drop target index contains merged cells then we should not allow the drop to occur.
-            var hasMergedCells = sourceType === 'table-row' ? _mergedCells.hasMergedCellsInRow : _mergedCells.hasMergedCellsInColumn;
-            if (hasMergedCells(targetAdjustedIndex)(editorView.state.selection)) {
+            if ((0, _utils2.hasMergedCellsInBetween)([targetAdjustedIndex - 1, targetAdjustedIndex], sourceType === 'table-row' ? _consts.DropTargetType.ROW : _consts.DropTargetType.COLUMN)(editorView.state.selection)) {
               (0, _commands.clearDropTarget)(tr)(editorView.state, editorView.dispatch);
               return;
             }
@@ -191,6 +189,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, eventD
               sourceIndex = _sourceIndexes[0];
             requestAnimationFrame(function () {
               (0, _commands.moveSource)(sourceType, sourceIndex, targetAdjustedIndex + (direction === -1 ? 0 : -1), tr)(editorView.state, editorView.dispatch);
+              editorView.focus();
             });
           }
         })

package/dist/cjs/plugins/table/ui/FloatingInsertButton/index.js

@@ -105,9 +105,6 @@ var FloatingInsertButton = exports.FloatingInsertButton = /*#__PURE__*/function
               position: pos,
               docSize: editorView.state.doc.nodeSize,
               error: error === null || error === void 0 ? void 0 : error.toString()
-            },
-            nonPrivacySafeAttributes: {
-              errorStack: error.stack || undefined
             }
           };
           dispatchAnalyticsEvent(payload);

package/dist/cjs/plugins/table/ui/TableFloatingColumnControls/ColumnControls/index.js

@@ -56,8 +56,14 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
   var handleClick = (0, _react.useCallback)(function (event) {
     var state = editorView.state,
       dispatch = editorView.dispatch;
-    (0, _commands.selectColumn)(colIndex, event.shiftKey)(state, dispatch);
-  }, [colIndex, editorView]);
+    var isClickOutsideSelectedCols = selectedColIndexes.length >= 1 && !selectedColIndexes.includes(colIndex);
+    if (!selectedColIndexes || selectedColIndexes.length === 0 || isClickOutsideSelectedCols) {
+      (0, _commands.selectColumn)(colIndex, event.shiftKey)(state, dispatch);
+    }
+    if (selectedColIndexes.length > 1 && selectedColIndexes.includes(colIndex) && !event.shiftKey) {
+      (0, _commands.selectColumns)(selectedColIndexes)(state, dispatch);
+    }
+  }, [colIndex, selectedColIndexes, editorView]);
   var handleMouseOver = (0, _react.useCallback)(function () {
     var state = editorView.state,
       dispatch = editorView.dispatch;

package/dist/cjs/plugins/table/ui/TableFloatingControls/RowControls/DragControls.js

@@ -48,6 +48,7 @@ var DragControlsComponent = function DragControlsComponent(_ref) {
     canDrag = _ref.canDrag,
     hoverRows = _ref.hoverRows,
     selectRow = _ref.selectRow,
+    selectRows = _ref.selectRows,
     updateCellHoverLocation = _ref.updateCellHoverLocation;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -113,8 +114,14 @@ var DragControlsComponent = function DragControlsComponent(_ref) {
     hoverRows([rowIndex]);
   }, [hoverRows, rowIndex]);
   var handleClick = (0, _react.useCallback)(function (e) {
-    selectRow(rowIndex, e === null || e === void 0 ? void 0 : e.shiftKey);
-  }, [rowIndex, selectRow]);
+    var isClickOutsideSelectedRows = selectedRowIndexes.length >= 1 && !selectedRowIndexes.includes(rowIndex);
+    if (!selectedRowIndexes || selectedRowIndexes.length === 0 || isClickOutsideSelectedRows) {
+      selectRow(rowIndex, e.shiftKey);
+    }
+    if (selectedRowIndexes.length > 1 && selectedRowIndexes.includes(rowIndex) && !e.shiftKey) {
+      selectRows(selectedRowIndexes);
+    }
+  }, [rowIndex, selectRow, selectRows, selectedRowIndexes]);
   var generateHandleByType = function generateHandleByType(type) {
     if (!hoveredCell) {
       return null;

package/dist/cjs/plugins/table/ui/TableFloatingControls/index.js

@@ -45,6 +45,16 @@ var TableFloatingControls = exports.default = /*#__PURE__*/function (_Component)
       }
       (0, _commands.selectRow)(row, expand)(state, dispatch);
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selectRows", function (rowIndexes) {
+      var editorView = _this.props.editorView;
+      var state = editorView.state,
+        dispatch = editorView.dispatch;
+      // fix for issue ED-4665
+      if (_utils.browser.ie_version === 11) {
+        editorView.dom.blur();
+      }
+      (0, _commands.selectRows)(rowIndexes)(state, dispatch);
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "hoverRows", function (rows, danger) {
       var _this$props$editorVie = _this.props.editorView,
         state = _this$props$editorVie.state,
@@ -208,6 +218,7 @@ var TableFloatingControls = exports.default = /*#__PURE__*/function (_Component)
         tableWidth: this.state.tableWrapperWidth,
         hoverRows: this.hoverRows,
         selectRow: this.selectRow,
+        selectRows: this.selectRows,
         updateCellHoverLocation: this.updateCellHoverLocation,
         canDrag: canDrag
       })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CornerControls.CornerControls, {

package/dist/cjs/plugins/table/utils/index.js

@@ -213,6 +213,12 @@ Object.defineProperty(exports, "getTableWidth", {
     return _nodes.getTableWidth;
   }
 });
+Object.defineProperty(exports, "hasMergedCellsInBetween", {
+  enumerable: true,
+  get: function get() {
+    return _mergedCells.hasMergedCellsInBetween;
+  }
+});
 Object.defineProperty(exports, "hasMergedCellsInColumn", {
   enumerable: true,
   get: function get() {

package/dist/cjs/plugins/table/utils/merged-cells.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.hasMergedCellsInRow = exports.hasMergedCellsInColumn = void 0;
+exports.hasMergedCellsInRow = exports.hasMergedCellsInColumn = exports.hasMergedCellsInBetween = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _editorTables = require("@atlaskit/editor-tables");
 var hasMergedCells = function hasMergedCells(indexes, normalizeRect) {
   return function (selection) {
@@ -63,4 +65,76 @@ var hasMergedCellsInRow = exports.hasMergedCellsInRow = function hasMergedCellsI
       bottom: y === index ? y + 1 : y
     };
   });
+};
+var getRect = function getRect(index, type, map) {
+  if (type === 'column') {
+    var x = Math.max(Math.min(index, map.width - 1), 0); // clamped index
+    return {
+      left: x,
+      right: x === index ? x + 1 : x,
+      top: 0,
+      bottom: map.height
+    };
+  } else {
+    var y = Math.max(Math.min(index, map.height - 1), 0); // clamped index
+    return {
+      left: 0,
+      right: map.width,
+      top: y,
+      bottom: y === index ? y + 1 : y
+    };
+  }
+};
+var hasMergedCellsInBetween = exports.hasMergedCellsInBetween = function hasMergedCellsInBetween(indexes, type) {
+  return function (selection) {
+    var table = (0, _editorTables.findTable)(selection);
+    if (!table) {
+      return false;
+    }
+    var map = _editorTables.TableMap.get(table.node);
+    var cellPositions = new Set();
+    var mergedCells = new Set();
+    map.map.forEach(function (value) {
+      if (cellPositions.has(value)) {
+        mergedCells.add(value);
+      } else {
+        cellPositions.add(value);
+      }
+    });
+    if (!mergedCells.size) {
+      return false;
+    }
+    var getMergedCellsInRect = function getMergedCellsInRect(index, type) {
+      var rect = getRect(index, type, map);
+      var isValidRectangle = rect.left < rect.right && rect.top < rect.bottom;
+      if (!isValidRectangle) {
+        return [];
+      }
+      var cells = map.cellsInRect(rect);
+      var allCellsInRect = [];
+      if (type === 'column') {
+        allCellsInRect = map.map.filter(function (_, key) {
+          return key % map.width === index;
+        });
+      } else {
+        allCellsInRect = map.map.filter(function (_, key) {
+          return Math.floor(key / map.width) === index;
+        });
+      }
+      var mergedCell = allCellsInRect.filter(function (nodePos) {
+        return !cells.includes(nodePos) // cell exists in Rect but not show in the map.cellsInRect list => merged cell
+        ? true : mergedCells.has(nodePos); // cell includes in mergedCells => merged cell
+      });
+
+      return (0, _toConsumableArray2.default)(new Set(mergedCell));
+    };
+    var mergedCellsInRectArr = indexes.map(function (index) {
+      return getMergedCellsInRect(index, type);
+    });
+
+    // Currently only support 2 indexes, but we can extend this to support more indexes in the future.
+    return mergedCellsInRectArr[0].some(function (cell) {
+      return mergedCellsInRectArr[1].includes(cell);
+    });
+  };
 };

package/dist/es2019/plugins/table/commands/index.js

@@ -2,7 +2,7 @@ export { hoverColumns, hoverRows, hoverTable, hoverCell, hoverMergedCells, clear
 export { insertColumn, insertRow, createTable } from './insert';
 export { getNextLayout, toggleContextualMenu, toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn, toggleTableLayout } from './toggle';
 export { clearMultipleCells } from './clear';
-export { autoSizeTable, convertFirstRowToHeader, deleteTable, hideInsertColumnOrRowButton, moveCursorBackward, selectColumn, selectRow, setCellAttr, setEditorFocus, setMultipleCellAttrs, setTableRef, showInsertColumnButton, showInsertRowButton, transformSliceToAddTableHeaders, triggerUnlessTableHeader, addBoldInEmptyHeaderCells, addResizeHandleDecorations } from './misc';
+export { autoSizeTable, convertFirstRowToHeader, deleteTable, hideInsertColumnOrRowButton, moveCursorBackward, selectColumn, selectColumns, selectRow, selectRows, setCellAttr, setEditorFocus, setMultipleCellAttrs, setTableRef, showInsertColumnButton, showInsertRowButton, transformSliceToAddTableHeaders, triggerUnlessTableHeader, addBoldInEmptyHeaderCells, addResizeHandleDecorations } from './misc';
 export { sortByColumn } from './sort';
 export { goToNextCell } from './go-to-next-cell';
 export { removeDescendantNodes } from './referentiality';

package/dist/es2019/plugins/table/commands/misc.js

@@ -2,7 +2,7 @@ import { closestElement, isParagraph, isTextSelection, mapSlice } from '@atlaski
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import { findCellClosestToPos, findTable, getCellsInColumn, getCellsInRow, getSelectionRect, isSelectionType, isTableSelected, removeTable, selectColumn as selectColumnTransform, selectionCell, selectRow as selectRowTransform, setCellAttrs } from '@atlaskit/editor-tables/utils';
+import { findCellClosestToPos, findTable, getCellsInColumn, getCellsInRow, getSelectionRect, isSelectionType, isTableSelected, removeTable, selectColumns as selectColumnsTransform, selectColumn as selectColumnTransform, selectionCell, selectRows as selectRowsTransform, selectRow as selectRowTransform, setCellAttrs } from '@atlaskit/editor-tables/utils';
 import { getDecorations } from '../pm-plugins/decorations/plugin';
 import { buildColumnResizingDecorations, clearColumnResizingDecorations } from '../pm-plugins/decorations/utils';
 import { createCommand, getPluginState } from '../pm-plugins/plugin-factory';
@@ -350,6 +350,31 @@ export const selectColumn = (column, expand) => createCommand(state => {
     }
   };
 }, tr => selectColumnTransform(column, expand)(tr).setMeta('addToHistory', false));
+export const selectColumns = columnIndexes => createCommand(state => {
+  if (!columnIndexes) {
+    return false;
+  }
+  const cells = columnIndexes.map(column => getCellsInColumn(column)(state.tr.selection)).flat();
+  if (!cells || !cells.length || cells.some(cell => cell && typeof cell.pos !== 'number')) {
+    return false;
+  }
+  const decorations = createColumnSelectedDecoration(selectColumnsTransform(columnIndexes)(state.tr));
+  const decorationSet = updatePluginStateDecorations(state, decorations, TableDecorations.COLUMN_SELECTED);
+  const cellsInFirstColumn = getCellsInColumn(Math.min(...columnIndexes))(state.tr.selection);
+  if (!cellsInFirstColumn || cellsInFirstColumn.length === 0) {
+    return false;
+  }
+  const targetCellPosition = cellsInFirstColumn[0].pos;
+  return {
+    type: 'SELECT_COLUMN',
+    data: {
+      targetCellPosition,
+      decorationSet
+    }
+  };
+}, tr => {
+  return selectColumnsTransform(columnIndexes)(tr).setMeta('addToHistory', false);
+});
 export const selectRow = (row, expand) => createCommand(state => {
   let targetCellPosition;
   const cells = getCellsInRow(row)(state.tr.selection);
@@ -363,6 +388,26 @@ export const selectRow = (row, expand) => createCommand(state => {
     }
   };
 }, tr => selectRowTransform(row, expand)(tr).setMeta('addToHistory', false));
+export const selectRows = rowIndexes => createCommand(state => {
+  if (rowIndexes.length === 0) {
+    return false;
+  }
+  const cells = rowIndexes.map(row => getCellsInRow(row)(state.tr.selection)).flat();
+  if (!cells || !cells.length || cells.some(cell => cell && typeof cell.pos !== 'number')) {
+    return false;
+  }
+  const cellsInFirstRow = getCellsInRow(Math.min(...rowIndexes))(state.tr.selection);
+  if (!cellsInFirstRow || cellsInFirstRow.length === 0) {
+    return false;
+  }
+  const targetCellPosition = cellsInFirstRow[0].pos;
+  return {
+    type: 'SET_TARGET_CELL_POSITION',
+    data: {
+      targetCellPosition
+    }
+  };
+}, tr => selectRowsTransform(rowIndexes)(tr).setMeta('addToHistory', false));
 export const showInsertColumnButton = columnIndex => createCommand(_ => columnIndex > -1 ? {
   type: 'SHOW_INSERT_COLUMN_BUTTON',
   data: {

package/dist/es2019/plugins/table/pm-plugins/drag-and-drop/plugin.js

@@ -3,8 +3,7 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getCellsInRow } from '@atlaskit/editor-tables/utils';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
-import { findNearestCellIndexToPoint } from '../../utils';
-import { hasMergedCellsInColumn, hasMergedCellsInRow } from '../../utils/merged-cells';
+import { findNearestCellIndexToPoint, hasMergedCellsInBetween } from '../../utils';
 import { getPluginState as getTablePluginState } from '../plugin-factory';
 import { pluginKey as tablePluginKey } from '../plugin-key';
 import { DragAndDropActionType } from './actions';
@@ -184,14 +183,14 @@ export const createPlugin = (dispatch, eventDispatcher) => {
             }
 
             // If the drop target index contains merged cells then we should not allow the drop to occur.
-            const hasMergedCells = sourceType === 'table-row' ? hasMergedCellsInRow : hasMergedCellsInColumn;
-            if (hasMergedCells(targetAdjustedIndex)(editorView.state.selection)) {
+            if (hasMergedCellsInBetween([targetAdjustedIndex - 1, targetAdjustedIndex], sourceType === 'table-row' ? DropTargetType.ROW : DropTargetType.COLUMN)(editorView.state.selection)) {
               clearDropTarget(tr)(editorView.state, editorView.dispatch);
               return;
             }
             const [sourceIndex] = sourceIndexes;
             requestAnimationFrame(() => {
               moveSource(sourceType, sourceIndex, targetAdjustedIndex + (direction === -1 ? 0 : -1), tr)(editorView.state, editorView.dispatch);
+              editorView.focus();
             });
           }
         })

package/dist/es2019/plugins/table/ui/FloatingInsertButton/index.js

@@ -85,9 +85,6 @@ export class FloatingInsertButton extends React.Component {
             position: pos,
             docSize: editorView.state.doc.nodeSize,
             error: error === null || error === void 0 ? void 0 : error.toString()
-          },
-          nonPrivacySafeAttributes: {
-            errorStack: error.stack || undefined
           }
         };
         dispatchAnalyticsEvent(payload);

package/dist/es2019/plugins/table/ui/TableFloatingColumnControls/ColumnControls/index.js

@@ -4,7 +4,7 @@ import React, { useCallback, useMemo } from 'react';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { clearHoverSelection, hoverCell, hoverColumns, selectColumn } from '../../../commands';
+import { clearHoverSelection, hoverCell, hoverColumns, selectColumn, selectColumns } from '../../../commands';
 import { toggleDragMenu } from '../../../pm-plugins/drag-and-drop/commands';
 import { TableCssClassName as ClassName } from '../../../types';
 import { getRowsParams, getSelectedColumnIndexes } from '../../../utils';
@@ -48,8 +48,14 @@ export const ColumnControls = ({
       state,
       dispatch
     } = editorView;
-    selectColumn(colIndex, event.shiftKey)(state, dispatch);
-  }, [colIndex, editorView]);
+    const isClickOutsideSelectedCols = selectedColIndexes.length >= 1 && !selectedColIndexes.includes(colIndex);
+    if (!selectedColIndexes || selectedColIndexes.length === 0 || isClickOutsideSelectedCols) {
+      selectColumn(colIndex, event.shiftKey)(state, dispatch);
+    }
+    if (selectedColIndexes.length > 1 && selectedColIndexes.includes(colIndex) && !event.shiftKey) {
+      selectColumns(selectedColIndexes)(state, dispatch);
+    }
+  }, [colIndex, selectedColIndexes, editorView]);
   const handleMouseOver = useCallback(() => {
     const {
       state,

package/dist/es2019/plugins/table/ui/TableFloatingControls/RowControls/DragControls.js

@@ -36,6 +36,7 @@ const DragControlsComponent = ({
   canDrag,
   hoverRows,
   selectRow,
+  selectRows,
   updateCellHoverLocation
 }) => {
   var _tableNode$attrs$loca, _tableNode$attrs;
@@ -103,8 +104,14 @@ const DragControlsComponent = ({
     hoverRows([rowIndex]);
   }, [hoverRows, rowIndex]);
   const handleClick = useCallback(e => {
-    selectRow(rowIndex, e === null || e === void 0 ? void 0 : e.shiftKey);
-  }, [rowIndex, selectRow]);
+    const isClickOutsideSelectedRows = selectedRowIndexes.length >= 1 && !selectedRowIndexes.includes(rowIndex);
+    if (!selectedRowIndexes || selectedRowIndexes.length === 0 || isClickOutsideSelectedRows) {
+      selectRow(rowIndex, e.shiftKey);
+    }
+    if (selectedRowIndexes.length > 1 && selectedRowIndexes.includes(rowIndex) && !e.shiftKey) {
+      selectRows(selectedRowIndexes);
+    }
+  }, [rowIndex, selectRow, selectRows, selectedRowIndexes]);
   const generateHandleByType = type => {
     if (!hoveredCell) {
       return null;

package/dist/es2019/plugins/table/ui/TableFloatingControls/index.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { Component } from 'react';
 import { browser } from '@atlaskit/editor-common/utils';
-import { hoverCell, hoverRows, selectRow } from '../../commands';
+import { hoverCell, hoverRows, selectRow, selectRows } from '../../commands';
 import { TableCssClassName as ClassName } from '../../types';
 import { isSelectionUpdated } from '../../utils';
 import { CornerControls, DragCornerControls } from './CornerControls';
@@ -24,6 +24,20 @@ export default class TableFloatingControls extends Component {
       }
       selectRow(row, expand)(state, dispatch);
     });
+    _defineProperty(this, "selectRows", rowIndexes => {
+      const {
+        editorView
+      } = this.props;
+      const {
+        state,
+        dispatch
+      } = editorView;
+      // fix for issue ED-4665
+      if (browser.ie_version === 11) {
+        editorView.dom.blur();
+      }
+      selectRows(rowIndexes)(state, dispatch);
+    });
     _defineProperty(this, "hoverRows", (rows, danger) => {
       const {
         state,
@@ -167,6 +181,7 @@ export default class TableFloatingControls extends Component {
       tableWidth: this.state.tableWrapperWidth,
       hoverRows: this.hoverRows,
       selectRow: this.selectRow,
+      selectRows: this.selectRows,
       updateCellHoverLocation: this.updateCellHoverLocation,
       canDrag: canDrag
     })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CornerControls, {

package/dist/es2019/plugins/table/utils/index.js

@@ -8,4 +8,4 @@ export { getRowHeights, isRowDeleteButtonVisible, getRowDeleteButtonParams, getR
 export { getSelectedTableInfo, getSelectedCellInfo } from './analytics';
 export { getMergedCellsPositions } from './table';
 export { updatePluginStateDecorations } from './update-plugin-state-decorations';
-export { hasMergedCellsInColumn, hasMergedCellsInRow } from './merged-cells';
+export { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInBetween } from './merged-cells';

package/dist/es2019/plugins/table/utils/merged-cells.js

@@ -45,4 +45,66 @@ export const hasMergedCellsInRow = rowIndexes => hasMergedCells(rowIndexes, (ind
     top: y,
     bottom: y === index ? y + 1 : y
   };
-});
+});
+const getRect = (index, type, map) => {
+  if (type === 'column') {
+    const x = Math.max(Math.min(index, map.width - 1), 0); // clamped index
+    return {
+      left: x,
+      right: x === index ? x + 1 : x,
+      top: 0,
+      bottom: map.height
+    };
+  } else {
+    const y = Math.max(Math.min(index, map.height - 1), 0); // clamped index
+    return {
+      left: 0,
+      right: map.width,
+      top: y,
+      bottom: y === index ? y + 1 : y
+    };
+  }
+};
+export const hasMergedCellsInBetween = (indexes, type) => selection => {
+  const table = findTable(selection);
+  if (!table) {
+    return false;
+  }
+  const map = TableMap.get(table.node);
+  const cellPositions = new Set();
+  const mergedCells = new Set();
+  map.map.forEach(value => {
+    if (cellPositions.has(value)) {
+      mergedCells.add(value);
+    } else {
+      cellPositions.add(value);
+    }
+  });
+  if (!mergedCells.size) {
+    return false;
+  }
+  const getMergedCellsInRect = (index, type) => {
+    const rect = getRect(index, type, map);
+    const isValidRectangle = rect.left < rect.right && rect.top < rect.bottom;
+    if (!isValidRectangle) {
+      return [];
+    }
+    const cells = map.cellsInRect(rect);
+    let allCellsInRect = [];
+    if (type === 'column') {
+      allCellsInRect = map.map.filter((_, key) => key % map.width === index);
+    } else {
+      allCellsInRect = map.map.filter((_, key) => Math.floor(key / map.width) === index);
+    }
+    const mergedCell = allCellsInRect.filter(nodePos => {
+      return !cells.includes(nodePos) // cell exists in Rect but not show in the map.cellsInRect list => merged cell
+      ? true : mergedCells.has(nodePos); // cell includes in mergedCells => merged cell
+    });
+
+    return [...new Set(mergedCell)];
+  };
+  const mergedCellsInRectArr = indexes.map(index => getMergedCellsInRect(index, type));
+
+  // Currently only support 2 indexes, but we can extend this to support more indexes in the future.
+  return mergedCellsInRectArr[0].some(cell => mergedCellsInRectArr[1].includes(cell));
+};

package/dist/esm/plugins/table/commands/index.js

@@ -2,7 +2,7 @@ export { hoverColumns, hoverRows, hoverTable, hoverCell, hoverMergedCells, clear
 export { insertColumn, insertRow, createTable } from './insert';
 export { getNextLayout, toggleContextualMenu, toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn, toggleTableLayout } from './toggle';
 export { clearMultipleCells } from './clear';
-export { autoSizeTable, convertFirstRowToHeader, deleteTable, hideInsertColumnOrRowButton, moveCursorBackward, selectColumn, selectRow, setCellAttr, setEditorFocus, setMultipleCellAttrs, setTableRef, showInsertColumnButton, showInsertRowButton, transformSliceToAddTableHeaders, triggerUnlessTableHeader, addBoldInEmptyHeaderCells, addResizeHandleDecorations } from './misc';
+export { autoSizeTable, convertFirstRowToHeader, deleteTable, hideInsertColumnOrRowButton, moveCursorBackward, selectColumn, selectColumns, selectRow, selectRows, setCellAttr, setEditorFocus, setMultipleCellAttrs, setTableRef, showInsertColumnButton, showInsertRowButton, transformSliceToAddTableHeaders, triggerUnlessTableHeader, addBoldInEmptyHeaderCells, addResizeHandleDecorations } from './misc';
 export { sortByColumn } from './sort';
 export { goToNextCell } from './go-to-next-cell';
 export { removeDescendantNodes } from './referentiality';