@atlaskit/editor-plugin-table 7.2.1 → 7.2.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-table
 
+## 7.2.3
+
+### Patch Changes
+
+- [#68572](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68572) [`15d407fe5143`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/15d407fe5143) - Upgrading @atlaskit/editor-prosemirror dependency
+- [#70707](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70707) [`01c10b920070`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/01c10b920070) - [ux] Move options in drag menu now have disabled state when target has merged cells.
+- Updated dependencies
+
+## 7.2.2
+
+### Patch Changes
+
+- [#70342](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70342) [`6862cba17f31`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6862cba17f31) - Fix drop functionality when dragging in overflown table
+
 ## 7.2.1
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -471,8 +471,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,
@@ -544,7 +544,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 ? -_editorSharedStyles.akEditorTableToolbarSize : _styles.tableMarginSides;
       var shadowStyle = (0, _memoizeOne.default)(function (visible) {
@@ -592,12 +596,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.default.createElement("div", {
         style: shadowStyle(showBeforeShadow),

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

@@ -11,6 +11,7 @@ var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _utils2 = require("../../utils");
 var _analytics2 = require("../../utils/analytics");
+var _dragMenu = require("../../utils/drag-menu");
 var _commands = require("./commands");
 var clearDropTargetWithAnalytics = exports.clearDropTargetWithAnalytics = function clearDropTargetWithAnalytics(editorAnalyticsAPI) {
   return function (inputMethod, sourceType, sourceIndexes, status, tr) {
@@ -91,30 +92,13 @@ var moveSourceWithAnalyticsViaShortcut = exports.moveSourceWithAnalyticsViaShort
       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, (0, _toConsumableArray2.default)(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 = (0, _utils2.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 ? (0, _utils2.hasMergedCellsInRow)(selectedIndexes)(selection) : (0, _utils2.hasMergedCellsInColumn)(selectedIndexes)(selection);
-      if (hasMergedCellsInSource) {
-        return false;
-      }
-      var hasMergedCellsInTarget = isRow ? (0, _utils2.hasMergedCellsInRow)(targetIndex)(selection) : (0, _utils2.hasMergedCellsInColumn)(targetIndex)(selection);
-      if (hasMergedCellsInTarget) {
+      if (!(0, _dragMenu.canMove)(sourceType, direction, isRow ? totalRowCount : totalColumnCount, selection, selectionRect)) {
         return false;
       }
+      var targetIndex = (0, _dragMenu.getTargetIndex)(selectedIndexes, direction);
       return moveSourceWithAnalytics(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT, sourceType, selectedIndexes, targetIndex)(state, dispatch);
     };
   };

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

@@ -7,14 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.ColumnControls = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _styles = require("@atlaskit/editor-common/styles");
-var _utils = require("@atlaskit/editor-common/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorTables = require("@atlaskit/editor-tables");
-var _utils2 = require("@atlaskit/editor-tables/utils");
+var _utils = require("@atlaskit/editor-tables/utils");
 var _commands = require("../../../commands");
 var _commands2 = require("../../../pm-plugins/drag-and-drop/commands");
 var _types = require("../../../types");
-var _utils3 = require("../../../utils");
+var _utils2 = require("../../../utils");
 var _DragHandle = require("../../DragHandle");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -22,11 +21,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var getSelectedColumns = function getSelectedColumns(selection) {
   if (selection instanceof _editorTables.CellSelection && selection.isColSelection()) {
-    var rect = (0, _utils2.getSelectionRect)(selection);
+    var rect = (0, _utils.getSelectionRect)(selection);
     if (!rect) {
       return [];
     }
-    return (0, _utils3.getSelectedColumnIndexes)(rect);
+    return (0, _utils2.getSelectedColumnIndexes)(rect);
   }
   return [];
 };
@@ -46,7 +45,8 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
     isTableHovered = _ref.isTableHovered,
     tableContainerWidth = _ref.tableContainerWidth,
     isNumberColumnEnabled = _ref.isNumberColumnEnabled,
-    isDragging = _ref.isDragging;
+    isDragging = _ref.isDragging,
+    getScrollOffset = _ref.getScrollOffset;
   var columnControlsRef = (0, _react.useRef)(null);
   var widths = (_colWidths$map$join = colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(function (width) {
     return (
@@ -56,7 +56,7 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
     );
   }).join(' ')) !== null && _colWidths$map$join !== void 0 ? _colWidths$map$join : '0px';
   // TODO: reusing getRowsParams here because it's generic enough to work for columns -> rename
-  var columnParams = (0, _utils3.getRowsParams)(colWidths !== null && colWidths !== void 0 ? colWidths : []);
+  var columnParams = (0, _utils2.getRowsParams)(colWidths !== null && colWidths !== void 0 ? colWidths : []);
   var colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
   var selectedColIndexes = getSelectedColumns(editorView.state.selection);
   var firstRow = tableRef.querySelector('tr');
@@ -116,24 +116,10 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
   var colIndexes = (0, _react.useMemo)(function () {
     return [colIndex];
   }, [colIndex]);
-  var tableWrapper = (0, _utils.closestElement)(tableRef, ".".concat(_types.TableCssClassName.TABLE_NODE_WRAPPER));
-  var handleScroll = (0, _react.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]);
-  (0, _react.useEffect)(function () {
-    handleScroll();
-  }, [handleScroll]);
-  (0, _react.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/cjs/ui/TableFloatingColumnControls/ColumnDropTargets/index.js

@@ -1,22 +1,32 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ColumnDropTargets = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _types = require("../../../types");
 var _ColumnDropTarget = require("./ColumnDropTarget");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var ColumnDropTargets = exports.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 = (0, _react.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.default.createElement("div", {
+    ref: dropTargetRef,
     className: _types.TableCssClassName.DRAG_COLUMN_DROP_TARGET_CONTROLS,
     contentEditable: false
   }, /*#__PURE__*/_react.default.createElement("div", {

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

@@ -31,7 +31,8 @@ var TableFloatingColumnControls = exports.TableFloatingColumnControls = function
     isInDanger = _ref.isInDanger,
     isTableHovered = _ref.isTableHovered,
     tableContainerWidth = _ref.tableContainerWidth,
-    isNumberColumnEnabled = _ref.isNumberColumnEnabled;
+    isNumberColumnEnabled = _ref.isNumberColumnEnabled,
+    getScrollOffset = _ref.getScrollOffset;
   var _useState = (0, _react.useState)({
       width: 0,
       height: 0
@@ -136,12 +137,15 @@ var TableFloatingColumnControls = exports.TableFloatingColumnControls = function
     hasHeaderColumn: hasHeaderColumn,
     tableContainerWidth: tableContainerWidth,
     isNumberColumnEnabled: isNumberColumnEnabled,
-    isDragging: isDragging
+    isDragging: isDragging,
+    getScrollOffset: getScrollOffset
   }), isDragging && /*#__PURE__*/_react.default.createElement(_ColumnDropTargets.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
   }));
 };
 var _default = exports.default = TableFloatingColumnControls;

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDragMenuConfig = void 0;
+exports.getTargetIndex = exports.getDragMenuConfig = exports.canMove = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _customSteps = require("@atlaskit/custom-steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -26,14 +26,36 @@ var _resizeState = require("../pm-plugins/table-resizing/utils/resize-state");
 var _toolbar = require("../toolbar");
 var _transforms = require("../transforms");
 var _icons = require("../ui/icons");
+var _mergedCells = require("./merged-cells");
 var _selection = require("./selection");
-var canDecrease = function canDecrease(index) {
-  var min = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  return index !== undefined && index > min;
+var getTargetIndex = exports.getTargetIndex = function getTargetIndex(selectedIndexes, direction) {
+  return Math[direction < 0 ? 'min' : 'max'].apply(Math, (0, _toConsumableArray2.default)(selectedIndexes)) + direction;
 };
-var canIncrease = function canIncrease(index) {
-  var max = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  return index !== undefined && index < max;
+var canMove = exports.canMove = function canMove(sourceType, direction, totalItemsOfSourceTypeCount, selection, selectionRect) {
+  if (!selectionRect) {
+    return false;
+  }
+  var isRow = sourceType === 'table-row';
+  var selectedIndexes = isRow ? (0, _selection.getSelectedRowIndexes)(selectionRect) : (0, _selection.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 ? (0, _mergedCells.hasMergedCellsWithRowNextToRowIndex)(targetIndex, selection) : (0, _mergedCells.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 ? (0, _mergedCells.hasMergedCellsInRow)(selectedIndexes)(selection) : (0, _mergedCells.hasMergedCellsInColumn)(selectedIndexes)(selection);
+  if (hasMergedCellsInSource) {
+    return false;
+  }
+  return true;
 };
 var isDistributeColumnsEnabled = function isDistributeColumnsEnabled(state) {
   var rect = (0, _toolbar.getClosestSelectionRect)(state);
@@ -44,6 +66,7 @@ var isDistributeColumnsEnabled = function isDistributeColumnsEnabled(state) {
   return false;
 };
 var getDragMenuConfig = exports.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,
@@ -65,13 +88,12 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     icon: _icons.AddColRightIcon,
     keymap: _keymaps.addColumnAfter
   }];
+  var selection = editorView.state.selection;
   var moveOptions = direction === 'row' ? [{
     label: 'up',
     icon: _arrowUp.default,
     keymap: _keymaps.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: _selection.getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.top - 1;
@@ -80,10 +102,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     label: 'down',
     icon: _arrowDown.default,
     keymap: _keymaps.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: _selection.getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.bottom;
@@ -92,9 +111,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     label: 'left',
     icon: _arrowLeft.default,
     keymap: _keymaps.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: _selection.getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.left - 1;
@@ -103,10 +120,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     label: 'right',
     icon: _arrowRight.default,
     keymap: _keymaps.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: _selection.getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.right;
@@ -191,10 +205,10 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     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 () {
             (0, _commandsWithAnalytics.moveSourceWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, "table-".concat(direction), getOriginIndexes(selectionRect), getTargetIndex(selectionRect))(editorView.state, editorView.dispatch);
           });

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.hasMergedCellsInRow = exports.hasMergedCellsInColumn = exports.hasMergedCellsInBetween = void 0;
+exports.hasMergedCellsWithRowNextToRowIndex = exports.hasMergedCellsWithColumnNextToColumnIndex = exports.hasMergedCellsInRow = exports.hasMergedCellsInColumn = exports.hasMergedCellsInBetween = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _editorTables = require("@atlaskit/editor-tables");
 var hasMergedCells = function hasMergedCells(indexes, normalizeRect) {
@@ -137,4 +137,69 @@ var hasMergedCellsInBetween = exports.hasMergedCellsInBetween = function hasMerg
       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.
+var hasMergedCellsWithColumnNextToColumnIndex = exports.hasMergedCellsWithColumnNextToColumnIndex = function hasMergedCellsWithColumnNextToColumnIndex(colIndex, selection) {
+  var table = (0, _editorTables.findTable)(selection);
+  if (!table) {
+    return false;
+  }
+  var tableMap = _editorTables.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.
+var hasMergedCellsWithRowNextToRowIndex = exports.hasMergedCellsWithRowNextToRowIndex = function hasMergedCellsWithRowNextToRowIndex(rowIndex, selection) {
+  var table = (0, _editorTables.findTable)(selection);
+  if (!table) {
+    return false;
+  }
+  var tableMap = _editorTables.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/es2019/nodeviews/TableComponent.js

@@ -543,7 +543,11 @@ class TableComponent extends React.Component {
       stickyHeader: this.state.stickyHeader,
       getEditorFeatureFlags: getEditorFeatureFlags,
       tableContainerWidth: tableContainerWidth,
-      isNumberColumnEnabled: node.attrs.isNumberColumnEnabled
+      isNumberColumnEnabled: node.attrs.isNumberColumnEnabled,
+      getScrollOffset: () => {
+        var _this$wrapper2;
+        return ((_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 ? void 0 : _this$wrapper2.scrollLeft) || 0;
+      }
     }) : null;
     const shadowPadding = allowControls && tableActive ? -tableToolbarSize : tableMarginSides;
     const shadowStyle = memoizeOne(visible => ({
@@ -595,12 +599,12 @@ class TableComponent extends React.Component {
       editorView: view,
       node: node,
       getScrollOffset: () => {
-        var _this$wrapper2;
-        return ((_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 ? void 0 : _this$wrapper2.scrollLeft) || 0;
+        var _this$wrapper3;
+        return ((_this$wrapper3 = this.wrapper) === null || _this$wrapper3 === void 0 ? void 0 : _this$wrapper3.scrollLeft) || 0;
       },
       getTableWrapperWidth: () => {
-        var _this$wrapper3;
-        return ((_this$wrapper3 = this.wrapper) === null || _this$wrapper3 === void 0 ? void 0 : _this$wrapper3.clientWidth) || 760;
+        var _this$wrapper4;
+        return ((_this$wrapper4 = this.wrapper) === null || _this$wrapper4 === void 0 ? void 0 : _this$wrapper4.clientWidth) || 760;
       }
     }), /*#__PURE__*/React.createElement("div", {
       style: shadowStyle(showBeforeShadow),

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

@@ -1,8 +1,9 @@
 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 const clearDropTargetWithAnalytics = editorAnalyticsAPI => (inputMethod, sourceType, sourceIndexes, status, tr) => {
   return withEditorAnalyticsAPI(({
@@ -81,30 +82,13 @@ export const moveSourceWithAnalyticsViaShortcut = editorAnalyticsAPI => (sourceT
   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)
-  const targetIndex = Math[direction < 0 ? 'min' : 'max'](...selectedIndexes) + 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(selectedIndexes)(selection) : hasMergedCellsInColumn(selectedIndexes)(selection);
-  if (hasMergedCellsInSource) {
-    return false;
-  }
-  const hasMergedCellsInTarget = isRow ? hasMergedCellsInRow(targetIndex)(selection) : hasMergedCellsInColumn(targetIndex)(selection);
-  if (hasMergedCellsInTarget) {
+  if (!canMove(sourceType, direction, isRow ? totalRowCount : totalColumnCount, selection, selectionRect)) {
     return false;
   }
+  const targetIndex = getTargetIndex(selectedIndexes, direction);
   return moveSourceWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT, sourceType, selectedIndexes, targetIndex)(state, dispatch);
 };

package/dist/es2019/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';
@@ -36,7 +35,8 @@ export const ColumnControls = ({
   isTableHovered,
   tableContainerWidth,
   isNumberColumnEnabled,
-  isDragging
+  isDragging,
+  getScrollOffset
 }) => {
   var _colWidths$map$join, _rowHeights$;
   const columnControlsRef = useRef(null);
@@ -115,24 +115,10 @@ export const ColumnControls = ({
   const colIndexes = useMemo(() => {
     return [colIndex];
   }, [colIndex]);
-  const tableWrapper = closestElement(tableRef, `.${ClassName.TABLE_NODE_WRAPPER}`);
-  const handleScroll = useCallback(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(() => {
-    handleScroll();
-  }, [handleScroll]);
-  useEffect(() => {
-    tableWrapper === null || tableWrapper === void 0 ? void 0 : tableWrapper.addEventListener('scroll', handleScroll);
-    return () => {
-      tableWrapper === null || tableWrapper === void 0 ? 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;
+  }
   const generateHandleByType = type => {
     var _rowHeights$reduce, _colWidths$reduce;
     if (!hoveredCell || !(colWidths !== null && colWidths !== void 0 && colWidths.length)) {

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

@@ -1,16 +1,24 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import { TableCssClassName as ClassName } from '../../../types';
 import { ColumnDropTarget } from './ColumnDropTarget';
 export const ColumnDropTargets = ({
   tableRef,
   tableHeight,
   localId,
-  colWidths
+  colWidths,
+  isHeaderSticky,
+  getScrollOffset
 }) => {
+  const dropTargetRef = useRef(null);
   if (!tableRef) {
     return null;
   }
+  if (isHeaderSticky && dropTargetRef.current) {
+    var _getScrollOffset;
+    dropTargetRef.current.style.marginLeft = `-${(_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/es2019/ui/TableFloatingColumnControls/index.js

@@ -17,7 +17,8 @@ export const TableFloatingColumnControls = ({
   isInDanger,
   isTableHovered,
   tableContainerWidth,
-  isNumberColumnEnabled
+  isNumberColumnEnabled,
+  getScrollOffset
 }) => {
   const [tableRect, setTableRect] = useState({
     width: 0,
@@ -107,12 +108,15 @@ export const TableFloatingColumnControls = ({
     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;