@atlaskit/editor-plugin-table 5.3.0 → 5.3.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-table
 
+## 5.3.2
+
+### Patch Changes
+
+- [#41446](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41446) [`ff8add18e61`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ff8add18e61) - Add drag handle controls to table behind a feature flag
+
+## 5.3.1
+
+### Patch Changes
+
+- [#41703](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41703) [`3631a9d9750`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3631a9d9750) - [ux] Added a command to show insert line decoration/ drop target when dragging a table column or a row.
+- [#41640](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41640) [`c387b1bfcdd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c387b1bfcdd) - Added a Pragmatic Drag and Drop montior to the DnD table plugin. This is responsible for triggering the row/column move when a drop operation occurs.
+
 ## 5.3.0
 
 ### Minor Changes

package/dist/cjs/plugins/table/commands/hover.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showResizeHandleLine = exports.hoverTable = exports.hoverRows = exports.hoverMergedCells = exports.hoverColumns = exports.hideResizeHandleLine = exports.clearHoverSelection = void 0;
+exports.showResizeHandleLine = exports.hoverTable = exports.hoverRows = exports.hoverMergedCells = exports.hoverColumns = exports.hoverCell = exports.hideResizeHandleLine = exports.clearHoverSelection = void 0;
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
@@ -11,14 +11,9 @@ var _types = require("../types");
 var _utils2 = require("../utils");
 // #region Imports
 
-// #endregion
-// #region Utils
 var makeArray = function makeArray(n) {
   return Array.from(Array(n).keys());
 };
-// #endregion
-
-// #region Commands
 var hoverMergedCells = exports.hoverMergedCells = function hoverMergedCells() {
   return (0, _pluginFactory.createCommand)(function (state) {
     var mergedCellsPositions = (0, _utils2.getMergedCellsPositions)(state.tr);
@@ -38,7 +33,7 @@ var hoverMergedCells = exports.hoverMergedCells = function hoverMergedCells() {
     });
     var decorations = (0, _utils2.createCellHoverDecoration)(mergedCells);
     return {
-      type: 'HOVER_CELLS',
+      type: 'HOVER_MERGED_CELLS',
       data: {
         decorationSet: (0, _utils2.updatePluginStateDecorations)(state, decorations, _types.TableDecorations.CELL_CONTROLS_HOVER)
       }
@@ -143,4 +138,18 @@ var hideResizeHandleLine = exports.hideResizeHandleLine = function hideResizeHan
     };
   });
 };
-// #endregion
+var hoverCell = exports.hoverCell = function hoverCell(rowIndex, colIndex) {
+  return (0, _pluginFactory.createCommand)(function () {
+    return {
+      type: 'HOVER_CELL',
+      data: {
+        hoveredCell: {
+          rowIndex: rowIndex,
+          colIndex: colIndex
+        }
+      }
+    };
+  }, function (tr) {
+    return tr.setMeta('addToHistory', false);
+  });
+};

package/dist/cjs/plugins/table/commands/index.js

@@ -75,6 +75,12 @@ Object.defineProperty(exports, "hideResizeHandleLine", {
     return _hover.hideResizeHandleLine;
   }
 });
+Object.defineProperty(exports, "hoverCell", {
+  enumerable: true,
+  get: function get() {
+    return _hover.hoverCell;
+  }
+});
 Object.defineProperty(exports, "hoverColumns", {
   enumerable: true,
   get: function get() {

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

@@ -21,11 +21,6 @@ var _nodes = require("../utils/nodes");
 var _updatePluginStateDecorations = require("../utils/update-plugin-state-decorations");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // #region Imports
-// #endregion
-
-// #endregion
-
-// #region Commands
 var setEditorFocus = exports.setEditorFocus = function setEditorFocus(editorHasFocus) {
   return (0, _pluginFactory.createCommand)({
     type: 'SET_EDITOR_FOCUS',
@@ -444,5 +439,4 @@ var addBoldInEmptyHeaderCells = exports.addBoldInEmptyHeaderCells = function add
     }
     return false;
   };
-};
-// #endregion
+};

package/dist/cjs/plugins/table/event-handlers.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleMouseOver = exports.handleMouseOut = exports.handleMouseMove = exports.handleMouseLeave = exports.handleMouseDown = exports.handleFocus = exports.handleCut = exports.handleClick = exports.handleBlur = void 0;
 exports.handleTripleClick = handleTripleClick;
-exports.whenTableInFocus = void 0;
+exports.withCellTracking = exports.whenTableInFocus = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -173,11 +173,15 @@ var handleMouseLeave = exports.handleMouseLeave = function handleMouseLeave(view
     dispatch = view.dispatch;
   var _getPluginState2 = (0, _pluginFactory.getPluginState)(state),
     insertColumnButtonIndex = _getPluginState2.insertColumnButtonIndex,
-    insertRowButtonIndex = _getPluginState2.insertRowButtonIndex;
+    insertRowButtonIndex = _getPluginState2.insertRowButtonIndex,
+    isDragAndDropEnabled = _getPluginState2.isDragAndDropEnabled;
   var target = event.target;
   if ((0, _utils3.isTableControlsButton)(target)) {
     return true;
   }
+  if (isDragAndDropEnabled) {
+    (0, _commands.hoverCell)(undefined, undefined)(state, dispatch);
+  }
   if ((typeof insertColumnButtonIndex !== 'undefined' || typeof insertRowButtonIndex !== 'undefined') && (0, _commands.hideInsertColumnOrRowButton)()(state, dispatch)) {
     return true;
   }
@@ -318,4 +322,27 @@ var whenTableInFocus = exports.whenTableInFocus = function whenTableInFocus(even
     }
     return eventHandler(view, mouseEvent, elementContentRects);
   };
+};
+var trackCellLocation = function trackCellLocation(view, mouseEvent) {
+  var target = mouseEvent.target;
+  var maybeTableCell = (0, _utils.isElementInTableCell)(target);
+  if (!maybeTableCell) {
+    return;
+  }
+  var colIndex = maybeTableCell.cellIndex;
+  var rowElement = (0, _utils.closestElement)(target, 'tr');
+  var rowIndex = rowElement && rowElement.rowIndex;
+  var _getPluginState8 = (0, _pluginFactory.getPluginState)(view.state),
+    hoveredCell = _getPluginState8.hoveredCell;
+  if (hoveredCell.colIndex !== colIndex || hoveredCell.rowIndex !== rowIndex) {
+    (0, _commands.hoverCell)(rowIndex, colIndex)(view.state, view.dispatch);
+  }
+};
+var withCellTracking = exports.withCellTracking = function withCellTracking(eventHandler, elementContentRects) {
+  return function (view, mouseEvent) {
+    if ((0, _pluginFactory.getPluginState)(view.state).isDragAndDropEnabled) {
+      trackCellLocation(view, mouseEvent);
+    }
+    return eventHandler(view, mouseEvent, elementContentRects);
+  };
 };

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

@@ -114,7 +114,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
             tableOptions = _ref3.tableOptions,
             getEditorFeatureFlags = _ref3.getEditorFeatureFlags,
             dragAndDropEnabled = _ref3.dragAndDropEnabled;
-          return (0, _main.createPlugin)(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, (0, _createPluginConfig.pluginConfig)(tableOptions), defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, getIntl, breakoutEnabled, fullWidthEnabled, tableResizingEnabled, wasFullWidthEnabled, dragAndDropEnabled, editorAnalyticsAPI, api);
+          return (0, _main.createPlugin)(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, (0, _createPluginConfig.pluginConfig)(tableOptions), defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, getIntl, breakoutEnabled, tableResizingEnabled, fullWidthEnabled, wasFullWidthEnabled, dragAndDropEnabled, editorAnalyticsAPI, api);
         }
       }, {
         name: 'tablePMColResizing',

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

@@ -469,7 +469,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       // doesn't work well with WithPluginState
       var _getPluginState2 = (0, _pluginFactory.getPluginState)(view.state),
         isInDanger = _getPluginState2.isInDanger,
-        hoveredRows = _getPluginState2.hoveredRows;
+        hoveredRows = _getPluginState2.hoveredRows,
+        hoveredCell = _getPluginState2.hoveredCell;
       var tableRef = this.table || undefined;
       var headerRow = tableRef ? tableRef.querySelector('tr[data-header-row]') : undefined;
       var hasHeaderRow = (0, _utils4.containsHeaderRow)(node);
@@ -480,10 +481,12 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         tableRef: tableRef,
         tableActive: tableActive,
         hoveredRows: hoveredRows,
+        hoveredCell: hoveredCell,
         isInDanger: isInDanger,
         isResizing: isResizing,
         isNumberColumnEnabled: node.attrs.isNumberColumnEnabled,
         isHeaderRowEnabled: isHeaderRowEnabled,
+        isDragAndDropEnabled: options === null || options === void 0 ? void 0 : options.isDragAndDropEnabled,
         ordering: ordering,
         isHeaderColumnEnabled: isHeaderColumnEnabled,
         hasHeaderRow: hasHeaderRow
@@ -491,8 +494,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         ,
         selection: view.state.selection,
         headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,
-        stickyHeader: this.state.stickyHeader,
-        getEditorFeatureFlags: this.props.getEditorFeatureFlags
+        stickyHeader: this.state.stickyHeader
       }));
       var colControls = /*#__PURE__*/_react.default.createElement("div", {
         className: _types.TableCssClassName.COLUMN_CONTROLS_WRAPPER

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

@@ -255,7 +255,8 @@ var createTableView = exports.createTableView = function createTableView(node, v
     isBreakoutEnabled = _getPluginState2.isBreakoutEnabled,
     isFullWidthModeEnabled = _getPluginState2.isFullWidthModeEnabled,
     wasFullWidthModeEnabled = _getPluginState2.wasFullWidthModeEnabled,
-    isTableResizingEnabled = _getPluginState2.isTableResizingEnabled;
+    isTableResizingEnabled = _getPluginState2.isTableResizingEnabled,
+    isDragAndDropEnabled = _getPluginState2.isDragAndDropEnabled;
   var _getPluginConfig = (0, _createPluginConfig.pluginConfig)(pluginConfig),
     allowColumnResizing = _getPluginConfig.allowColumnResizing;
   var hasIntlContext = true;
@@ -270,7 +271,8 @@ var createTableView = exports.createTableView = function createTableView(node, v
       isBreakoutEnabled: isBreakoutEnabled,
       isFullWidthModeEnabled: isFullWidthModeEnabled,
       wasFullWidthModeEnabled: wasFullWidthModeEnabled,
-      isTableResizingEnabled: isTableResizingEnabled
+      isTableResizingEnabled: isTableResizingEnabled,
+      isDragAndDropEnabled: isDragAndDropEnabled
     },
     getEditorContainerWidth: getEditorContainerWidth,
     getEditorFeatureFlags: getEditorFeatureFlags,

package/dist/cjs/plugins/table/pm-plugins/decorations/plugin.js

@@ -16,7 +16,7 @@ var getDecorations = exports.getDecorations = function getDecorations(state) {
   return pluginKey.getState(state);
 };
 var handleDocOrSelectionChanged = exports.handleDocOrSelectionChanged = function handleDocOrSelectionChanged(tr, decorationSet, oldState, newState) {
-  var _tableWidthPluginKey$, _tableWidthPluginKey$2;
+  var _tableWidthPluginKey$, _tableWidthPluginKey$2, _tr$getMeta;
   var isResizing = (_tableWidthPluginKey$ = _tableWidth.pluginKey.getState(newState)) === null || _tableWidthPluginKey$ === void 0 ? void 0 : _tableWidthPluginKey$.resizing;
   var wasResizing = (_tableWidthPluginKey$2 = _tableWidth.pluginKey.getState(oldState)) === null || _tableWidthPluginKey$2 === void 0 ? void 0 : _tableWidthPluginKey$2.resizing;
   var changedResizing = isResizing !== wasResizing;
@@ -24,7 +24,7 @@ var handleDocOrSelectionChanged = exports.handleDocOrSelectionChanged = function
   // Remove column controls when resizing
   if (isResizing) {
     return _view.DecorationSet.empty;
-  } else if (tr.docChanged || tr.selection instanceof _cellSelection.CellSelection || changedResizing) {
+  } else if (tr.docChanged || tr.selection instanceof _cellSelection.CellSelection || changedResizing || ((_tr$getMeta = tr.getMeta(_pluginKey.pluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.type) === 'HOVER_CELL') {
     return (0, _utils.buildColumnControlsDecorations)({
       decorationSet: decorationSet,
       tr: tr
@@ -47,12 +47,16 @@ var createPlugin = exports.createPlugin = function createPlugin() {
         return _view.DecorationSet.empty;
       },
       apply: function apply(tr, decorationSet, oldState, newState) {
+        var _tablePluginKey$getSt, _tablePluginKey$getSt2;
         var pluginState = decorationSet;
         var meta = tr.getMeta(_pluginKey.pluginKey);
+        var previousHover = (_tablePluginKey$getSt = _pluginKey.pluginKey.getState(oldState)) === null || _tablePluginKey$getSt === void 0 ? void 0 : _tablePluginKey$getSt.hoveredCell;
+        var newHover = (_tablePluginKey$getSt2 = _pluginKey.pluginKey.getState(newState)) === null || _tablePluginKey$getSt2 === void 0 ? void 0 : _tablePluginKey$getSt2.hoveredCell;
+        var changedCellHover = (previousHover === null || previousHover === void 0 ? void 0 : previousHover.colIndex) !== (newHover === null || newHover === void 0 ? void 0 : newHover.colIndex) || (previousHover === null || previousHover === void 0 ? void 0 : previousHover.rowIndex) !== (newHover === null || newHover === void 0 ? void 0 : newHover.rowIndex);
         if (meta && meta.data && meta.data.decorationSet) {
           pluginState = meta.data.decorationSet;
         }
-        if (tr.docChanged || tr.selectionSet || tr.getMeta(_tableWidth.pluginKey)) {
+        if (tr.docChanged || tr.selectionSet || tr.getMeta(_tableWidth.pluginKey) || changedCellHover) {
           pluginState = pluginState.map(tr.mapping, tr.doc);
           return handleDocOrSelectionChanged(tr, pluginState, oldState, newState);
         }

package/dist/cjs/plugins/table/pm-plugins/decorations/utils/column-controls.js

@@ -8,6 +8,7 @@ var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _types = require("../../../types");
 var _decoration = require("../../../utils/decoration");
+var _pluginKey = require("../../plugin-key");
 var _composeDecorations = require("./compose-decorations");
 // @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
 
@@ -29,13 +30,17 @@ var maybeUpdateColumnSelectedDecoration = function maybeUpdateColumnSelectedDeco
   return (0, _decoration.updateDecorations)(tr.doc, decorationSet, (0, _decoration.createColumnSelectedDecoration)(tr), _types.TableDecorations.COLUMN_SELECTED);
 };
 var maybeUpdateColumnControlsDecoration = function maybeUpdateColumnControlsDecoration(_ref3) {
+  var _meta$data;
   var decorationSet = _ref3.decorationSet,
     tr = _ref3.tr;
   var table = (0, _utils.findTable)(tr.selection);
-  if (!table) {
+  var meta = tr.getMeta(_pluginKey.pluginKey);
+
+  // avoid re-drawing state if dnd decorations don't need to be updated
+  if (!table && (meta === null || meta === void 0 ? void 0 : meta.type) !== 'HOVER_CELL') {
     return decorationSet;
   }
-  return (0, _decoration.updateDecorations)(tr.doc, decorationSet, (0, _decoration.createColumnControlsDecoration)(tr.selection), _types.TableDecorations.COLUMN_CONTROLS_DECORATIONS);
+  return (0, _decoration.updateDecorations)(tr.doc, decorationSet, (0, _decoration.createColumnControlsDecoration)(tr.selection, meta === null || meta === void 0 || (_meta$data = meta.data) === null || _meta$data === void 0 ? void 0 : _meta$data.hoveredCell), _types.TableDecorations.COLUMN_CONTROLS_DECORATIONS);
 };
 
 // @see: https://product-fabric.atlassian.net/browse/ED-7304

package/dist/cjs/plugins/table/pm-plugins/default-table-selection.js

@@ -3,8 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultTableSelection = void 0;
+exports.defaultTableSelection = exports.defaultHoveredCell = void 0;
 var defaultTableSelection = exports.defaultTableSelection = {
   hoveredColumns: [],
   hoveredRows: []
+};
+
+/**
+ * Creating a separate object for hoveredCell so it doesn't get defaulted when `handleDocOrSelectionChanged` runs.
+ *
+ * It is safe to persist this value as it gets removed when the mouse cursor leaves the table, so no need to remove it
+ * when doc changes.
+ */
+var defaultHoveredCell = exports.defaultHoveredCell = {
+  hoveredCell: {
+    rowIndex: undefined,
+    colIndex: undefined
+  }
 };

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

@@ -3,24 +3,53 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setDropTarget = exports.clearDropTarget = void 0;
+exports.updatePluginStateDecorations = exports.setDropTarget = exports.getDecorations = exports.clearDropTarget = void 0;
+var _view = require("@atlaskit/editor-prosemirror/view");
+var _types = require("../../types");
+var _utils = require("../../utils");
 var _actions = require("./actions");
 var _pluginFactory = require("./plugin-factory");
+var _pluginKey = require("./plugin-key");
 // TODO: This command is a placeholder example. Please replace this if required.
+var getDecorations = exports.getDecorations = function getDecorations(state) {
+  var _pluginKey$getState;
+  return ((_pluginKey$getState = _pluginKey.pluginKey.getState(state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.decorationSet) || _view.DecorationSet.empty;
+};
+var updatePluginStateDecorations = exports.updatePluginStateDecorations = function updatePluginStateDecorations(state, decorations, key) {
+  return (0, _utils.updateDecorations)(state.doc, getDecorations(state), decorations, key);
+};
 var setDropTarget = exports.setDropTarget = function setDropTarget(type, index, tr) {
-  return (0, _pluginFactory.createCommand)({
-    type: _actions.DragAndDropActionType.SET_DROP_TARGET,
-    data: {
-      type: type,
-      index: index
+  return (0, _pluginFactory.createCommand)(function (state) {
+    var _getPluginState = (0, _pluginFactory.getPluginState)(state),
+      dropTargetType = _getPluginState.dropTargetType,
+      dropTargetIndex = _getPluginState.dropTargetIndex;
+    if (dropTargetType === type && dropTargetIndex === index) {
+      return false;
     }
+    var decorationSet = _view.DecorationSet.empty;
+    if (type === 'column') {
+      decorationSet = updatePluginStateDecorations(state, (0, _utils.createColumnInsertLine)(index, state.selection), _types.TableDecorations.COLUMN_INSERT_LINE);
+    } else if (type === 'row') {
+      decorationSet = updatePluginStateDecorations(state, (0, _utils.createRowInsertLine)(index, state.selection), _types.TableDecorations.ROW_INSERT_LINE);
+    }
+    return {
+      type: _actions.DragAndDropActionType.SET_DROP_TARGET,
+      data: {
+        decorationSet: decorationSet,
+        type: type,
+        index: index
+      }
+    };
   }, function (originalTr) {
     return (tr || originalTr).setMeta('addToHistory', false);
   });
 };
 var clearDropTarget = exports.clearDropTarget = function clearDropTarget(tr) {
   return (0, _pluginFactory.createCommand)({
-    type: _actions.DragAndDropActionType.CLEAR_DROP_TARGET
+    type: _actions.DragAndDropActionType.CLEAR_DROP_TARGET,
+    data: {
+      decorationSet: _view.DecorationSet.empty
+    }
   }, function (originalTr) {
     return (tr || originalTr).setMeta('addToHistory', false);
   });

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

@@ -1,17 +1,24 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createPlugin = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _utils = require("@atlaskit/editor-tables/utils");
+var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
+var _mergedCells = require("../../utils/merged-cells");
+var _pluginFactory = require("../plugin-factory");
 var _consts = require("./consts");
-var _pluginFactory = require("./plugin-factory");
+var _pluginFactory2 = require("./plugin-factory");
 var _pluginKey = require("./plugin-key");
+var _monitor = require("./utils/monitor");
 var createPlugin = exports.createPlugin = function createPlugin(dispatch, eventDispatcher) {
   return new _safePlugin.SafePlugin({
-    state: (0, _pluginFactory.createPluginState)(dispatch, function (state) {
+    state: (0, _pluginFactory2.createPluginState)(dispatch, function (state) {
       return {
         decorationSet: _view.DecorationSet.empty,
         // TODO: This is example placeholder state. We could use this to track which row/col is currently set as the drop target
@@ -22,16 +29,71 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, eventD
     }),
     key: _pluginKey.pluginKey,
     view: function view(editorView) {
-      // TODO: Add Pragmatic DnD monitor when the view is constructed.
-
       return {
-        // TODO: Cleanup monitor instance
-        // destroy: cleanup,
+        destroy: (0, _element.monitorForElements)({
+          canMonitor: function canMonitor(_ref) {
+            var source = _ref.source;
+            var _ref2 = source.data,
+              type = _ref2.type,
+              localId = _ref2.localId,
+              indexes = _ref2.indexes;
+
+            // First; Perform any quick checks so we can abort early.
+            if (!indexes || !localId ||
+            // FIXME: We currently don't support DragNDrop of multiple elements. For now we will not bother to monitor drags
+            // of more then 1 item.
+            indexes.length !== 1 || !(type === 'table-row' || type === 'table-column')) {
+              return false;
+            }
+            var _getTablePluginState = (0, _pluginFactory.getPluginState)(editorView.state),
+              tableNode = _getTablePluginState.tableNode;
+            // If the draggable localId is the same as the current selected table localId then we will allow the monitor
+            // watch for changes
+            return localId === (tableNode === null || tableNode === void 0 ? void 0 : tableNode.attrs.localId);
+          },
+          onDrag: function onDrag(event) {
+            var data = (0, _monitor.getDraggableDataFromEvent)(event);
+
+            // If no data can be found then it's most like we do not want to perform any drag actions
+            if (!data) {
+              return;
+            }
+
+            // TODO: as we drag an element around we are going to want to update the state to acurately reflect the current
+            // insert location as to where the draggable will most likely be go. For example;
+            // const { sourceType, targetAdjustedIndex } = data;
+            // const highlight = sourceType === 'table-row' ? highlightRow : highlightColumn;
+            // return editorView.dispatch(
+            //   highlight(targetAdjustedIndex)(editorView.state.tr),
+            // );
+          },
+          onDrop: function onDrop(event) {
+            var data = (0, _monitor.getDraggableDataFromEvent)(event);
+
+            // If no data can be found then it's most like we do not want to perform any drop action
+            if (!data) {
+              return;
+            }
+            var sourceType = data.sourceType,
+              sourceIndexes = data.sourceIndexes,
+              targetAdjustedIndex = data.targetAdjustedIndex;
+
+            // 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;
+            if (hasMergedCells(targetAdjustedIndex)(editorView.state.selection)) {
+              return;
+            }
+            var move = sourceType === 'table-row' ? _utils.moveRow : _utils.moveColumn;
+            var _sourceIndexes = (0, _slicedToArray2.default)(sourceIndexes, 1),
+              sourceIndex = _sourceIndexes[0];
+            return editorView.dispatch(move(sourceIndex, targetAdjustedIndex)(editorView.state.tr));
+          }
+        })
       };
     },
     props: {
       decorations: function decorations(state) {
-        var _getPluginState = (0, _pluginFactory.getPluginState)(state),
+        var _getPluginState = (0, _pluginFactory2.getPluginState)(state),
           decorationSet = _getPluginState.decorationSet;
         return decorationSet;
       }

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

@@ -14,11 +14,13 @@ var _default = exports.default = function _default(pluginState, action) {
   switch (action.type) {
     case _actions.DragAndDropActionType.SET_DROP_TARGET:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
+        decorationSet: action.data.decorationSet,
         dropTargetType: action.data.type,
         dropTargetIndex: action.data.index
       });
     case _actions.DragAndDropActionType.CLEAR_DROP_TARGET:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
+        decorationSet: action.data.decorationSet,
         dropTargetType: _consts.DropTargetType.NONE,
         dropTargetIndex: 0
       });

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

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "getDraggableDataFromEvent", {
+  enumerable: true,
+  get: function get() {
+    return _monitor.getDraggableDataFromEvent;
+  }
+});
+var _monitor = require("./monitor");

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

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDraggableDataFromEvent = void 0;
+var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge");
+var getDraggableDataFromEvent = exports.getDraggableDataFromEvent = function getDraggableDataFromEvent(_ref) {
+  var _extractClosestEdge;
+  var location = _ref.location,
+    source = _ref.source;
+  var destination = location.current.dropTargets.at(0);
+  // If no target exists at the current location, then the current draggable is not over a target or the target doesn't support
+  // the current draggable.
+  if (!destination) {
+    return undefined;
+  }
+
+  // This is the draggable elements data
+  var _ref2 = source.data,
+    sourceIndexes = _ref2.indexes,
+    sourceType = _ref2.type,
+    sourceLocalId = _ref2.localId;
+
+  // This is the drop target's data
+  var _ref3 = destination.data,
+    targetIndex = _ref3.targetIndex,
+    targetType = _ref3.type,
+    targetLocalId = _ref3.localId;
+
+  // Some basic check to abort early with...
+  if (!sourceIndexes || targetIndex < 0 ||
+  // abort if the type of the draggable is different to the target, for eg. rows cannot be dropped onto column targets.
+  sourceType !== targetType ||
+  // abort if the draggable is coming from a different table that the target is on.
+  sourceLocalId !== targetLocalId) {
+    return undefined;
+  }
+
+  // FIXME: currently we only support a single row/col index being moved, remove this clause when this is no longer the case.
+  if (sourceIndexes.length > 1) {
+    return undefined;
+  }
+  var targetClosestEdge = (_extractClosestEdge = (0, _closestEdge.extractClosestEdge)(destination.data)) !== null && _extractClosestEdge !== void 0 ? _extractClosestEdge : targetType === 'table-row' ? 'top' : 'left';
+  // NOTE: By default we always insert row/cols at the target index to the top/left (retrospectively of row/cols).
+  // 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;
+  return {
+    sourceType: sourceType,
+    sourceLocalId: sourceLocalId,
+    sourceIndexes: sourceIndexes,
+    targetType: targetType,
+    targetLocalId: targetLocalId,
+    targetIndex: targetIndex,
+    targetAdjustedIndex: targetIndex + targetOffset,
+    targetClosestEdge: targetClosestEdge
+  };
+};

package/dist/cjs/plugins/table/pm-plugins/main.js

@@ -30,9 +30,9 @@ var _pluginFactory = require("./plugin-factory");
 var _pluginKey = require("./plugin-key");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, breakoutEnabled, fullWidthModeEnabled, tableResizingEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi) {
+var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, breakoutEnabled, tableResizingEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi) {
   var _window;
-  var state = (0, _pluginFactory.createPluginState)(dispatch, _objectSpread(_objectSpread({
+  var state = (0, _pluginFactory.createPluginState)(dispatch, _objectSpread(_objectSpread(_objectSpread({
     pluginConfig: pluginConfig,
     insertColumnButtonIndex: undefined,
     insertRowButtonIndex: undefined,
@@ -43,7 +43,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
     isHeaderRowEnabled: !!pluginConfig.allowHeaderRow,
     isHeaderColumnEnabled: false,
     isDragAndDropEnabled: dragAndDropEnabled
-  }, _defaultTableSelection.defaultTableSelection), {}, {
+  }, _defaultTableSelection.defaultHoveredCell), _defaultTableSelection.defaultTableSelection), {}, {
     getIntl: getIntl
   }));
   var elementContentRects = {};
@@ -247,8 +247,8 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
       handleDOMEvents: {
         focus: _eventHandlers.handleFocus,
         blur: _eventHandlers.handleBlur,
-        mousedown: _eventHandlers.handleMouseDown,
-        mouseover: (0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseOver),
+        mousedown: (0, _eventHandlers.withCellTracking)(_eventHandlers.handleMouseDown),
+        mouseover: (0, _eventHandlers.whenTableInFocus)((0, _eventHandlers.withCellTracking)(_eventHandlers.handleMouseOver)),
         mouseleave: (0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseLeave),
         mouseout: (0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseOut),
         mousemove: (0, _eventHandlers.whenTableInFocus)(_eventHandlers.handleMouseMove, elementContentRects),

package/dist/cjs/plugins/table/reducer.js

@@ -97,7 +97,8 @@ var _default = exports.default = function _default(pluginState, action) {
     case 'HOVER_ROWS':
     case 'HOVER_COLUMNS':
     case 'HOVER_TABLE':
-    case 'HOVER_CELLS':
+    case 'HOVER_MERGED_CELLS':
+    case 'HOVER_CELL':
     case 'SHOW_RESIZE_HANDLE_LINE':
     case 'SET_EDITOR_FOCUS':
       return _objectSpread(_objectSpread({}, pluginState), action.data);