@atlaskit/editor-plugin-table 7.2.1 → 7.2.3

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

@@ -18,9 +18,35 @@ import { getNewResizeStateFromSelectedColumns } from '../pm-plugins/table-resizi
 import { getClosestSelectionRect } from '../toolbar';
 import { deleteRows } from '../transforms';
 import { AddColLeftIcon, AddColRightIcon, AddRowAboveIcon, AddRowBelowIcon } from '../ui/icons';
+import { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsWithColumnNextToColumnIndex, hasMergedCellsWithRowNextToRowIndex } from './merged-cells';
 import { getSelectedColumnIndexes, getSelectedRowIndexes } from './selection';
-const canDecrease = (index, min = 0) => index !== undefined && index > min;
-const canIncrease = (index, max = 0) => index !== undefined && index < max;
+export const getTargetIndex = (selectedIndexes, direction) => Math[direction < 0 ? 'min' : 'max'](...selectedIndexes) + direction;
+export const canMove = (sourceType, direction, totalItemsOfSourceTypeCount, selection, selectionRect) => {
+  if (!selectionRect) {
+    return false;
+  }
+  const isRow = sourceType === 'table-row';
+  const selectedIndexes = isRow ? getSelectedRowIndexes(selectionRect) : getSelectedColumnIndexes(selectionRect);
+  const targetIndex = getTargetIndex(selectedIndexes, direction);
+  const isValidTargetIndex = targetIndex >= 0 && targetIndex < totalItemsOfSourceTypeCount;
+  if (!isValidTargetIndex) {
+    return false;
+  }
+
+  // We can't move column when target has merges with other columns
+  // We can't move row when target has merges with other rows
+  const hasMergedCellsInTarget = isRow ? hasMergedCellsWithRowNextToRowIndex(targetIndex, selection) : hasMergedCellsWithColumnNextToColumnIndex(targetIndex, selection);
+  if (hasMergedCellsInTarget) {
+    return false;
+  }
+
+  // Currently we can't move in any direction if there are merged cells in the source
+  const hasMergedCellsInSource = isRow ? hasMergedCellsInRow(selectedIndexes)(selection) : hasMergedCellsInColumn(selectedIndexes)(selection);
+  if (hasMergedCellsInSource) {
+    return false;
+  }
+  return true;
+};
 const isDistributeColumnsEnabled = state => {
   const rect = getClosestSelectionRect(state);
   if (rect) {
@@ -30,6 +56,7 @@ const isDistributeColumnsEnabled = state => {
   return false;
 };
 export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI) => {
+  var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
   const addOptions = direction === 'row' ? [{
     label: 'above',
     offset: 0,
@@ -51,38 +78,35 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, h
     icon: AddColRightIcon,
     keymap: addColumnAfter
   }];
+  const {
+    selection
+  } = editorView.state;
   const moveOptions = direction === 'row' ? [{
     label: 'up',
     icon: ArrowUpIcon,
     keymap: moveRowUp,
-    canMove: selectionRect => canDrag && canDecrease(selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.top),
+    canMove: canDrag && canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: selectionRect => selectionRect.top - 1
   }, {
     label: 'down',
     icon: ArrowDownIcon,
     keymap: moveRowDown,
-    canMove: selectionRect => {
-      var _selectionRect$bottom, _tableMap$height;
-      return canDrag && canIncrease(((_selectionRect$bottom = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.bottom) !== null && _selectionRect$bottom !== void 0 ? _selectionRect$bottom : 0) - 1, ((_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0) - 1);
-    },
+    canMove: canDrag && canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: selectionRect => selectionRect.bottom
   }] : [{
     label: 'left',
     icon: ArrowLeftIcon,
     keymap: moveColumnLeft,
-    canMove: selectionRect => canDrag && canDecrease(selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.left),
+    canMove: canDrag && canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: selectionRect => selectionRect.left - 1
   }, {
     label: 'right',
     icon: ArrowRightIcon,
     keymap: moveColumnRight,
-    canMove: selectionRect => {
-      var _selectionRect$right, _tableMap$width;
-      return canDrag && canIncrease(((_selectionRect$right = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right) !== null && _selectionRect$right !== void 0 ? _selectionRect$right : 0) - 1, ((_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0) - 1);
-    },
+    canMove: canDrag && canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: selectionRect => selectionRect.right
   }];
@@ -166,10 +190,10 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, h
   }) => ({
     id: `move_${direction}_${label}`,
     title: `Move ${direction} ${label}`,
-    disabled: !canMove(selectionRect),
+    disabled: !canMove,
     icon,
     onClick: (state, dispatch) => {
-      if (canMove(selectionRect)) {
+      if (canMove) {
         requestAnimationFrame(() => {
           moveSourceWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.TABLE_CONTEXT_MENU, `table-${direction}`, getOriginIndexes(selectionRect), getTargetIndex(selectionRect))(editorView.state, editorView.dispatch);
         });

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

@@ -107,4 +107,77 @@ export const hasMergedCellsInBetween = (indexes, type) => selection => {
 
   // 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));
+};
+
+// Checks if any cell in the column with colIndex is merged with a cell in a column to the left or to the right of it.
+// colIndex is a logical index of the column. It starts at 0 and goes up to tableMap.width - 1.
+export const hasMergedCellsWithColumnNextToColumnIndex = (colIndex, selection) => {
+  const table = findTable(selection);
+  if (!table) {
+    return false;
+  }
+  const tableMap = TableMap.get(table.node);
+  const {
+    width
+  } = tableMap;
+  if (width <= 1) {
+    return false;
+  }
+  if (colIndex < 0 || colIndex > width - 1) {
+    return false;
+  }
+  const {
+    map
+  } = tableMap;
+  // j is an index in the tableMap.map array. tableMap.map is a flat array.
+  // Each item of this array contains a number.
+  // The number represents the position of the corresponding cell in the tableMap. It exists for each cell.
+  // If there are merged cells, their positions will be represented by the same number.
+  const isFirstColumn = colIndex === 0;
+  const isLastColumn = colIndex === width - 1;
+  for (let j = colIndex; j < map.length; j += width) {
+    if (!isFirstColumn && map[j] === map[j - 1] ||
+    // compare with a cell in the column on the left
+    !isLastColumn && map[j] === map[j + 1] // compare with a cell in the column on the right
+    ) {
+      return true;
+    }
+  }
+  return false;
+};
+
+// Checks if any cell in the row with rowIndex is merged with a cell in a row above or below it.
+export const hasMergedCellsWithRowNextToRowIndex = (rowIndex, selection) => {
+  const table = findTable(selection);
+  if (!table) {
+    return false;
+  }
+  const tableMap = TableMap.get(table.node);
+  const {
+    height
+  } = tableMap;
+  if (height <= 1) {
+    return false;
+  }
+  if (rowIndex < 0 || rowIndex > height - 1) {
+    return false;
+  }
+  const {
+    map,
+    width
+  } = tableMap; // map is a flat array representing position of each cell in the table.
+  const indexOfFirstCellInTheRow = rowIndex * width;
+  const indexOfLastCellInTheRow = indexOfFirstCellInTheRow + width - 1;
+  const isFirstRow = rowIndex === 0;
+  const isLastRow = rowIndex === height - 1;
+  // j is an index of a cell in a row
+  for (let j = indexOfFirstCellInTheRow; j <= indexOfLastCellInTheRow; j++) {
+    if (!isFirstRow && map[j] === map[j - width] ||
+    // compare with a cell in the row above
+    !isLastRow && map[j] === map[j + width] // compare with a cell in the row below
+    ) {
+      return true;
+    }
+  }
+  return false;
 };

package/dist/esm/nodeviews/TableComponent.js

@@ -464,8 +464,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _classnames,
-        _this3 = this;
+      var _this3 = this,
+        _classnames;
       var _this$props10 = this.props,
         view = _this$props10.view,
         getNode = _this$props10.getNode,
@@ -537,7 +537,11 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         stickyHeader: this.state.stickyHeader,
         getEditorFeatureFlags: getEditorFeatureFlags,
         tableContainerWidth: tableContainerWidth,
-        isNumberColumnEnabled: node.attrs.isNumberColumnEnabled
+        isNumberColumnEnabled: node.attrs.isNumberColumnEnabled,
+        getScrollOffset: function getScrollOffset() {
+          var _this3$wrapper;
+          return ((_this3$wrapper = _this3.wrapper) === null || _this3$wrapper === void 0 ? void 0 : _this3$wrapper.scrollLeft) || 0;
+        }
       }) : null;
       var shadowPadding = allowControls && tableActive ? -tableToolbarSize : tableMarginSides;
       var shadowStyle = memoizeOne(function (visible) {
@@ -585,12 +589,12 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         editorView: view,
         node: node,
         getScrollOffset: function getScrollOffset() {
-          var _this3$wrapper;
-          return ((_this3$wrapper = _this3.wrapper) === null || _this3$wrapper === void 0 ? void 0 : _this3$wrapper.scrollLeft) || 0;
+          var _this3$wrapper2;
+          return ((_this3$wrapper2 = _this3.wrapper) === null || _this3$wrapper2 === void 0 ? void 0 : _this3$wrapper2.scrollLeft) || 0;
         },
         getTableWrapperWidth: function getTableWrapperWidth() {
-          var _this3$wrapper2;
-          return ((_this3$wrapper2 = _this3.wrapper) === null || _this3$wrapper2 === void 0 ? void 0 : _this3$wrapper2.clientWidth) || 760;
+          var _this3$wrapper3;
+          return ((_this3$wrapper3 = _this3.wrapper) === null || _this3$wrapper3 === void 0 ? void 0 : _this3$wrapper3.clientWidth) || 760;
         }
       }), /*#__PURE__*/React.createElement("div", {
         style: shadowStyle(showBeforeShadow),

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

@@ -2,8 +2,9 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 { getSelectedColumnIndexes, getSelectedRowIndexes, getSelectedTableInfo } from '../../utils';
 import { withEditorAnalyticsAPI } from '../../utils/analytics';
+import { canMove, getTargetIndex } from '../../utils/drag-menu';
 import { clearDropTarget, moveSource } from './commands';
 export var clearDropTargetWithAnalytics = function clearDropTargetWithAnalytics(editorAnalyticsAPI) {
   return function (inputMethod, sourceType, sourceIndexes, status, tr) {
@@ -84,30 +85,13 @@ export var moveSourceWithAnalyticsViaShortcut = function moveSourceWithAnalytics
       if (selectedIndexes.length === 0) {
         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)
-      var targetIndex = Math[direction < 0 ? 'min' : 'max'].apply(Math, _toConsumableArray(selectedIndexes)) + 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(selectedIndexes)(selection) : hasMergedCellsInColumn(selectedIndexes)(selection);
-      if (hasMergedCellsInSource) {
-        return false;
-      }
-      var hasMergedCellsInTarget = isRow ? hasMergedCellsInRow(targetIndex)(selection) : hasMergedCellsInColumn(targetIndex)(selection);
-      if (hasMergedCellsInTarget) {
+      if (!canMove(sourceType, direction, isRow ? totalRowCount : totalColumnCount, selection, selectionRect)) {
         return false;
       }
+      var targetIndex = getTargetIndex(selectedIndexes, direction);
       return moveSourceWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, sourceType, selectedIndexes, targetIndex)(state, dispatch);
     };
   };

package/dist/esm/ui/TableFloatingColumnControls/ColumnControls/index.js

@@ -1,8 +1,7 @@
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
 
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { useCallback, useMemo, useRef } from 'react';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
-import { closestElement } from '@atlaskit/editor-common/utils';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
@@ -37,7 +36,8 @@ export var ColumnControls = function ColumnControls(_ref) {
     isTableHovered = _ref.isTableHovered,
     tableContainerWidth = _ref.tableContainerWidth,
     isNumberColumnEnabled = _ref.isNumberColumnEnabled,
-    isDragging = _ref.isDragging;
+    isDragging = _ref.isDragging,
+    getScrollOffset = _ref.getScrollOffset;
   var columnControlsRef = useRef(null);
   var widths = (_colWidths$map$join = colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(function (width) {
     return (
@@ -107,24 +107,10 @@ export var ColumnControls = function ColumnControls(_ref) {
   var colIndexes = useMemo(function () {
     return [colIndex];
   }, [colIndex]);
-  var tableWrapper = closestElement(tableRef, ".".concat(ClassName.TABLE_NODE_WRAPPER));
-  var handleScroll = useCallback(function (event) {
-    if (stickyTop) {
-      if (columnControlsRef && columnControlsRef.current) {
-        var _tableWrapper$scrollL;
-        columnControlsRef.current.scrollLeft = (_tableWrapper$scrollL = tableWrapper === null || tableWrapper === void 0 ? void 0 : tableWrapper.scrollLeft) !== null && _tableWrapper$scrollL !== void 0 ? _tableWrapper$scrollL : 0;
-      }
-    }
-  }, [stickyTop, tableWrapper]);
-  useEffect(function () {
-    handleScroll();
-  }, [handleScroll]);
-  useEffect(function () {
-    tableWrapper === null || tableWrapper === void 0 || tableWrapper.addEventListener('scroll', handleScroll);
-    return function () {
-      tableWrapper === null || tableWrapper === void 0 || tableWrapper.removeEventListener('scroll', handleScroll);
-    };
-  }, [tableWrapper, handleScroll]);
+  if (stickyTop && columnControlsRef.current) {
+    var _getScrollOffset;
+    columnControlsRef.current.scrollLeft = (_getScrollOffset = getScrollOffset === null || getScrollOffset === void 0 ? void 0 : getScrollOffset()) !== null && _getScrollOffset !== void 0 ? _getScrollOffset : 0;
+  }
   var generateHandleByType = function generateHandleByType(type) {
     var _rowHeights$reduce, _colWidths$reduce;
     if (!hoveredCell || !(colWidths !== null && colWidths !== void 0 && colWidths.length)) {

package/dist/esm/ui/TableFloatingColumnControls/ColumnDropTargets/index.js

@@ -1,15 +1,23 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import { TableCssClassName as ClassName } from '../../../types';
 import { ColumnDropTarget } from './ColumnDropTarget';
 export var ColumnDropTargets = function ColumnDropTargets(_ref) {
   var tableRef = _ref.tableRef,
     tableHeight = _ref.tableHeight,
     localId = _ref.localId,
-    colWidths = _ref.colWidths;
+    colWidths = _ref.colWidths,
+    isHeaderSticky = _ref.isHeaderSticky,
+    getScrollOffset = _ref.getScrollOffset;
+  var dropTargetRef = useRef(null);
   if (!tableRef) {
     return null;
   }
+  if (isHeaderSticky && dropTargetRef.current) {
+    var _getScrollOffset;
+    dropTargetRef.current.style.marginLeft = "-".concat((_getScrollOffset = getScrollOffset === null || getScrollOffset === void 0 ? void 0 : getScrollOffset()) !== null && _getScrollOffset !== void 0 ? _getScrollOffset : 0, "px");
+  }
   return /*#__PURE__*/React.createElement("div", {
+    ref: dropTargetRef,
     className: ClassName.DRAG_COLUMN_DROP_TARGET_CONTROLS,
     contentEditable: false
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -21,7 +21,8 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
     isInDanger = _ref.isInDanger,
     isTableHovered = _ref.isTableHovered,
     tableContainerWidth = _ref.tableContainerWidth,
-    isNumberColumnEnabled = _ref.isNumberColumnEnabled;
+    isNumberColumnEnabled = _ref.isNumberColumnEnabled,
+    getScrollOffset = _ref.getScrollOffset;
   var _useState = useState({
       width: 0,
       height: 0
@@ -126,12 +127,15 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
     hasHeaderColumn: hasHeaderColumn,
     tableContainerWidth: tableContainerWidth,
     isNumberColumnEnabled: isNumberColumnEnabled,
-    isDragging: isDragging
+    isDragging: isDragging,
+    getScrollOffset: getScrollOffset
   }), isDragging && /*#__PURE__*/React.createElement(ColumnDropTargets, {
     tableRef: tableRef,
+    isHeaderSticky: (stickyHeader === null || stickyHeader === void 0 ? void 0 : stickyHeader.sticky) && hasHeaderRow,
     tableHeight: tableRect.height,
     localId: currentNodeLocalId,
-    colWidths: colWidths
+    colWidths: colWidths,
+    getScrollOffset: getScrollOffset
   }));
 };
 export default TableFloatingColumnControls;

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

@@ -19,14 +19,36 @@ import { getNewResizeStateFromSelectedColumns } from '../pm-plugins/table-resizi
 import { getClosestSelectionRect } from '../toolbar';
 import { deleteRows } from '../transforms';
 import { AddColLeftIcon, AddColRightIcon, AddRowAboveIcon, AddRowBelowIcon } from '../ui/icons';
+import { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsWithColumnNextToColumnIndex, hasMergedCellsWithRowNextToRowIndex } from './merged-cells';
 import { getSelectedColumnIndexes, getSelectedRowIndexes } from './selection';
-var canDecrease = function canDecrease(index) {
-  var min = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  return index !== undefined && index > min;
+export var getTargetIndex = function getTargetIndex(selectedIndexes, direction) {
+  return Math[direction < 0 ? 'min' : 'max'].apply(Math, _toConsumableArray(selectedIndexes)) + direction;
 };
-var canIncrease = function canIncrease(index) {
-  var max = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  return index !== undefined && index < max;
+export var canMove = function canMove(sourceType, direction, totalItemsOfSourceTypeCount, selection, selectionRect) {
+  if (!selectionRect) {
+    return false;
+  }
+  var isRow = sourceType === 'table-row';
+  var selectedIndexes = isRow ? getSelectedRowIndexes(selectionRect) : getSelectedColumnIndexes(selectionRect);
+  var targetIndex = getTargetIndex(selectedIndexes, direction);
+  var isValidTargetIndex = targetIndex >= 0 && targetIndex < totalItemsOfSourceTypeCount;
+  if (!isValidTargetIndex) {
+    return false;
+  }
+
+  // We can't move column when target has merges with other columns
+  // We can't move row when target has merges with other rows
+  var hasMergedCellsInTarget = isRow ? hasMergedCellsWithRowNextToRowIndex(targetIndex, selection) : hasMergedCellsWithColumnNextToColumnIndex(targetIndex, selection);
+  if (hasMergedCellsInTarget) {
+    return false;
+  }
+
+  // Currently we can't move in any direction if there are merged cells in the source
+  var hasMergedCellsInSource = isRow ? hasMergedCellsInRow(selectedIndexes)(selection) : hasMergedCellsInColumn(selectedIndexes)(selection);
+  if (hasMergedCellsInSource) {
+    return false;
+  }
+  return true;
 };
 var isDistributeColumnsEnabled = function isDistributeColumnsEnabled(state) {
   var rect = getClosestSelectionRect(state);
@@ -37,6 +59,7 @@ var isDistributeColumnsEnabled = function isDistributeColumnsEnabled(state) {
   return false;
 };
 export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, canDrag, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI) {
+  var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
   var addOptions = direction === 'row' ? [{
     label: 'above',
     offset: 0,
@@ -58,13 +81,12 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     icon: AddColRightIcon,
     keymap: addColumnAfter
   }];
+  var selection = editorView.state.selection;
   var moveOptions = direction === 'row' ? [{
     label: 'up',
     icon: ArrowUpIcon,
     keymap: moveRowUp,
-    canMove: function canMove(selectionRect) {
-      return canDrag && canDecrease(selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.top);
-    },
+    canMove: canDrag && canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.top - 1;
@@ -73,10 +95,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     label: 'down',
     icon: ArrowDownIcon,
     keymap: moveRowDown,
-    canMove: function canMove(selectionRect) {
-      var _selectionRect$bottom, _tableMap$height;
-      return canDrag && canIncrease(((_selectionRect$bottom = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.bottom) !== null && _selectionRect$bottom !== void 0 ? _selectionRect$bottom : 0) - 1, ((_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0) - 1);
-    },
+    canMove: canDrag && canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.bottom;
@@ -85,9 +104,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     label: 'left',
     icon: ArrowLeftIcon,
     keymap: moveColumnLeft,
-    canMove: function canMove(selectionRect) {
-      return canDrag && canDecrease(selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.left);
-    },
+    canMove: canDrag && canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.left - 1;
@@ -96,10 +113,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     label: 'right',
     icon: ArrowRightIcon,
     keymap: moveColumnRight,
-    canMove: function canMove(selectionRect) {
-      var _selectionRect$right, _tableMap$width;
-      return canDrag && canIncrease(((_selectionRect$right = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right) !== null && _selectionRect$right !== void 0 ? _selectionRect$right : 0) - 1, ((_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0) - 1);
-    },
+    canMove: canDrag && canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.right;
@@ -184,10 +198,10 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     return {
       id: "move_".concat(direction, "_").concat(label),
       title: "Move ".concat(direction, " ").concat(label),
-      disabled: !canMove(selectionRect),
+      disabled: !canMove,
       icon: icon,
       onClick: function onClick(state, dispatch) {
-        if (canMove(selectionRect)) {
+        if (canMove) {
           requestAnimationFrame(function () {
             moveSourceWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.TABLE_CONTEXT_MENU, "table-".concat(direction), getOriginIndexes(selectionRect), getTargetIndex(selectionRect))(editorView.state, editorView.dispatch);
           });

package/dist/esm/utils/merged-cells.js

@@ -130,4 +130,69 @@ export var hasMergedCellsInBetween = function hasMergedCellsInBetween(indexes, t
       return mergedCellsInRectArr[1].includes(cell);
     });
   };
+};
+
+// Checks if any cell in the column with colIndex is merged with a cell in a column to the left or to the right of it.
+// colIndex is a logical index of the column. It starts at 0 and goes up to tableMap.width - 1.
+export var hasMergedCellsWithColumnNextToColumnIndex = function hasMergedCellsWithColumnNextToColumnIndex(colIndex, selection) {
+  var table = findTable(selection);
+  if (!table) {
+    return false;
+  }
+  var tableMap = TableMap.get(table.node);
+  var width = tableMap.width;
+  if (width <= 1) {
+    return false;
+  }
+  if (colIndex < 0 || colIndex > width - 1) {
+    return false;
+  }
+  var map = tableMap.map;
+  // j is an index in the tableMap.map array. tableMap.map is a flat array.
+  // Each item of this array contains a number.
+  // The number represents the position of the corresponding cell in the tableMap. It exists for each cell.
+  // If there are merged cells, their positions will be represented by the same number.
+  var isFirstColumn = colIndex === 0;
+  var isLastColumn = colIndex === width - 1;
+  for (var j = colIndex; j < map.length; j += width) {
+    if (!isFirstColumn && map[j] === map[j - 1] ||
+    // compare with a cell in the column on the left
+    !isLastColumn && map[j] === map[j + 1] // compare with a cell in the column on the right
+    ) {
+      return true;
+    }
+  }
+  return false;
+};
+
+// Checks if any cell in the row with rowIndex is merged with a cell in a row above or below it.
+export var hasMergedCellsWithRowNextToRowIndex = function hasMergedCellsWithRowNextToRowIndex(rowIndex, selection) {
+  var table = findTable(selection);
+  if (!table) {
+    return false;
+  }
+  var tableMap = TableMap.get(table.node);
+  var height = tableMap.height;
+  if (height <= 1) {
+    return false;
+  }
+  if (rowIndex < 0 || rowIndex > height - 1) {
+    return false;
+  }
+  var map = tableMap.map,
+    width = tableMap.width; // map is a flat array representing position of each cell in the table.
+  var indexOfFirstCellInTheRow = rowIndex * width;
+  var indexOfLastCellInTheRow = indexOfFirstCellInTheRow + width - 1;
+  var isFirstRow = rowIndex === 0;
+  var isLastRow = rowIndex === height - 1;
+  // j is an index of a cell in a row
+  for (var j = indexOfFirstCellInTheRow; j <= indexOfLastCellInTheRow; j++) {
+    if (!isFirstRow && map[j] === map[j - width] ||
+    // compare with a cell in the row above
+    !isLastRow && map[j] === map[j + width] // compare with a cell in the row below
+    ) {
+      return true;
+    }
+  }
+  return false;
 };

package/dist/types/ui/TableFloatingColumnControls/ColumnControls/index.d.ts

@@ -17,6 +17,7 @@ export interface ColumnControlsProps {
     tableContainerWidth?: number;
     isNumberColumnEnabled?: boolean;
     isDragging?: boolean;
+    getScrollOffset?: () => number;
 }
-export declare const ColumnControls: ({ editorView, tableActive, tableRef, hoveredCell, isResizing, stickyTop, localId, isInDanger, rowHeights, colWidths, hasHeaderColumn, isTableHovered, tableContainerWidth, isNumberColumnEnabled, isDragging, }: ColumnControlsProps) => JSX.Element;
+export declare const ColumnControls: ({ editorView, tableActive, tableRef, hoveredCell, isResizing, stickyTop, localId, isInDanger, rowHeights, colWidths, hasHeaderColumn, isTableHovered, tableContainerWidth, isNumberColumnEnabled, isDragging, getScrollOffset, }: ColumnControlsProps) => JSX.Element;
 export default ColumnControls;

package/dist/types/ui/TableFloatingColumnControls/ColumnDropTargets/index.d.ts

@@ -4,5 +4,7 @@ export interface Props {
     tableHeight?: number;
     localId?: string;
     colWidths?: (number | undefined)[];
+    isHeaderSticky?: boolean;
+    getScrollOffset?: () => number;
 }
 export declare const ColumnDropTargets: React.FC<Props>;

package/dist/types/ui/TableFloatingColumnControls/index.d.ts

@@ -24,6 +24,7 @@ export interface Props {
     isTableHovered?: boolean;
     tableContainerWidth?: number;
     isNumberColumnEnabled?: boolean;
+    getScrollOffset?: () => number;
 }
 export declare const TableFloatingColumnControls: React.FC<Props>;
 export default TableFloatingColumnControls;

package/dist/types/utils/drag-menu.d.ts

@@ -1,9 +1,12 @@
 /// <reference types="react" />
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { Command, DropdownOptionT, GetEditorContainerWidth, IconProps } from '@atlaskit/editor-common/types';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
-import type { TableDirection } from '../types';
+import type { DraggableData, DraggableType, TableDirection } from '../types';
+export declare const getTargetIndex: (selectedIndexes: number[], direction: DraggableData['direction']) => number;
+export declare const canMove: (sourceType: DraggableType, direction: DraggableData['direction'], totalItemsOfSourceTypeCount: number, selection: Selection, selectionRect?: Rect) => boolean;
 export type DragMenuOptionIdType = 'add_row_above' | 'add_row_below' | 'add_column_left' | 'add_column_right' | 'distribute_columns' | 'clear_cells' | 'delete_row' | 'delete_column' | 'move_column_left' | 'move_column_right' | 'move_row_up' | 'move_row_down' | 'sort_column_asc' | 'sort_column_desc';
 export interface DragMenuConfig extends DropdownOptionT<Command> {
     id: DragMenuOptionIdType;

package/dist/types/utils/merged-cells.d.ts

@@ -3,4 +3,6 @@ type MergeType = 'row' | 'column';
 export declare const hasMergedCellsInColumn: (columnIndexes: number | number[]) => (selection: Selection) => boolean;
 export declare const hasMergedCellsInRow: (rowIndexes: number | number[]) => (selection: Selection) => boolean;
 export declare const hasMergedCellsInBetween: (indexes: number[], type: MergeType) => (selection: Selection) => boolean;
+export declare const hasMergedCellsWithColumnNextToColumnIndex: (colIndex: number, selection: Selection) => boolean;
+export declare const hasMergedCellsWithRowNextToRowIndex: (rowIndex: number, selection: Selection) => boolean;
 export {};

package/dist/types-ts4.5/ui/TableFloatingColumnControls/ColumnControls/index.d.ts

@@ -17,6 +17,7 @@ export interface ColumnControlsProps {
     tableContainerWidth?: number;
     isNumberColumnEnabled?: boolean;
     isDragging?: boolean;
+    getScrollOffset?: () => number;
 }
-export declare const ColumnControls: ({ editorView, tableActive, tableRef, hoveredCell, isResizing, stickyTop, localId, isInDanger, rowHeights, colWidths, hasHeaderColumn, isTableHovered, tableContainerWidth, isNumberColumnEnabled, isDragging, }: ColumnControlsProps) => JSX.Element;
+export declare const ColumnControls: ({ editorView, tableActive, tableRef, hoveredCell, isResizing, stickyTop, localId, isInDanger, rowHeights, colWidths, hasHeaderColumn, isTableHovered, tableContainerWidth, isNumberColumnEnabled, isDragging, getScrollOffset, }: ColumnControlsProps) => JSX.Element;
 export default ColumnControls;

package/dist/types-ts4.5/ui/TableFloatingColumnControls/ColumnDropTargets/index.d.ts

@@ -4,5 +4,7 @@ export interface Props {
     tableHeight?: number;
     localId?: string;
     colWidths?: (number | undefined)[];
+    isHeaderSticky?: boolean;
+    getScrollOffset?: () => number;
 }
 export declare const ColumnDropTargets: React.FC<Props>;

package/dist/types-ts4.5/ui/TableFloatingColumnControls/index.d.ts

@@ -24,6 +24,7 @@ export interface Props {
     isTableHovered?: boolean;
     tableContainerWidth?: number;
     isNumberColumnEnabled?: boolean;
+    getScrollOffset?: () => number;
 }
 export declare const TableFloatingColumnControls: React.FC<Props>;
 export default TableFloatingColumnControls;