@atlaskit/editor-plugin-table 7.5.4 → 7.5.6

package/dist/esm/ui/FloatingDragMenu/index.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { akEditorFloatingDialogZIndex, akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getPluginState } from '../../pm-plugins/plugin-factory';
 import { dragMenuDropdownWidth, tablePopupMenuFitHeight } from '../consts';
 import DragMenu from './DragMenu';
 var FloatingDragMenu = function FloatingDragMenu(_ref) {
@@ -17,8 +18,7 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     getEditorContainerWidth = _ref.getEditorContainerWidth,
     editorAnalyticsAPI = _ref.editorAnalyticsAPI,
     stickyHeaders = _ref.stickyHeaders,
-    pluginConfig = _ref.pluginConfig,
-    getEditorFeatureFlags = _ref.getEditorFeatureFlags;
+    pluginConfig = _ref.pluginConfig;
   if (!isOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
     return null;
   }
@@ -28,9 +28,9 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
   if (!targetHandleRef || !(editorView.state.selection instanceof CellSelection)) {
     return null;
   }
-  var _getEditorFeatureFlag = getEditorFeatureFlags(),
-    _getEditorFeatureFlag2 = _getEditorFeatureFlag.tablePreserveWidth,
-    tablePreserveWidth = _getEditorFeatureFlag2 === void 0 ? false : _getEditorFeatureFlag2;
+  var _getPluginState = getPluginState(editorView.state),
+    _getPluginState$isTab = _getPluginState.isTableScalingEnabled,
+    isTableScalingEnabled = _getPluginState$isTab === void 0 ? false : _getPluginState$isTab;
   return /*#__PURE__*/React.createElement(Popup, {
     alignX: direction === 'row' ? 'right' : undefined,
     alignY: direction === 'row' ? 'start' : undefined,
@@ -64,7 +64,7 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     mountPoint: mountPoint,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
-    tablePreserveWidth: tablePreserveWidth
+    isTableScalingEnabled: isTableScalingEnabled
   }));
 };
 FloatingDragMenu.displayName = 'FloatingDragMenu';

package/dist/esm/ui/FloatingInsertButton/index.js

@@ -19,6 +19,7 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../commands-with-analytics';
+import { getPluginState } from '../../pm-plugins/plugin-factory';
 import { TableCssClassName as ClassName } from '../../types';
 import { checkIfNumberColumnEnabled } from '../../utils';
 import getPopupOptions from './getPopupOptions';
@@ -185,17 +186,15 @@ export var FloatingInsertButton = /*#__PURE__*/function (_React$Component) {
       var _this$props4 = this.props,
         editorView = _this$props4.editorView,
         insertColumnButtonIndex = _this$props4.insertColumnButtonIndex,
-        editorAnalyticsAPI = _this$props4.editorAnalyticsAPI,
-        getEditorContainerWidth = _this$props4.getEditorContainerWidth;
+        editorAnalyticsAPI = _this$props4.editorAnalyticsAPI;
       if (typeof insertColumnButtonIndex !== 'undefined') {
-        var _this$props$getEditor, _this$props5;
         event.preventDefault();
-        var _ref = ((_this$props$getEditor = (_this$props5 = this.props).getEditorFeatureFlags) === null || _this$props$getEditor === void 0 ? void 0 : _this$props$getEditor.call(_this$props5)) || {},
-          _ref$tablePreserveWid = _ref.tablePreserveWidth,
-          tablePreserveWidth = _ref$tablePreserveWid === void 0 ? false : _ref$tablePreserveWid;
+        var _getPluginState = getPluginState(editorView.state),
+          _getPluginState$isTab = _getPluginState.isTableScalingEnabled,
+          isTableScalingEnabled = _getPluginState$isTab === void 0 ? false : _getPluginState$isTab;
         var state = editorView.state,
           dispatch = editorView.dispatch;
-        insertColumnWithAnalytics(getEditorContainerWidth, editorAnalyticsAPI, tablePreserveWidth)(INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
+        insertColumnWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled)(INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
       }
     }
   }]);

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

@@ -1,7 +1,4 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-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, useRef, useState } from 'react';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { TableCssClassName as ClassName } from '../../types';
@@ -22,54 +19,17 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
     isTableHovered = _ref.isTableHovered,
     tableContainerWidth = _ref.tableContainerWidth,
     isNumberColumnEnabled = _ref.isNumberColumnEnabled,
-    getScrollOffset = _ref.getScrollOffset;
-  var _useState = useState({
-      width: 0,
-      height: 0
-    }),
+    getScrollOffset = _ref.getScrollOffset,
+    tableWrapperHeight = _ref.tableWrapperHeight;
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    tableRect = _useState2[0],
-    setTableRect = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isDragging = _useState4[0],
-    setIsDragging = _useState4[1];
+    isDragging = _useState2[0],
+    setIsDragging = _useState2[1];
   var containerRef = useRef(null);
   var node = getNode();
   var currentNodeLocalId = node === null || node === void 0 ? void 0 : node.attrs.localId;
   var hasHeaderColumn = containsHeaderColumn(node);
   var stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
-  useEffect(function () {
-    var _window;
-    if (tableRef && (_window = window) !== null && _window !== void 0 && _window.ResizeObserver) {
-      var resizeObserver = new ResizeObserver(function (entries) {
-        var _iterator = _createForOfIteratorHelper(entries),
-          _step;
-        try {
-          var _loop = function _loop() {
-            var entry = _step.value;
-            setTableRect(function (prev) {
-              if (prev.width !== entry.contentRect.width || prev.height !== entry.contentRect.height) {
-                return entry.contentRect;
-              }
-              return prev;
-            });
-          };
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            _loop();
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      });
-      resizeObserver.observe(tableRef);
-      return function () {
-        resizeObserver.disconnect();
-      };
-    }
-  }, [tableRef]);
   useEffect(function () {
     return monitorForElements({
       canMonitor: function canMonitor(_ref2) {
@@ -90,11 +50,11 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
   }, [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) {
+    if (tableRef && !!tableWrapperHeight) {
       return getRowHeights(tableRef);
     }
     return [0];
-  }, [tableRef, tableRect.height]);
+  }, [tableRef, tableWrapperHeight]);
   if (!tableRef || !tableActive || isResizing) {
     return null;
   }
@@ -131,7 +91,7 @@ export var TableFloatingColumnControls = function TableFloatingColumnControls(_r
   }), isDragging && /*#__PURE__*/React.createElement(ColumnDropTargets, {
     tableRef: tableRef,
     isHeaderSticky: (stickyHeader === null || stickyHeader === void 0 ? void 0 : stickyHeader.sticky) && hasHeaderRow,
-    tableHeight: tableRect.height,
+    tableHeight: tableWrapperHeight,
     localId: currentNodeLocalId,
     colWidths: colWidths,
     getScrollOffset: getScrollOffset

package/dist/esm/ui/TableFloatingControls/index.js

@@ -1,235 +1,124 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-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; }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-import React, { Component } from 'react';
+import React, { useCallback } from 'react';
 import { browser } from '@atlaskit/editor-common/utils';
 import { hoverCell, hoverRows, selectRow, selectRows } from '../../commands';
 import { TableCssClassName as ClassName } from '../../types';
-import { isSelectionUpdated } from '../../utils';
 import { CornerControls, DragCornerControls } from './CornerControls';
 import NumberColumn from './NumberColumn';
 import { DragControls, RowControls } from './RowControls';
-var TableFloatingControls = /*#__PURE__*/function (_Component) {
-  _inherits(TableFloatingControls, _Component);
-  var _super = _createSuper(TableFloatingControls);
-  function TableFloatingControls(props) {
-    var _this;
-    _classCallCheck(this, TableFloatingControls);
-    _this = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this), "selectRow", function (row, expand) {
-      var editorView = _this.props.editorView;
-      var state = editorView.state,
-        dispatch = editorView.dispatch;
-      // fix for issue ED-4665
-      if (browser.ie_version === 11) {
-        editorView.dom.blur();
-      }
-      selectRow(row, expand)(state, dispatch);
-    });
-    _defineProperty(_assertThisInitialized(_this), "selectRows", function (rowIndexes) {
-      var editorView = _this.props.editorView;
-      var state = editorView.state,
-        dispatch = editorView.dispatch;
-      // fix for issue ED-4665
-      if (browser.ie_version === 11) {
-        editorView.dom.blur();
-      }
-      selectRows(rowIndexes)(state, dispatch);
-    });
-    _defineProperty(_assertThisInitialized(_this), "hoverRows", function (rows, danger) {
-      var _this$props$editorVie = _this.props.editorView,
-        state = _this$props$editorVie.state,
-        dispatch = _this$props$editorVie.dispatch;
-      hoverRows(rows, danger)(state, dispatch);
-    });
-    // re-use across numbered columns and row controls
-    _defineProperty(_assertThisInitialized(_this), "updateCellHoverLocation", function (rowIndex) {
-      var _this$props = _this.props,
-        editorView = _this$props.editorView,
-        tableActive = _this$props.tableActive;
-      var state = editorView.state,
-        dispatch = editorView.dispatch;
-      if (tableActive) {
-        // For context:  Whenever we mouse over a column or row drag handle, we will ALWAYS be hovering over the 0 index
-        // of the opposite dimension. For example; here when we mouse over the row drag handle then we're technically
-        // also hovering over column 0 index. And vice-versa with columns. This means we don't need to worry about knowing the
-        // current column index. We can just force it to 0.
-        hoverCell(rowIndex, 0)(state, dispatch);
-      }
-    });
-    _this.state = {
-      tableWrapperWidth: 0,
-      /** Height needs to be tracked to re-render decorations correctly, do not remove */
-      tableWrapperHeight: 0
-    };
-    return _this;
-  }
-  _createClass(TableFloatingControls, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.tryInitResizeObserver();
+export var TableFloatingControls = function TableFloatingControls(_ref) {
+  var editorView = _ref.editorView,
+    tableRef = _ref.tableRef,
+    tableNode = _ref.tableNode,
+    isInDanger = _ref.isInDanger,
+    isResizing = _ref.isResizing,
+    isNumberColumnEnabled = _ref.isNumberColumnEnabled,
+    isHeaderRowEnabled = _ref.isHeaderRowEnabled,
+    isHeaderColumnEnabled = _ref.isHeaderColumnEnabled,
+    tableActive = _ref.tableActive,
+    hasHeaderRow = _ref.hasHeaderRow,
+    hoveredRows = _ref.hoveredRows,
+    stickyHeader = _ref.stickyHeader,
+    isDragAndDropEnabled = _ref.isDragAndDropEnabled,
+    hoveredCell = _ref.hoveredCell,
+    isTableHovered = _ref.isTableHovered,
+    tableWrapperWidth = _ref.tableWrapperWidth;
+  var _selectRow = useCallback(function (row, expand) {
+    var state = editorView.state,
+      dispatch = editorView.dispatch;
+    // fix for issue ED-4665
+    if (browser.ie_version === 11) {
+      editorView.dom.blur();
     }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate() {
-      // tableRef prop is not guaranteed to be defined after componentDidMount, so retry to init resize observer on update
-      this.tryInitResizeObserver();
+    selectRow(row, expand)(state, dispatch);
+  }, [editorView]);
+  var _selectRows = useCallback(function (rowIndexes) {
+    var state = editorView.state,
+      dispatch = editorView.dispatch;
+    // fix for issue ED-4665
+    if (browser.ie_version === 11) {
+      editorView.dom.blur();
     }
+    selectRows(rowIndexes)(state, dispatch);
+  }, [editorView]);
+  var _hoverRows = useCallback(function (rows, danger) {
+    var state = editorView.state,
+      dispatch = editorView.dispatch;
+    hoverRows(rows, danger)(state, dispatch);
+  }, [editorView]);
 
-    // tracking the table height changes to update floating controls
-  }, {
-    key: "tryInitResizeObserver",
-    value: function tryInitResizeObserver() {
-      var _window,
-        _this2 = this;
-      var tableRef = this.props.tableRef;
-      if (tableRef && !this.resizeObserver && (_window = window) !== null && _window !== void 0 && _window.ResizeObserver) {
-        var tableWrapper = tableRef.closest(".".concat(ClassName.TABLE_NODE_WRAPPER));
-        this.resizeObserver = new ResizeObserver(function (entries) {
-          var _iterator = _createForOfIteratorHelper(entries),
-            _step;
-          try {
-            var _loop = function _loop() {
-              var entry = _step.value;
-              _this2.setState(function (prev) {
-                return (prev === null || prev === void 0 ? void 0 : prev.tableWrapperWidth) === entry.contentRect.width && prev.tableWrapperHeight === entry.contentRect.height ? prev : {
-                  tableWrapperWidth: entry.contentRect.width,
-                  tableWrapperHeight: entry.contentRect.height
-                };
-              });
-            };
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              _loop();
-            }
-          } catch (err) {
-            _iterator.e(err);
-          } finally {
-            _iterator.f();
-          }
-        });
-        this.resizeObserver.observe(tableWrapper);
-      }
-    }
-  }, {
-    key: "shouldComponentUpdate",
-    value: function shouldComponentUpdate(nextProps, nextState) {
-      var _this$props2 = this.props,
-        tableRef = _this$props2.tableRef,
-        isInDanger = _this$props2.isInDanger,
-        isResizing = _this$props2.isResizing,
-        isHeaderRowEnabled = _this$props2.isHeaderRowEnabled,
-        isNumberColumnEnabled = _this$props2.isNumberColumnEnabled,
-        hoveredRows = _this$props2.hoveredRows,
-        selection = _this$props2.selection,
-        tableActive = _this$props2.tableActive,
-        isHeaderColumnEnabled = _this$props2.isHeaderColumnEnabled,
-        ordering = _this$props2.ordering,
-        headerRowHeight = _this$props2.headerRowHeight,
-        stickyHeader = _this$props2.stickyHeader,
-        hoveredCell = _this$props2.hoveredCell,
-        isTableHovered = _this$props2.isTableHovered;
-      return this.state.tableWrapperWidth !== nextState.tableWrapperWidth || this.state.tableWrapperHeight !== nextState.tableWrapperHeight || ordering !== nextProps.ordering || tableRef !== nextProps.tableRef || tableActive !== nextProps.tableActive || isInDanger !== nextProps.isInDanger || isResizing !== nextProps.isResizing || hoveredRows !== nextProps.hoveredRows || isHeaderRowEnabled !== nextProps.isHeaderRowEnabled || isHeaderColumnEnabled !== nextProps.isHeaderColumnEnabled || isNumberColumnEnabled !== nextProps.isNumberColumnEnabled || isSelectionUpdated(selection, nextProps.selection) || headerRowHeight !== nextProps.headerRowHeight || stickyHeader !== nextProps.stickyHeader || hoveredCell !== nextProps.hoveredCell || isTableHovered !== nextProps.isTableHovered;
+  // re-use across numbered columns and row controls
+  var updateCellHoverLocation = useCallback(function (rowIndex) {
+    var state = editorView.state,
+      dispatch = editorView.dispatch;
+    if (tableActive) {
+      // For context:  Whenever we mouse over a column or row drag handle, we will ALWAYS be hovering over the 0 index
+      // of the opposite dimension. For example; here when we mouse over the row drag handle then we're technically
+      // also hovering over column 0 index. And vice-versa with columns. This means we don't need to worry about knowing the
+      // current column index. We can just force it to 0.
+      hoverCell(rowIndex, 0)(state, dispatch);
     }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      if (this.resizeObserver) {
-        this.resizeObserver.disconnect();
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props3 = this.props,
-        editorView = _this$props3.editorView,
-        tableRef = _this$props3.tableRef,
-        tableNode = _this$props3.tableNode,
-        isInDanger = _this$props3.isInDanger,
-        isResizing = _this$props3.isResizing,
-        isNumberColumnEnabled = _this$props3.isNumberColumnEnabled,
-        isHeaderRowEnabled = _this$props3.isHeaderRowEnabled,
-        isHeaderColumnEnabled = _this$props3.isHeaderColumnEnabled,
-        tableActive = _this$props3.tableActive,
-        hasHeaderRow = _this$props3.hasHeaderRow,
-        hoveredRows = _this$props3.hoveredRows,
-        stickyHeader = _this$props3.stickyHeader,
-        isDragAndDropEnabled = _this$props3.isDragAndDropEnabled,
-        hoveredCell = _this$props3.hoveredCell,
-        isTableHovered = _this$props3.isTableHovered;
-      if (!tableRef) {
-        return null;
-      }
-      var stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
-      var wrapperClassName = isDragAndDropEnabled ? ClassName.DRAG_ROW_CONTROLS_WRAPPER : ClassName.ROW_CONTROLS_WRAPPER;
-      return /*#__PURE__*/React.createElement("div", {
-        className: wrapperClassName
-      }, /*#__PURE__*/React.createElement("div", {
-        onMouseDown: function onMouseDown(e) {
-          return !isDragAndDropEnabled && e.preventDefault();
-        }
-      }, isNumberColumnEnabled ? /*#__PURE__*/React.createElement(NumberColumn, {
-        editorView: editorView,
-        hoverRows: this.hoverRows,
-        tableRef: tableRef,
-        tableActive: tableActive,
-        hoveredRows: hoveredRows,
-        hasHeaderRow: hasHeaderRow,
-        isInDanger: isInDanger,
-        isResizing: isResizing,
-        selectRow: this.selectRow,
-        updateCellHoverLocation: this.updateCellHoverLocation,
-        stickyTop: stickyTop,
-        isDragAndDropEnabled: isDragAndDropEnabled
-      }) : null, tableActive && /*#__PURE__*/React.createElement(React.Fragment, null, isDragAndDropEnabled ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DragCornerControls, {
-        editorView: editorView,
-        tableRef: tableRef,
-        isInDanger: isInDanger,
-        isResizing: isResizing
-      }), /*#__PURE__*/React.createElement(DragControls, {
-        tableRef: tableRef,
-        tableNode: tableNode,
-        hoveredCell: hoveredCell,
-        isTableHovered: isTableHovered,
-        editorView: editorView,
-        tableActive: tableActive,
-        isInDanger: isInDanger,
-        isResizing: isResizing,
-        tableWidth: this.state.tableWrapperWidth,
-        hoverRows: this.hoverRows,
-        selectRow: this.selectRow,
-        selectRows: this.selectRows,
-        updateCellHoverLocation: this.updateCellHoverLocation
-      })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CornerControls, {
-        editorView: editorView,
-        tableRef: tableRef,
-        isInDanger: isInDanger,
-        isResizing: isResizing,
-        isHeaderRowEnabled: isHeaderRowEnabled,
-        isHeaderColumnEnabled: isHeaderColumnEnabled,
-        hoveredRows: hoveredRows,
-        stickyTop: tableActive ? stickyTop : undefined
-      }), /*#__PURE__*/React.createElement(RowControls, {
-        editorView: editorView,
-        tableRef: tableRef,
-        hoverRows: this.hoverRows,
-        hoveredRows: hoveredRows,
-        isInDanger: isInDanger,
-        isResizing: isResizing,
-        selectRow: this.selectRow,
-        stickyTop: tableActive ? stickyTop : undefined
-      })))));
+  }, [editorView, tableActive]);
+  if (!tableRef) {
+    return null;
+  }
+  var stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
+  var wrapperClassName = isDragAndDropEnabled ? ClassName.DRAG_ROW_CONTROLS_WRAPPER : ClassName.ROW_CONTROLS_WRAPPER;
+  return /*#__PURE__*/React.createElement("div", {
+    className: wrapperClassName
+  }, /*#__PURE__*/React.createElement("div", {
+    onMouseDown: function onMouseDown(e) {
+      return !isDragAndDropEnabled && e.preventDefault();
     }
-  }]);
-  return TableFloatingControls;
-}(Component);
-_defineProperty(TableFloatingControls, "displayName", 'TableFloatingControls');
-export { TableFloatingControls as default };
+  }, isNumberColumnEnabled ? /*#__PURE__*/React.createElement(NumberColumn, {
+    editorView: editorView,
+    hoverRows: _hoverRows,
+    tableRef: tableRef,
+    tableActive: tableActive,
+    hoveredRows: hoveredRows,
+    hasHeaderRow: hasHeaderRow,
+    isInDanger: isInDanger,
+    isResizing: isResizing,
+    selectRow: _selectRow,
+    updateCellHoverLocation: updateCellHoverLocation,
+    stickyTop: stickyTop,
+    isDragAndDropEnabled: isDragAndDropEnabled
+  }) : null, tableActive && /*#__PURE__*/React.createElement(React.Fragment, null, isDragAndDropEnabled ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DragCornerControls, {
+    editorView: editorView,
+    tableRef: tableRef,
+    isInDanger: isInDanger,
+    isResizing: isResizing
+  }), /*#__PURE__*/React.createElement(DragControls, {
+    tableRef: tableRef,
+    tableNode: tableNode,
+    hoveredCell: hoveredCell,
+    isTableHovered: isTableHovered,
+    editorView: editorView,
+    tableActive: tableActive,
+    isInDanger: isInDanger,
+    isResizing: isResizing,
+    tableWidth: tableWrapperWidth,
+    hoverRows: _hoverRows,
+    selectRow: _selectRow,
+    selectRows: _selectRows,
+    updateCellHoverLocation: updateCellHoverLocation
+  })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CornerControls, {
+    editorView: editorView,
+    tableRef: tableRef,
+    isInDanger: isInDanger,
+    isResizing: isResizing,
+    isHeaderRowEnabled: isHeaderRowEnabled,
+    isHeaderColumnEnabled: isHeaderColumnEnabled,
+    hoveredRows: hoveredRows,
+    stickyTop: tableActive ? stickyTop : undefined
+  }), /*#__PURE__*/React.createElement(RowControls, {
+    editorView: editorView,
+    tableRef: tableRef,
+    hoverRows: _hoverRows,
+    hoveredRows: hoveredRows,
+    isInDanger: isInDanger,
+    isResizing: isResizing,
+    selectRow: _selectRow,
+    stickyTop: tableActive ? stickyTop : undefined
+  })))));
+};
+export default TableFloatingControls;

package/dist/esm/utils/column-controls.js

@@ -3,7 +3,7 @@ import { maphElem } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import { findTable, getCellsInColumn, getSelectionRect, isColumnSelected, isTableSelected } from '@atlaskit/editor-tables/utils';
+import { findTable, getSelectionRect, isColumnSelected, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { TableCssClassName as ClassName } from '../types';
 import { tableDeleteButtonSize } from '../ui/consts';
 export var getColumnsWidths = function getColumnsWidths(view) {
@@ -19,13 +19,13 @@ export var getColumnsWidths = function getColumnsWidths(view) {
       length: map.width
     });
     for (var i = 0; i < map.width; i++) {
-      var cells = getCellsInColumn(i)(selection);
-      var cell = cells[0];
-      if (cell) {
-        var cellRef = findDomRefAtPos(cell.pos, domAtPos);
+      if (!map.isCellMergedTopLeft(0, i)) {
+        var node = table.node.nodeAt(map.map[i]);
+        var pos = map.map[i] + table.start;
+        var cellRef = findDomRefAtPos(pos, domAtPos);
         var rect = cellRef.getBoundingClientRect();
         widths[i] = (rect ? rect.width : cellRef.offsetWidth) + 1;
-        i += cell.node.attrs.colspan - 1;
+        i += node.attrs.colspan - 1;
       }
     }
   }

package/dist/esm/utils/create.js

@@ -3,12 +3,9 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { createTable } from '@atlaskit/editor-tables/utils';
 import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils';
-export var createTableWithWidth = function createTableWithWidth(isFullWidthModeEnabled, getEditorFeatureFlags, createTableProps) {
+export var createTableWithWidth = function createTableWithWidth(isTableScalingEnabled, isFullWidthModeEnabled, createTableProps) {
   return function (schema) {
-    var _ref = (getEditorFeatureFlags === null || getEditorFeatureFlags === void 0 ? void 0 : getEditorFeatureFlags()) || {},
-      _ref$tablePreserveWid = _ref.tablePreserveWidth,
-      tablePreserveWidth = _ref$tablePreserveWid === void 0 ? false : _ref$tablePreserveWid;
-    if (tablePreserveWidth && isFullWidthModeEnabled) {
+    if (isTableScalingEnabled && isFullWidthModeEnabled) {
       return createTable(_objectSpread({
         schema: schema,
         tableWidth: TABLE_MAX_WIDTH

package/dist/esm/utils/dom.js

@@ -1,6 +1,5 @@
 import { closestElement, containsClassName } from '@atlaskit/editor-common/utils';
 import { TableCssClassName as ClassName } from '../types';
-var SELECTOR_TABLE_LEAFS = ".".concat(ClassName.TABLE_CELL, ", .").concat(ClassName.TABLE_HEADER_CELL);
 export var isCell = function isCell(node) {
   return Boolean(node && (['TH', 'TD'].indexOf(node.tagName) > -1 || !!closestElement(node, ".".concat(ClassName.TABLE_HEADER_CELL)) || !!closestElement(node, ".".concat(ClassName.TABLE_CELL))));
 };
@@ -96,22 +95,21 @@ export var isDragCornerButton = function isDragCornerButton(node) {
  *
  * the same is valid to the right side.
  */
-
-export var getMousePositionHorizontalRelativeByElement = function getMousePositionHorizontalRelativeByElement(mouseEvent, elementContentRects, gapInPixels, isDragAndDropEnabled) {
+/**
+ * This can be used with mouse events to determine the left/right side of the target the pointer is closest too.
+ *
+ * WARNING: This metod reads properties which can trigger a reflow; use this wisely.
+ *
+ * @param mouseEvent
+ * @param gapInPixels
+ * @returns
+ */
+export var getMousePositionHorizontalRelativeByElement = function getMousePositionHorizontalRelativeByElement(mouseEvent, offsetX, gapInPixels) {
   var element = mouseEvent.target;
   if (element instanceof HTMLElement) {
-    var width, x;
-    if (isDragAndDropEnabled) {
-      // mouse event fires for new overlapping column controls, so the cell can not get detected. Get width
-      // directly from element that will be .pm-table-drag-columns-floating-insert-dot-wrapper
-      width = element.clientWidth;
-    } else {
-      var _closestCell$id, _elementContentRects$, _elementContentRects$2;
-      var closestCell = element.closest(SELECTOR_TABLE_LEAFS);
-      var id = (_closestCell$id = closestCell === null || closestCell === void 0 ? void 0 : closestCell.id) !== null && _closestCell$id !== void 0 ? _closestCell$id : '';
-      width = (_elementContentRects$ = elementContentRects === null || elementContentRects === void 0 || (_elementContentRects$2 = elementContentRects[id]) === null || _elementContentRects$2 === void 0 ? void 0 : _elementContentRects$2.width) !== null && _elementContentRects$ !== void 0 ? _elementContentRects$ : 0;
-    }
-    x = mouseEvent.offsetX;
+    var width = element.clientWidth; // reflow
+    var x = !Number.isNaN(offsetX) ? offsetX : mouseEvent.offsetX; // reflow
+
     if (width <= 0) {
       return null;
     }

package/dist/esm/utils/drag-menu.js

@@ -63,7 +63,7 @@ var defaultSelectionRect = {
 };
 export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, canDrag, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired) {
   var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
-  var tablePreserveWidth = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
+  var isTableScalingEnabled = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
   var addOptions = direction === 'row' ? [{
     label: 'above',
     offset: 0,
@@ -148,7 +148,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
             moveCursorToInsertedRow: true
           })(state, dispatch);
         } else {
-          insertColumnWithAnalytics(getEditorContainerWidth, editorAnalyticsAPI, tablePreserveWidth)(INPUT_METHOD.TABLE_CONTEXT_MENU, (index !== null && index !== void 0 ? index : 0) + offset)(state, dispatch, editorView);
+          insertColumnWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled)(INPUT_METHOD.TABLE_CONTEXT_MENU, (index !== null && index !== void 0 ? index : 0) + offset)(state, dispatch, editorView);
         }
         return true;
       },
@@ -161,7 +161,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     onClick: function onClick(state, dispatch) {
       var selectionRect = getClosestSelectionRect(state);
       if (selectionRect) {
-        var newResizeState = getNewResizeStateFromSelectedColumns(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, tablePreserveWidth);
+        var newResizeState = getNewResizeStateFromSelectedColumns(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled);
         if (newResizeState) {
           distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.TABLE_CONTEXT_MENU, newResizeState)(state, dispatch);
           return true;
@@ -187,7 +187,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
       if (direction === 'row') {
         deleteRowsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect, !!isHeaderRowRequired)(state, dispatch);
       } else {
-        deleteColumnsWithAnalytics(editorAnalyticsAPI, tablePreserveWidth)(INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect)(state, dispatch, editorView);
+        deleteColumnsWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled)(INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect !== null && selectionRect !== void 0 ? selectionRect : defaultSelectionRect)(state, dispatch, editorView);
       }
       return true;
     },