@atlaskit/editor-plugin-table 5.3.8 → 5.3.9

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

@@ -4,13 +4,15 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { 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 var TableFloatingColumnControls = function TableFloatingColumnControls(_ref) {
   var editorView = _ref.editorView,
     tableRef = _ref.tableRef,
+    getNode = _ref.getNode,
     tableActive = _ref.tableActive,
     hasHeaderRow = _ref.hasHeaderRow,
     hoveredCell = _ref.hoveredCell,
@@ -24,6 +26,12 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
     _useState2 = _slicedToArray(_useState, 2),
     tableRect = _useState2[0],
     setTableRect = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    hasDropTargets = _useState4[0],
+    setHasDropTargets = _useState4[1];
+  var node = getNode();
+  var currentNodeLocalId = node === null || node === void 0 ? void 0 : node.attrs.localId;
   useEffect(function () {
     var _window;
     if (tableRef && (_window = window) !== null && _window !== void 0 && _window.ResizeObserver) {
@@ -55,26 +63,41 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
       };
     }
   }, [tableRef]);
-  var selectedLocalId = useMemo(function () {
-    if (!selection) {
-      return undefined;
-    }
-    var tableNode = findTable(selection);
-    if (!tableNode) {
-      return undefined;
+  useEffect(function () {
+    return monitorForElements({
+      canMonitor: function canMonitor(_ref2) {
+        var source = _ref2.source;
+        var _ref3 = source.data,
+          type = _ref3.type,
+          localId = _ref3.localId,
+          indexes = _ref3.indexes;
+        return type === 'table-column' && !!(indexes !== null && indexes !== void 0 && indexes.length) && localId === currentNodeLocalId;
+      },
+      onDragStart: function onDragStart() {
+        setHasDropTargets(true);
+      },
+      onDrop: function onDrop() {
+        setHasDropTargets(false);
+      }
+    });
+  }, [editorView, currentNodeLocalId]);
+  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 && !!tableRect.height) {
+      return getRowHeights(tableRef);
     }
-    return tableNode.node.attrs.localId;
-  }, [selection]);
+    return [0];
+  }, [tableRef, tableRect.height]);
   if (!tableRef) {
     return null;
   }
+  var colWidths = getColumnsWidths(editorView);
   var stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
   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();
+    className: ClassName.COLUMN_CONTROLS_WRAPPER,
+    style: {
+      pointerEvents: 'none'
     },
     "data-testid": "table-floating-column-controls-wrapper"
   }, /*#__PURE__*/React.createElement(ColumnControls, {
@@ -84,14 +107,16 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
     isResizing: isResizing,
     tableActive: tableActive,
     stickyTop: tableActive ? stickyTop : undefined,
-    tableHeight: tableRect.height,
-    localId: selectedLocalId
-  }), /*#__PURE__*/React.createElement(ColumnDropTargets, {
-    editorView: editorView,
+    localId: currentNodeLocalId,
+    rowHeights: rowHeights,
+    colWidths: colWidths
+  }), hasDropTargets && /*#__PURE__*/React.createElement(ColumnDropTargets, {
     tableRef: tableRef,
     stickyTop: tableActive ? stickyTop : undefined,
     tableHeight: tableRect.height,
-    localId: selectedLocalId
-  }))), mountTo);
+    localId: currentNodeLocalId,
+    rowHeights: rowHeights,
+    colWidths: colWidths
+  })), mountTo);
 };
 export default TableFloatingColumnControls;

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

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

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

@@ -64,7 +64,7 @@ var getFloatingDotOverrides = function getFloatingDotOverrides(props) {
   return getBooleanFF('platform.editor.custom-table-width') ? css(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["\n        tr\n          th:last-child\n          .", "::before,\n          tr\n          td:last-child\n          .", "::before {\n          content: '';\n          background-color: ", ";\n          position: absolute;\n          height: ", "px;\n          width: ", "px;\n          border-radius: 50%;\n          pointer-events: none;\n          top: ", ";\n          right: 0px;\n        }\n      "])), ClassName.COLUMN_CONTROLS_DECORATIONS, ClassName.COLUMN_CONTROLS_DECORATIONS, tableBorderColor(props), lineMarkerSize, lineMarkerSize, "var(--ds-space-025, 2px)") : '';
 };
 export var floatingColumnControls = function floatingColumnControls(props) {
-  return css(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n    .", " {\n      box-sizing: border-box;\n      position: absolute;\n      top: 0;\n      z-index: -1;\n\n      .", " {\n        display: flex;\n        flex-direction: row;\n      }\n    }\n\n    .", " {\n      box-sizing: border-box;\n\n      .", " {\n        display: grid;\n        justify-items: center;\n      }\n    }\n  "])), ClassName.COLUMN_DROP_TARGET_CONTROLS, ClassName.COLUMN_CONTROLS_INNER, ClassName.COLUMN_CONTROLS_WITH_DRAG, ClassName.COLUMN_CONTROLS_INNER);
+  return css(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n    .", " {\n      box-sizing: border-box;\n      position: absolute;\n      top: 0;\n\n      .", " {\n        display: flex;\n        flex-direction: row;\n      }\n    }\n\n    .", " {\n      box-sizing: border-box;\n\n      .", " {\n        display: grid;\n        justify-items: center;\n      }\n    }\n  "])), ClassName.COLUMN_DROP_TARGET_CONTROLS, ClassName.COLUMN_CONTROLS_INNER, ClassName.COLUMN_CONTROLS_WITH_DRAG, ClassName.COLUMN_CONTROLS_INNER);
 };
 export var rowControlsWrapperDotStyle = function rowControlsWrapperDotStyle(props) {
   if (getBooleanFF('platform.editor.table.drag-and-drop')) {

package/dist/types/plugins/table/types.d.ts

@@ -392,4 +392,5 @@ export interface DraggableData {
     targetIndex: number;
     targetAdjustedIndex: number;
     targetClosestEdge: Edge;
+    direction: 1 | -1;
 }

package/dist/types/plugins/table/ui/TableFloatingColumnControls/ColumnControls/index.d.ts

@@ -8,8 +8,9 @@ export interface Props {
     hoveredCell?: CellHoverCoordinates;
     isResizing?: boolean;
     stickyTop?: number;
-    tableHeight?: number;
     localId?: string;
+    rowHeights?: number[];
+    colWidths?: (number | undefined)[];
 }
 export declare const ColumnControls: React.FC<Props>;
 export default ColumnControls;

package/dist/types/plugins/table/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export interface Props {
+    index: number;
+    localId?: string;
+    width?: number;
+    height?: number;
+    marginTop?: number;
+}
+export declare const ColumnDropTarget: React.FC<Props>;

package/dist/types/plugins/table/ui/TableFloatingColumnControls/ColumnDropTargets/index.d.ts

@@ -1,11 +1,10 @@
 import React from 'react';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export interface Props {
-    editorView: EditorView;
     tableRef: HTMLTableElement;
     stickyTop?: number;
     tableHeight?: number;
     localId?: string;
+    rowHeights?: number[];
+    colWidths?: (number | undefined)[];
 }
 export declare const ColumnDropTargets: React.FC<Props>;
-export default ColumnDropTargets;

package/dist/types/plugins/table/ui/TableFloatingColumnControls/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { TableColumnOrdering } from '@atlaskit/custom-steps';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
+import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
@@ -10,6 +11,7 @@ export interface Props {
     getEditorFeatureFlags: GetEditorFeatureFlags;
     selection?: Selection;
     tableRef?: HTMLTableElement;
+    getNode: () => PmNode;
     tableActive?: boolean;
     hasHeaderRow?: boolean;
     headerRowHeight?: number;

package/dist/types/plugins/table/ui/icons/index.d.ts

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

package/dist/types-ts4.5/plugins/table/types.d.ts

@@ -392,4 +392,5 @@ export interface DraggableData {
     targetIndex: number;
     targetAdjustedIndex: number;
     targetClosestEdge: Edge;
+    direction: 1 | -1;
 }

package/dist/types-ts4.5/plugins/table/ui/TableFloatingColumnControls/ColumnControls/index.d.ts

@@ -8,8 +8,9 @@ export interface Props {
     hoveredCell?: CellHoverCoordinates;
     isResizing?: boolean;
     stickyTop?: number;
-    tableHeight?: number;
     localId?: string;
+    rowHeights?: number[];
+    colWidths?: (number | undefined)[];
 }
 export declare const ColumnControls: React.FC<Props>;
 export default ColumnControls;

package/dist/types-ts4.5/plugins/table/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export interface Props {
+    index: number;
+    localId?: string;
+    width?: number;
+    height?: number;
+    marginTop?: number;
+}
+export declare const ColumnDropTarget: React.FC<Props>;

package/dist/types-ts4.5/plugins/table/ui/TableFloatingColumnControls/ColumnDropTargets/index.d.ts

@@ -1,11 +1,10 @@
 import React from 'react';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export interface Props {
-    editorView: EditorView;
     tableRef: HTMLTableElement;
     stickyTop?: number;
     tableHeight?: number;
     localId?: string;
+    rowHeights?: number[];
+    colWidths?: (number | undefined)[];
 }
 export declare const ColumnDropTargets: React.FC<Props>;
-export default ColumnDropTargets;

package/dist/types-ts4.5/plugins/table/ui/TableFloatingColumnControls/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { TableColumnOrdering } from '@atlaskit/custom-steps';
 import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
+import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
@@ -10,6 +11,7 @@ export interface Props {
     getEditorFeatureFlags: GetEditorFeatureFlags;
     selection?: Selection;
     tableRef?: HTMLTableElement;
+    getNode: () => PmNode;
     tableActive?: boolean;
     hasHeaderRow?: boolean;
     headerRowHeight?: number;

package/dist/types-ts4.5/plugins/table/ui/icons/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "5.3.8",
+  "version": "5.3.9",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -70,6 +70,7 @@
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@atlassian/feature-flags-test-utils": "^0.1.2",
+    "@testing-library/dom": "^8.17.1",
     "@testing-library/react": "^12.1.5",
     "@testing-library/react-hooks": "^8.0.1",
     "raf-stub": "^2.0.1",

package/src/__tests__/unit/ui/TableFloatingColumnControls.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
 
+import { fireEvent } from '@testing-library/dom';
 import { render, screen } from '@testing-library/react';
 import { IntlProvider } from 'react-intl-next';
 
-import type { DocBuilder } from '@atlaskit/editor-common/types';
+import type { DocBuilder, Refs } from '@atlaskit/editor-common/types';
 // eslint-disable-next-line import/no-extraneous-dependencies -- Removed import for fixing circular dependencies
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
@@ -12,6 +13,7 @@ import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { selectionPlugin } from '@atlaskit/editor-plugin-selection';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import type { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { LightEditorPlugin } from '@atlaskit/editor-test-helpers/create-prosemirror-editor';
 // eslint-disable-next-line import/no-extraneous-dependencies -- Removed import for fixing circular dependencies
 import {
@@ -56,13 +58,28 @@ describe('TableFloatingColumnControls', () => {
     });
   };
 
+  const getNodeFunc = (view: EditorView, refs: Refs) => () =>
+    view.state.doc.nodeAt(refs['<node>'])!;
+
+  afterEach(async () => {
+    // cleanup any pending drags
+    fireEvent.dragEnd(window);
+    // Optional: unwind a post-drop browser bug fix
+    // tick forward a micro task to flush a post-drag bug fix
+    await 1;
+    // this will trigger the fix to be released
+    fireEvent.pointerMove(window);
+  });
+
   it('should not render floating column controls when tableRef undefined and drag and drop is not enabled', () => {
-    const { editorView } = editor(
-      doc(p('text'), table()(tr(tdEmpty, tdEmpty, tdEmpty))),
+    const { editorView, refs } = editor(
+      doc(p('text'), '{<node>}', table()(tr(tdEmpty, tdEmpty, tdEmpty))),
     );
+
     const { container } = render(
       <TableFloatingColumnControls
         editorView={editorView}
+        getNode={getNodeFunc(editorView, refs)}
         getEditorFeatureFlags={fakeGetEditorFeatureFlags}
       />,
     );
@@ -70,8 +87,8 @@ describe('TableFloatingColumnControls', () => {
   });
 
   it('should not render floating column controls when tableRef undefined and drag and drop is enabled', () => {
-    const { editorView } = editor(
-      doc(p('text'), table()(tr(tdEmpty, tdEmpty, tdEmpty))),
+    const { editorView, refs } = editor(
+      doc(p('text'), '{<node>}', table()(tr(tdEmpty, tdEmpty, tdEmpty))),
       {
         dragAndDropEnabled: true,
       },
@@ -79,16 +96,23 @@ describe('TableFloatingColumnControls', () => {
     const { container } = render(
       <TableFloatingColumnControls
         editorView={editorView}
+        getNode={getNodeFunc(editorView, refs)}
         getEditorFeatureFlags={fakeGetEditorFeatureFlags}
       />,
     );
     expect(container.innerHTML).toEqual('');
   });
 
-  // FIXME and unskip: presumably doesn't work becuase TableFloatingColumnControls are now mounted via ReactDOM.createPortal
-  it.skip('should render a drop target per column', () => {
-    const { editorView } = editor(
-      doc(p('text'), table()(tr(tdEmpty, tdEmpty, tdEmpty, tdEmpty, tdEmpty))),
+  it.todo('should not render drop target when no drag is active');
+
+  it.todo(
+    'should render a drop target per column when dragging' /*, () => {
+    const { editorView, refs } = editor(
+      doc(
+        p('text'),
+        '{<node>}',
+        table()(tr(tdEmpty, tdCursor, tdEmpty, tdEmpty, tdEmpty)),
+      ),
       {
         dragAndDropEnabled: true,
       },
@@ -98,25 +122,44 @@ describe('TableFloatingColumnControls', () => {
     render(
       <IntlProvider locale="en">
         <TableFloatingColumnControls
+          getNode={getNodeFunc(editorView, refs)}
           tableRef={ref}
           tableActive={true}
+          hoveredCell={{ colIndex: 1, rowIndex: 0}}
           editorView={editorView}
           getEditorFeatureFlags={fakeGetEditorFeatureFlags}
         />
       </IntlProvider>,
     );
 
+    screen.debug();
+
+    const dragHandle = screen.getByTestId(
+      'table-floating-column-controls-drag-handle',
+    );
+
+    fireEvent.dragStart(dragHandle);
+
+     // ticking forward an animation frame will complete the lift
+    // @ts-expect-error
+    requestAnimationFrame.step();
+
     const dropTargets = screen.getAllByTestId(
       'table-floating-column-controls-drop-target',
     );
 
     expect(dropTargets).toHaveLength(5);
-  });
+  }*/,
+  );
 
   // FIXME and unskp: presumably doesn't work becuase TableFloatingColumnControls are now mounted via ReactDOM.createPortal
   it.skip('should render a drop target per column regardless of row count', () => {
-    const { editorView } = editor(
-      doc(p('text'), table()(tr(tdEmpty), tr(tdEmpty), tr(tdEmpty))),
+    const { editorView, refs } = editor(
+      doc(
+        p('text'),
+        '{<node>}',
+        table()(tr(tdEmpty), tr(tdEmpty), tr(tdEmpty)),
+      ),
       {
         dragAndDropEnabled: true,
       },
@@ -126,6 +169,7 @@ describe('TableFloatingColumnControls', () => {
     render(
       <IntlProvider locale="en">
         <TableFloatingColumnControls
+          getNode={getNodeFunc(editorView, refs)}
           tableRef={ref}
           tableActive={true}
           editorView={editorView}
@@ -139,4 +183,6 @@ describe('TableFloatingColumnControls', () => {
     );
     expect(dropTargets).toHaveLength(1);
   });
+
+  it.todo('should remove column drop targets when dragging ends');
 });

package/src/plugins/table/nodeviews/TableComponent.tsx

@@ -439,13 +439,14 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
       <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}

package/src/plugins/table/pm-plugins/drag-and-drop/commands.ts

@@ -110,9 +110,6 @@ export const moveSource = (
       }
 
       const move = sourceType === 'table-row' ? moveRow : moveColumn;
-      return move(
-        sourceIndex,
-        targetIndex + (sourceIndex > targetIndex ? 0 : -1),
-      )(tr);
+      return move(sourceIndex, targetIndex)(tr);
     },
   );

package/src/plugins/table/pm-plugins/drag-and-drop/plugin.ts

@@ -87,7 +87,12 @@ export const createPlugin = (
               return;
             }
 
-            const { sourceType, sourceIndexes, targetAdjustedIndex } = data;
+            const {
+              sourceType,
+              sourceIndexes,
+              targetAdjustedIndex,
+              direction,
+            } = data;
 
             // If the drop target index contains merged cells then we should not allow the drop to occur.
             const hasMergedCells =
@@ -105,7 +110,7 @@ export const createPlugin = (
             moveSource(
               sourceType,
               sourceIndex,
-              targetAdjustedIndex,
+              targetAdjustedIndex + (direction === -1 ? 0 : -1),
             )(editorView.state, editorView.dispatch);
           },
         }),

package/src/plugins/table/pm-plugins/drag-and-drop/utils/monitor.ts

@@ -59,6 +59,10 @@ export const getDraggableDataFromEvent = ({
   const 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
+  const direction = sourceIndexes[0] > targetIndex ? -1 : 1;
+
   return {
     sourceType,
     sourceLocalId,
@@ -68,5 +72,6 @@ export const getDraggableDataFromEvent = ({
     targetIndex,
     targetAdjustedIndex: targetIndex + targetOffset,
     targetClosestEdge,
+    direction,
   };
 };

package/src/plugins/table/types.ts

@@ -421,4 +421,5 @@ export interface DraggableData {
   targetIndex: number;
   targetAdjustedIndex: number;
   targetClosestEdge: Edge;
+  direction: 1 | -1;
 }

package/src/plugins/table/ui/DragHandle/index.tsx

@@ -10,7 +10,7 @@ import { token } from '@atlaskit/tokens';
 
 import { TableCssClassName as ClassName } from '../../types';
 import { DragPreview } from '../DragPreview';
-import { DragHandleIcon } from '../icons/DragHandleIcon';
+import { DragHandleIcon } from '../icons';
 
 type DragHandleState = 'default' | 'selected' | 'disabled' | 'danger';
 
@@ -99,7 +99,9 @@ export const DragHandle = ({
         borderRadius: '4px',
         border: `2px solid ${token('elevation.surface', 'white')}`,
         transform: direction === 'column' ? 'none' : 'rotate(90deg)',
+        pointerEvents: 'auto',
       }}
+      data-testid="table-floating-column-controls-drag-handle"
     >
       <DragHandleIcon {...iconProps} />
       {previewContainer &&

package/src/plugins/table/ui/TableFloatingColumnControls/ColumnControls/index.tsx

@@ -1,10 +1,9 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 
 import type { CellHoverCoordinates } from '../../../types';
 import { TableCssClassName as ClassName } from '../../../types';
-import { getColumnsWidths, getRowHeights } from '../../../utils';
 import { DragHandle } from '../../DragHandle';
 
 export interface Props {
@@ -14,8 +13,9 @@ export interface Props {
   hoveredCell?: CellHoverCoordinates;
   isResizing?: boolean;
   stickyTop?: number;
-  tableHeight?: number;
   localId?: string;
+  rowHeights?: number[];
+  colWidths?: (number | undefined)[];
 }
 
 export const ColumnControls: React.FC<Props> = ({
@@ -24,18 +24,11 @@ export const ColumnControls: React.FC<Props> = ({
   tableRef,
   hoveredCell,
   isResizing,
-  tableHeight,
   stickyTop,
   localId,
+  rowHeights,
+  colWidths,
 }) => {
-  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;
   }
@@ -48,10 +41,9 @@ export const ColumnControls: React.FC<Props> = ({
   const marginTop =
     hasHeaderRow && stickyTop !== undefined ? rowHeights?.[0] ?? 0 : 0;
 
-  const colWidths = getColumnsWidths(editorView);
-  const widths = colWidths
-    .map((width) => (width ? `${width - 1}px` : '0px'))
-    .join(' ');
+  const widths =
+    colWidths?.map((width) => (width ? `${width - 1}px` : '0px')).join(' ') ??
+    '0px';
 
   const colIndex = hoveredCell?.colIndex;
 
@@ -84,7 +76,7 @@ export const ColumnControls: React.FC<Props> = ({
           >
             <DragHandle
               direction="column"
-              indexes={[]}
+              indexes={[colIndex!]}
               onClick={(event) => onClick(colIndex as number, event)}
               onMouseOver={onMouseOver}
               onMouseOut={onMouseOut}

package/src/plugins/table/ui/TableFloatingColumnControls/ColumnDropTargets/ColumnDropTarget.tsx

@@ -0,0 +1,74 @@
+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';
+
+import type { DraggableSourceData } from '../../../types';
+
+export interface Props {
+  index: number;
+  localId?: string;
+  width?: number;
+  height?: number;
+  marginTop?: number;
+}
+
+export const ColumnDropTarget: React.FC<Props> = ({
+  index,
+  localId,
+  width,
+  height,
+  marginTop,
+}) => {
+  const dropTargetRef = useRef<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    if (!dropTargetRef.current) {
+      return;
+    }
+
+    return dropTargetForElements({
+      element: dropTargetRef.current,
+      canDrop({ source }) {
+        const data = source.data as DraggableSourceData;
+        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?.length &&
+          data.indexes?.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 (
+    <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"
+    />
+  );
+};