@atlaskit/editor-plugin-table 5.7.5 → 5.7.7

package/dist/es2019/commands-with-analytics.js

@@ -6,7 +6,7 @@ import { clearMultipleCells } from './commands/clear';
 import { wrapTableInExpand } from './commands/collapse';
 import { deleteColumnsCommand } from './commands/delete';
 import { insertColumn, insertRow } from './commands/insert';
-import { deleteTable, deleteTableIfSelected, setMultipleCellAttrs } from './commands/misc';
+import { deleteTable, deleteTableIfSelected, getTableSelectionType, setMultipleCellAttrs } from './commands/misc';
 import { sortByColumn } from './commands/sort';
 import { splitCell } from './commands/split-cell';
 import { getNextLayout, toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn, toggleTableLayout } from './commands/toggle';
@@ -232,6 +232,31 @@ export const deleteColumnsWithAnalytics = editorAnalyticsAPI => (inputMethod, re
     eventType: EVENT_TYPE.TRACK
   };
 })(editorAnalyticsAPI)(deleteColumnsCommand(rect));
+export const deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = editorAnalyticsAPI => (state, dispatch) => {
+  const {
+    selection
+  } = state;
+  const isCellSelection = selection instanceof CellSelection;
+  if (!isCellSelection) {
+    return false;
+  }
+  const rect = getSelectionRect(selection);
+  if (!rect) {
+    return false;
+  }
+  const selectionType = getTableSelectionType(selection);
+  if (selectionType === 'row') {
+    const {
+      pluginConfig
+    } = getPluginState(state);
+    const isHeaderRowRequired = pluginConfig.isHeaderRowRequired || false;
+    return deleteRowsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, rect, isHeaderRowRequired)(state, dispatch);
+  } else if (selectionType === 'column') {
+    return deleteColumnsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, rect)(state, dispatch);
+  } else {
+    return false;
+  }
+};
 const getTableDeletedAnalytics = (selection, inputMethod) => {
   const {
     totalRowCount,

package/dist/es2019/plugin.js

@@ -140,7 +140,12 @@ const tablesPlugin = ({
       // plugin as it is currently swallowing backspace events inside tables
       {
         name: 'tableKeymap',
-        plugin: () => keymapPlugin(defaultGetEditorContainerWidth, editorAnalyticsAPI)
+        plugin: () => {
+          const {
+            dragAndDropEnabled
+          } = options || {};
+          return keymapPlugin(defaultGetEditorContainerWidth, editorAnalyticsAPI, dragAndDropEnabled);
+        }
       }, {
         name: 'tableSelectionKeymap',
         plugin: () => tableSelectionKeymapPlugin(api === null || api === void 0 ? void 0 : api.selection)

package/dist/es2019/pm-plugins/drag-and-drop/commands-with-analytics.js

@@ -1,5 +1,7 @@
-import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION, TABLE_STATUS } from '@atlaskit/editor-common/analytics';
-import { getSelectedTableInfo } from '../../utils';
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION, TABLE_STATUS } from '@atlaskit/editor-common/analytics';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { findCellRectClosestToPos, getSelectionRect } from '@atlaskit/editor-tables/utils';
+import { getSelectedColumnIndexes, getSelectedRowIndexes, getSelectedTableInfo, hasMergedCellsInColumn, hasMergedCellsInRow } from '../../utils';
 import { withEditorAnalyticsAPI } from '../../utils/analytics';
 import { clearDropTarget, moveSource } from './commands';
 export const clearDropTargetWithAnalytics = editorAnalyticsAPI => (inputMethod, sourceType, status, tr) => {
@@ -63,4 +65,46 @@ export const moveSourceWithAnalytics = editorAnalyticsAPI => (inputMethod, sourc
     }
     return true;
   });
+};
+export const moveSourceWithAnalyticsViaShortcut = editorAnalyticsAPI => (sourceType, direction) => (state, dispatch) => {
+  const {
+    selection
+  } = state;
+  const isCellSelection = selection instanceof CellSelection;
+  const selectionRect = isCellSelection ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
+  if (!selectionRect) {
+    return false;
+  }
+  const isRow = sourceType === 'table-row';
+  const selectedIndexes = isRow ? getSelectedRowIndexes(selectionRect) : getSelectedColumnIndexes(selectionRect);
+
+  // We can move if only one row/column selected
+  if (selectedIndexes.length === 0 || selectedIndexes.length > 1) {
+    return false;
+  }
+  const sourceIndex = selectedIndexes[0];
+  // we can move only by one row/column
+  // 'direction' can only be 1 (for right or down) or -1 (for left or up)
+  const targetIndex = sourceIndex + direction;
+
+  // We can move only if targetIndex is a positive number and is not higher than the total number of rows/columns.
+  const {
+    totalRowCount,
+    totalColumnCount
+  } = getSelectedTableInfo(selection);
+  const isValidTargetIndex = targetIndex < 0 ? false : isRow ? targetIndex <= totalRowCount - 1 : targetIndex <= totalColumnCount - 1;
+  if (!isValidTargetIndex) {
+    return false;
+  }
+
+  // We can move only if there are no merged cells in the source or target row/column
+  const hasMergedCellsInSource = isRow ? hasMergedCellsInRow(sourceIndex)(selection) : hasMergedCellsInColumn(sourceIndex)(selection);
+  if (hasMergedCellsInSource) {
+    return false;
+  }
+  const hasMergedCellsInTarget = isRow ? hasMergedCellsInRow(targetIndex)(selection) : hasMergedCellsInColumn(targetIndex)(selection);
+  if (hasMergedCellsInTarget) {
+    return false;
+  }
+  return moveSourceWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, sourceType, sourceIndex, targetIndex)(state, dispatch);
 };

package/dist/es2019/pm-plugins/keymap.js

@@ -1,10 +1,11 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, bindKeymapWithCommand, nextCell, previousCell, toggleTable } from '@atlaskit/editor-common/keymaps';
+import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, bindKeymapWithCommand, deleteColumn, deleteRow, moveColumnLeft, moveColumnRight, moveRowDown, moveRowUp, nextCell, previousCell, toggleTable } from '@atlaskit/editor-common/keymaps';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { createTable, goToNextCell, moveCursorBackward, triggerUnlessTableHeader } from '../commands';
-import { addRowAroundSelection, deleteTableIfSelectedWithAnalytics, emptyMultipleCellsWithAnalytics } from '../commands-with-analytics';
+import { addRowAroundSelection, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut, deleteTableIfSelectedWithAnalytics, emptyMultipleCellsWithAnalytics } from '../commands-with-analytics';
 import { addColumnAfter as addColumnAfterCommand, addColumnBefore as addColumnBeforeCommand } from '../commands/insert';
+import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/commands-with-analytics';
 import { withEditorAnalyticsAPI } from '../utils/analytics';
 const createTableWithAnalytics = editorAnalyticsAPI => withEditorAnalyticsAPI({
   action: ACTION.INSERTED,
@@ -15,7 +16,7 @@ const createTableWithAnalytics = editorAnalyticsAPI => withEditorAnalyticsAPI({
   },
   eventType: EVENT_TYPE.TRACK
 })(editorAnalyticsAPI)(createTable());
-export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI) {
+export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, dragAndDropEnabled) {
   const list = {};
   bindKeymapWithCommand(nextCell.common, goToNextCell(editorAnalyticsAPI)(1), list);
   bindKeymapWithCommand(previousCell.common, goToNextCell(editorAnalyticsAPI)(-1), list);
@@ -28,6 +29,17 @@ export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI) {
   bindKeymapWithCommand(addRowAfter.common, addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'), list);
   bindKeymapWithCommand(addColumnBefore.common, triggerUnlessTableHeader(addColumnBeforeCommand(getEditorContainerWidth)), list);
   bindKeymapWithCommand(addColumnAfter.common, addColumnAfterCommand(getEditorContainerWidth), list);
+  if (dragAndDropEnabled) {
+    // Move row/column shortcuts
+    bindKeymapWithCommand(moveRowDown.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI)('table-row', 1), list);
+    bindKeymapWithCommand(moveRowUp.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI)('table-row', -1), list);
+    bindKeymapWithCommand(moveColumnLeft.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI)('table-column', -1), list);
+    bindKeymapWithCommand(moveColumnRight.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI)('table-column', 1), list);
+
+    // Delete row/column shortcuts
+    bindKeymapWithCommand(deleteColumn.common, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI), list);
+    bindKeymapWithCommand(deleteRow.common, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI), list);
+  }
   return keymap(list);
 }
 export default keymapPlugin;

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

@@ -6,7 +6,7 @@ import { ACTION, ACTION_SUBJECT, CONTENT_COMPONENT, EVENT_TYPE, INPUT_METHOD } f
 import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { akEditorTableInsertButtonOnStickyHeaderZIndex } from '@atlaskit/editor-shared-styles';
+import { akEditorTableCellOnStickyHeaderZIndex } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
@@ -106,7 +106,7 @@ export class FloatingInsertButton extends React.Component {
     // By setting the Popup z-index higher than the sticky header z-index ( common-styles.ts tr.sticky)
     // Only when inserting a column, otherwise set to undefined
     // Need to set z-index in the Popup, set z-index in the <InsertButton /> will not work
-    const zIndex = type === 'column' ? akEditorTableInsertButtonOnStickyHeaderZIndex : undefined;
+    const zIndex = type === 'column' ? akEditorTableCellOnStickyHeaderZIndex : undefined;
     return /*#__PURE__*/React.createElement(Popup, _extends({
       target: targetCellRef,
       mountTo: tableContainerWrapper || mountPoint,

package/dist/es2019/ui/common-styles.js

@@ -1,7 +1,7 @@
 import { css } from '@emotion/react';
 import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common/styles';
 import { browser } from '@atlaskit/editor-common/utils';
-import { akEditorFloatingDialogZIndex, akEditorSelectedNodeClassName, akEditorSmallZIndex, akEditorStickyHeaderZIndex, akEditorTableCellOnStickyHeaderZIndex, akEditorTableNumberColumnWidth, akEditorTableToolbarSize, akEditorUnitZIndex, getSelectionStyles, MAX_BROWSER_SCROLLBAR_HEIGHT, relativeFontSizeToBase16, SelectionStyle } from '@atlaskit/editor-shared-styles';
+import { akEditorSelectedNodeClassName, akEditorSmallZIndex, akEditorStickyHeaderZIndex, akEditorTableCellOnStickyHeaderZIndex, akEditorTableNumberColumnWidth, akEditorTableToolbarSize, akEditorUnitZIndex, getSelectionStyles, MAX_BROWSER_SCROLLBAR_HEIGHT, relativeFontSizeToBase16, SelectionStyle } from '@atlaskit/editor-shared-styles';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B300, N0, N20A, N300, N40A, R500 } from '@atlaskit/theme/colors';
@@ -943,7 +943,8 @@ export const tableStyles = props => css`
 
     .${ClassName.TABLE_STICKY} .${ClassName.DRAG_COLUMN_CONTROLS_WRAPPER} {
       position: fixed;
-      z-index: ${akEditorFloatingDialogZIndex};
+      /* higher zIndex than sticky header which is akEditorTableCellOnStickyHeaderZIndex - 5 */
+      z-index: ${akEditorTableCellOnStickyHeaderZIndex - 4};
     }
 
     ${tableWrapperStyles()}

package/dist/es2019/utils/drag-menu.js

@@ -1,6 +1,6 @@
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, tooltip } from '@atlaskit/editor-common/keymaps';
+import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, deleteColumn, deleteRow, moveColumnLeft, moveColumnRight, moveRowDown, moveRowUp, tooltip } from '@atlaskit/editor-common/keymaps';
 import ArrowDownIcon from '@atlaskit/icon/glyph/arrow-down';
 import ArrowLeftIcon from '@atlaskit/icon/glyph/arrow-left';
 import ArrowRightIcon from '@atlaskit/icon/glyph/arrow-right';
@@ -55,7 +55,8 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, h
     label: 'up',
     offset: -1,
     canMove: index => canDrag && canDecrease(index),
-    icon: ArrowUpIcon
+    icon: ArrowUpIcon,
+    keymap: moveRowUp
   }, {
     label: 'down',
     offset: 1,
@@ -63,12 +64,14 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, h
       var _tableMap$height;
       return canDrag && canIncrease(index, ((_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0) - 1);
     },
-    icon: ArrowDownIcon
+    icon: ArrowDownIcon,
+    keymap: moveRowDown
   }] : [{
     label: 'left',
     offset: -1,
     canMove: index => canDrag && canDecrease(index),
-    icon: ArrowLeftIcon
+    icon: ArrowLeftIcon,
+    keymap: moveColumnLeft
   }, {
     label: 'right',
     offset: 1,
@@ -76,7 +79,8 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, h
       var _tableMap$width;
       return canDrag && canIncrease(index, ((_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0) - 1);
     },
-    icon: ArrowRightIcon
+    icon: ArrowRightIcon,
+    keymap: moveColumnRight
   }];
   const sortOptions = direction === 'column' ? [{
     label: 'increasing',
@@ -146,12 +150,14 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, h
       }
       return true;
     },
-    icon: RemoveIcon
+    icon: RemoveIcon,
+    keymap: direction === 'row' ? tooltip(deleteRow) : tooltip(deleteColumn)
   }, ...moveOptions.map(({
     label,
     offset,
     canMove,
-    icon
+    icon,
+    keymap
   }) => ({
     id: `move_${direction}_${label}`,
     title: `Move ${direction} ${label}`,
@@ -165,7 +171,8 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, h
         return true;
       }
       return false;
-    }
+    },
+    keymap: keymap && tooltip(keymap)
   })), ...sortOptions.map(({
     label,
     order,

package/dist/esm/commands-with-analytics.js

@@ -9,7 +9,7 @@ import { clearMultipleCells } from './commands/clear';
 import { wrapTableInExpand } from './commands/collapse';
 import { deleteColumnsCommand } from './commands/delete';
 import { insertColumn, insertRow } from './commands/insert';
-import { deleteTable, deleteTableIfSelected, setMultipleCellAttrs } from './commands/misc';
+import { deleteTable, deleteTableIfSelected, getTableSelectionType, setMultipleCellAttrs } from './commands/misc';
 import { sortByColumn } from './commands/sort';
 import { splitCell } from './commands/split-cell';
 import { getNextLayout, toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn, toggleTableLayout } from './commands/toggle';
@@ -254,6 +254,30 @@ export var deleteColumnsWithAnalytics = function deleteColumnsWithAnalytics(edit
     })(editorAnalyticsAPI)(deleteColumnsCommand(rect));
   };
 };
+export var deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut = function deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var selection = state.selection;
+    var isCellSelection = selection instanceof CellSelection;
+    if (!isCellSelection) {
+      return false;
+    }
+    var rect = getSelectionRect(selection);
+    if (!rect) {
+      return false;
+    }
+    var selectionType = getTableSelectionType(selection);
+    if (selectionType === 'row') {
+      var _getPluginState = getPluginState(state),
+        pluginConfig = _getPluginState.pluginConfig;
+      var isHeaderRowRequired = pluginConfig.isHeaderRowRequired || false;
+      return deleteRowsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, rect, isHeaderRowRequired)(state, dispatch);
+    } else if (selectionType === 'column') {
+      return deleteColumnsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, rect)(state, dispatch);
+    } else {
+      return false;
+    }
+  };
+};
 var getTableDeletedAnalytics = function getTableDeletedAnalytics(selection, inputMethod) {
   var _getSelectedTableInfo5 = getSelectedTableInfo(selection),
     totalRowCount = _getSelectedTableInfo5.totalRowCount,
@@ -288,8 +312,8 @@ export var toggleHeaderRowWithAnalytics = function toggleHeaderRowWithAnalytics(
     var _getSelectedTableInfo6 = getSelectedTableInfo(state.selection),
       totalRowCount = _getSelectedTableInfo6.totalRowCount,
       totalColumnCount = _getSelectedTableInfo6.totalColumnCount;
-    var _getPluginState = getPluginState(state),
-      isHeaderRowEnabled = _getPluginState.isHeaderRowEnabled;
+    var _getPluginState2 = getPluginState(state),
+      isHeaderRowEnabled = _getPluginState2.isHeaderRowEnabled;
     return {
       action: TABLE_ACTION.TOGGLED_HEADER_ROW,
       actionSubject: ACTION_SUBJECT.TABLE,
@@ -308,8 +332,8 @@ export var toggleHeaderColumnWithAnalytics = function toggleHeaderColumnWithAnal
     var _getSelectedTableInfo7 = getSelectedTableInfo(state.selection),
       totalRowCount = _getSelectedTableInfo7.totalRowCount,
       totalColumnCount = _getSelectedTableInfo7.totalColumnCount;
-    var _getPluginState2 = getPluginState(state),
-      isHeaderColumnEnabled = _getPluginState2.isHeaderColumnEnabled;
+    var _getPluginState3 = getPluginState(state),
+      isHeaderColumnEnabled = _getPluginState3.isHeaderColumnEnabled;
     return {
       action: TABLE_ACTION.TOGGLED_HEADER_COLUMN,
       actionSubject: ACTION_SUBJECT.TABLE,

package/dist/esm/plugin.js

@@ -141,7 +141,9 @@ var tablesPlugin = function tablesPlugin(_ref) {
       {
         name: 'tableKeymap',
         plugin: function plugin() {
-          return keymapPlugin(defaultGetEditorContainerWidth, editorAnalyticsAPI);
+          var _ref6 = options || {},
+            dragAndDropEnabled = _ref6.dragAndDropEnabled;
+          return keymapPlugin(defaultGetEditorContainerWidth, editorAnalyticsAPI, dragAndDropEnabled);
         }
       }, {
         name: 'tableSelectionKeymap',
@@ -151,12 +153,12 @@ var tablesPlugin = function tablesPlugin(_ref) {
       }, {
         name: 'tableEditing',
         plugin: function plugin() {
-          var _ref6 = options || {},
-            dragAndDropEnabled = _ref6.dragAndDropEnabled;
+          var _ref7 = options || {},
+            dragAndDropEnabled = _ref7.dragAndDropEnabled;
           return tableEditing({
-            reportFixedTable: function reportFixedTable(_ref7) {
-              var tr = _ref7.tr,
-                reason = _ref7.reason;
+            reportFixedTable: function reportFixedTable(_ref8) {
+              var tr = _ref8.tr,
+                reason = _ref8.reason;
               editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
                 action: TABLE_ACTION.FIXED,
                 actionSubject: ACTION_SUBJECT.TABLE,
@@ -172,50 +174,50 @@ var tablesPlugin = function tablesPlugin(_ref) {
         }
       }, {
         name: 'tableStickyHeaders',
-        plugin: function plugin(_ref8) {
-          var dispatch = _ref8.dispatch,
-            eventDispatcher = _ref8.eventDispatcher;
+        plugin: function plugin(_ref9) {
+          var dispatch = _ref9.dispatch,
+            eventDispatcher = _ref9.eventDispatcher;
           return options && options.tableOptions.stickyHeaders ? createStickyHeadersPlugin(dispatch, eventDispatcher, function () {
             return [];
           }, (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags) : undefined;
         }
       }, {
         name: 'tableDragAndDrop',
-        plugin: function plugin(_ref9) {
-          var dispatch = _ref9.dispatch,
-            eventDispatcher = _ref9.eventDispatcher,
-            dispatchAnalyticsEvent = _ref9.dispatchAnalyticsEvent;
+        plugin: function plugin(_ref10) {
+          var dispatch = _ref10.dispatch,
+            eventDispatcher = _ref10.eventDispatcher,
+            dispatchAnalyticsEvent = _ref10.dispatchAnalyticsEvent;
           return options !== null && options !== void 0 && options.dragAndDropEnabled ? createDragAndDropPlugin(dispatch, eventDispatcher, editorAnalyticsAPI) : undefined;
         }
       }, {
         name: 'tableLocalId',
-        plugin: function plugin(_ref10) {
-          var dispatch = _ref10.dispatch;
+        plugin: function plugin(_ref11) {
+          var dispatch = _ref11.dispatch;
           return createTableLocalIdPlugin(dispatch);
         }
       }, {
         name: 'tableWidth',
-        plugin: function plugin(_ref11) {
+        plugin: function plugin(_ref12) {
           var _options$fullWidthEna;
-          var dispatchAnalyticsEvent = _ref11.dispatchAnalyticsEvent,
-            dispatch = _ref11.dispatch;
+          var dispatchAnalyticsEvent = _ref12.dispatchAnalyticsEvent,
+            dispatch = _ref12.dispatch;
           return options !== null && options !== void 0 && options.tableResizingEnabled ? createTableWidthPlugin(dispatch, dispatchAnalyticsEvent, (_options$fullWidthEna = options === null || options === void 0 ? void 0 : options.fullWidthEnabled) !== null && _options$fullWidthEna !== void 0 ? _options$fullWidthEna : false) : undefined;
         }
       },
       // TODO: should be deprecated and eventually replaced with 'tableAnalyticsPlugin'
       {
         name: 'tableOverflowAnalyticsPlugin',
-        plugin: function plugin(_ref12) {
+        plugin: function plugin(_ref13) {
           var _options$tableResizin;
-          var dispatch = _ref12.dispatch,
-            dispatchAnalyticsEvent = _ref12.dispatchAnalyticsEvent;
+          var dispatch = _ref13.dispatch,
+            dispatchAnalyticsEvent = _ref13.dispatchAnalyticsEvent;
           return createTableOverflowAnalyticsPlugin(dispatch, dispatchAnalyticsEvent, (_options$tableResizin = options === null || options === void 0 ? void 0 : options.tableResizingEnabled) !== null && _options$tableResizin !== void 0 ? _options$tableResizin : false);
         }
       }, {
         name: 'tableAnalyticsPlugin',
-        plugin: function plugin(_ref13) {
-          var dispatch = _ref13.dispatch,
-            dispatchAnalyticsEvent = _ref13.dispatchAnalyticsEvent;
+        plugin: function plugin(_ref14) {
+          var dispatch = _ref14.dispatch,
+            dispatchAnalyticsEvent = _ref14.dispatchAnalyticsEvent;
           return getBooleanFF('platform.editor.table.analytics-plugin-moved-event') ? createTableAnalyticsPlugin(dispatch, dispatchAnalyticsEvent) : undefined;
         }
       }, {
@@ -246,12 +248,12 @@ var tablesPlugin = function tablesPlugin(_ref) {
       }
       return plugins;
     },
-    contentComponent: function contentComponent(_ref14) {
-      var editorView = _ref14.editorView,
-        popupsMountPoint = _ref14.popupsMountPoint,
-        popupsBoundariesElement = _ref14.popupsBoundariesElement,
-        popupsScrollableElement = _ref14.popupsScrollableElement,
-        dispatchAnalyticsEvent = _ref14.dispatchAnalyticsEvent;
+    contentComponent: function contentComponent(_ref15) {
+      var editorView = _ref15.editorView,
+        popupsMountPoint = _ref15.popupsMountPoint,
+        popupsBoundariesElement = _ref15.popupsBoundariesElement,
+        popupsScrollableElement = _ref15.popupsScrollableElement,
+        dispatchAnalyticsEvent = _ref15.dispatchAnalyticsEvent;
       return /*#__PURE__*/React.createElement(ErrorBoundary, {
         component: ACTION_SUBJECT.TABLES_PLUGIN,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
@@ -265,30 +267,30 @@ var tablesPlugin = function tablesPlugin(_ref) {
           stickyHeadersState: stickyHeadersPluginKey,
           dragAndDropState: dragAndDropPluginKey
         },
-        render: function render(_ref15) {
-          var resizingPluginState = _ref15.tableResizingPluginState,
-            stickyHeadersState = _ref15.stickyHeadersState,
-            tablePluginState = _ref15.tablePluginState,
-            tableWidthPluginState = _ref15.tableWidthPluginState,
-            dragAndDropState = _ref15.dragAndDropState;
+        render: function render(_ref16) {
+          var resizingPluginState = _ref16.tableResizingPluginState,
+            stickyHeadersState = _ref16.stickyHeadersState,
+            tablePluginState = _ref16.tablePluginState,
+            tableWidthPluginState = _ref16.tableWidthPluginState,
+            dragAndDropState = _ref16.dragAndDropState;
           var state = editorView.state;
           var isColumnResizing = resizingPluginState === null || resizingPluginState === void 0 ? void 0 : resizingPluginState.dragging;
           var isTableResizing = tableWidthPluginState === null || tableWidthPluginState === void 0 ? void 0 : tableWidthPluginState.resizing;
           var isResizing = isColumnResizing || isTableResizing;
-          var _ref16 = tablePluginState,
-            tableNode = _ref16.tableNode,
-            tablePos = _ref16.tablePos,
-            targetCellPosition = _ref16.targetCellPosition,
-            isContextualMenuOpen = _ref16.isContextualMenuOpen,
-            layout = _ref16.layout,
-            tableRef = _ref16.tableRef,
-            pluginConfig = _ref16.pluginConfig,
-            insertColumnButtonIndex = _ref16.insertColumnButtonIndex,
-            insertRowButtonIndex = _ref16.insertRowButtonIndex,
-            isHeaderColumnEnabled = _ref16.isHeaderColumnEnabled,
-            isHeaderRowEnabled = _ref16.isHeaderRowEnabled,
-            isDragAndDropEnabled = _ref16.isDragAndDropEnabled,
-            tableWrapperTarget = _ref16.tableWrapperTarget;
+          var _ref17 = tablePluginState,
+            tableNode = _ref17.tableNode,
+            tablePos = _ref17.tablePos,
+            targetCellPosition = _ref17.targetCellPosition,
+            isContextualMenuOpen = _ref17.isContextualMenuOpen,
+            layout = _ref17.layout,
+            tableRef = _ref17.tableRef,
+            pluginConfig = _ref17.pluginConfig,
+            insertColumnButtonIndex = _ref17.insertColumnButtonIndex,
+            insertRowButtonIndex = _ref17.insertRowButtonIndex,
+            isHeaderColumnEnabled = _ref17.isHeaderColumnEnabled,
+            isHeaderRowEnabled = _ref17.isHeaderRowEnabled,
+            isDragAndDropEnabled = _ref17.isDragAndDropEnabled,
+            tableWrapperTarget = _ref17.tableWrapperTarget;
           var allowControls = pluginConfig.allowControls;
           var stickyHeader = stickyHeadersState ? findStickyHeaderForTable(stickyHeadersState, tablePos) : undefined;
           var LayoutContent = options && !options.tableResizingEnabled && isLayoutSupported(state) && options.breakoutEnabled ? /*#__PURE__*/React.createElement(LayoutButton, {
@@ -369,8 +371,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
       }));
     },
     pluginsOptions: {
-      quickInsert: function quickInsert(_ref17) {
-        var formatMessage = _ref17.formatMessage;
+      quickInsert: function quickInsert(_ref18) {
+        var formatMessage = _ref18.formatMessage;
         return [{
           id: 'table',
           title: formatMessage(messages.table),

package/dist/esm/pm-plugins/drag-and-drop/commands-with-analytics.js

@@ -1,5 +1,7 @@
-import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION, TABLE_STATUS } from '@atlaskit/editor-common/analytics';
-import { getSelectedTableInfo } from '../../utils';
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION, TABLE_STATUS } from '@atlaskit/editor-common/analytics';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { findCellRectClosestToPos, getSelectionRect } from '@atlaskit/editor-tables/utils';
+import { getSelectedColumnIndexes, getSelectedRowIndexes, getSelectedTableInfo, hasMergedCellsInColumn, hasMergedCellsInRow } from '../../utils';
 import { withEditorAnalyticsAPI } from '../../utils/analytics';
 import { clearDropTarget, moveSource } from './commands';
 export var clearDropTargetWithAnalytics = function clearDropTargetWithAnalytics(editorAnalyticsAPI) {
@@ -63,4 +65,47 @@ export var moveSourceWithAnalytics = function moveSourceWithAnalytics(editorAnal
       return true;
     });
   };
+};
+export var moveSourceWithAnalyticsViaShortcut = function moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI) {
+  return function (sourceType, direction) {
+    return function (state, dispatch) {
+      var selection = state.selection;
+      var isCellSelection = selection instanceof CellSelection;
+      var selectionRect = isCellSelection ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
+      if (!selectionRect) {
+        return false;
+      }
+      var isRow = sourceType === 'table-row';
+      var selectedIndexes = isRow ? getSelectedRowIndexes(selectionRect) : getSelectedColumnIndexes(selectionRect);
+
+      // We can move if only one row/column selected
+      if (selectedIndexes.length === 0 || selectedIndexes.length > 1) {
+        return false;
+      }
+      var sourceIndex = selectedIndexes[0];
+      // we can move only by one row/column
+      // 'direction' can only be 1 (for right or down) or -1 (for left or up)
+      var targetIndex = sourceIndex + direction;
+
+      // We can move only if targetIndex is a positive number and is not higher than the total number of rows/columns.
+      var _getSelectedTableInfo3 = getSelectedTableInfo(selection),
+        totalRowCount = _getSelectedTableInfo3.totalRowCount,
+        totalColumnCount = _getSelectedTableInfo3.totalColumnCount;
+      var isValidTargetIndex = targetIndex < 0 ? false : isRow ? targetIndex <= totalRowCount - 1 : targetIndex <= totalColumnCount - 1;
+      if (!isValidTargetIndex) {
+        return false;
+      }
+
+      // We can move only if there are no merged cells in the source or target row/column
+      var hasMergedCellsInSource = isRow ? hasMergedCellsInRow(sourceIndex)(selection) : hasMergedCellsInColumn(sourceIndex)(selection);
+      if (hasMergedCellsInSource) {
+        return false;
+      }
+      var hasMergedCellsInTarget = isRow ? hasMergedCellsInRow(targetIndex)(selection) : hasMergedCellsInColumn(targetIndex)(selection);
+      if (hasMergedCellsInTarget) {
+        return false;
+      }
+      return moveSourceWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, sourceType, sourceIndex, targetIndex)(state, dispatch);
+    };
+  };
 };

package/dist/esm/pm-plugins/keymap.js

@@ -1,10 +1,11 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, bindKeymapWithCommand, nextCell, previousCell, toggleTable } from '@atlaskit/editor-common/keymaps';
+import { addColumnAfter, addColumnBefore, addRowAfter, addRowBefore, backspace, bindKeymapWithCommand, deleteColumn, deleteRow, moveColumnLeft, moveColumnRight, moveRowDown, moveRowUp, nextCell, previousCell, toggleTable } from '@atlaskit/editor-common/keymaps';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { createTable, goToNextCell, moveCursorBackward, triggerUnlessTableHeader } from '../commands';
-import { addRowAroundSelection, deleteTableIfSelectedWithAnalytics, emptyMultipleCellsWithAnalytics } from '../commands-with-analytics';
+import { addRowAroundSelection, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut, deleteTableIfSelectedWithAnalytics, emptyMultipleCellsWithAnalytics } from '../commands-with-analytics';
 import { addColumnAfter as addColumnAfterCommand, addColumnBefore as addColumnBeforeCommand } from '../commands/insert';
+import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/commands-with-analytics';
 import { withEditorAnalyticsAPI } from '../utils/analytics';
 var createTableWithAnalytics = function createTableWithAnalytics(editorAnalyticsAPI) {
   return withEditorAnalyticsAPI({
@@ -17,7 +18,7 @@ var createTableWithAnalytics = function createTableWithAnalytics(editorAnalytics
     eventType: EVENT_TYPE.TRACK
   })(editorAnalyticsAPI)(createTable());
 };
-export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI) {
+export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, dragAndDropEnabled) {
   var list = {};
   bindKeymapWithCommand(nextCell.common, goToNextCell(editorAnalyticsAPI)(1), list);
   bindKeymapWithCommand(previousCell.common, goToNextCell(editorAnalyticsAPI)(-1), list);
@@ -30,6 +31,17 @@ export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI) {
   bindKeymapWithCommand(addRowAfter.common, addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'), list);
   bindKeymapWithCommand(addColumnBefore.common, triggerUnlessTableHeader(addColumnBeforeCommand(getEditorContainerWidth)), list);
   bindKeymapWithCommand(addColumnAfter.common, addColumnAfterCommand(getEditorContainerWidth), list);
+  if (dragAndDropEnabled) {
+    // Move row/column shortcuts
+    bindKeymapWithCommand(moveRowDown.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI)('table-row', 1), list);
+    bindKeymapWithCommand(moveRowUp.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI)('table-row', -1), list);
+    bindKeymapWithCommand(moveColumnLeft.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI)('table-column', -1), list);
+    bindKeymapWithCommand(moveColumnRight.common, moveSourceWithAnalyticsViaShortcut(editorAnalyticsAPI)('table-column', 1), list);
+
+    // Delete row/column shortcuts
+    bindKeymapWithCommand(deleteColumn.common, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI), list);
+    bindKeymapWithCommand(deleteRow.common, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI), list);
+  }
   return keymap(list);
 }
 export default keymapPlugin;

package/dist/esm/ui/FloatingInsertButton/index.js

@@ -14,7 +14,7 @@ import { ACTION, ACTION_SUBJECT, CONTENT_COMPONENT, EVENT_TYPE, INPUT_METHOD } f
 import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { akEditorTableInsertButtonOnStickyHeaderZIndex } from '@atlaskit/editor-shared-styles';
+import { akEditorTableCellOnStickyHeaderZIndex } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
@@ -116,7 +116,7 @@ export var FloatingInsertButton = /*#__PURE__*/function (_React$Component) {
       // By setting the Popup z-index higher than the sticky header z-index ( common-styles.ts tr.sticky)
       // Only when inserting a column, otherwise set to undefined
       // Need to set z-index in the Popup, set z-index in the <InsertButton /> will not work
-      var zIndex = type === 'column' ? akEditorTableInsertButtonOnStickyHeaderZIndex : undefined;
+      var zIndex = type === 'column' ? akEditorTableCellOnStickyHeaderZIndex : undefined;
       return /*#__PURE__*/React.createElement(Popup, _extends({
         target: targetCellRef,
         mountTo: tableContainerWrapper || mountPoint,