@atlaskit/editor-plugin-table 5.5.3 → 5.5.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-table
 
+## 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

@@ -191,6 +191,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/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/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

@@ -192,6 +192,7 @@ export const createPlugin = (dispatch, eventDispatcher) => {
             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/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/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';

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

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -5,7 +6,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';
@@ -339,6 +340,37 @@ export var selectColumn = function selectColumn(column, expand) {
     return selectColumnTransform(column, expand)(tr).setMeta('addToHistory', false);
   });
 };
+export var selectColumns = function selectColumns(columnIndexes) {
+  return createCommand(function (state) {
+    if (!columnIndexes) {
+      return false;
+    }
+    var cells = columnIndexes.map(function (column) {
+      return getCellsInColumn(column)(state.tr.selection);
+    }).flat();
+    if (!cells || !cells.length || cells.some(function (cell) {
+      return cell && typeof cell.pos !== 'number';
+    })) {
+      return false;
+    }
+    var decorations = createColumnSelectedDecoration(selectColumnsTransform(columnIndexes)(state.tr));
+    var decorationSet = updatePluginStateDecorations(state, decorations, TableDecorations.COLUMN_SELECTED);
+    var cellsInFirstColumn = getCellsInColumn(Math.min.apply(Math, _toConsumableArray(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 selectColumnsTransform(columnIndexes)(tr).setMeta('addToHistory', false);
+  });
+};
 export var selectRow = function selectRow(row, expand) {
   return createCommand(function (state) {
     var targetCellPosition;
@@ -356,6 +388,34 @@ export var selectRow = function selectRow(row, expand) {
     return selectRowTransform(row, expand)(tr).setMeta('addToHistory', false);
   });
 };
+export var selectRows = function selectRows(rowIndexes) {
+  return createCommand(function (state) {
+    if (rowIndexes.length === 0) {
+      return false;
+    }
+    var cells = rowIndexes.map(function (row) {
+      return getCellsInRow(row)(state.tr.selection);
+    }).flat();
+    if (!cells || !cells.length || cells.some(function (cell) {
+      return cell && typeof cell.pos !== 'number';
+    })) {
+      return false;
+    }
+    var cellsInFirstRow = getCellsInRow(Math.min.apply(Math, _toConsumableArray(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 selectRowsTransform(rowIndexes)(tr).setMeta('addToHistory', false);
+  });
+};
 export var showInsertColumnButton = function showInsertColumnButton(columnIndex) {
   return createCommand(function (_) {
     return columnIndex > -1 ? {

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

@@ -184,6 +184,7 @@ export var createPlugin = function createPlugin(dispatch, eventDispatcher) {
               sourceIndex = _sourceIndexes[0];
             requestAnimationFrame(function () {
               moveSource(sourceType, sourceIndex, targetAdjustedIndex + (direction === -1 ? 0 : -1), tr)(editorView.state, editorView.dispatch);
+              editorView.focus();
             });
           }
         })

package/dist/esm/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';
@@ -47,8 +47,14 @@ export var ColumnControls = function ColumnControls(_ref) {
   var handleClick = useCallback(function (event) {
     var state = editorView.state,
       dispatch = editorView.dispatch;
-    selectColumn(colIndex, event.shiftKey)(state, dispatch);
-  }, [colIndex, editorView]);
+    var 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]);
   var handleMouseOver = useCallback(function () {
     var state = editorView.state,
       dispatch = editorView.dispatch;

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

@@ -38,6 +38,7 @@ var DragControlsComponent = function DragControlsComponent(_ref) {
     canDrag = _ref.canDrag,
     hoverRows = _ref.hoverRows,
     selectRow = _ref.selectRow,
+    selectRows = _ref.selectRows,
     updateCellHoverLocation = _ref.updateCellHoverLocation;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -103,8 +104,14 @@ var DragControlsComponent = function DragControlsComponent(_ref) {
     hoverRows([rowIndex]);
   }, [hoverRows, rowIndex]);
   var handleClick = 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/esm/plugins/table/ui/TableFloatingControls/index.js

@@ -12,7 +12,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 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';
@@ -35,6 +35,16 @@ var TableFloatingControls = /*#__PURE__*/function (_Component) {
       }
       selectRow(row, expand)(state, dispatch);
     });
+    _defineProperty(_assertThisInitialized(_this), "selectRows", function (rowIndexes) {
+      var editorView = _this.props.editorView;
+      var state = editorView.state,
+        dispatch = editorView.dispatch;
+      // fix for issue ED-4665
+      if (browser.ie_version === 11) {
+        editorView.dom.blur();
+      }
+      selectRows(rowIndexes)(state, dispatch);
+    });
     _defineProperty(_assertThisInitialized(_this), "hoverRows", function (rows, danger) {
       var _this$props$editorVie = _this.props.editorView,
         state = _this$props$editorVie.state,
@@ -198,6 +208,7 @@ var TableFloatingControls = /*#__PURE__*/function (_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/types/plugins/table/commands/index.d.ts

@@ -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/types/plugins/table/commands/misc.d.ts

@@ -20,7 +20,9 @@ export declare const convertFirstRowToHeader: (schema: Schema) => (tr: Transacti
 export declare const moveCursorBackward: Command;
 export declare const setMultipleCellAttrs: (attrs: Object, targetCellPosition?: number) => Command;
 export declare const selectColumn: (column: number, expand?: boolean) => Command;
+export declare const selectColumns: (columnIndexes: number[]) => Command;
 export declare const selectRow: (row: number, expand?: boolean) => Command;
+export declare const selectRows: (rowIndexes: number[]) => Command;
 export declare const showInsertColumnButton: (columnIndex: number) => Command;
 export declare const showInsertRowButton: (rowIndex: number) => Command;
 export declare const hideInsertColumnOrRowButton: () => Command;

package/dist/types/plugins/table/ui/TableFloatingControls/RowControls/DragControls.d.ts

@@ -16,6 +16,7 @@ type DragControlsProps = {
     canDrag?: boolean;
     hoverRows: (rows: number[], danger?: boolean) => void;
     selectRow: (row: number, expand: boolean) => void;
+    selectRows: (rowIndexes: number[]) => void;
     updateCellHoverLocation: (rowIndex: number) => void;
 };
 export declare const DragControls: React.FC<import("react-intl-next").WithIntlProps<DragControlsProps & WrappedComponentProps<"intl">>> & {

package/dist/types/plugins/table/ui/TableFloatingControls/index.d.ts

@@ -42,6 +42,7 @@ export default class TableFloatingControls extends Component<Props, State> {
     componentWillUnmount(): void;
     render(): JSX.Element | null;
     private selectRow;
+    private selectRows;
     private hoverRows;
     private updateCellHoverLocation;
 }

package/dist/types-ts4.5/plugins/table/commands/index.d.ts

@@ -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/types-ts4.5/plugins/table/commands/misc.d.ts

@@ -20,7 +20,9 @@ export declare const convertFirstRowToHeader: (schema: Schema) => (tr: Transacti
 export declare const moveCursorBackward: Command;
 export declare const setMultipleCellAttrs: (attrs: Object, targetCellPosition?: number) => Command;
 export declare const selectColumn: (column: number, expand?: boolean) => Command;
+export declare const selectColumns: (columnIndexes: number[]) => Command;
 export declare const selectRow: (row: number, expand?: boolean) => Command;
+export declare const selectRows: (rowIndexes: number[]) => Command;
 export declare const showInsertColumnButton: (columnIndex: number) => Command;
 export declare const showInsertRowButton: (rowIndex: number) => Command;
 export declare const hideInsertColumnOrRowButton: () => Command;

package/dist/types-ts4.5/plugins/table/ui/TableFloatingControls/RowControls/DragControls.d.ts

@@ -16,6 +16,7 @@ type DragControlsProps = {
     canDrag?: boolean;
     hoverRows: (rows: number[], danger?: boolean) => void;
     selectRow: (row: number, expand: boolean) => void;
+    selectRows: (rowIndexes: number[]) => void;
     updateCellHoverLocation: (rowIndex: number) => void;
 };
 export declare const DragControls: React.FC<import("react-intl-next").WithIntlProps<DragControlsProps & WrappedComponentProps<"intl">>> & {

package/dist/types-ts4.5/plugins/table/ui/TableFloatingControls/index.d.ts

@@ -42,6 +42,7 @@ export default class TableFloatingControls extends Component<Props, State> {
     componentWillUnmount(): void;
     render(): JSX.Element | null;
     private selectRow;
+    private selectRows;
     private hoverRows;
     private updateCellHoverLocation;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "5.5.3",
+  "version": "5.5.4",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/__tests__/unit/ui/RowDragControls.tsx

@@ -74,6 +74,7 @@ describe('NumberColumn', () => {
           isTableHovered={true}
           hoverRows={jest.fn()}
           selectRow={jest.fn()}
+          selectRows={jest.fn()}
           updateCellHoverLocation={jest.fn()}
           tableWidth={760}
         />
@@ -111,6 +112,7 @@ describe('NumberColumn', () => {
           }}
           hoverRows={jest.fn()}
           selectRow={jest.fn()}
+          selectRows={jest.fn()}
           updateCellHoverLocation={jest.fn()}
           tableWidth={760}
         />

package/src/plugins/table/commands/index.ts

@@ -26,7 +26,9 @@ export {
   hideInsertColumnOrRowButton,
   moveCursorBackward,
   selectColumn,
+  selectColumns,
   selectRow,
+  selectRows,
   setCellAttr,
   setEditorFocus,
   setMultipleCellAttrs,

package/src/plugins/table/commands/misc.ts

@@ -30,8 +30,10 @@ import {
   isSelectionType,
   isTableSelected,
   removeTable,
+  selectColumns as selectColumnsTransform,
   selectColumn as selectColumnTransform,
   selectionCell,
+  selectRows as selectRowsTransform,
   selectRow as selectRowTransform,
   setCellAttrs,
 } from '@atlaskit/editor-tables/utils';
@@ -487,6 +489,53 @@ export const selectColumn = (column: number, expand?: boolean) =>
       selectColumnTransform(column, expand)(tr).setMeta('addToHistory', false),
   );
 
+export const selectColumns = (columnIndexes: number[]) =>
+  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: Transaction) => {
+      return selectColumnsTransform(columnIndexes)(tr).setMeta(
+        'addToHistory',
+        false,
+      );
+    },
+  );
+
 export const selectRow = (row: number, expand?: boolean) =>
   createCommand(
     (state) => {
@@ -501,6 +550,35 @@ export const selectRow = (row: number, expand?: boolean) =>
     (tr) => selectRowTransform(row, expand)(tr).setMeta('addToHistory', false),
   );
 
+export const selectRows = (rowIndexes: number[]) =>
+  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: number) =>
   createCommand(
     (_) =>

package/src/plugins/table/pm-plugins/drag-and-drop/plugin.ts

@@ -235,6 +235,8 @@ export const createPlugin = (
                 targetAdjustedIndex + (direction === -1 ? 0 : -1),
                 tr,
               )(editorView.state, editorView.dispatch);
+
+              editorView.focus();
             });
           },
         }),

package/src/plugins/table/ui/TableFloatingColumnControls/ColumnControls/index.tsx

@@ -13,6 +13,7 @@ import {
   hoverCell,
   hoverColumns,
   selectColumn,
+  selectColumns,
 } from '../../../commands';
 import { toggleDragMenu } from '../../../pm-plugins/drag-and-drop/commands';
 import type { CellHoverMeta, HandleTypes } from '../../../types';
@@ -81,9 +82,28 @@ export const ColumnControls = ({
   const handleClick = useCallback(
     (event: MouseEvent) => {
       const { state, dispatch } = editorView;
-      selectColumn(colIndex!, event.shiftKey)(state, dispatch);
+
+      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, editorView],
+    [colIndex, selectedColIndexes, editorView],
   );
 
   const handleMouseOver = useCallback(() => {

package/src/plugins/table/ui/TableFloatingControls/RowControls/DragControls.tsx

@@ -50,6 +50,7 @@ type DragControlsProps = {
   canDrag?: boolean;
   hoverRows: (rows: number[], danger?: boolean) => void;
   selectRow: (row: number, expand: boolean) => void;
+  selectRows: (rowIndexes: number[]) => void;
   updateCellHoverLocation: (rowIndex: number) => void;
 };
 
@@ -77,6 +78,7 @@ const DragControlsComponent = ({
   canDrag,
   hoverRows,
   selectRow,
+  selectRows,
   updateCellHoverLocation,
 }: DragControlsProps & WrappedComponentProps) => {
   const [isDragging, setIsDragging] = useState(false);
@@ -157,9 +159,26 @@ const DragControlsComponent = ({
 
   const handleClick = useCallback(
     (e: MouseEvent) => {
-      selectRow(rowIndex!, e?.shiftKey);
+      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],
+    [rowIndex, selectRow, selectRows, selectedRowIndexes],
   );
 
   const generateHandleByType = (type: HandleTypes): JSX.Element | null => {

package/src/plugins/table/ui/TableFloatingControls/index.tsx

@@ -6,7 +6,7 @@ import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 
-import { hoverCell, hoverRows, selectRow } from '../../commands';
+import { hoverCell, hoverRows, selectRow, selectRows } from '../../commands';
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
 import { TableCssClassName as ClassName } from '../../types';
 import type { CellHoverMeta } from '../../types';
@@ -211,6 +211,7 @@ export default class TableFloatingControls extends Component<Props, State> {
                     tableWidth={this.state.tableWrapperWidth}
                     hoverRows={this.hoverRows}
                     selectRow={this.selectRow}
+                    selectRows={this.selectRows}
                     updateCellHoverLocation={this.updateCellHoverLocation}
                     canDrag={canDrag}
                   />
@@ -256,6 +257,16 @@ export default class TableFloatingControls extends Component<Props, State> {
     selectRow(row, expand)(state, dispatch);
   };
 
+  private selectRows = (rowIndexes: number[]) => {
+    const { editorView } = this.props;
+    const { state, dispatch } = editorView;
+    // fix for issue ED-4665
+    if (browser.ie_version === 11) {
+      (editorView.dom as HTMLElement).blur();
+    }
+    selectRows(rowIndexes)(state, dispatch);
+  };
+
   private hoverRows = (rows: Array<number>, danger?: boolean) => {
     const { state, dispatch } = this.props.editorView;
     hoverRows(rows, danger)(state, dispatch);