@atlaskit/editor-plugin-table 5.3.8 → 5.3.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-table
 
+## 5.3.9
+
+### Patch Changes
+
+- [#41924](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41924) [`71cb328c202`](https://bitbucket.org/atlassian/atlassian-frontend/commits/71cb328c202) - Fixed the column controls drag and drop targets. The monitor was not responding to the targets due to there layering and pointer value. The targets are now added/removed on demand when the user starts/stop dragging
+
 ## 5.3.8
 
 ### Patch Changes

package/dist/cjs/plugins/table/nodeviews/TableComponent.js

@@ -499,13 +499,14 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       var colControls = /*#__PURE__*/_react.default.createElement(_TableFloatingColumnControls.default, {
         editorView: view,
         tableRef: tableRef,
+        getNode: getNode,
         tableActive: tableActive,
         hoveredRows: hoveredRows,
         hoveredCell: hoveredCell,
         isResizing: isResizing,
         ordering: ordering,
         hasHeaderRow: hasHeaderRow
-        // pass `selection` and `tableHeight` to control re-render
+        // pass `selection` to control re-render
         ,
         selection: view.state.selection,
         headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,

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

@@ -77,6 +77,6 @@ var moveSource = exports.moveSource = function moveSource(sourceType, sourceInde
       return tr.setMeta('addToHistory', false);
     }
     var move = sourceType === 'table-row' ? _utils.moveRow : _utils.moveColumn;
-    return move(sourceIndex, targetIndex + (sourceIndex > targetIndex ? 0 : -1))(tr);
+    return move(sourceIndex, targetIndex)(tr);
   });
 };

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

@@ -76,7 +76,8 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, eventD
             }
             var sourceType = data.sourceType,
               sourceIndexes = data.sourceIndexes,
-              targetAdjustedIndex = data.targetAdjustedIndex;
+              targetAdjustedIndex = data.targetAdjustedIndex,
+              direction = data.direction;
 
             // If the drop target index contains merged cells then we should not allow the drop to occur.
             var hasMergedCells = sourceType === 'table-row' ? _mergedCells.hasMergedCellsInRow : _mergedCells.hasMergedCellsInColumn;
@@ -86,7 +87,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, eventD
             }
             var _sourceIndexes = (0, _slicedToArray2.default)(sourceIndexes, 1),
               sourceIndex = _sourceIndexes[0];
-            (0, _commands.moveSource)(sourceType, sourceIndex, targetAdjustedIndex)(editorView.state, editorView.dispatch);
+            (0, _commands.moveSource)(sourceType, sourceIndex, targetAdjustedIndex + (direction === -1 ? 0 : -1))(editorView.state, editorView.dispatch);
           }
         })
       };

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

@@ -46,6 +46,10 @@ var getDraggableDataFromEvent = exports.getDraggableDataFromEvent = function get
   // This introduces an offset in the event the drop occured closer to the bottom/right of the target. We want
   // the new target index to be 1 index higher.
   var targetOffset = targetClosestEdge === 'right' || targetClosestEdge === 'bottom' ? 1 : 0;
+
+  // since only consecutive rows/cols can be moved we can assume that if the first index is greater then
+  // the target index, the then the direction of the DnD is decreasing
+  var direction = sourceIndexes[0] > targetIndex ? -1 : 1;
   return {
     sourceType: sourceType,
     sourceLocalId: sourceLocalId,
@@ -54,6 +58,7 @@ var getDraggableDataFromEvent = exports.getDraggableDataFromEvent = function get
     targetLocalId: targetLocalId,
     targetIndex: targetIndex,
     targetAdjustedIndex: targetIndex + targetOffset,
-    targetClosestEdge: targetClosestEdge
+    targetClosestEdge: targetClosestEdge,
+    direction: direction
   };
 };

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

@@ -14,7 +14,7 @@ var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/uti
 var _colors = require("@atlaskit/theme/colors");
 var _types = require("../../types");
 var _DragPreview = require("../DragPreview");
-var _DragHandleIcon = require("../icons/DragHandleIcon");
+var _icons = require("../icons");
 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 mapStateToProps = function mapStateToProps(state) {
@@ -98,9 +98,11 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       backgroundColor: "var(--ds-surface, white)",
       borderRadius: '4px',
       border: "2px solid ".concat("var(--ds-surface, white)"),
-      transform: direction === 'column' ? 'none' : 'rotate(90deg)'
-    }
-  }, /*#__PURE__*/_react.default.createElement(_DragHandleIcon.DragHandleIcon, iconProps), previewContainer && previewWidth !== undefined && previewHeight !== undefined && /*#__PURE__*/_reactDom.default.createPortal( /*#__PURE__*/_react.default.createElement(_DragPreview.DragPreview, {
+      transform: direction === 'column' ? 'none' : 'rotate(90deg)',
+      pointerEvents: 'auto'
+    },
+    "data-testid": "table-floating-column-controls-drag-handle"
+  }, /*#__PURE__*/_react.default.createElement(_icons.DragHandleIcon, iconProps), previewContainer && previewWidth !== undefined && previewHeight !== undefined && /*#__PURE__*/_reactDom.default.createPortal( /*#__PURE__*/_react.default.createElement(_DragPreview.DragPreview, {
     direction: direction,
     width: previewWidth,
     height: previewHeight

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

@@ -1,43 +1,33 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ColumnControls = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _types = require("../../../types");
-var _utils = 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; }
 var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
-  var _rowHeights$;
+  var _rowHeights$, _colWidths$map$join;
   var editorView = _ref.editorView,
     tableActive = _ref.tableActive,
     tableRef = _ref.tableRef,
     hoveredCell = _ref.hoveredCell,
     isResizing = _ref.isResizing,
-    tableHeight = _ref.tableHeight,
     stickyTop = _ref.stickyTop,
-    localId = _ref.localId;
-  var rowHeights = (0, _react.useMemo)(function () {
-    // NOTE: we don't care so much as to what tableHeight is, we only care that it changed and is a sane value.
-    if (tableRef && !!tableHeight) {
-      return (0, _utils.getRowHeights)(tableRef);
-    }
-    return [0];
-  }, [tableRef, tableHeight]);
+    localId = _ref.localId,
+    rowHeights = _ref.rowHeights,
+    colWidths = _ref.colWidths;
   if (!tableRef) {
     return null;
   }
   var firstRow = tableRef.querySelector('tr');
   var hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
   var marginTop = hasHeaderRow && stickyTop !== undefined ? (_rowHeights$ = rowHeights === null || rowHeights === void 0 ? void 0 : rowHeights[0]) !== null && _rowHeights$ !== void 0 ? _rowHeights$ : 0 : 0;
-  var colWidths = (0, _utils.getColumnsWidths)(editorView);
-  var widths = colWidths.map(function (width) {
+  var widths = (_colWidths$map$join = colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(function (width) {
     return width ? "".concat(width - 1, "px") : '0px';
-  }).join(' ');
+  }).join(' ')) !== null && _colWidths$map$join !== void 0 ? _colWidths$map$join : '0px';
   var colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
   var _onClick = function onClick(index, event) {};
   var onMouseOver = function onMouseOver() {};
@@ -60,7 +50,7 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
     "data-testid": "table-floating-column-control"
   }, /*#__PURE__*/_react.default.createElement(_DragHandle.DragHandle, {
     direction: "column",
-    indexes: [],
+    indexes: [colIndex],
     onClick: function onClick(event) {
       return _onClick(colIndex, event);
     },

package/dist/cjs/plugins/table/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.js

@@ -0,0 +1,70 @@
+"use strict";
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ColumnDropTarget = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge");
+var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
+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 ColumnDropTarget = exports.ColumnDropTarget = function ColumnDropTarget(_ref) {
+  var index = _ref.index,
+    localId = _ref.localId,
+    width = _ref.width,
+    height = _ref.height,
+    marginTop = _ref.marginTop;
+  var dropTargetRef = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    if (!dropTargetRef.current) {
+      return;
+    }
+    return (0, _element.dropTargetForElements)({
+      element: dropTargetRef.current,
+      canDrop: function canDrop(_ref2) {
+        var _data$indexes, _data$indexes2;
+        var source = _ref2.source;
+        var data = source.data;
+        return (
+          // Only draggables of row type can be dropped on this target
+          data.type === 'table-column' &&
+          // Only draggables which came from the same table can be dropped on this target
+          data.localId === localId &&
+          // Only draggables which DO NOT include this drop targets index can be dropped
+          !!((_data$indexes = data.indexes) !== null && _data$indexes !== void 0 && _data$indexes.length) && ((_data$indexes2 = data.indexes) === null || _data$indexes2 === void 0 ? void 0 : _data$indexes2.indexOf(index)) === -1
+        );
+      },
+      getIsSticky: function getIsSticky() {
+        return true;
+      },
+      getData: function getData(_ref3) {
+        var input = _ref3.input,
+          element = _ref3.element;
+        var data = {
+          localId: localId,
+          type: 'table-column',
+          targetIndex: index
+        };
+        return (0, _closestEdge.attachClosestEdge)(data, {
+          input: input,
+          element: element,
+          allowedEdges: ['left', 'right']
+        });
+      }
+    });
+  }, [index, localId]);
+  return /*#__PURE__*/_react.default.createElement("div", {
+    ref: dropTargetRef,
+    style: {
+      width: width && "".concat(width - 1, "px"),
+      height: height && "".concat(height, "px"),
+      marginTop: marginTop && "".concat(marginTop, "px"),
+      pointerEvents: 'auto'
+    },
+    "data-drop-target-index": index,
+    "data-drop-target-localid": localId,
+    "data-testid": "table-floating-column-controls-drop-target"
+  });
+};

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

@@ -1,32 +1,21 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.ColumnDropTargets = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge");
-var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
+exports.ColumnDropTargets = void 0;
+var _react = _interopRequireDefault(require("react"));
 var _types = require("../../../types");
-var _utils = require("../../../utils");
-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 _ColumnDropTarget = require("./ColumnDropTarget");
 var ColumnDropTargets = exports.ColumnDropTargets = function ColumnDropTargets(_ref) {
   var _rowHeights$;
-  var editorView = _ref.editorView,
-    tableRef = _ref.tableRef,
+  var tableRef = _ref.tableRef,
     tableHeight = _ref.tableHeight,
     stickyTop = _ref.stickyTop,
-    localId = _ref.localId;
-  var colWidths = (0, _utils.getColumnsWidths)(editorView);
-  var rowHeights = (0, _react.useMemo)(function () {
-    // NOTE: we don't care so much as to what tableHeight is, we only care that it changed and is a sane value.
-    if (tableRef && !!tableHeight) {
-      return (0, _utils.getRowHeights)(tableRef);
-    }
-    return [0];
-  }, [tableRef, tableHeight]);
+    localId = _ref.localId,
+    rowHeights = _ref.rowHeights,
+    colWidths = _ref.colWidths;
   if (!tableRef) {
     return null;
   }
@@ -34,12 +23,13 @@ var ColumnDropTargets = exports.ColumnDropTargets = function ColumnDropTargets(_
   var hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
   var marginTop = hasHeaderRow && stickyTop !== undefined ? (_rowHeights$ = rowHeights === null || rowHeights === void 0 ? void 0 : rowHeights[0]) !== null && _rowHeights$ !== void 0 ? _rowHeights$ : 0 : 0;
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: _types.TableCssClassName.COLUMN_DROP_TARGET_CONTROLS
+    className: _types.TableCssClassName.COLUMN_DROP_TARGET_CONTROLS,
+    contentEditable: false
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: _types.TableCssClassName.COLUMN_CONTROLS_INNER,
     "data-testid": "table-floating-column-controls-drop-targets"
-  }, colWidths.map(function (width, index) {
-    return /*#__PURE__*/_react.default.createElement(ColumnDropTarget, {
+  }, colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(function (width, index) {
+    return /*#__PURE__*/_react.default.createElement(_ColumnDropTarget.ColumnDropTarget, {
       key: index,
       index: index,
       localId: localId,
@@ -48,59 +38,4 @@ var ColumnDropTargets = exports.ColumnDropTargets = function ColumnDropTargets(_
       marginTop: marginTop
     });
   })));
-};
-var _default = exports.default = ColumnDropTargets;
-var ColumnDropTarget = function ColumnDropTarget(_ref2) {
-  var index = _ref2.index,
-    localId = _ref2.localId,
-    width = _ref2.width,
-    height = _ref2.height,
-    marginTop = _ref2.marginTop;
-  var dropTargetRef = (0, _react.useRef)(null);
-  (0, _react.useEffect)(function () {
-    if (!dropTargetRef.current) {
-      return;
-    }
-    return (0, _element.dropTargetForElements)({
-      element: dropTargetRef.current,
-      canDrop: function canDrop(_ref3) {
-        var _data$indexes, _data$indexes2;
-        var source = _ref3.source;
-        var data = source.data;
-        return (
-          // Only draggables of row type can be dropped on this target
-          data.type === 'table-column' &&
-          // Only draggables which came from the same table can be dropped on this target
-          data.localId === localId &&
-          // Only draggables which DO NOT include this drop targets index can be dropped
-          !!((_data$indexes = data.indexes) !== null && _data$indexes !== void 0 && _data$indexes.length) && ((_data$indexes2 = data.indexes) === null || _data$indexes2 === void 0 ? void 0 : _data$indexes2.indexOf(index)) === -1
-        );
-      },
-      getData: function getData(_ref4) {
-        var input = _ref4.input,
-          element = _ref4.element;
-        var data = {
-          localId: localId,
-          type: 'table-column',
-          targetIndex: index
-        };
-        return (0, _closestEdge.attachClosestEdge)(data, {
-          input: input,
-          element: element,
-          allowedEdges: ['left', 'right']
-        });
-      }
-    });
-  }, [index, localId]);
-  return /*#__PURE__*/_react.default.createElement("div", {
-    ref: dropTargetRef,
-    style: {
-      width: width && "".concat(width - 1, "px"),
-      height: height && "".concat(height, "px"),
-      marginTop: marginTop && "".concat(marginTop, "px")
-    },
-    "data-drop-target-index": index,
-    "data-drop-target-localid": localId,
-    "data-testid": "table-floating-column-controls-drop-target"
-  });
 };

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

@@ -9,8 +9,9 @@ exports.default = exports.TableFloatingColumnControls = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
-var _editorTables = require("@atlaskit/editor-tables");
+var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
 var _types = require("../../types");
+var _utils = require("../../utils");
 var _ColumnControls = require("./ColumnControls");
 var _ColumnDropTargets = require("./ColumnDropTargets");
 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); }
@@ -21,6 +22,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 var TableFloatingColumnControls = exports.TableFloatingColumnControls = function TableFloatingColumnControls(_ref) {
   var editorView = _ref.editorView,
     tableRef = _ref.tableRef,
+    getNode = _ref.getNode,
     tableActive = _ref.tableActive,
     hasHeaderRow = _ref.hasHeaderRow,
     hoveredCell = _ref.hoveredCell,
@@ -34,6 +36,12 @@ var TableFloatingColumnControls = exports.TableFloatingColumnControls = function
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     tableRect = _useState2[0],
     setTableRect = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    hasDropTargets = _useState4[0],
+    setHasDropTargets = _useState4[1];
+  var node = getNode();
+  var currentNodeLocalId = node === null || node === void 0 ? void 0 : node.attrs.localId;
   (0, _react.useEffect)(function () {
     var _window;
     if (tableRef && (_window = window) !== null && _window !== void 0 && _window.ResizeObserver) {
@@ -65,26 +73,41 @@ var TableFloatingColumnControls = exports.TableFloatingColumnControls = function
       };
     }
   }, [tableRef]);
-  var selectedLocalId = (0, _react.useMemo)(function () {
-    if (!selection) {
-      return undefined;
-    }
-    var tableNode = (0, _editorTables.findTable)(selection);
-    if (!tableNode) {
-      return undefined;
+  (0, _react.useEffect)(function () {
+    return (0, _element.monitorForElements)({
+      canMonitor: function canMonitor(_ref2) {
+        var source = _ref2.source;
+        var _ref3 = source.data,
+          type = _ref3.type,
+          localId = _ref3.localId,
+          indexes = _ref3.indexes;
+        return type === 'table-column' && !!(indexes !== null && indexes !== void 0 && indexes.length) && localId === currentNodeLocalId;
+      },
+      onDragStart: function onDragStart() {
+        setHasDropTargets(true);
+      },
+      onDrop: function onDrop() {
+        setHasDropTargets(false);
+      }
+    });
+  }, [editorView, currentNodeLocalId]);
+  var rowHeights = (0, _react.useMemo)(function () {
+    // NOTE: we don't care so much as to what tableHeight is, we only care that it changed and is a sane value.
+    if (tableRef && !!tableRect.height) {
+      return (0, _utils.getRowHeights)(tableRef);
     }
-    return tableNode.node.attrs.localId;
-  }, [selection]);
+    return [0];
+  }, [tableRef, tableRect.height]);
   if (!tableRef) {
     return null;
   }
+  var colWidths = (0, _utils.getColumnsWidths)(editorView);
   var stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
   var mountTo = tableRef && (tableRef === null || tableRef === void 0 ? void 0 : tableRef.parentElement) || document.body;
   return /*#__PURE__*/_reactDom.default.createPortal( /*#__PURE__*/_react.default.createElement("div", {
-    className: _types.TableCssClassName.COLUMN_CONTROLS_WRAPPER
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    onMouseDown: function onMouseDown(e) {
-      return e.preventDefault();
+    className: _types.TableCssClassName.COLUMN_CONTROLS_WRAPPER,
+    style: {
+      pointerEvents: 'none'
     },
     "data-testid": "table-floating-column-controls-wrapper"
   }, /*#__PURE__*/_react.default.createElement(_ColumnControls.ColumnControls, {
@@ -94,14 +117,16 @@ var TableFloatingColumnControls = exports.TableFloatingColumnControls = function
     isResizing: isResizing,
     tableActive: tableActive,
     stickyTop: tableActive ? stickyTop : undefined,
-    tableHeight: tableRect.height,
-    localId: selectedLocalId
-  }), /*#__PURE__*/_react.default.createElement(_ColumnDropTargets.ColumnDropTargets, {
-    editorView: editorView,
+    localId: currentNodeLocalId,
+    rowHeights: rowHeights,
+    colWidths: colWidths
+  }), hasDropTargets && /*#__PURE__*/_react.default.createElement(_ColumnDropTargets.ColumnDropTargets, {
     tableRef: tableRef,
     stickyTop: tableActive ? stickyTop : undefined,
     tableHeight: tableRect.height,
-    localId: selectedLocalId
-  }))), mountTo);
+    localId: currentNodeLocalId,
+    rowHeights: rowHeights,
+    colWidths: colWidths
+  })), mountTo);
 };
 var _default = exports.default = TableFloatingColumnControls;

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

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "DragHandleIcon", {
+  enumerable: true,
+  get: function get() {
+    return _DragHandleIcon.DragHandleIcon;
+  }
+});
+Object.defineProperty(exports, "DragInMotionIcon", {
+  enumerable: true,
+  get: function get() {
+    return _DragInMotionIcon.DragInMotionIcon;
+  }
+});
+var _DragHandleIcon = require("./DragHandleIcon");
+var _DragInMotionIcon = require("./DragInMotionIcon");

package/dist/cjs/plugins/table/ui/ui-styles.js

@@ -71,7 +71,7 @@ var getFloatingDotOverrides = function getFloatingDotOverrides(props) {
   return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.custom-table-width') ? (0, _react.css)(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteral2.default)(["\n        tr\n          th:last-child\n          .", "::before,\n          tr\n          td:last-child\n          .", "::before {\n          content: '';\n          background-color: ", ";\n          position: absolute;\n          height: ", "px;\n          width: ", "px;\n          border-radius: 50%;\n          pointer-events: none;\n          top: ", ";\n          right: 0px;\n        }\n      "])), _types.TableCssClassName.COLUMN_CONTROLS_DECORATIONS, _types.TableCssClassName.COLUMN_CONTROLS_DECORATIONS, (0, _consts.tableBorderColor)(props), _consts.lineMarkerSize, _consts.lineMarkerSize, "var(--ds-space-025, 2px)") : '';
 };
 var floatingColumnControls = exports.floatingColumnControls = function floatingColumnControls(props) {
-  return (0, _react.css)(_templateObject19 || (_templateObject19 = (0, _taggedTemplateLiteral2.default)(["\n    .", " {\n      box-sizing: border-box;\n      position: absolute;\n      top: 0;\n      z-index: -1;\n\n      .", " {\n        display: flex;\n        flex-direction: row;\n      }\n    }\n\n    .", " {\n      box-sizing: border-box;\n\n      .", " {\n        display: grid;\n        justify-items: center;\n      }\n    }\n  "])), _types.TableCssClassName.COLUMN_DROP_TARGET_CONTROLS, _types.TableCssClassName.COLUMN_CONTROLS_INNER, _types.TableCssClassName.COLUMN_CONTROLS_WITH_DRAG, _types.TableCssClassName.COLUMN_CONTROLS_INNER);
+  return (0, _react.css)(_templateObject19 || (_templateObject19 = (0, _taggedTemplateLiteral2.default)(["\n    .", " {\n      box-sizing: border-box;\n      position: absolute;\n      top: 0;\n\n      .", " {\n        display: flex;\n        flex-direction: row;\n      }\n    }\n\n    .", " {\n      box-sizing: border-box;\n\n      .", " {\n        display: grid;\n        justify-items: center;\n      }\n    }\n  "])), _types.TableCssClassName.COLUMN_DROP_TARGET_CONTROLS, _types.TableCssClassName.COLUMN_CONTROLS_INNER, _types.TableCssClassName.COLUMN_CONTROLS_WITH_DRAG, _types.TableCssClassName.COLUMN_CONTROLS_INNER);
 };
 var rowControlsWrapperDotStyle = exports.rowControlsWrapperDotStyle = function rowControlsWrapperDotStyle(props) {
   if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.drag-and-drop')) {

package/dist/es2019/plugins/table/nodeviews/TableComponent.js

@@ -497,13 +497,14 @@ class TableComponent extends React.Component {
     const colControls = /*#__PURE__*/React.createElement(TableFloatingColumnControls, {
       editorView: view,
       tableRef: tableRef,
+      getNode: getNode,
       tableActive: tableActive,
       hoveredRows: hoveredRows,
       hoveredCell: hoveredCell,
       isResizing: isResizing,
       ordering: ordering,
       hasHeaderRow: hasHeaderRow
-      // pass `selection` and `tableHeight` to control re-render
+      // pass `selection` to control re-render
       ,
       selection: view.state.selection,
       headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,

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

@@ -63,5 +63,5 @@ export const moveSource = (sourceType, sourceIndex, targetIndex) => createComman
     return tr.setMeta('addToHistory', false);
   }
   const move = sourceType === 'table-row' ? moveRow : moveColumn;
-  return move(sourceIndex, targetIndex + (sourceIndex > targetIndex ? 0 : -1))(tr);
+  return move(sourceIndex, targetIndex)(tr);
 });

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

@@ -72,7 +72,8 @@ export const createPlugin = (dispatch, eventDispatcher) => {
             const {
               sourceType,
               sourceIndexes,
-              targetAdjustedIndex
+              targetAdjustedIndex,
+              direction
             } = data;
 
             // If the drop target index contains merged cells then we should not allow the drop to occur.
@@ -82,7 +83,7 @@ export const createPlugin = (dispatch, eventDispatcher) => {
               return;
             }
             const [sourceIndex] = sourceIndexes;
-            moveSource(sourceType, sourceIndex, targetAdjustedIndex)(editorView.state, editorView.dispatch);
+            moveSource(sourceType, sourceIndex, targetAdjustedIndex + (direction === -1 ? 0 : -1))(editorView.state, editorView.dispatch);
           }
         })
       };

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

@@ -43,6 +43,10 @@ export const getDraggableDataFromEvent = ({
   // This introduces an offset in the event the drop occured closer to the bottom/right of the target. We want
   // the new target index to be 1 index higher.
   const targetOffset = targetClosestEdge === 'right' || targetClosestEdge === 'bottom' ? 1 : 0;
+
+  // since only consecutive rows/cols can be moved we can assume that if the first index is greater then
+  // the target index, the then the direction of the DnD is decreasing
+  const direction = sourceIndexes[0] > targetIndex ? -1 : 1;
   return {
     sourceType,
     sourceLocalId,
@@ -51,6 +55,7 @@ export const getDraggableDataFromEvent = ({
     targetLocalId,
     targetIndex,
     targetAdjustedIndex: targetIndex + targetOffset,
-    targetClosestEdge
+    targetClosestEdge,
+    direction
   };
 };

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

@@ -5,7 +5,7 @@ import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/ut
 import { N200, N700 } from '@atlaskit/theme/colors';
 import { TableCssClassName as ClassName } from '../../types';
 import { DragPreview } from '../DragPreview';
-import { DragHandleIcon } from '../icons/DragHandleIcon';
+import { DragHandleIcon } from '../icons';
 const mapStateToProps = state => {
   switch (state) {
     case 'danger':
@@ -84,8 +84,10 @@ export const DragHandle = ({
       backgroundColor: `${"var(--ds-surface, white)"}`,
       borderRadius: '4px',
       border: `2px solid ${"var(--ds-surface, white)"}`,
-      transform: direction === 'column' ? 'none' : 'rotate(90deg)'
-    }
+      transform: direction === 'column' ? 'none' : 'rotate(90deg)',
+      pointerEvents: 'auto'
+    },
+    "data-testid": "table-floating-column-controls-drag-handle"
   }, /*#__PURE__*/React.createElement(DragHandleIcon, iconProps), previewContainer && previewWidth !== undefined && previewHeight !== undefined && /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement(DragPreview, {
     direction: direction,
     width: previewWidth,

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

@@ -1,6 +1,5 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { TableCssClassName as ClassName } from '../../../types';
-import { getColumnsWidths, getRowHeights } from '../../../utils';
 import { DragHandle } from '../../DragHandle';
 export const ColumnControls = ({
   editorView,
@@ -8,26 +7,19 @@ export const ColumnControls = ({
   tableRef,
   hoveredCell,
   isResizing,
-  tableHeight,
   stickyTop,
-  localId
+  localId,
+  rowHeights,
+  colWidths
 }) => {
-  var _rowHeights$;
-  const rowHeights = useMemo(() => {
-    // NOTE: we don't care so much as to what tableHeight is, we only care that it changed and is a sane value.
-    if (tableRef && !!tableHeight) {
-      return getRowHeights(tableRef);
-    }
-    return [0];
-  }, [tableRef, tableHeight]);
+  var _rowHeights$, _colWidths$map$join;
   if (!tableRef) {
     return null;
   }
   const firstRow = tableRef.querySelector('tr');
   const hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
   const marginTop = hasHeaderRow && stickyTop !== undefined ? (_rowHeights$ = rowHeights === null || rowHeights === void 0 ? void 0 : rowHeights[0]) !== null && _rowHeights$ !== void 0 ? _rowHeights$ : 0 : 0;
-  const colWidths = getColumnsWidths(editorView);
-  const widths = colWidths.map(width => width ? `${width - 1}px` : '0px').join(' ');
+  const widths = (_colWidths$map$join = colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(width => width ? `${width - 1}px` : '0px').join(' ')) !== null && _colWidths$map$join !== void 0 ? _colWidths$map$join : '0px';
   const colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
   const onClick = (index, event) => {};
   const onMouseOver = () => {};
@@ -50,7 +42,7 @@ export const ColumnControls = ({
     "data-testid": "table-floating-column-control"
   }, /*#__PURE__*/React.createElement(DragHandle, {
     direction: "column",
-    indexes: [],
+    indexes: [colIndex],
     onClick: event => onClick(colIndex, event),
     onMouseOver: onMouseOver,
     onMouseOut: onMouseOut,