@atlaskit/editor-plugin-table 5.3.0 → 5.3.2

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

@@ -5,7 +5,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B300, N0, N300, N40A, N60A, Y200, Y50 } from '@atlaskit/theme/colors';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { TableCssClassName as ClassName } from '../types';
-import { columnControlsDecorationHeight, columnControlsSelectedZIndex, columnControlsZIndex, lineMarkerSize, resizeHandlerAreaWidth, resizeHandlerZIndex, resizeLineWidth, tableBorderColor, tableBorderDeleteColor, tableBorderSelectedColor, tableCellDeleteColor, tableCellHoverDeleteIconBackground, tableCellHoverDeleteIconColor, tableCellSelectedDeleteIconBackground, tableCellSelectedDeleteIconColor, tableDeleteButtonSize, tableHeaderCellBackgroundColor, tableInsertColumnButtonSize, tableOverflowShadowWidth, tableOverflowShadowWidthWide, tableToolbarDeleteColor, tableToolbarSelectedColor, tableToolbarSize } from './consts';
+import { columnControlsDecorationHeight, columnControlsSelectedZIndex, columnControlsZIndex, insertLineWidth, lineMarkerSize, resizeHandlerAreaWidth, resizeHandlerZIndex, resizeLineWidth, tableBorderColor, tableBorderDeleteColor, tableBorderSelectedColor, tableCellDeleteColor, tableCellHoverDeleteIconBackground, tableCellHoverDeleteIconColor, tableCellSelectedDeleteIconBackground, tableCellSelectedDeleteIconColor, tableDeleteButtonSize, tableHeaderCellBackgroundColor, tableInsertColumnButtonSize, tableOverflowShadowWidth, tableOverflowShadowWidthWide, tableToolbarDeleteColor, tableToolbarSelectedColor, tableToolbarSize } from './consts';
 const InsertLine = (props, cssString) => css`
   .${ClassName.CONTROLS_INSERT_LINE} {
     background: ${tableBorderSelectedColor(props)};
@@ -300,6 +300,17 @@ export const floatingColumnControls = props => {
   `;
 };
 export const columnControlsDecoration = props => {
+  if (getBooleanFF('platform.editor.table.drag-and-drop')) {
+    return css`
+      .${ClassName.COLUMN_CONTROLS_DECORATIONS_WITH_DRAG} {
+        position: absolute;
+        // kinda a hacky way to center an element with absolute positioning inside a relative element
+        top: 25%;
+        left: 50%;
+        transform: translate(-50%, -100%);
+      }
+    `;
+  }
   if (getBooleanFF('platform.editor.table.column-controls-styles-updated')) {
     return css`
       .${ClassName.COLUMN_CONTROLS_DECORATIONS} {
@@ -564,21 +575,35 @@ const getLastColumnResizerOverrides = () => {
         }
       ` : '';
 };
-export const resizeHandle = props => css`
-  .${ClassName.TABLE_CONTAINER} {
-    .${ClassName.RESIZE_HANDLE_DECORATION} {
-      background-color: transparent;
-      position: absolute;
-      width: ${resizeHandlerAreaWidth}px;
-      height: 100%;
-      top: 0;
-      right: -${resizeHandlerAreaWidth / 2}px;
-      cursor: col-resize;
-      z-index: ${resizeHandlerZIndex};
-    }
-
-    ${getLastColumnResizerOverrides()}
+const resizeHandleOverrides = props => {
+  if (getBooleanFF('platform.editor.table.drag-and-drop')) {
+    return css`
+      th.${ClassName.WITH_RESIZE_LINE}::before,
+        td.${ClassName.WITH_RESIZE_LINE}::before {
+        content: ' ';
+        position: absolute;
+        left: ${"var(--ds-space-negative-025, -2px)"};
+        top: -1px;
+        width: ${resizeLineWidth}px;
+        height: calc(100% + 2px);
+        background-color: ${tableBorderSelectedColor(props)};
+        z-index: ${columnControlsZIndex * 2};
+      }
 
+      th.${ClassName.WITH_RESIZE_LINE_LAST_COLUMN}::before,
+        td.${ClassName.WITH_RESIZE_LINE_LAST_COLUMN}::before {
+        content: ' ';
+        position: absolute;
+        right: -1px;
+        top: -1px;
+        width: ${resizeLineWidth}px;
+        height: calc(100% + 2px);
+        background-color: ${tableBorderSelectedColor(props)};
+        z-index: ${columnControlsZIndex * 2};
+      }
+    `;
+  }
+  return css`
     td.${ClassName.WITH_RESIZE_LINE}::before {
       content: ' ';
       position: absolute;
@@ -622,6 +647,24 @@ export const resizeHandle = props => css`
       z-index: ${columnControlsZIndex * 2};
       top: -${tableToolbarSize + tableCellBorderWidth}px;
     }
+  `;
+};
+export const resizeHandle = props => css`
+  .${ClassName.TABLE_CONTAINER} {
+    .${ClassName.RESIZE_HANDLE_DECORATION} {
+      background-color: transparent;
+      position: absolute;
+      width: ${resizeHandlerAreaWidth}px;
+      height: 100%;
+      top: 0;
+      right: -${resizeHandlerAreaWidth / 2}px;
+      cursor: col-resize;
+      z-index: ${resizeHandlerZIndex};
+    }
+
+    ${getLastColumnResizerOverrides()}
+
+    ${resizeHandleOverrides(props)}
 
     table
       tr:first-of-type
@@ -635,4 +678,117 @@ export const resizeHandle = props => css`
       height: calc(100% + ${tableToolbarSize + tableCellBorderWidth}px);
     }
   }
+`;
+export const insertLine = props => css`
+  .${ClassName.TABLE_CONTAINER} {
+    td.${ClassName.WITH_FIRST_COLUMN_INSERT_LINE}::before {
+      content: ' ';
+      position: absolute;
+      left: -1px;
+      top: -1px;
+      width: ${insertLineWidth}px;
+      height: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+    }
+
+    th.${ClassName.WITH_FIRST_COLUMN_INSERT_LINE}::before {
+      content: ' ';
+      left: -1px;
+      position: absolute;
+      width: ${insertLineWidth}px;
+      height: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+      top: -${tableCellBorderWidth}px;
+    }
+
+    td.${ClassName.WITH_COLUMN_INSERT_LINE}::before {
+      content: ' ';
+      position: absolute;
+      left: ${"var(--ds-space-negative-025, -2px)"};
+      top: -1px;
+      width: ${insertLineWidth}px;
+      height: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+    }
+
+    th.${ClassName.WITH_COLUMN_INSERT_LINE}::before {
+      content: ' ';
+      left: ${"var(--ds-space-negative-025, -2px)"};
+      position: absolute;
+      width: ${insertLineWidth}px;
+      height: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+      top: -${tableCellBorderWidth}px;
+    }
+
+    td.${ClassName.WITH_LAST_COLUMN_INSERT_LINE}::before {
+      content: ' ';
+      position: absolute;
+      right: -1px;
+      top: -1px;
+      width: ${insertLineWidth}px;
+      height: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+    }
+
+    th.${ClassName.WITH_LAST_COLUMN_INSERT_LINE}::before {
+      content: ' ';
+      right: -1px;
+      position: absolute;
+      width: ${insertLineWidth}px;
+      height: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+      top: -${tableCellBorderWidth}px;
+    }
+
+    td.${ClassName.WITH_ROW_INSERT_LINE}::before {
+      content: ' ';
+      position: absolute;
+      left: ${"var(--ds-space-negative-025, -2px)"};
+      top: -1px;
+      height: ${insertLineWidth}px;
+      width: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+    }
+
+    th.${ClassName.WITH_ROW_INSERT_LINE}::before {
+      content: ' ';
+      left: ${"var(--ds-space-negative-025, -2px)"};
+      position: absolute;
+      height: ${insertLineWidth}px;
+      width: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+      top: -1px;
+    }
+
+    td.${ClassName.WITH_LAST_ROW_INSERT_LINE}::before {
+      content: ' ';
+      position: absolute;
+      left: ${"var(--ds-space-negative-025, -2px)"};
+      bottom: 0;
+      height: ${insertLineWidth}px;
+      width: calc(100% + 2px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+    }
+
+    th.${ClassName.WITH_LAST_ROW_INSERT_LINE}::before {
+      content: ' ';
+      left: ${"var(--ds-space-negative-025, -2px)"};
+      bottom: 0;
+      position: absolute;
+      height: ${insertLineWidth}px;
+      width: calc(100% + ${tableCellBorderWidth * 2}px);
+      background-color: ${tableBorderSelectedColor(props)};
+      z-index: ${columnControlsZIndex * 2};
+    }
+  }
 `;

package/dist/es2019/plugins/table/utils/decoration.js

@@ -8,8 +8,10 @@ import { nonNullable } from '@atlaskit/editor-common/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { Rect, TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getCellsInRow, getSelectionRect } from '@atlaskit/editor-tables/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { TableCssClassName as ClassName, TableDecorations } from '../types';
 import { ColumnResizeWidget } from '../ui/ColumnResizeWidget';
+import { DragHandle } from '../ui/DragHandle';
 const filterDecorationByKey = (key, decorationSet) => decorationSet.find(undefined, undefined, spec => spec.key.indexOf(key) > -1);
 export const findColumnControlSelectedDecoration = decorationSet => filterDecorationByKey(TableDecorations.COLUMN_SELECTED, decorationSet);
 export const findControlsHoverDecoration = decorationSet => filterDecorationByKey(TableDecorations.ALL_CONTROLS_HOVER, decorationSet);
@@ -128,30 +130,54 @@ export const createColumnSelectedDecoration = tr => {
     });
   });
 };
-export const createColumnControlsDecoration = selection => {
+export const createColumnControlsDecoration = (selection, hoverLocation) => {
+  // todo: issue here where table may not be selected yet
   const cells = getCellsInRow(0)(selection) || [];
-  let index = 0;
-  return cells.map(cell => {
-    const colspan = cell.node.attrs.colspan || 1;
-    // It's important these values are scoped locally as the widget callback could be executed anytime in the future
-    // and we want to avoid value leak
-    const startIndex = index;
-    const endIndex = startIndex + colspan;
-
-    // The next cell start index will commence from the current cell end index.
-    index = endIndex;
-    return Decoration.widget(cell.pos + 1, () => {
+  const table = findTable(selection);
+  if (getBooleanFF('platform.editor.table.drag-and-drop') && hoverLocation && !Number.isNaN(hoverLocation === null || hoverLocation === void 0 ? void 0 : hoverLocation.colIndex) && table) {
+    const colIndex = hoverLocation.colIndex;
+    const cell = cells[colIndex];
+    return [Decoration.widget(cell.pos + 1, () => {
       const element = document.createElement('div');
-      element.classList.add(ClassName.COLUMN_CONTROLS_DECORATIONS);
-      element.dataset.startIndex = `${startIndex}`;
-      element.dataset.endIndex = `${endIndex}`;
+      element.classList.add(ClassName.COLUMN_CONTROLS_DECORATIONS_WITH_DRAG);
+      ReactDOM.render( /*#__PURE__*/createElement(DragHandle, {
+        tableLocalId: table.node.attrs.localId,
+        direction: 'column',
+        indexes: [colIndex]
+      }), element);
       return element;
     }, {
-      key: `${TableDecorations.COLUMN_CONTROLS_DECORATIONS}_${endIndex}`,
+      key: `${TableDecorations.COLUMN_CONTROLS_DECORATIONS}_${colIndex}`,
       // this decoration should be the first one, even before gap cursor.
-      side: -100
+      side: -100,
+      destroy: node => {
+        ReactDOM.unmountComponentAtNode(node);
+      }
+    })];
+  } else {
+    let index = 0;
+    return cells.map(cell => {
+      const colspan = cell.node.attrs.colspan || 1;
+      // It's important these values are scoped locally as the widget callback could be executed anytime in the future
+      // and we want to avoid value leak
+      const startIndex = index;
+      const endIndex = startIndex + colspan;
+
+      // The next cell start index will commence from the current cell end index.
+      index = endIndex;
+      return Decoration.widget(cell.pos + 1, () => {
+        const element = document.createElement('div');
+        element.classList.add(ClassName.COLUMN_CONTROLS_DECORATIONS);
+        element.dataset.startIndex = `${startIndex}`;
+        element.dataset.endIndex = `${endIndex}`;
+        return element;
+      }, {
+        key: `${TableDecorations.COLUMN_CONTROLS_DECORATIONS}_${endIndex}`,
+        // this decoration should be the first one, even before gap cursor.
+        side: -100
+      });
     });
-  });
+  }
 };
 export const updateDecorations = (node, decorationSet, decorations, key) => {
   const filteredDecorations = filterDecorationByKey(key, decorationSet);
@@ -404,4 +430,66 @@ export const createColumnLineResize = (selection, cellColumnPositioning) => {
       key: `${TableDecorations.COLUMN_RESIZING_HANDLE_LINE}_${cellColumnPositioning.right}_${index}`
     });
   }).filter(nonNullable);
+};
+export const createColumnInsertLine = (columnIndex, selection) => {
+  const table = findTable(selection);
+  if (!table) {
+    return [];
+  }
+  const map = TableMap.get(table.node);
+  const isFirstColumn = columnIndex === 0;
+  const isLastColumn = columnIndex === map.width;
+  if (isLastColumn) {
+    columnIndex -= 1;
+  }
+  const decorationClassName = isFirstColumn ? ClassName.WITH_FIRST_COLUMN_INSERT_LINE : isLastColumn ? ClassName.WITH_LAST_COLUMN_INSERT_LINE : ClassName.WITH_COLUMN_INSERT_LINE;
+  const cellPositions = makeArray(map.height).map(rowIndex => map.map[map.width * rowIndex + columnIndex]).filter((cellPosition, rowIndex) => {
+    if (isLastColumn) {
+      return true; // If is the last column no filter applied
+    }
+
+    const nextPosition = map.map[map.width * rowIndex + columnIndex - 1];
+    return cellPosition !== nextPosition; // Removed it if next position is merged
+  });
+
+  const cells = cellPositions.map(pos => ({
+    pos: pos + table.start,
+    node: table.node.nodeAt(pos)
+  }));
+  return cells.map((cell, index) => {
+    if (!cell || !cell.node) {
+      return;
+    }
+    return Decoration.node(cell.pos, cell.pos + cell.node.nodeSize, {
+      class: decorationClassName
+    }, {
+      key: `${TableDecorations.COLUMN_INSERT_LINE}_${index}`
+    });
+  }).filter(nonNullable);
+};
+export const createRowInsertLine = (rowIndex, selection) => {
+  const table = findTable(selection);
+  if (!table) {
+    return [];
+  }
+  const map = TableMap.get(table.node);
+  const isLastRow = rowIndex === map.height;
+  if (isLastRow) {
+    rowIndex -= 1;
+  }
+  const cells = getCellsInRow(rowIndex)(selection);
+  if (!cells) {
+    return [];
+  }
+  const decorationClassName = isLastRow ? ClassName.WITH_LAST_ROW_INSERT_LINE : ClassName.WITH_ROW_INSERT_LINE;
+  return cells.map((cell, index) => {
+    if (!cell || !cell.node) {
+      return;
+    }
+    return Decoration.node(cell.pos, cell.pos + cell.node.nodeSize, {
+      class: decorationClassName
+    }, {
+      key: `${TableDecorations.ROW_INSERT_LINE}_${index}`
+    });
+  }).filter(nonNullable);
 };

package/dist/es2019/plugins/table/utils/dom.js

@@ -9,7 +9,9 @@ export const isCornerButton = node => containsClassName(node, ClassName.CONTROLS
 export const isInsertRowButton = node => containsClassName(node, ClassName.CONTROLS_INSERT_ROW) || closestElement(node, `.${ClassName.CONTROLS_INSERT_ROW}`) || containsClassName(node, ClassName.CONTROLS_BUTTON_OVERLAY) && closestElement(node, `.${ClassName.ROW_CONTROLS}`);
 export const getColumnOrRowIndex = target => [parseInt(target.getAttribute('data-start-index') || '-1', 10), parseInt(target.getAttribute('data-end-index') || '-1', 10)];
 export const isColumnControlsDecorations = node => containsClassName(node, ClassName.COLUMN_CONTROLS_DECORATIONS);
+export const isColumnDragControlsDecorations = node => containsClassName(node, ClassName.COLUMN_CONTROLS_DECORATIONS_WITH_DRAG) || closestElement(node, `.${ClassName.COLUMN_CONTROLS_DECORATIONS_WITH_DRAG}`);
 export const isRowControlsButton = node => containsClassName(node, ClassName.ROW_CONTROLS_BUTTON) || containsClassName(node, ClassName.NUMBERED_COLUMN_BUTTON);
+export const isRowDragControlsButton = node => containsClassName(node, ClassName.ROW_CONTROLS_WITH_DRAG) || closestElement(node, `.${ClassName.ROW_CONTROLS_WITH_DRAG}`);
 export const isResizeHandleDecoration = node => containsClassName(node, ClassName.RESIZE_HANDLE_DECORATION);
 export const isTableControlsButton = node => containsClassName(node, ClassName.CONTROLS_BUTTON) || containsClassName(node, ClassName.ROW_CONTROLS_BUTTON_WRAP);
 export const isTableContainerOrWrapper = node => containsClassName(node, ClassName.TABLE_CONTAINER) || containsClassName(node, ClassName.TABLE_NODE_WRAPPER);

package/dist/es2019/plugins/table/utils/index.js

@@ -1,10 +1,11 @@
 export { getSelectedColumnIndexes, getSelectedRowIndexes, normalizeSelection, isSelectionUpdated } from './selection';
-export { findControlsHoverDecoration, createControlsHoverDecoration, createColumnControlsDecoration, createColumnSelectedDecoration, createCellHoverDecoration, updateDecorations, createResizeHandleDecoration, createColumnLineResize } from './decoration';
+export { findControlsHoverDecoration, createControlsHoverDecoration, createColumnControlsDecoration, createColumnSelectedDecoration, createCellHoverDecoration, updateDecorations, createResizeHandleDecoration, createColumnInsertLine, createColumnLineResize, createRowInsertLine } from './decoration';
 export { isIsolating, containsHeaderColumn, containsHeaderRow, checkIfHeaderColumnEnabled, checkIfHeaderRowEnabled, checkIfNumberColumnEnabled, isLayoutSupported, getTableWidth, tablesHaveDifferentColumnWidths, tablesHaveDifferentNoOfColumns, isTableNested, anyChildCellMergedAcrossRow, supportedHeaderRow } from './nodes';
 export { unwrapContentFromTable, removeTableFromFirstChild, removeTableFromLastChild, transformSliceToRemoveOpenTable, transformSliceToCorrectEmptyTableCells, transformSliceToFixHardBreakProblemOnCopyFromCell } from './paste';
-export { isCell, isCornerButton, isInsertRowButton, isColumnControlsDecorations, isTableControlsButton, isTableContainerOrWrapper, isRowControlsButton, getColumnOrRowIndex, getMousePositionHorizontalRelativeByElement, getMousePositionVerticalRelativeByElement, updateResizeHandles, isResizeHandleDecoration, hasResizeHandler } from './dom';
+export { isCell, isCornerButton, isInsertRowButton, isColumnControlsDecorations, isTableControlsButton, isTableContainerOrWrapper, isColumnDragControlsDecorations, isRowDragControlsButton, isRowControlsButton, getColumnOrRowIndex, getMousePositionHorizontalRelativeByElement, getMousePositionVerticalRelativeByElement, updateResizeHandles, isResizeHandleDecoration, hasResizeHandler } from './dom';
 export { getColumnsWidths, isColumnDeleteButtonVisible, getColumnDeleteButtonParams, getColumnClassNames } from './column-controls';
 export { getRowHeights, isRowDeleteButtonVisible, getRowDeleteButtonParams, getRowsParams, getRowClassNames, copyPreviousRow } from './row-controls';
 export { getSelectedTableInfo, getSelectedCellInfo } from './analytics';
 export { getMergedCellsPositions } from './table';
-export { updatePluginStateDecorations } from './update-plugin-state-decorations';
+export { updatePluginStateDecorations } from './update-plugin-state-decorations';
+export { hasMergedCellsInColumn, hasMergedCellsInRow } from './merged-cells';

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

@@ -0,0 +1,48 @@
+import { findTable, TableMap } from '@atlaskit/editor-tables';
+const hasMergedCells = (indexes, normalizeRect) => selection => {
+  const table = findTable(selection);
+  if (!table) {
+    return false;
+  }
+  const map = TableMap.get(table.node);
+  const cellPositions = new Set();
+  const mergedCells = new Set();
+  map.map.forEach(value => {
+    if (cellPositions.has(value)) {
+      mergedCells.add(value);
+    } else {
+      cellPositions.add(value);
+    }
+  });
+  if (!mergedCells.size) {
+    return false;
+  }
+  return (Array.isArray(indexes) ? indexes : [indexes]).map(index => normalizeRect(index, map)).filter(rect => rect.left < rect.right && rect.top < rect.bottom).some(rect => {
+    const n = (rect.right - rect.left) * (rect.bottom - rect.top);
+    const cells = map.cellsInRect(rect);
+    if (cells.length !== n) {
+      // We can quickly assume that if the amount of cells from the map is different to what the rect says
+      // then there is most likely merged cells across this area which is removing cells
+      return true;
+    }
+    return cells.some(nodePos => mergedCells.has(nodePos));
+  });
+};
+export const hasMergedCellsInColumn = columnIndexes => hasMergedCells(columnIndexes, (index, map) => {
+  const x = Math.max(Math.min(index, map.width - 1), 0); // clamped index
+  return {
+    left: x,
+    right: x === index ? x + 1 : x,
+    top: 0,
+    bottom: map.height
+  };
+});
+export const hasMergedCellsInRow = rowIndexes => hasMergedCells(rowIndexes, (index, map) => {
+  const y = Math.max(Math.min(index, map.height - 1), 0); // clamped index
+  return {
+    left: 0,
+    right: map.width,
+    top: y,
+    bottom: y === index ? y + 1 : y
+  };
+});

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

@@ -4,15 +4,9 @@ import { findTable, getCellsInColumn, getCellsInRow } from '@atlaskit/editor-tab
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { TableDecorations } from '../types';
 import { createCellHoverDecoration, createColumnLineResize, createControlsHoverDecoration, getMergedCellsPositions, updatePluginStateDecorations } from '../utils';
-// #endregion
-
-// #region Utils
 var makeArray = function makeArray(n) {
   return Array.from(Array(n).keys());
 };
-// #endregion
-
-// #region Commands
 export var hoverMergedCells = function hoverMergedCells() {
   return createCommand(function (state) {
     var mergedCellsPositions = getMergedCellsPositions(state.tr);
@@ -32,7 +26,7 @@ export var hoverMergedCells = function hoverMergedCells() {
     });
     var decorations = createCellHoverDecoration(mergedCells);
     return {
-      type: 'HOVER_CELLS',
+      type: 'HOVER_MERGED_CELLS',
       data: {
         decorationSet: updatePluginStateDecorations(state, decorations, TableDecorations.CELL_CONTROLS_HOVER)
       }
@@ -137,4 +131,18 @@ export var hideResizeHandleLine = function hideResizeHandleLine() {
     };
   });
 };
-// #endregion
+export var hoverCell = function hoverCell(rowIndex, colIndex) {
+  return createCommand(function () {
+    return {
+      type: 'HOVER_CELL',
+      data: {
+        hoveredCell: {
+          rowIndex: rowIndex,
+          colIndex: colIndex
+        }
+      }
+    };
+  }, function (tr) {
+    return tr.setMeta('addToHistory', false);
+  });
+};

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

@@ -1,4 +1,4 @@
-export { hoverColumns, hoverRows, hoverTable, hoverMergedCells, clearHoverSelection, showResizeHandleLine, hideResizeHandleLine } from './hover';
+export { hoverColumns, hoverRows, hoverTable, hoverCell, hoverMergedCells, clearHoverSelection, showResizeHandleLine, hideResizeHandleLine } from './hover';
 export { insertColumn, insertRow, createTable } from './insert';
 export { getNextLayout, toggleContextualMenu, toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn, toggleTableLayout } from './toggle';
 export { clearMultipleCells } from './clear';

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

@@ -16,11 +16,6 @@ import { TableCssClassName as ClassName, TableDecorations } from '../types';
 import { createColumnControlsDecoration, createColumnSelectedDecoration } from '../utils/decoration';
 import { checkIfHeaderColumnEnabled, checkIfHeaderRowEnabled, checkIfNumberColumnEnabled, isIsolating } from '../utils/nodes';
 import { updatePluginStateDecorations } from '../utils/update-plugin-state-decorations';
-// #endregion
-
-// #endregion
-
-// #region Commands
 export var setEditorFocus = function setEditorFocus(editorHasFocus) {
   return createCommand({
     type: 'SET_EDITOR_FOCUS',
@@ -439,5 +434,4 @@ export var addBoldInEmptyHeaderCells = function addBoldInEmptyHeaderCells(tableC
     }
     return false;
   };
-};
-// #endregion
+};

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

@@ -5,7 +5,7 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { cellAround, findCellRectClosestToPos, findTable, getSelectionRect, removeTable } from '@atlaskit/editor-tables/utils';
-import { addResizeHandleDecorations, clearHoverSelection, hideInsertColumnOrRowButton, hideResizeHandleLine, hoverColumns, selectColumn, setEditorFocus, showInsertColumnButton, showInsertRowButton, showResizeHandleLine } from './commands';
+import { addResizeHandleDecorations, clearHoverSelection, hideInsertColumnOrRowButton, hideResizeHandleLine, hoverCell, hoverColumns, selectColumn, setEditorFocus, showInsertColumnButton, showInsertRowButton, showResizeHandleLine } from './commands';
 import { getPluginState } from './pm-plugins/plugin-factory';
 import { getPluginState as getResizePluginState } from './pm-plugins/table-resizing/plugin-factory';
 import { deleteColumns, deleteRows } from './transforms';
@@ -164,11 +164,15 @@ export var handleMouseLeave = function handleMouseLeave(view, event) {
     dispatch = view.dispatch;
   var _getPluginState2 = getPluginState(state),
     insertColumnButtonIndex = _getPluginState2.insertColumnButtonIndex,
-    insertRowButtonIndex = _getPluginState2.insertRowButtonIndex;
+    insertRowButtonIndex = _getPluginState2.insertRowButtonIndex,
+    isDragAndDropEnabled = _getPluginState2.isDragAndDropEnabled;
   var target = event.target;
   if (isTableControlsButton(target)) {
     return true;
   }
+  if (isDragAndDropEnabled) {
+    hoverCell(undefined, undefined)(state, dispatch);
+  }
   if ((typeof insertColumnButtonIndex !== 'undefined' || typeof insertRowButtonIndex !== 'undefined') && hideInsertColumnOrRowButton()(state, dispatch)) {
     return true;
   }
@@ -309,4 +313,27 @@ export var whenTableInFocus = function whenTableInFocus(eventHandler, elementCon
     }
     return eventHandler(view, mouseEvent, elementContentRects);
   };
+};
+var trackCellLocation = function trackCellLocation(view, mouseEvent) {
+  var target = mouseEvent.target;
+  var maybeTableCell = isElementInTableCell(target);
+  if (!maybeTableCell) {
+    return;
+  }
+  var colIndex = maybeTableCell.cellIndex;
+  var rowElement = closestElement(target, 'tr');
+  var rowIndex = rowElement && rowElement.rowIndex;
+  var _getPluginState8 = getPluginState(view.state),
+    hoveredCell = _getPluginState8.hoveredCell;
+  if (hoveredCell.colIndex !== colIndex || hoveredCell.rowIndex !== rowIndex) {
+    hoverCell(rowIndex, colIndex)(view.state, view.dispatch);
+  }
+};
+export var withCellTracking = function withCellTracking(eventHandler, elementContentRects) {
+  return function (view, mouseEvent) {
+    if (getPluginState(view.state).isDragAndDropEnabled) {
+      trackCellLocation(view, mouseEvent);
+    }
+    return eventHandler(view, mouseEvent, elementContentRects);
+  };
 };

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

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

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

@@ -462,7 +462,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       // doesn't work well with WithPluginState
       var _getPluginState2 = 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 = containsHeaderRow(node);
@@ -473,10 +474,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
@@ -484,8 +487,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.createElement("div", {
         className: ClassName.COLUMN_CONTROLS_WRAPPER

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

@@ -249,7 +249,8 @@ export var createTableView = function createTableView(node, view, getPos, portal
     isBreakoutEnabled = _getPluginState2.isBreakoutEnabled,
     isFullWidthModeEnabled = _getPluginState2.isFullWidthModeEnabled,
     wasFullWidthModeEnabled = _getPluginState2.wasFullWidthModeEnabled,
-    isTableResizingEnabled = _getPluginState2.isTableResizingEnabled;
+    isTableResizingEnabled = _getPluginState2.isTableResizingEnabled,
+    isDragAndDropEnabled = _getPluginState2.isDragAndDropEnabled;
   var _getPluginConfig = getPluginConfig(pluginConfig),
     allowColumnResizing = _getPluginConfig.allowColumnResizing;
   var hasIntlContext = true;
@@ -264,7 +265,8 @@ export var createTableView = function createTableView(node, view, getPos, portal
       isBreakoutEnabled: isBreakoutEnabled,
       isFullWidthModeEnabled: isFullWidthModeEnabled,
       wasFullWidthModeEnabled: wasFullWidthModeEnabled,
-      isTableResizingEnabled: isTableResizingEnabled
+      isTableResizingEnabled: isTableResizingEnabled,
+      isDragAndDropEnabled: isDragAndDropEnabled
     },
     getEditorContainerWidth: getEditorContainerWidth,
     getEditorFeatureFlags: getEditorFeatureFlags,