@atlaskit/editor-plugin-table 5.3.7 → 5.3.8

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

@@ -231,12 +231,6 @@ Object.defineProperty(exports, "isColumnDeleteButtonVisible", {
     return _columnControls.isColumnDeleteButtonVisible;
   }
 });
-Object.defineProperty(exports, "isColumnDragControlsDecorations", {
-  enumerable: true,
-  get: function get() {
-    return _dom.isColumnDragControlsDecorations;
-  }
-});
 Object.defineProperty(exports, "isCornerButton", {
   enumerable: true,
   get: function get() {

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

@@ -494,13 +494,13 @@ class TableComponent extends React.Component {
       headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,
       stickyHeader: this.state.stickyHeader
     }));
-    const colControls = /*#__PURE__*/React.createElement("div", {
-      className: ClassName.COLUMN_CONTROLS_WRAPPER
-    }, /*#__PURE__*/React.createElement(TableFloatingColumnControls, {
+    const colControls = /*#__PURE__*/React.createElement(TableFloatingColumnControls, {
       editorView: view,
       tableRef: tableRef,
       tableActive: tableActive,
       hoveredRows: hoveredRows,
+      hoveredCell: hoveredCell,
+      isResizing: isResizing,
       ordering: ordering,
       hasHeaderRow: hasHeaderRow
       // pass `selection` and `tableHeight` to control re-render
@@ -509,7 +509,7 @@ class TableComponent extends React.Component {
       headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,
       stickyHeader: this.state.stickyHeader,
       getEditorFeatureFlags: this.props.getEditorFeatureFlags
-    }));
+    });
     const shadowPadding = allowControls && tableActive ? -tableToolbarSize : tableMarginSides;
     const shadowStyle = memoizeOne(visible => ({
       visibility: visible ? 'visible' : 'hidden'

package/dist/es2019/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';
@@ -13,8 +14,8 @@ export const handleDocOrSelectionChanged = (tr, decorationSet, oldState, newStat
   const wasResizing = (_tableWidthPluginKey$2 = tableWidthPluginKey.getState(oldState)) === null || _tableWidthPluginKey$2 === void 0 ? void 0 : _tableWidthPluginKey$2.resizing;
   const 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/es2019/plugins/table/pm-plugins/decorations/utils/column-controls.js

@@ -25,7 +25,6 @@ const maybeUpdateColumnControlsDecoration = ({
   decorationSet,
   tr
 }) => {
-  var _meta$data;
   const table = findTable(tr.selection);
   const meta = tr.getMeta(tablePluginKey);
 
@@ -33,7 +32,7 @@ const maybeUpdateColumnControlsDecoration = ({
   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 ? 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/es2019/plugins/table/types.js

@@ -78,7 +78,7 @@ export const TableCssClassName = {
   CORNER_CONTROLS_INSERT_COLUMN_MARKER: `${tablePrefixSelector}-corner-controls__insert-column-marker`,
   CONTROLS_CORNER_BUTTON: `${tablePrefixSelector}-corner-button`,
   /** Controls with drag handle */
-  COLUMN_CONTROLS_DECORATIONS_WITH_DRAG: `${tablePrefixSelector}-column-controls-decoration-with-drag`,
+  COLUMN_CONTROLS_WITH_DRAG: `${tablePrefixSelector}-column-controls-with-drag`,
   ROW_CONTROLS_WITH_DRAG: `${tablePrefixSelector}-row-controls-with-drag`,
   DRAG_HANDLE_BUTTON_CONTAINER: `${tablePrefixSelector}-drag-handle-button-container`,
   /** Other classes */

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

@@ -0,0 +1,60 @@
+import React, { useMemo } from 'react';
+import { TableCssClassName as ClassName } from '../../../types';
+import { getColumnsWidths, getRowHeights } from '../../../utils';
+import { DragHandle } from '../../DragHandle';
+export const ColumnControls = ({
+  editorView,
+  tableActive,
+  tableRef,
+  hoveredCell,
+  isResizing,
+  tableHeight,
+  stickyTop,
+  localId
+}) => {
+  var _rowHeights$;
+  const rowHeights = useMemo(() => {
+    // NOTE: we don't care so much as to what tableHeight is, we only care that it changed and is a sane value.
+    if (tableRef && !!tableHeight) {
+      return getRowHeights(tableRef);
+    }
+    return [0];
+  }, [tableRef, tableHeight]);
+  if (!tableRef) {
+    return null;
+  }
+  const firstRow = tableRef.querySelector('tr');
+  const hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
+  const marginTop = hasHeaderRow && stickyTop !== undefined ? (_rowHeights$ = rowHeights === null || rowHeights === void 0 ? void 0 : rowHeights[0]) !== null && _rowHeights$ !== void 0 ? _rowHeights$ : 0 : 0;
+  const colWidths = getColumnsWidths(editorView);
+  const widths = colWidths.map(width => width ? `${width - 1}px` : '0px').join(' ');
+  const 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: [],
+    onClick: event => onClick(colIndex, event),
+    onMouseOver: onMouseOver,
+    onMouseOut: onMouseOut,
+    tableLocalId: localId || ''
+  }))));
+};
+export default ColumnControls;

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

@@ -1,11 +1,16 @@
 import React, { useEffect, useMemo, useState } from 'react';
+import ReactDOM from 'react-dom';
 import { findTable } from '@atlaskit/editor-tables';
+import { TableCssClassName as ClassName } from '../../types';
+import { ColumnControls } from './ColumnControls';
 import { ColumnDropTargets } from './ColumnDropTargets';
 export const TableFloatingColumnControls = ({
   editorView,
   tableRef,
   tableActive,
   hasHeaderRow,
+  hoveredCell,
+  isResizing,
   stickyHeader,
   selection
 }) => {
@@ -46,15 +51,27 @@ export const TableFloatingColumnControls = ({
     return null;
   }
   const stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
-  return /*#__PURE__*/React.createElement("div", {
+  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
+  }, /*#__PURE__*/React.createElement("div", {
     onMouseDown: e => e.preventDefault(),
     "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,
     tableHeight: tableRect.height,
     localId: selectedLocalId
-  }));
+  }), /*#__PURE__*/React.createElement(ColumnDropTargets, {
+    editorView: editorView,
+    tableRef: tableRef,
+    stickyTop: tableActive ? stickyTop : undefined,
+    tableHeight: tableRect.height,
+    localId: selectedLocalId
+  }))), 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/ui-styles.js

@@ -291,26 +291,49 @@ export const floatingColumnControls = props => {
     .${ClassName.COLUMN_DROP_TARGET_CONTROLS} {
       box-sizing: border-box;
       position: absolute;
+      top: 0;
+      z-index: -1;
 
       .${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 +378,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 +481,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,13 +489,13 @@ 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,
         tableActive: tableActive,
         hoveredRows: hoveredRows,
+        hoveredCell: hoveredCell,
+        isResizing: isResizing,
         ordering: ordering,
         hasHeaderRow: hasHeaderRow
         // pass `selection` and `tableHeight` to control re-render
@@ -504,7 +504,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         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/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 */

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

@@ -0,0 +1,63 @@
+import React, { useMemo } from 'react';
+import { TableCssClassName as ClassName } from '../../../types';
+import { getColumnsWidths, getRowHeights } from '../../../utils';
+import { DragHandle } from '../../DragHandle';
+export var ColumnControls = function ColumnControls(_ref) {
+  var _rowHeights$;
+  var editorView = _ref.editorView,
+    tableActive = _ref.tableActive,
+    tableRef = _ref.tableRef,
+    hoveredCell = _ref.hoveredCell,
+    isResizing = _ref.isResizing,
+    tableHeight = _ref.tableHeight,
+    stickyTop = _ref.stickyTop,
+    localId = _ref.localId;
+  var rowHeights = useMemo(function () {
+    // NOTE: we don't care so much as to what tableHeight is, we only care that it changed and is a sane value.
+    if (tableRef && !!tableHeight) {
+      return getRowHeights(tableRef);
+    }
+    return [0];
+  }, [tableRef, tableHeight]);
+  if (!tableRef) {
+    return null;
+  }
+  var firstRow = tableRef.querySelector('tr');
+  var hasHeaderRow = firstRow ? firstRow.getAttribute('data-header-row') : false;
+  var marginTop = hasHeaderRow && stickyTop !== undefined ? (_rowHeights$ = rowHeights === null || rowHeights === void 0 ? void 0 : rowHeights[0]) !== null && _rowHeights$ !== void 0 ? _rowHeights$ : 0 : 0;
+  var colWidths = getColumnsWidths(editorView);
+  var widths = colWidths.map(function (width) {
+    return width ? "".concat(width - 1, "px") : '0px';
+  }).join(' ');
+  var colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
+  var _onClick = function onClick(index, event) {};
+  var onMouseOver = function onMouseOver() {};
+  var onMouseOut = function 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: marginTop
+    }
+  }, tableActive && !isResizing && Number.isFinite(colIndex) && /*#__PURE__*/React.createElement("div", {
+    style: {
+      gridColumn: "".concat(colIndex + 1, " / span 1"),
+      marginTop: "-15px"
+    },
+    "data-column-control-index": colIndex,
+    "data-testid": "table-floating-column-control"
+  }, /*#__PURE__*/React.createElement(DragHandle, {
+    direction: "column",
+    indexes: [],
+    onClick: function onClick(event) {
+      return _onClick(colIndex, event);
+    },
+    onMouseOver: onMouseOver,
+    onMouseOut: onMouseOut,
+    tableLocalId: localId || ''
+  }))));
+};
+export default ColumnControls;

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

@@ -3,13 +3,18 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import React, { useEffect, useMemo, useState } from 'react';
+import ReactDOM from 'react-dom';
 import { findTable } from '@atlaskit/editor-tables';
+import { TableCssClassName as ClassName } from '../../types';
+import { ColumnControls } from './ColumnControls';
 import { ColumnDropTargets } from './ColumnDropTargets';
 export var TableFloatingColumnControls = function TableFloatingColumnControls(_ref) {
   var editorView = _ref.editorView,
     tableRef = _ref.tableRef,
     tableActive = _ref.tableActive,
     hasHeaderRow = _ref.hasHeaderRow,
+    hoveredCell = _ref.hoveredCell,
+    isResizing = _ref.isResizing,
     stickyHeader = _ref.stickyHeader,
     selection = _ref.selection;
   var _useState = useState({
@@ -64,17 +69,29 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
     return null;
   }
   var stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
-  return /*#__PURE__*/React.createElement("div", {
+  var 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
+  }, /*#__PURE__*/React.createElement("div", {
     onMouseDown: function onMouseDown(e) {
       return e.preventDefault();
     },
     "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,
     tableHeight: tableRect.height,
     localId: selectedLocalId
-  }));
+  }), /*#__PURE__*/React.createElement(ColumnDropTargets, {
+    editorView: editorView,
+    tableRef: tableRef,
+    stickyTop: tableActive ? stickyTop : undefined,
+    tableHeight: tableRect.height,
+    localId: selectedLocalId
+  }))), mountTo);
 };
 export default TableFloatingColumnControls;