@atlaskit/editor-plugin-table 5.3.1 → 5.3.3

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

@@ -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

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);

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

@@ -2,7 +2,7 @@ export { getSelectedColumnIndexes, getSelectedRowIndexes, normalizeSelection, is
 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';

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,

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

@@ -1,7 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey
-// @ts-ignore -- ReadonlyTransaction is a local declaration and will cause a TS2305 error in CCFE typecheck
-} from '@atlaskit/editor-prosemirror/state';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { pluginKey as tablePluginKey } from '../plugin-key';
@@ -12,7 +10,7 @@ export var getDecorations = function getDecorations(state) {
   return pluginKey.getState(state);
 };
 export var handleDocOrSelectionChanged = function handleDocOrSelectionChanged(tr, decorationSet, oldState, newState) {
-  var _tableWidthPluginKey$, _tableWidthPluginKey$2;
+  var _tableWidthPluginKey$, _tableWidthPluginKey$2, _tr$getMeta;
   var isResizing = (_tableWidthPluginKey$ = tableWidthPluginKey.getState(newState)) === null || _tableWidthPluginKey$ === void 0 ? void 0 : _tableWidthPluginKey$.resizing;
   var wasResizing = (_tableWidthPluginKey$2 = tableWidthPluginKey.getState(oldState)) === null || _tableWidthPluginKey$2 === void 0 ? void 0 : _tableWidthPluginKey$2.resizing;
   var changedResizing = isResizing !== wasResizing;
@@ -20,7 +18,7 @@ export var handleDocOrSelectionChanged = function handleDocOrSelectionChanged(tr
   // Remove column controls when resizing
   if (isResizing) {
     return DecorationSet.empty;
-  } else if (tr.docChanged || tr.selection instanceof CellSelection || changedResizing) {
+  } else if (tr.docChanged || tr.selection instanceof CellSelection || changedResizing || ((_tr$getMeta = tr.getMeta(tablePluginKey)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.type) === 'HOVER_CELL') {
     return buildColumnControlsDecorations({
       decorationSet: decorationSet,
       tr: tr
@@ -43,12 +41,16 @@ export var createPlugin = function createPlugin() {
         return DecorationSet.empty;
       },
       apply: function apply(tr, decorationSet, oldState, newState) {
+        var _tablePluginKey$getSt, _tablePluginKey$getSt2;
         var pluginState = decorationSet;
         var meta = tr.getMeta(tablePluginKey);
+        var previousHover = (_tablePluginKey$getSt = tablePluginKey.getState(oldState)) === null || _tablePluginKey$getSt === void 0 ? void 0 : _tablePluginKey$getSt.hoveredCell;
+        var newHover = (_tablePluginKey$getSt2 = tablePluginKey.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(tableWidthPluginKey)) {
+        if (tr.docChanged || tr.selectionSet || tr.getMeta(tableWidthPluginKey) || changedCellHover) {
           pluginState = pluginState.map(tr.mapping, tr.doc);
           return handleDocOrSelectionChanged(tr, pluginState, oldState, newState);
         }

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

@@ -4,6 +4,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { TableDecorations } from '../../../types';
 import { createColumnControlsDecoration, createColumnSelectedDecoration, findColumnControlSelectedDecoration, findControlsHoverDecoration, updateDecorations } from '../../../utils/decoration';
+import { pluginKey as tablePluginKey } from '../../plugin-key';
 import { composeDecorations } from './compose-decorations';
 var isColumnSelected = function isColumnSelected(tr) {
   return tr.selection instanceof CellSelection && tr.selection.isColSelection();
@@ -23,13 +24,17 @@ var maybeUpdateColumnSelectedDecoration = function maybeUpdateColumnSelectedDeco
   return updateDecorations(tr.doc, decorationSet, createColumnSelectedDecoration(tr), TableDecorations.COLUMN_SELECTED);
 };
 var maybeUpdateColumnControlsDecoration = function maybeUpdateColumnControlsDecoration(_ref3) {
+  var _meta$data;
   var decorationSet = _ref3.decorationSet,
     tr = _ref3.tr;
   var table = findTable(tr.selection);
-  if (!table) {
+  var meta = tr.getMeta(tablePluginKey);
+
+  // 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 updateDecorations(tr.doc, decorationSet, createColumnControlsDecoration(tr.selection), TableDecorations.COLUMN_CONTROLS_DECORATIONS);
+  return updateDecorations(tr.doc, decorationSet, createColumnControlsDecoration(tr.selection, meta === null || meta === void 0 || (_meta$data = meta.data) === null || _meta$data === void 0 ? void 0 : _meta$data.hoveredCell), TableDecorations.COLUMN_CONTROLS_DECORATIONS);
 };
 
 // @see: https://product-fabric.atlassian.net/browse/ED-7304

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

@@ -1,4 +1,17 @@
 export var 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.
+ */
+export var defaultHoveredCell = {
+  hoveredCell: {
+    rowIndex: undefined,
+    colIndex: undefined
+  }
 };

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

@@ -11,7 +11,7 @@ import { findTable } from '@atlaskit/editor-tables/utils';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { addBoldInEmptyHeaderCells, clearHoverSelection, setTableRef } from '../commands';
 import { removeResizeHandleDecorations, transformSliceRemoveCellBackgroundColor, transformSliceToAddTableHeaders, transformSliceToRemoveColumnsWidths } from '../commands/misc';
-import { handleBlur, handleClick, handleCut, handleFocus, handleMouseDown, handleMouseLeave, handleMouseMove, handleMouseOut, handleMouseOver, handleTripleClick, whenTableInFocus } from '../event-handlers';
+import { handleBlur, handleClick, handleCut, handleFocus, handleMouseDown, handleMouseLeave, handleMouseMove, handleMouseOut, handleMouseOver, handleTripleClick, whenTableInFocus, withCellTracking } from '../event-handlers';
 import { createTableView } from '../nodeviews/table';
 import TableCell from '../nodeviews/TableCell';
 import TableRow from '../nodeviews/TableRow';
@@ -20,12 +20,12 @@ import { fixTables, replaceSelectedTable } from '../transforms';
 import { TableCssClassName as ClassName } from '../types';
 import { findControlsHoverDecoration, transformSliceToCorrectEmptyTableCells, transformSliceToFixHardBreakProblemOnCopyFromCell, transformSliceToRemoveOpenTable, updateResizeHandles } from '../utils';
 import { isHeaderRowRequired } from '../utils/paste';
-import { defaultTableSelection } from './default-table-selection';
+import { defaultHoveredCell, defaultTableSelection } from './default-table-selection';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
-export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, breakoutEnabled, fullWidthModeEnabled, tableResizingEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi) {
+export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, breakoutEnabled, tableResizingEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi) {
   var _window;
-  var state = createPluginState(dispatch, _objectSpread(_objectSpread({
+  var state = createPluginState(dispatch, _objectSpread(_objectSpread(_objectSpread({
     pluginConfig: pluginConfig,
     insertColumnButtonIndex: undefined,
     insertRowButtonIndex: undefined,
@@ -36,7 +36,7 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
     isHeaderRowEnabled: !!pluginConfig.allowHeaderRow,
     isHeaderColumnEnabled: false,
     isDragAndDropEnabled: dragAndDropEnabled
-  }, defaultTableSelection), {}, {
+  }, defaultHoveredCell), defaultTableSelection), {}, {
     getIntl: getIntl
   }));
   var elementContentRects = {};
@@ -240,8 +240,8 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
       handleDOMEvents: {
         focus: handleFocus,
         blur: handleBlur,
-        mousedown: handleMouseDown,
-        mouseover: whenTableInFocus(handleMouseOver),
+        mousedown: withCellTracking(handleMouseDown),
+        mouseover: whenTableInFocus(withCellTracking(handleMouseOver)),
         mouseleave: whenTableInFocus(handleMouseLeave),
         mouseout: whenTableInFocus(handleMouseOut),
         mousemove: whenTableInFocus(handleMouseMove, elementContentRects),

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

@@ -90,7 +90,8 @@ export default (function (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);

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

@@ -48,6 +48,7 @@ export var TableDecorations = /*#__PURE__*/function (TableDecorations) {
   return TableDecorations;
 }({});
 export var TableCssClassName = _objectSpread(_objectSpread({}, TableSharedCssClassName), {}, {
+  /** Classic controls */
   COLUMN_CONTROLS: "".concat(tablePrefixSelector, "-column-controls"),
   COLUMN_CONTROLS_DECORATIONS: "".concat(tablePrefixSelector, "-column-controls-decoration"),
   COLUMN_SELECTED: "".concat(tablePrefixSelector, "-column__selected"),
@@ -78,8 +79,13 @@ export var TableCssClassName = _objectSpread(_objectSpread({}, TableSharedCssCla
   CORNER_CONTROLS_INSERT_ROW_MARKER: "".concat(tablePrefixSelector, "-corner-controls__insert-row-marker"),
   CORNER_CONTROLS_INSERT_COLUMN_MARKER: "".concat(tablePrefixSelector, "-corner-controls__insert-column-marker"),
   CONTROLS_CORNER_BUTTON: "".concat(tablePrefixSelector, "-corner-button"),
+  /** Controls with drag handle */
+  COLUMN_CONTROLS_DECORATIONS_WITH_DRAG: "".concat(tablePrefixSelector, "-column-controls-decoration-with-drag"),
+  ROW_CONTROLS_WITH_DRAG: "".concat(tablePrefixSelector, "-row-controls-with-drag"),
+  /** Other classes */
   NUMBERED_COLUMN: "".concat(tablePrefixSelector, "-numbered-column"),
   NUMBERED_COLUMN_BUTTON: "".concat(tablePrefixSelector, "-numbered-column__button"),
+  NUMBERED_COLUMN_BUTTON_DISABLED: "".concat(tablePrefixSelector, "-numbered-column__button-disabled"),
   HOVERED_COLUMN: "".concat(tablePrefixSelector, "-hovered-column"),
   HOVERED_ROW: "".concat(tablePrefixSelector, "-hovered-row"),
   HOVERED_TABLE: "".concat(tablePrefixSelector, "-hovered-table"),

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

@@ -0,0 +1,41 @@
+import React, { useEffect, useRef } from 'react';
+import { DragHandleButton } from '@atlaskit/pragmatic-drag-and-drop-react-accessibility/drag-handle-button';
+import { draggable } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
+// TODO: use for now, in future replace with custom @atlaskit/icon/glyph/drag-handler
+// width is too large (24px), should be 16px
+export var DragHandle = function DragHandle(_ref) {
+  var tableLocalId = _ref.tableLocalId,
+    _ref$direction = _ref.direction,
+    direction = _ref$direction === void 0 ? 'row' : _ref$direction,
+    indexes = _ref.indexes,
+    onClick = _ref.onClick,
+    onMouseOver = _ref.onMouseOver,
+    onMouseOut = _ref.onMouseOut;
+  var dragHandleDivRef = useRef(null);
+  useEffect(function () {
+    var dragHandleDivRefCurrent = dragHandleDivRef.current;
+    if (dragHandleDivRefCurrent) {
+      return draggable({
+        element: dragHandleDivRefCurrent,
+        getInitialData: function getInitialData() {
+          return {
+            localId: tableLocalId,
+            type: "table-".concat(direction),
+            indexes: indexes
+          };
+        }
+      });
+    }
+  }, [tableLocalId, direction, indexes]);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: dragHandleDivRef,
+    style: {
+      backgroundColor: "var(--ds-surface, white)",
+      borderRadius: '4px',
+      border: "2px solid ".concat("var(--ds-surface, white)"),
+      transform: direction === 'column' ? 'rotate(90deg)' : 'none'
+    }
+  }, /*#__PURE__*/React.createElement(DragHandleButton, {
+    label: "blah"
+  }));
+};

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

@@ -0,0 +1,32 @@
+import React from 'react';
+import { Box, xcss } from '@atlaskit/primitives';
+import { DragInMotionIcon } from '../Icons/DragInMotionIcon';
+var boxStyles = xcss({
+  borderColor: 'color.border.focused',
+  borderStyle: 'solid',
+  borderRadius: 'border.radius.100',
+  borderWidth: 'border.width.outline',
+  backgroundColor: 'color.blanket.selected'
+});
+export var DragPreview = function DragPreview(_ref) {
+  var direction = _ref.direction,
+    width = _ref.width,
+    height = _ref.height;
+  var marginLeft = direction === 'row' ? -14 : width / 2 - 14;
+  var marginTop = direction === 'row' ? height / 2 - 14 : -10;
+  var transform = direction === 'row' ? 'rotate(90deg)' : 'none';
+  return /*#__PURE__*/React.createElement(Box, {
+    xcss: boxStyles,
+    style: {
+      width: "".concat(width, "px"),
+      height: "".concat(height, "px")
+    }
+  }, /*#__PURE__*/React.createElement(DragInMotionIcon, {
+    style: {
+      position: 'absolute',
+      marginLeft: "".concat(marginLeft, "px"),
+      marginTop: "".concat(marginTop, "px"),
+      transform: transform
+    }
+  }));
+};