@atlaskit/editor-plugin-table 7.6.2 → 7.6.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-table
 
+## 7.6.3
+
+### Patch Changes
+
+- [#82198](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/82198) [`fb41831c5371`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fb41831c5371) - Remove WithPluginState behind a feature flag and introduce basic gemini tests
+
 ## 7.6.2
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableComponent.js

@@ -505,9 +505,12 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         options = _this$props10.options,
         isTableScalingEnabled = _this$props10.isTableScalingEnabled,
         getPos = _this$props10.getPos;
-      var _getPluginState = (0, _pluginFactory.getPluginState)(view.state),
-        isInDanger = _getPluginState.isInDanger;
+      var isInDanger = this.props.isInDanger;
       var table = (0, _utils2.findTable)(view.state.selection);
+      if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-shared-state-hook')) {
+        var pluginState = (0, _pluginFactory.getPluginState)(view.state);
+        isInDanger = pluginState.isInDanger;
+      }
       if (isTableScalingEnabled) {
         this.handleColgroupUpdates();
       }
@@ -609,16 +612,24 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         isDragAndDropEnabled = _this$props11.isDragAndDropEnabled,
         getEditorFeatureFlags = _this$props11.getEditorFeatureFlags,
         isTableScalingEnabled = _this$props11.isTableScalingEnabled;
+      var _this$props12 = this.props,
+        isInDanger = _this$props12.isInDanger,
+        hoveredRows = _this$props12.hoveredRows,
+        hoveredCell = _this$props12.hoveredCell,
+        isTableHovered = _this$props12.isTableHovered,
+        isWholeTableInDanger = _this$props12.isWholeTableInDanger;
       var _this$state3 = this.state,
         showBeforeShadow = _this$state3.showBeforeShadow,
         showAfterShadow = _this$state3.showAfterShadow;
       var node = getNode();
-      // doesn't work well with WithPluginState
-      var _getPluginState2 = (0, _pluginFactory.getPluginState)(view.state),
-        isInDanger = _getPluginState2.isInDanger,
-        hoveredRows = _getPluginState2.hoveredRows,
-        hoveredCell = _getPluginState2.hoveredCell,
-        isTableHovered = _getPluginState2.isTableHovered;
+      if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-shared-state-hook')) {
+        var pluginState = (0, _pluginFactory.getPluginState)(view.state);
+        isInDanger = pluginState.isInDanger;
+        hoveredRows = pluginState.hoveredRows;
+        hoveredCell = pluginState.hoveredCell;
+        isTableHovered = pluginState.isTableHovered;
+        isWholeTableInDanger = pluginState.isWholeTableInDanger;
+      }
       var tableRef = this.table || undefined;
       var headerRow = tableRef ? tableRef.querySelector('tr[data-header-row]') : undefined;
       var hasHeaderRow = (0, _utils5.containsHeaderRow)(node);
@@ -643,7 +654,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         selection: view.state.selection,
         headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,
         stickyHeader: this.state.stickyHeader,
-        tableWrapperWidth: this.state.tableWrapperWidth
+        tableWrapperWidth: this.state.tableWrapperWidth,
+        api: pluginInjectionApi
       });
       var tableContainerWidth = (0, _nodeWidth.getTableContainerWidth)(node);
       var colControls = isDragAndDropEnabled ? /*#__PURE__*/_react.default.createElement(_TableFloatingColumnControls.default, {
@@ -670,7 +682,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           var _this4$wrapper;
           return ((_this4$wrapper = _this4.wrapper) === null || _this4$wrapper === void 0 ? void 0 : _this4$wrapper.scrollLeft) || 0;
         },
-        tableWrapperHeight: this.state.tableWrapperHeight
+        tableWrapperHeight: this.state.tableWrapperHeight,
+        api: pluginInjectionApi
       }) : null;
       var shadowPadding = allowControls && tableActive ? -_editorSharedStyles.akEditorTableToolbarSize : _styles.tableMarginSides;
       var shadowStyle = (0, _memoizeOne.default)(function (visible) {
@@ -707,7 +720,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         tableWrapperHeight: this.state.tableWrapperHeight,
         isTableResizingEnabled: options === null || options === void 0 ? void 0 : options.isTableResizingEnabled,
         isResizing: isResizing,
-        isTableScalingEnabled: isTableScalingEnabled
+        isTableScalingEnabled: isTableScalingEnabled,
+        isWholeTableInDanger: isWholeTableInDanger
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: _types.TableCssClassName.TABLE_STICKY_SENTINEL_TOP,
         "data-testid": "sticky-sentinel-top"

package/dist/cjs/nodeviews/TableComponentWithSharedState.js

@@ -0,0 +1,87 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TableComponentWithSharedState = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _editorTables = require("@atlaskit/editor-tables");
+var _TableComponent = _interopRequireDefault(require("./TableComponent"));
+/**
+ * Use useSharedPluginState to control re-renders from plugin dependencies
+ */
+var TableComponentWithSharedState = exports.TableComponentWithSharedState = function TableComponentWithSharedState(_ref) {
+  var view = _ref.view,
+    options = _ref.options,
+    getNode = _ref.getNode,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    api = _ref.api,
+    getEditorFeatureFlags = _ref.getEditorFeatureFlags,
+    eventDispatcher = _ref.eventDispatcher,
+    allowColumnResizing = _ref.allowColumnResizing,
+    allowControls = _ref.allowControls,
+    getPos = _ref.getPos,
+    forwardRef = _ref.forwardRef;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['width', 'table', 'media']),
+    widthState = _useSharedPluginState.widthState,
+    tableState = _useSharedPluginState.tableState,
+    mediaState = _useSharedPluginState.mediaState;
+  if (!tableState) {
+    return null;
+  }
+  var _ref2 = tableState,
+    isTableResizing = _ref2.isTableResizing,
+    isHeaderColumnEnabled = _ref2.isHeaderColumnEnabled,
+    isHeaderRowEnabled = _ref2.isHeaderRowEnabled,
+    ordering = _ref2.ordering,
+    isResizing = _ref2.isResizing,
+    isInDanger = _ref2.isInDanger,
+    hoveredCell = _ref2.hoveredCell,
+    hoveredRows = _ref2.hoveredRows,
+    isTableHovered = _ref2.isTableHovered,
+    isWholeTableInDanger = _ref2.isWholeTableInDanger;
+
+  /**
+   *  ED-19810
+   *  There is a getPos issue coming from this code. We need to apply this workaround for now and apply a patch
+   *  directly to confluence since this bug is now in production.
+   */
+  var currentTablePos;
+  try {
+    currentTablePos = getPos ? getPos() : undefined;
+  } catch (e) {
+    currentTablePos = undefined;
+  }
+  var selectedTable = (0, _editorTables.findTable)(view.state.selection);
+  var tablePos = selectedTable && selectedTable.start - 1;
+  var tableActive = typeof currentTablePos === 'number' && typeof tablePos === 'number' && currentTablePos === tablePos && !isTableResizing;
+  return /*#__PURE__*/_react.default.createElement(_TableComponent.default, {
+    view: view,
+    allowColumnResizing: allowColumnResizing,
+    eventDispatcher: eventDispatcher,
+    getPos: getPos,
+    isMediaFullscreen: mediaState === null || mediaState === void 0 ? void 0 : mediaState.isFullscreen,
+    options: options,
+    allowControls: !!allowControls,
+    isHeaderRowEnabled: isHeaderRowEnabled,
+    isHeaderColumnEnabled: isHeaderColumnEnabled,
+    isDragAndDropEnabled: options === null || options === void 0 ? void 0 : options.isDragAndDropEnabled,
+    isTableScalingEnabled: options === null || options === void 0 ? void 0 : options.isTableScalingEnabled,
+    tableActive: tableActive,
+    ordering: ordering,
+    isResizing: isResizing,
+    getNode: getNode,
+    containerWidth: widthState,
+    contentDOM: forwardRef,
+    getEditorFeatureFlags: getEditorFeatureFlags,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    pluginInjectionApi: api,
+    isInDanger: !!isInDanger,
+    hoveredRows: hoveredRows,
+    hoveredCell: hoveredCell,
+    isTableHovered: isTableHovered,
+    isWholeTableInDanger: isWholeTableInDanger
+  });
+};

package/dist/cjs/nodeviews/TableContainer.js

@@ -56,7 +56,8 @@ var ResizableTableContainer = exports.ResizableTableContainer = /*#__PURE__*/_re
     isResizing = _ref2.isResizing,
     pluginInjectionApi = _ref2.pluginInjectionApi,
     isTableScalingEnabled = _ref2.isTableScalingEnabled,
-    tableWrapperHeight = _ref2.tableWrapperHeight;
+    tableWrapperHeight = _ref2.tableWrapperHeight,
+    isWholeTableInDanger = _ref2.isWholeTableInDanger;
   var containerRef = (0, _react.useRef)(null);
   var tableWidthRef = (0, _react.useRef)(_editorSharedStyles.akEditorDefaultLayoutWidth);
   var _useState = (0, _react.useState)(false),
@@ -135,7 +136,8 @@ var ResizableTableContainer = exports.ResizableTableContainer = /*#__PURE__*/_re
     displayGuideline: displayGuideline,
     attachAnalyticsEvent: attachAnalyticsEvent,
     displayGapCursor: displayGapCursor,
-    isTableScalingEnabled: isTableScalingEnabled
+    isTableScalingEnabled: isTableScalingEnabled,
+    isWholeTableInDanger: isWholeTableInDanger
   };
   if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.resizing-table-height-improvement')) {
     tableResizerProps = _objectSpread(_objectSpread({}, tableResizerProps), {}, {
@@ -176,7 +178,8 @@ var TableContainer = exports.TableContainer = function TableContainer(_ref3) {
     tableWrapperHeight = _ref3.tableWrapperHeight,
     isResizing = _ref3.isResizing,
     pluginInjectionApi = _ref3.pluginInjectionApi,
-    isTableScalingEnabled = _ref3.isTableScalingEnabled;
+    isTableScalingEnabled = _ref3.isTableScalingEnabled,
+    isWholeTableInDanger = _ref3.isWholeTableInDanger;
   if (isTableResizingEnabled && !isNested) {
     return /*#__PURE__*/_react.default.createElement(ResizableTableContainer, {
       className: className,
@@ -188,7 +191,8 @@ var TableContainer = exports.TableContainer = function TableContainer(_ref3) {
       tableWrapperHeight: tableWrapperHeight,
       isResizing: isResizing,
       pluginInjectionApi: pluginInjectionApi,
-      isTableScalingEnabled: isTableScalingEnabled
+      isTableScalingEnabled: isTableScalingEnabled,
+      isWholeTableInDanger: isWholeTableInDanger
     }, children);
   }
   var tableWidth = isBreakoutEnabled ? (0, _styles.calcTableWidth)(node.attrs.layout, editorWidth) : 'inherit';

package/dist/cjs/nodeviews/TableResizer.js

@@ -100,7 +100,8 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
     displayGuideline = _ref.displayGuideline,
     attachAnalyticsEvent = _ref.attachAnalyticsEvent,
     displayGapCursor = _ref.displayGapCursor,
-    isTableScalingEnabled = _ref.isTableScalingEnabled;
+    isTableScalingEnabled = _ref.isTableScalingEnabled,
+    isWholeTableInDanger = _ref.isWholeTableInDanger;
   var currentGap = (0, _react.useRef)(0);
   // track resizing state - use ref over state to avoid re-render
   var isResizing = (0, _react.useRef)(false);
@@ -136,8 +137,6 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
   var isTableSelected = ((_findTable = (0, _utils2.findTable)((_editorView$state = editorView.state) === null || _editorView$state === void 0 ? void 0 : _editorView$state.selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) === getPos();
   var resizerMinWidth = getResizerMinWidth(node);
   var handleSize = getResizerHandleHeight(tableRef);
-  var _getPluginState = (0, _pluginFactory.getPluginState)(editorView.state),
-    isWholeTableInDanger = _getPluginState.isWholeTableInDanger;
   var _useMeasureFramerate = (0, _analytics2.useMeasureFramerate)(),
     startMeasure = _useMeasureFramerate.startMeasure,
     endMeasure = _useMeasureFramerate.endMeasure,
@@ -233,8 +232,8 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
     var state = editorView.state,
       dispatch = editorView.dispatch;
     var pos = getPos();
-    var _getPluginState2 = (0, _pluginFactory.getPluginState)(editorView.state),
-      widthToWidest = _getPluginState2.widthToWidest;
+    var _getPluginState = (0, _pluginFactory.getPluginState)(editorView.state),
+      widthToWidest = _getPluginState.widthToWidest;
     newWidth = widthToWidest ? _editorSharedStyles.akEditorFullWidthLayoutWidth : newWidth;
     var tr = state.tr.setMeta(_tableWidth.pluginKey, {
       resizing: false

package/dist/cjs/nodeviews/table.js

@@ -22,6 +22,7 @@ var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _createPluginConfig = require("../create-plugin-config");
 var _dragAndDrop = require("../pm-plugins/drag-and-drop");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
@@ -31,6 +32,7 @@ var _utils = require("../pm-plugins/table-resizing/utils");
 var _tableWidth = require("../pm-plugins/table-width");
 var _utils2 = require("../utils");
 var _TableComponent = _interopRequireDefault(require("./TableComponent"));
+var _TableComponentWithSharedState = require("./TableComponentWithSharedState");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var tableAttributes = function tableAttributes(node) {
@@ -123,6 +125,22 @@ var TableView = exports.default = /*#__PURE__*/function (_ReactNodeView) {
     key: "render",
     value: function render(props, forwardRef) {
       var _this3 = this;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-shared-state-hook')) {
+        return /*#__PURE__*/_react.default.createElement(_TableComponentWithSharedState.TableComponentWithSharedState, {
+          forwardRef: forwardRef,
+          getNode: this.getNode,
+          view: props.view,
+          options: props.options,
+          eventDispatcher: props.eventDispatcher,
+          api: props.pluginInjectionApi,
+          allowColumnResizing: props.allowColumnResizing,
+          allowControls: props.allowControls,
+          getPos: props.getPos,
+          getEditorFeatureFlags: props.getEditorFeatureFlags,
+          dispatchAnalyticsEvent: props.dispatchAnalyticsEvent
+        });
+      }
+
       // TODO: ED-15663
       // Please, do not copy or use this kind of code below
       // @ts-ignore
@@ -268,12 +286,14 @@ var createTableView = exports.createTableView = function createTableView(node, v
     isDragAndDropEnabled = _getPluginState2.isDragAndDropEnabled,
     isTableScalingEnabled = _getPluginState2.isTableScalingEnabled;
   var _getPluginConfig = (0, _createPluginConfig.pluginConfig)(pluginConfig),
-    allowColumnResizing = _getPluginConfig.allowColumnResizing;
+    allowColumnResizing = _getPluginConfig.allowColumnResizing,
+    allowControls = _getPluginConfig.allowControls;
   var hasIntlContext = true;
   return new TableView({
     node: node,
     view: view,
     allowColumnResizing: allowColumnResizing,
+    allowControls: allowControls,
     portalProviderAPI: portalProviderAPI,
     eventDispatcher: eventDispatcher,
     getPos: getPos,

package/dist/cjs/plugin.js

@@ -45,6 +45,9 @@ var _utils2 = require("./utils");
 var defaultGetEditorFeatureFlags = function defaultGetEditorFeatureFlags() {
   return {};
 };
+
+// TODO: duplicating type instead of importing media plugin causing a circular dependency
+
 /**
  * Table plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
@@ -67,10 +70,29 @@ var tablesPlugin = function tablesPlugin(_ref) {
     name: 'table',
     // Use getSharedState to store fullWidthEnabled and wasFullWidthModeEnabled to guarantee access
     // to most up to date values - passing to createPluginState will not re-initialise the state
-    getSharedState: function getSharedState() {
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      var tablePluginState = (0, _pluginFactory.getPluginState)(editorState);
+      var tableResizingPluginState = (0, _tableResizing.getPluginState)(editorState);
+      var tableWidthResizingPluginState = _tableWidth.pluginKey.getState(editorState);
       return {
         isFullWidthModeEnabled: !!(options !== null && options !== void 0 && options.fullWidthEnabled),
-        wasFullWidthModeEnabled: !!(options !== null && options !== void 0 && options.wasFullWidthEnabled)
+        wasFullWidthModeEnabled: !!(options !== null && options !== void 0 && options.wasFullWidthEnabled),
+        isHeaderRowEnabled: tablePluginState.isHeaderRowEnabled,
+        isHeaderColumnEnabled: tablePluginState.isHeaderColumnEnabled,
+        ordering: tablePluginState.ordering,
+        isResizing: !!(tableResizingPluginState !== null && tableResizingPluginState !== void 0 && tableResizingPluginState.dragging || tableWidthResizingPluginState !== null && tableWidthResizingPluginState !== void 0 && tableWidthResizingPluginState.resizing),
+        isTableResizing: tableWidthResizingPluginState === null || tableWidthResizingPluginState === void 0 ? void 0 : tableWidthResizingPluginState.resizing,
+        isInDanger: tablePluginState.isInDanger,
+        hoveredRows: tablePluginState.hoveredRows,
+        hoveredCell: tablePluginState.hoveredCell,
+        isTableHovered: tablePluginState.isTableHovered,
+        isWholeTableInDanger: tablePluginState.isWholeTableInDanger,
+        // IMPORTANT: Need to continue to pass tableNode to control re-renders
+        // TableComponent listens for node attribute changes to update colgroups
+        tableNode: tablePluginState.tableNode
       };
     },
     actions: {

package/dist/cjs/types.js

@@ -16,6 +16,9 @@ var RESIZE_HANDLE_AREA_DECORATION_GAP = exports.RESIZE_HANDLE_AREA_DECORATION_GA
  * @deprecated {@link https://hello.atlassian.net/browse/ENGHEALTH-6877 Internal documentation for deprecation (no external access)}
  **/
 
+// override getPluginState but do not expose publicly as this type is experimental and will change
+// in the future
+
 /*
  * This type represents the start and end from a cell in a column,
  * for example, on this table the cell C1 will have

package/dist/cjs/ui/TableFloatingColumnControls/ColumnControls/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.ColumnControls = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorTables = require("@atlaskit/editor-tables");
@@ -45,8 +46,11 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
     tableContainerWidth = _ref.tableContainerWidth,
     isNumberColumnEnabled = _ref.isNumberColumnEnabled,
     isDragging = _ref.isDragging,
-    getScrollOffset = _ref.getScrollOffset;
+    getScrollOffset = _ref.getScrollOffset,
+    api = _ref.api;
   var columnControlsRef = (0, _react.useRef)(null);
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['selection']),
+    selectionState = _useSharedPluginState.selectionState;
   var widths = (_colWidths$map$join = colWidths === null || colWidths === void 0 ? void 0 : colWidths.map(function (width) {
     return (
       // when there is sticky header, a `margin-right: -1px` applied to `tr.sticky th` so it causes colWidths to be 1px wider
@@ -57,7 +61,7 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
   // TODO: reusing getRowsParams here because it's generic enough to work for columns -> rename
   var columnParams = (0, _utils2.getRowsParams)(colWidths !== null && colWidths !== void 0 ? colWidths : []);
   var colIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.colIndex;
-  var selectedColIndexes = getSelectedColumns(editorView.state.selection);
+  var selectedColIndexes = getSelectedColumns((selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection) || editorView.state.selection);
   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;

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

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.TableFloatingColumnControls = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _types = require("../../types");
 var _utils = require("../../utils");
@@ -30,7 +31,8 @@ var TableFloatingColumnControls = exports.TableFloatingColumnControls = function
     tableContainerWidth = _ref.tableContainerWidth,
     isNumberColumnEnabled = _ref.isNumberColumnEnabled,
     getScrollOffset = _ref.getScrollOffset,
-    tableWrapperHeight = _ref.tableWrapperHeight;
+    tableWrapperHeight = _ref.tableWrapperHeight,
+    api = _ref.api;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isDragging = _useState2[0],
@@ -97,7 +99,8 @@ var TableFloatingColumnControls = exports.TableFloatingColumnControls = function
     tableContainerWidth: tableContainerWidth,
     isNumberColumnEnabled: isNumberColumnEnabled,
     isDragging: isDragging,
-    getScrollOffset: getScrollOffset
+    getScrollOffset: getScrollOffset,
+    api: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-shared-state-hook') ? api : undefined
   }), isDragging && /*#__PURE__*/_react.default.createElement(_ColumnDropTargets.ColumnDropTargets, {
     tableRef: tableRef,
     isHeaderSticky: (stickyHeader === null || stickyHeader === void 0 ? void 0 : stickyHeader.sticky) && hasHeaderRow,

package/dist/cjs/ui/TableFloatingControls/CornerControls/DragCornerControls.js

@@ -5,10 +5,11 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DragCornerControls = void 0;
+exports.DragCornerControlsWithSelection = exports.DragCornerControls = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactIntlNext = require("react-intl-next");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _commands = require("../../../commands");
@@ -55,4 +56,50 @@ var DragCornerControlsComponent = function DragCornerControlsComponent(_ref) {
     className: _types.TableCssClassName.DRAG_CORNER_BUTTON_INNER
   }));
 };
+var DragCornerControlsComponentWithSelection = function DragCornerControlsComponentWithSelection(_ref2) {
+  var editorView = _ref2.editorView,
+    isInDanger = _ref2.isInDanger,
+    isResizing = _ref2.isResizing,
+    formatMessage = _ref2.intl.formatMessage,
+    api = _ref2.api;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['selection']),
+    selectionState = _useSharedPluginState.selectionState;
+  var handleOnClick = function handleOnClick() {
+    var state = editorView.state,
+      dispatch = editorView.dispatch;
+    dispatch((0, _utils.selectTable)(state.tr).setMeta('addToHistory', false));
+  };
+  var handleMouseOut = function handleMouseOut() {
+    var state = editorView.state,
+      dispatch = editorView.dispatch;
+    (0, _commands.clearHoverSelection)()(state, dispatch);
+  };
+  var isActive = (0, _react.useMemo)(function () {
+    if (!(selectionState !== null && selectionState !== void 0 && selectionState.selection)) {
+      return;
+    }
+    var table = (0, _utils.findTable)(selectionState.selection);
+    if (!table) {
+      return false;
+    }
+    return (0, _utils.isTableSelected)(selectionState.selection);
+  }, [selectionState]);
+  if (isResizing) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement("button", {
+    className: (0, _classnames.default)(_types.TableCssClassName.DRAG_CORNER_BUTTON, {
+      active: isActive,
+      danger: isActive && isInDanger
+    }),
+    "aria-label": formatMessage(_messages.tableMessages.cornerControl),
+    type: "button",
+    onClick: handleOnClick,
+    onMouseOut: handleMouseOut,
+    contentEditable: false
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: _types.TableCssClassName.DRAG_CORNER_BUTTON_INNER
+  }));
+};
+var DragCornerControlsWithSelection = exports.DragCornerControlsWithSelection = (0, _reactIntlNext.injectIntl)(DragCornerControlsComponentWithSelection);
 var DragCornerControls = exports.DragCornerControls = (0, _reactIntlNext.injectIntl)(DragCornerControlsComponent);

package/dist/cjs/ui/TableFloatingControls/CornerControls/index.js

@@ -15,5 +15,11 @@ Object.defineProperty(exports, "DragCornerControls", {
     return _DragCornerControls.DragCornerControls;
   }
 });
+Object.defineProperty(exports, "DragCornerControlsWithSelection", {
+  enumerable: true,
+  get: function get() {
+    return _DragCornerControls.DragCornerControlsWithSelection;
+  }
+});
 var _ClassicCornerControls = require("./ClassicCornerControls");
 var _DragCornerControls = require("./DragCornerControls");

package/dist/cjs/ui/TableFloatingControls/FloatingControlsWithSelection.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FloatingControlsWithSelection = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _CornerControls = require("./CornerControls");
+var _RowControls = require("./RowControls");
+var FloatingControlsWithSelection = exports.FloatingControlsWithSelection = function FloatingControlsWithSelection(_ref) {
+  var editorView = _ref.editorView,
+    tableRef = _ref.tableRef,
+    isInDanger = _ref.isInDanger,
+    isResizing = _ref.isResizing,
+    isHeaderRowEnabled = _ref.isHeaderRowEnabled,
+    isHeaderColumnEnabled = _ref.isHeaderColumnEnabled,
+    hoveredRows = _ref.hoveredRows,
+    stickyTop = _ref.stickyTop,
+    hoverRows = _ref.hoverRows,
+    selectRow = _ref.selectRow,
+    tableActive = _ref.tableActive,
+    api = _ref.api;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['selection']),
+    selectionState = _useSharedPluginState.selectionState;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CornerControls.CornerControls, {
+    editorView: editorView,
+    tableRef: tableRef,
+    isInDanger: isInDanger,
+    isResizing: isResizing,
+    isHeaderRowEnabled: isHeaderRowEnabled,
+    isHeaderColumnEnabled: isHeaderColumnEnabled,
+    hoveredRows: hoveredRows,
+    stickyTop: tableActive ? stickyTop : undefined
+  }), /*#__PURE__*/_react.default.createElement(_RowControls.RowControls, {
+    selection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection,
+    editorView: editorView,
+    tableRef: tableRef,
+    hoverRows: hoverRows,
+    hoveredRows: hoveredRows,
+    isInDanger: isInDanger,
+    isResizing: isResizing,
+    selectRow: selectRow,
+    stickyTop: tableActive ? stickyTop : undefined
+  }));
+};

package/dist/cjs/ui/TableFloatingControls/RowControls/ClassicControls.js

@@ -52,7 +52,8 @@ var RowControlsComponent = /*#__PURE__*/function (_Component) {
         hoveredRows = _this$props.hoveredRows,
         isInDanger = _this$props.isInDanger,
         isResizing = _this$props.isResizing,
-        formatMessage = _this$props.intl.formatMessage;
+        formatMessage = _this$props.intl.formatMessage,
+        selectionState = _this$props.selection;
       if (!tableRef) {
         return null;
       }
@@ -76,7 +77,7 @@ var RowControlsComponent = /*#__PURE__*/function (_Component) {
         }
         var thisRowSticky = _this2.props.stickyTop !== undefined && index === 0 && hasHeaderRow;
         return /*#__PURE__*/_react.default.createElement("div", {
-          className: "".concat(_types.TableCssClassName.ROW_CONTROLS_BUTTON_WRAP, " ").concat((0, _utils.getRowClassNames)(startIndex, selection, hoveredRows, isInDanger, isResizing), " ").concat(thisRowSticky ? 'sticky' : ''),
+          className: "".concat(_types.TableCssClassName.ROW_CONTROLS_BUTTON_WRAP, " ").concat((0, _utils.getRowClassNames)(startIndex, selectionState || selection, hoveredRows, isInDanger, isResizing), " ").concat(thisRowSticky ? 'sticky' : ''),
           key: startIndex,
           style: {
             height: height,

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

@@ -8,9 +8,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.TableFloatingControls = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../../commands");
 var _types = require("../../types");
 var _CornerControls = require("./CornerControls");
+var _FloatingControlsWithSelection = require("./FloatingControlsWithSelection");
 var _NumberColumn = _interopRequireDefault(require("./NumberColumn"));
 var _RowControls = require("./RowControls");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -31,7 +33,8 @@ var TableFloatingControls = exports.TableFloatingControls = function TableFloati
     isDragAndDropEnabled = _ref.isDragAndDropEnabled,
     hoveredCell = _ref.hoveredCell,
     isTableHovered = _ref.isTableHovered,
-    tableWrapperWidth = _ref.tableWrapperWidth;
+    tableWrapperWidth = _ref.tableWrapperWidth,
+    api = _ref.api;
   var _selectRow = (0, _react.useCallback)(function (row, expand) {
     var state = editorView.state,
       dispatch = editorView.dispatch;
@@ -92,7 +95,13 @@ var TableFloatingControls = exports.TableFloatingControls = function TableFloati
     updateCellHoverLocation: updateCellHoverLocation,
     stickyTop: stickyTop,
     isDragAndDropEnabled: isDragAndDropEnabled
-  }) : null, tableActive && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isDragAndDropEnabled ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CornerControls.DragCornerControls, {
+  }) : null, tableActive && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isDragAndDropEnabled ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-shared-state-hook') ? /*#__PURE__*/_react.default.createElement(_CornerControls.DragCornerControlsWithSelection, {
+    editorView: editorView,
+    tableRef: tableRef,
+    isInDanger: isInDanger,
+    isResizing: isResizing,
+    api: api
+  }) : /*#__PURE__*/_react.default.createElement(_CornerControls.DragCornerControls, {
     editorView: editorView,
     tableRef: tableRef,
     isInDanger: isInDanger,
@@ -111,7 +120,20 @@ var TableFloatingControls = exports.TableFloatingControls = function TableFloati
     selectRow: _selectRow,
     selectRows: _selectRows,
     updateCellHoverLocation: updateCellHoverLocation
-  })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CornerControls.CornerControls, {
+  })) : (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.use-shared-state-hook') ? /*#__PURE__*/_react.default.createElement(_FloatingControlsWithSelection.FloatingControlsWithSelection, {
+    editorView: editorView,
+    tableRef: tableRef,
+    isInDanger: isInDanger,
+    isResizing: isResizing,
+    isHeaderRowEnabled: isHeaderRowEnabled,
+    isHeaderColumnEnabled: isHeaderColumnEnabled,
+    hoveredRows: hoveredRows,
+    stickyTop: tableActive ? stickyTop : undefined,
+    tableActive: tableActive,
+    hoverRows: _hoverRows,
+    selectRow: _selectRow,
+    api: api
+  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CornerControls.CornerControls, {
     editorView: editorView,
     tableRef: tableRef,
     isInDanger: isInDanger,