@atlaskit/editor-plugin-table 5.3.7 → 5.3.9

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

@@ -0,0 +1,52 @@
+import React from 'react';
+import { TableCssClassName as ClassName } from '../../../types';
+import { DragHandle } from '../../DragHandle';
+export const ColumnControls = ({
+  editorView,
+  tableActive,
+  tableRef,
+  hoveredCell,
+  isResizing,
+  stickyTop,
+  localId,
+  rowHeights,
+  colWidths
+}) => {
+  var _rowHeights$, _colWidths$map$join;
+  if (!tableRef) {
+    return null;
+  }
+  const firstRow = tableRef.querySelector('tr');
+  const hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
+  const marginTop = hasHeaderRow && stickyTop !== undefined ? (_rowHeights$ = rowHeights === null || rowHeights === void 0 ? void 0 : rowHeights[0]) !== null && _rowHeights$ !== void 0 ? _rowHeights$ : 0 : 0;
+  const widths = (_colWidths$map$join = colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(width => width ? `${width - 1}px` : '0px').join(' ')) !== null && _colWidths$map$join !== void 0 ? _colWidths$map$join : '0px';
+  const colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
+  const onClick = (index, event) => {};
+  const onMouseOver = () => {};
+  const onMouseOut = () => {};
+  return /*#__PURE__*/React.createElement("div", {
+    className: ClassName.COLUMN_CONTROLS_WITH_DRAG
+  }, /*#__PURE__*/React.createElement("div", {
+    className: ClassName.COLUMN_CONTROLS_INNER,
+    "data-testid": "table-floating-column-controls",
+    style: {
+      gridTemplateColumns: widths,
+      marginTop
+    }
+  }, tableActive && !isResizing && Number.isFinite(colIndex) && /*#__PURE__*/React.createElement("div", {
+    style: {
+      gridColumn: `${colIndex + 1} / span 1`,
+      marginTop: `-15px`
+    },
+    "data-column-control-index": colIndex,
+    "data-testid": "table-floating-column-control"
+  }, /*#__PURE__*/React.createElement(DragHandle, {
+    direction: "column",
+    indexes: [colIndex],
+    onClick: event => onClick(colIndex, event),
+    onMouseOver: onMouseOver,
+    onMouseOut: onMouseOut,
+    tableLocalId: localId || ''
+  }))));
+};
+export default ColumnControls;

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

@@ -0,0 +1,62 @@
+import React, { useEffect, useRef } from 'react';
+import { attachClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge';
+import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
+export const ColumnDropTarget = ({
+  index,
+  localId,
+  width,
+  height,
+  marginTop
+}) => {
+  const dropTargetRef = useRef(null);
+  useEffect(() => {
+    if (!dropTargetRef.current) {
+      return;
+    }
+    return dropTargetForElements({
+      element: dropTargetRef.current,
+      canDrop({
+        source
+      }) {
+        var _data$indexes, _data$indexes2;
+        const data = source.data;
+        return (
+          // Only draggables of row type can be dropped on this target
+          data.type === 'table-column' &&
+          // Only draggables which came from the same table can be dropped on this target
+          data.localId === localId &&
+          // Only draggables which DO NOT include this drop targets index can be dropped
+          !!((_data$indexes = data.indexes) !== null && _data$indexes !== void 0 && _data$indexes.length) && ((_data$indexes2 = data.indexes) === null || _data$indexes2 === void 0 ? void 0 : _data$indexes2.indexOf(index)) === -1
+        );
+      },
+      getIsSticky: () => true,
+      getData({
+        input,
+        element
+      }) {
+        const data = {
+          localId,
+          type: 'table-column',
+          targetIndex: index
+        };
+        return attachClosestEdge(data, {
+          input,
+          element,
+          allowedEdges: ['left', 'right']
+        });
+      }
+    });
+  }, [index, localId]);
+  return /*#__PURE__*/React.createElement("div", {
+    ref: dropTargetRef,
+    style: {
+      width: width && `${width - 1}px`,
+      height: height && `${height}px`,
+      marginTop: marginTop && `${marginTop}px`,
+      pointerEvents: 'auto'
+    },
+    "data-drop-target-index": index,
+    "data-drop-target-localid": localId,
+    "data-testid": "table-floating-column-controls-drop-target"
+  });
+};

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

@@ -1,24 +1,15 @@
-import React, { useEffect, useMemo, useRef } from 'react';
-import { attachClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge';
-import { dropTargetForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
+import React from 'react';
 import { TableCssClassName as ClassName } from '../../../types';
-import { getColumnsWidths, getRowHeights } from '../../../utils';
+import { ColumnDropTarget } from './ColumnDropTarget';
 export const ColumnDropTargets = ({
-  editorView,
   tableRef,
   tableHeight,
   stickyTop,
-  localId
+  localId,
+  rowHeights,
+  colWidths
 }) => {
   var _rowHeights$;
-  const colWidths = getColumnsWidths(editorView);
-  const rowHeights = useMemo(() => {
-    // NOTE: we don't care so much as to what tableHeight is, we only care that it changed and is a sane value.
-    if (tableRef && !!tableHeight) {
-      return getRowHeights(tableRef);
-    }
-    return [0];
-  }, [tableRef, tableHeight]);
   if (!tableRef) {
     return null;
   }
@@ -26,11 +17,12 @@ export const ColumnDropTargets = ({
   const hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
   const marginTop = hasHeaderRow && stickyTop !== undefined ? (_rowHeights$ = rowHeights === null || rowHeights === void 0 ? void 0 : rowHeights[0]) !== null && _rowHeights$ !== void 0 ? _rowHeights$ : 0 : 0;
   return /*#__PURE__*/React.createElement("div", {
-    className: ClassName.COLUMN_DROP_TARGET_CONTROLS
+    className: ClassName.COLUMN_DROP_TARGET_CONTROLS,
+    contentEditable: false
   }, /*#__PURE__*/React.createElement("div", {
     className: ClassName.COLUMN_CONTROLS_INNER,
     "data-testid": "table-floating-column-controls-drop-targets"
-  }, colWidths.map((width, index) => {
+  }, colWidths === null || colWidths === void 0 ? void 0 : colWidths.map((width, index) => {
     return /*#__PURE__*/React.createElement(ColumnDropTarget, {
       key: index,
       index: index,
@@ -40,62 +32,4 @@ export const ColumnDropTargets = ({
       marginTop: marginTop
     });
   })));
-};
-export default ColumnDropTargets;
-const ColumnDropTarget = ({
-  index,
-  localId,
-  width,
-  height,
-  marginTop
-}) => {
-  const dropTargetRef = useRef(null);
-  useEffect(() => {
-    if (!dropTargetRef.current) {
-      return;
-    }
-    return dropTargetForElements({
-      element: dropTargetRef.current,
-      canDrop({
-        source
-      }) {
-        var _data$indexes, _data$indexes2;
-        const data = source.data;
-        return (
-          // Only draggables of row type can be dropped on this target
-          data.type === 'table-column' &&
-          // Only draggables which came from the same table can be dropped on this target
-          data.localId === localId &&
-          // Only draggables which DO NOT include this drop targets index can be dropped
-          !!((_data$indexes = data.indexes) !== null && _data$indexes !== void 0 && _data$indexes.length) && ((_data$indexes2 = data.indexes) === null || _data$indexes2 === void 0 ? void 0 : _data$indexes2.indexOf(index)) === -1
-        );
-      },
-      getData({
-        input,
-        element
-      }) {
-        const data = {
-          localId,
-          type: 'table-column',
-          targetIndex: index
-        };
-        return attachClosestEdge(data, {
-          input,
-          element,
-          allowedEdges: ['left', 'right']
-        });
-      }
-    });
-  }, [index, localId]);
-  return /*#__PURE__*/React.createElement("div", {
-    ref: dropTargetRef,
-    style: {
-      width: width && `${width - 1}px`,
-      height: height && `${height}px`,
-      marginTop: marginTop && `${marginTop}px`
-    },
-    "data-drop-target-index": index,
-    "data-drop-target-localid": localId,
-    "data-testid": "table-floating-column-controls-drop-target"
-  });
 };

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

@@ -1,11 +1,18 @@
 import React, { useEffect, useMemo, useState } from 'react';
-import { findTable } from '@atlaskit/editor-tables';
+import ReactDOM from 'react-dom';
+import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
+import { TableCssClassName as ClassName } from '../../types';
+import { getColumnsWidths, getRowHeights } from '../../utils';
+import { ColumnControls } from './ColumnControls';
 import { ColumnDropTargets } from './ColumnDropTargets';
 export const TableFloatingColumnControls = ({
   editorView,
   tableRef,
+  getNode,
   tableActive,
   hasHeaderRow,
+  hoveredCell,
+  isResizing,
   stickyHeader,
   selection
 }) => {
@@ -13,6 +20,9 @@ export const TableFloatingColumnControls = ({
     width: 0,
     height: 0
   });
+  const [hasDropTargets, setHasDropTargets] = useState(false);
+  const node = getNode();
+  const currentNodeLocalId = node === null || node === void 0 ? void 0 : node.attrs.localId;
   useEffect(() => {
     var _window;
     if (tableRef && (_window = window) !== null && _window !== void 0 && _window.ResizeObserver) {
@@ -32,29 +42,62 @@ export const TableFloatingColumnControls = ({
       };
     }
   }, [tableRef]);
-  const selectedLocalId = useMemo(() => {
-    if (!selection) {
-      return undefined;
-    }
-    const tableNode = findTable(selection);
-    if (!tableNode) {
-      return undefined;
+  useEffect(() => {
+    return monitorForElements({
+      canMonitor({
+        source
+      }) {
+        const {
+          type,
+          localId,
+          indexes
+        } = source.data;
+        return type === 'table-column' && !!(indexes !== null && indexes !== void 0 && indexes.length) && localId === currentNodeLocalId;
+      },
+      onDragStart() {
+        setHasDropTargets(true);
+      },
+      onDrop() {
+        setHasDropTargets(false);
+      }
+    });
+  }, [editorView, currentNodeLocalId]);
+  const rowHeights = useMemo(() => {
+    // NOTE: we don't care so much as to what tableHeight is, we only care that it changed and is a sane value.
+    if (tableRef && !!tableRect.height) {
+      return getRowHeights(tableRef);
     }
-    return tableNode.node.attrs.localId;
-  }, [selection]);
+    return [0];
+  }, [tableRef, tableRect.height]);
   if (!tableRef) {
     return null;
   }
+  const colWidths = getColumnsWidths(editorView);
   const stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
-  return /*#__PURE__*/React.createElement("div", {
-    onMouseDown: e => e.preventDefault(),
+  const mountTo = tableRef && (tableRef === null || tableRef === void 0 ? void 0 : tableRef.parentElement) || document.body;
+  return /*#__PURE__*/ReactDOM.createPortal( /*#__PURE__*/React.createElement("div", {
+    className: ClassName.COLUMN_CONTROLS_WRAPPER,
+    style: {
+      pointerEvents: 'none'
+    },
     "data-testid": "table-floating-column-controls-wrapper"
-  }, tableActive && /*#__PURE__*/React.createElement(ColumnDropTargets, {
+  }, /*#__PURE__*/React.createElement(ColumnControls, {
     editorView: editorView,
+    hoveredCell: hoveredCell,
+    tableRef: tableRef,
+    isResizing: isResizing,
+    tableActive: tableActive,
+    stickyTop: tableActive ? stickyTop : undefined,
+    localId: currentNodeLocalId,
+    rowHeights: rowHeights,
+    colWidths: colWidths
+  }), hasDropTargets && /*#__PURE__*/React.createElement(ColumnDropTargets, {
     tableRef: tableRef,
     stickyTop: tableActive ? stickyTop : undefined,
     tableHeight: tableRect.height,
-    localId: selectedLocalId
-  }));
+    localId: currentNodeLocalId,
+    rowHeights: rowHeights,
+    colWidths: colWidths
+  })), mountTo);
 };
 export default TableFloatingColumnControls;

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

@@ -7,7 +7,7 @@ import { B300, N0, N20A, N300, N40A, R500 } from '@atlaskit/theme/colors';
 import { fontSize } from '@atlaskit/theme/constants';
 import { TableCssClassName as ClassName } from '../types';
 import { columnControlsDecorationHeight, resizeHandlerAreaWidth, resizeLineWidth, rowControlsZIndex, stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableBorderColor, tableBorderDeleteColor, tableBorderRadiusSize, tableBorderSelectedColor, tableCellBackgroundColor, tableCellDeleteColor, tableCellSelectedColor, tableControlsSpacing, tableHeaderCellBackgroundColor, tableInsertColumnButtonSize, tableOverflowShadowWidth, tablePadding, tableScrollbarOffset, tableTextColor, tableToolbarDeleteColor, tableToolbarSelectedColor, tableToolbarSize } from './consts';
-import { columnControlsDecoration, columnControlsLineMarker, DeleteButton, floatingColumnControls, HeaderButton, HeaderButtonDanger, HeaderButtonHover, hoveredCell, hoveredDeleteButton, hoveredWarningCell, insertColumnButtonWrapper, insertLine, InsertMarker, insertRowButtonWrapper, OverflowShadow, resizeHandle } from './ui-styles';
+import { columnControlsDecoration, columnControlsLineMarker, DeleteButton, floatingColumnControls, HeaderButton, HeaderButtonDanger, HeaderButtonHover, hoveredCell, hoveredDeleteButton, hoveredWarningCell, insertColumnButtonWrapper, insertLine, InsertMarker, insertRowButtonWrapper, OverflowShadow, resizeHandle, rowControlsWrapperDotStyle } from './ui-styles';
 const cornerControlHeight = tableToolbarSize + 1;
 
 /*
@@ -487,6 +487,7 @@ export const tableStyles = props => {
     ${breakoutWidthStyling()}
 
     ${columnControlsDecoration(props)};
+    ${rowControlsWrapperDotStyle(props)};
 
     /* Corner controls */
     .${ClassName.CORNER_CONTROLS} {
@@ -730,10 +731,6 @@ export const tableStyles = props => {
         margin-top: 0;
       }
 
-      .${ClassName.COLUMN_CONTROLS_DECORATIONS_WITH_DRAG} + * {
-        margin-top: 0;
-      }
-
       /*
        * Headings have a top margin by default, but we don't want this on the
        * first heading within table header cells.

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

@@ -0,0 +1,2 @@
+export { DragHandleIcon } from './DragHandleIcon';
+export { DragInMotionIcon } from './DragInMotionIcon';

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

@@ -291,26 +291,48 @@ export const floatingColumnControls = props => {
     .${ClassName.COLUMN_DROP_TARGET_CONTROLS} {
       box-sizing: border-box;
       position: absolute;
+      top: 0;
 
       .${ClassName.COLUMN_CONTROLS_INNER} {
         display: flex;
         flex-direction: row;
       }
     }
+
+    .${ClassName.COLUMN_CONTROLS_WITH_DRAG} {
+      box-sizing: border-box;
+
+      .${ClassName.COLUMN_CONTROLS_INNER} {
+        display: grid;
+        justify-items: center;
+      }
+    }
   `;
 };
-export const columnControlsDecoration = props => {
+export const rowControlsWrapperDotStyle = props => {
   if (getBooleanFF('platform.editor.table.drag-and-drop')) {
     return css`
-      .${ClassName.COLUMN_CONTROLS_DECORATIONS_WITH_DRAG} {
+      div.${ClassName.WITH_CONTROLS}>.${ClassName.ROW_CONTROLS_WRAPPER}::after {
+        display: none;
+      }
+    `;
+  } else {
+    return css`
+      div.${ClassName.WITH_CONTROLS}>.${ClassName.ROW_CONTROLS_WRAPPER}::after {
+        content: ' ';
+        background-color: ${tableBorderColor(props)};
         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%);
+        height: ${lineMarkerSize}px;
+        width: ${lineMarkerSize}px;
+        border-radius: 50%;
+        pointer-events: none;
+        top: -${tableToolbarSize + tableCellBorderWidth}px;
+        right: -1px;
       }
     `;
   }
+};
+export const columnControlsDecoration = props => {
   if (getBooleanFF('platform.editor.table.column-controls-styles-updated')) {
     return css`
       .${ClassName.COLUMN_CONTROLS_DECORATIONS} {
@@ -355,18 +377,6 @@ export const columnControlsDecoration = props => {
       // floating dot for adding column button - overriding style on last column to avoid scroll
       ${getFloatingDotOverrides(props)}
 
-      div.${ClassName.WITH_CONTROLS}>.${ClassName.ROW_CONTROLS_WRAPPER}::after {
-        content: ' ';
-        background-color: ${tableBorderColor(props)};
-        position: absolute;
-        height: ${lineMarkerSize}px;
-        width: ${lineMarkerSize}px;
-        border-radius: 50%;
-        pointer-events: none;
-        top: -${tableToolbarSize + tableCellBorderWidth}px;
-        right: -1px;
-      }
-
       .${ClassName.WITH_CONTROLS} .${ClassName.COLUMN_CONTROLS_DECORATIONS} {
         display: block;
       }
@@ -470,18 +480,6 @@ export const columnControlsDecoration = props => {
       // floating dot for adding column button - overriding style on last column to avoid scroll
       ${getFloatingDotOverrides(props)}
 
-      div.${ClassName.WITH_CONTROLS}>.${ClassName.ROW_CONTROLS_WRAPPER}::after {
-        content: ' ';
-        background-color: ${tableBorderColor(props)};
-        position: absolute;
-        height: ${lineMarkerSize}px;
-        width: ${lineMarkerSize}px;
-        border-radius: 50%;
-        pointer-events: none;
-        top: -${tableToolbarSize + tableCellBorderWidth}px;
-        right: -1px;
-      }
-
       .${ClassName.WITH_CONTROLS} .${ClassName.COLUMN_CONTROLS_DECORATIONS} {
         display: block;
       }

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

@@ -11,7 +11,6 @@ import { findTable, getCellsInRow, getSelectionRect } from '@atlaskit/editor-tab
 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);
@@ -130,30 +129,10 @@ export const createColumnSelectedDecoration = tr => {
     });
   });
 };
-export const createColumnControlsDecoration = (selection, hoverLocation) => {
-  // todo: issue here where table may not be selected yet
+export const createColumnControlsDecoration = selection => {
   const cells = getCellsInRow(0)(selection) || [];
-  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_WITH_DRAG);
-      ReactDOM.render( /*#__PURE__*/createElement(DragHandle, {
-        tableLocalId: table.node.attrs.localId,
-        direction: 'column',
-        indexes: [colIndex]
-      }), element);
-      return element;
-    }, {
-      key: `${TableDecorations.COLUMN_CONTROLS_DECORATIONS}_${colIndex}`,
-      // this decoration should be the first one, even before gap cursor.
-      side: -100,
-      destroy: node => {
-        ReactDOM.unmountComponentAtNode(node);
-      }
-    })];
+  if (getBooleanFF('platform.editor.table.drag-and-drop')) {
+    return [];
   } else {
     let index = 0;
     return cells.map(cell => {

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

@@ -9,7 +9,6 @@ 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);

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, isColumnDragControlsDecorations, isRowDragControlsButton, isRowControlsButton, getColumnOrRowIndex, getMousePositionHorizontalRelativeByElement, getMousePositionVerticalRelativeByElement, updateResizeHandles, isResizeHandleDecoration, hasResizeHandler } from './dom';
+export { isCell, isCornerButton, isInsertRowButton, isColumnControlsDecorations, isTableControlsButton, isTableContainerOrWrapper, 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/nodeviews/TableComponent.js

@@ -489,22 +489,23 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,
         stickyHeader: this.state.stickyHeader
       }));
-      var colControls = /*#__PURE__*/React.createElement("div", {
-        className: ClassName.COLUMN_CONTROLS_WRAPPER
-      }, /*#__PURE__*/React.createElement(TableFloatingColumnControls, {
+      var colControls = /*#__PURE__*/React.createElement(TableFloatingColumnControls, {
         editorView: view,
         tableRef: tableRef,
+        getNode: getNode,
         tableActive: tableActive,
         hoveredRows: hoveredRows,
+        hoveredCell: hoveredCell,
+        isResizing: isResizing,
         ordering: ordering,
         hasHeaderRow: hasHeaderRow
-        // pass `selection` and `tableHeight` to control re-render
+        // pass `selection` to control re-render
         ,
         selection: view.state.selection,
         headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,
         stickyHeader: this.state.stickyHeader,
         getEditorFeatureFlags: this.props.getEditorFeatureFlags
-      }));
+      });
       var shadowPadding = allowControls && tableActive ? -tableToolbarSize : tableMarginSides;
       var shadowStyle = memoizeOne(function (visible) {
         return {

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

@@ -2,6 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { pluginKey as tablePluginKey } from '../plugin-key';
 import { pluginKey as tableWidthPluginKey } from '../table-width';
 import { buildColumnControlsDecorations, maybeUpdateColumnControlsSelectedDecoration } from './utils';
@@ -15,8 +16,8 @@ export var handleDocOrSelectionChanged = function handleDocOrSelectionChanged(tr
   var wasResizing = (_tableWidthPluginKey$2 = tableWidthPluginKey.getState(oldState)) === null || _tableWidthPluginKey$2 === void 0 ? void 0 : _tableWidthPluginKey$2.resizing;
   var changedResizing = isResizing !== wasResizing;
 
-  // Remove column controls when resizing
-  if (isResizing) {
+  // Remove column controls when resizing and don't add column decoration controls when DnD enabled
+  if (isResizing || getBooleanFF('platform.editor.table.drag-and-drop')) {
     return DecorationSet.empty;
   } 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({

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

@@ -24,7 +24,6 @@ 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);
@@ -34,7 +33,7 @@ var maybeUpdateColumnControlsDecoration = function maybeUpdateColumnControlsDeco
   if (!table && (meta === null || meta === void 0 ? void 0 : meta.type) !== 'HOVER_CELL') {
     return decorationSet;
   }
-  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);
+  return updateDecorations(tr.doc, decorationSet, createColumnControlsDecoration(tr.selection), TableDecorations.COLUMN_CONTROLS_DECORATIONS);
 };
 
 // @see: https://product-fabric.atlassian.net/browse/ED-7304

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

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

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

@@ -69,7 +69,8 @@ export var createPlugin = function createPlugin(dispatch, eventDispatcher) {
             }
             var sourceType = data.sourceType,
               sourceIndexes = data.sourceIndexes,
-              targetAdjustedIndex = data.targetAdjustedIndex;
+              targetAdjustedIndex = data.targetAdjustedIndex,
+              direction = data.direction;
 
             // If the drop target index contains merged cells then we should not allow the drop to occur.
             var hasMergedCells = sourceType === 'table-row' ? hasMergedCellsInRow : hasMergedCellsInColumn;
@@ -79,7 +80,7 @@ export var createPlugin = function createPlugin(dispatch, eventDispatcher) {
             }
             var _sourceIndexes = _slicedToArray(sourceIndexes, 1),
               sourceIndex = _sourceIndexes[0];
-            moveSource(sourceType, sourceIndex, targetAdjustedIndex)(editorView.state, editorView.dispatch);
+            moveSource(sourceType, sourceIndex, targetAdjustedIndex + (direction === -1 ? 0 : -1))(editorView.state, editorView.dispatch);
           }
         })
       };

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

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

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

@@ -80,7 +80,7 @@ export var TableCssClassName = _objectSpread(_objectSpread({}, TableSharedCssCla
   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"),
+  COLUMN_CONTROLS_WITH_DRAG: "".concat(tablePrefixSelector, "-column-controls-with-drag"),
   ROW_CONTROLS_WITH_DRAG: "".concat(tablePrefixSelector, "-row-controls-with-drag"),
   DRAG_HANDLE_BUTTON_CONTAINER: "".concat(tablePrefixSelector, "-drag-handle-button-container"),
   /** Other classes */