@atlaskit/editor-plugin-table 7.18.2 → 7.18.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-table
 
+## 7.18.4
+
+### Patch Changes
+
+- [#113338](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113338)
+  [`6b5439f51eab4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6b5439f51eab4) -
+  ECA11Y-5 remove FF from codebase
+
+## 7.18.3
+
+### Patch Changes
+
+- [#115110](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/115110)
+  [`c6f8e2be84f70`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c6f8e2be84f70) -
+  ECA11Y-20/ECA11Y-59 Make table cell options menu accessible for keyboard only users
+
 ## 7.18.2
 
 ### Patch Changes

package/dist/cjs/commands/column-resize.js

@@ -71,9 +71,6 @@ var initiateKeyboardColumnResizing = exports.initiateKeyboardColumnResizing = fu
   var ariaNotify = _ref.ariaNotify,
     getIntl = _ref.getIntl;
   return function (state, dispatch, view) {
-    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-      return false;
-    }
     var selection = state.selection;
     var selectionRect = (0, _utils.isSelectionType)(selection, 'cell') ? (0, _utils.getSelectionRect)(selection) : (0, _utils.findCellRectClosestToPos)(selection.$from);
     var cell = (0, _utils.findCellClosestToPos)(selection.$from);
@@ -93,9 +90,6 @@ var activateNextResizeArea = exports.activateNextResizeArea = function activateN
     ariaNotify = _ref2.ariaNotify,
     getIntl = _ref2.getIntl;
   return function (state, dispatch, view) {
-    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-      return false;
-    }
     var _ref3 = (0, _pluginFactory2.getPluginState)(state) || {},
       resizeHandlePos = _ref3.resizeHandlePos;
     // If No resizing has initiated, skip to regular handler
@@ -168,9 +162,6 @@ var changeColumnWidthByStep = exports.changeColumnWidthByStep = function changeC
     var fakeDispatch = function fakeDispatch(tr) {
       customTr = tr;
     };
-    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-      return false;
-    }
     var _getTableResizingPlug = (0, _pluginFactory2.getPluginState)(state),
       resizeHandlePos = _getTableResizingPlug.resizeHandlePos;
     var cell = (0, _utils.findCellClosestToPos)(state.selection.$from);
@@ -258,9 +249,6 @@ var stopKeyboardColumnResizing = exports.stopKeyboardColumnResizing = function s
     getIntl = _ref5.getIntl,
     originalTr = _ref5.originalTr;
   return function (state, dispatch) {
-    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-      return false;
-    }
     var customTr = originalTr || state.tr;
     var fakeDispatch = function fakeDispatch(tr) {
       customTr = tr;

package/dist/cjs/commands/go-to-next-cell.js

@@ -8,7 +8,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils2 = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commandsWithAnalytics = require("../commands-with-analytics");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _columnResize = require("./column-resize");
@@ -19,20 +18,18 @@ var TAB_BACKWARD_DIRECTION = -1;
 var goToNextCell = exports.goToNextCell = function goToNextCell(editorAnalyticsAPI, ariaNotify, getIntl) {
   return function (direction) {
     return function (state, dispatch, view) {
+      var _getPluginState;
       var table = (0, _utils2.findTable)(state.selection);
       if (!table) {
         return false;
       }
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-        var _getPluginState;
-        var isColumnResizing = (_getPluginState = (0, _pluginFactory.getPluginState)(state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.isKeyboardResize;
-        if (isColumnResizing) {
-          (0, _columnResize.stopKeyboardColumnResizing)({
-            ariaNotify: ariaNotify,
-            getIntl: getIntl
-          })(state, dispatch, view);
-          return true;
-        }
+      var isColumnResizing = (_getPluginState = (0, _pluginFactory.getPluginState)(state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.isKeyboardResize;
+      if (isColumnResizing) {
+        (0, _columnResize.stopKeyboardColumnResizing)({
+          ariaNotify: ariaNotify,
+          getIntl: getIntl
+        })(state, dispatch, view);
+        return true;
       }
       var map = _tableMap.TableMap.get(table.node);
       var _state$schema$nodes = state.schema.nodes,

package/dist/cjs/commands/index.js

@@ -165,6 +165,12 @@ Object.defineProperty(exports, "setEditorFocus", {
     return _misc.setEditorFocus;
   }
 });
+Object.defineProperty(exports, "setFocusToCellMenu", {
+  enumerable: true,
+  get: function get() {
+    return _misc.setFocusToCellMenu;
+  }
+});
 Object.defineProperty(exports, "setMultipleCellAttrs", {
   enumerable: true,
   get: function get() {

package/dist/cjs/commands/misc.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateWidthToWidest = exports.updateResizeHandleDecorations = exports.triggerUnlessTableHeader = exports.transformSliceToRemoveColumnsWidths = exports.transformSliceToAddTableHeaders = exports.transformSliceRemoveCellBackgroundColor = exports.showInsertRowButton = exports.showInsertColumnButton = exports.setTableRef = exports.setTableAlignmentWithTableContentWithPos = exports.setTableAlignment = exports.setMultipleCellAttrs = exports.setEditorFocus = exports.setCellAttr = exports.selectRows = exports.selectRow = exports.selectColumns = exports.selectColumn = exports.removeResizeHandleDecorations = exports.moveCursorBackward = exports.isInsideFirstCellOfRowOrColumn = exports.hideInsertColumnOrRowButton = exports.getTableSelectionType = exports.getTableElementMoveTypeBySlice = exports.deleteTableIfSelected = exports.deleteTable = exports.countCellsInSlice = exports.convertFirstRowToHeader = exports.autoSizeTable = exports.addResizeHandleDecorations = exports.addBoldInEmptyHeaderCells = void 0;
+exports.updateWidthToWidest = exports.updateResizeHandleDecorations = exports.triggerUnlessTableHeader = exports.transformSliceToRemoveColumnsWidths = exports.transformSliceToAddTableHeaders = exports.transformSliceRemoveCellBackgroundColor = exports.showInsertRowButton = exports.showInsertColumnButton = exports.setTableRef = exports.setTableAlignmentWithTableContentWithPos = exports.setTableAlignment = exports.setMultipleCellAttrs = exports.setFocusToCellMenu = exports.setEditorFocus = exports.setCellAttr = exports.selectRows = exports.selectRow = exports.selectColumns = exports.selectColumn = exports.removeResizeHandleDecorations = exports.moveCursorBackward = exports.isInsideFirstCellOfRowOrColumn = exports.hideInsertColumnOrRowButton = exports.getTableSelectionType = exports.getTableElementMoveTypeBySlice = exports.deleteTableIfSelected = exports.deleteTable = exports.countCellsInSlice = exports.convertFirstRowToHeader = exports.autoSizeTable = exports.addResizeHandleDecorations = exports.addBoldInEmptyHeaderCells = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
@@ -626,4 +626,18 @@ var setTableAlignmentWithTableContentWithPos = exports.setTableAlignmentWithTabl
     tr.setNodeMarkup(tableNodeWithPos.pos, undefined, nextTableAttrs).setMeta('scrollIntoView', false);
     return tr;
   };
+};
+var setFocusToCellMenu = exports.setFocusToCellMenu = function setFocusToCellMenu() {
+  var isCellMenuOpenByKeyboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  var originalTr = arguments.length > 1 ? arguments[1] : undefined;
+  return (0, _pluginFactory.createCommand)(function () {
+    return {
+      type: 'SET_CELL_MENU_OPEN',
+      data: {
+        isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard
+      }
+    };
+  }, function (tr) {
+    return (originalTr || tr).setMeta('addToHistory', false);
+  });
 };

package/dist/cjs/commands/selection.js

@@ -9,7 +9,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _misc = require("../commands/misc");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _toolbar = require("../toolbar");
@@ -202,11 +201,8 @@ var arrowLeftFromText = function arrowLeftFromText(editorSelectionAPI) {
       var table = (0, _utils.findTable)(selection);
       if (table) {
         var $from = selection.$from;
-        var isColumnResizing = false;
-        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-          var columResizePluginState = (0, _pluginFactory.getPluginState)(state) || {};
-          isColumnResizing = Boolean(columResizePluginState === null || columResizePluginState === void 0 ? void 0 : columResizePluginState.isKeyboardResize);
-        }
+        var columResizePluginState = (0, _pluginFactory.getPluginState)(state) || {};
+        var isColumnResizing = Boolean(columResizePluginState === null || columResizePluginState === void 0 ? void 0 : columResizePluginState.isKeyboardResize);
         if (isSelectionAtStartOfTable($from, selection) && $from.parent.type.name === 'paragraph' && $from.depth === table.depth + 3 &&
         // + 3 for: row, cell & paragraph nodes
         editorSelectionAPI && !isColumnResizing) {
@@ -236,11 +232,8 @@ var arrowRightFromText = function arrowRightFromText(editorSelectionAPI) {
       var table = (0, _utils.findTable)(selection);
       if (table) {
         var $to = selection.$to;
-        var isColumnResizing = false;
-        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-          var columResizePluginState = (0, _pluginFactory.getPluginState)(state) || {};
-          isColumnResizing = Boolean(columResizePluginState === null || columResizePluginState === void 0 ? void 0 : columResizePluginState.isKeyboardResize);
-        }
+        var columResizePluginState = (0, _pluginFactory.getPluginState)(state) || {};
+        var isColumnResizing = Boolean(columResizePluginState === null || columResizePluginState === void 0 ? void 0 : columResizePluginState.isKeyboardResize);
         if (isSelectionAtEndOfTable($to, selection) && $to.parent.type.name === 'paragraph' && $to.depth === table.depth + 3 &&
         // + 3 for: row, cell & paragraph nodes
         !isColumnResizing) {

package/dist/cjs/event-handlers.js

@@ -199,17 +199,13 @@ var handleMouseOut = exports.handleMouseOut = function handleMouseOut(view, mous
   if ((0, _utils3.isResizeHandleDecoration)(target) && !(0, _utils3.isResizeHandleDecoration)(relatedTarget)) {
     var _state2 = view.state,
       _dispatch3 = view.dispatch;
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-      var _getPluginState3 = (0, _pluginFactory2.getPluginState)(_state2),
-        isKeyboardResize = _getPluginState3.isKeyboardResize;
-      if (isKeyboardResize) {
-        // no need to hide decoration if column resizing started by keyboard
-        return false;
-      }
-      return (0, _commands.hideResizeHandleLine)()(_state2, _dispatch3);
-    } else {
-      return (0, _commands.hideResizeHandleLine)()(_state2, _dispatch3);
+    var _getPluginState3 = (0, _pluginFactory2.getPluginState)(_state2),
+      isKeyboardResize = _getPluginState3.isKeyboardResize;
+    if (isKeyboardResize) {
+      // no need to hide decoration if column resizing started by keyboard
+      return false;
     }
+    return (0, _commands.hideResizeHandleLine)()(_state2, _dispatch3);
   }
   return false;
 };
@@ -302,7 +298,7 @@ var handleMouseMoveDebounce = (0, _rafSchd.default)(function (view, event, offse
       var _getPluginState8 = (0, _pluginFactory2.getPluginState)(_state4),
         resizeHandleColumnIndex = _getPluginState8.resizeHandleColumnIndex,
         resizeHandleRowIndex = _getPluginState8.resizeHandleRowIndex;
-      var isKeyboardResize = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz') ? (0, _pluginFactory2.getPluginState)(_state4).isKeyboardResize : false;
+      var isKeyboardResize = (0, _pluginFactory2.getPluginState)(_state4).isKeyboardResize;
       var tableCell = (0, _utils.closestElement)(element, 'td, th');
       var cellStartPosition = view.posAtDOM(tableCell, 0);
       var rect = (0, _utils2.findCellRectClosestToPos)(_state4.doc.resolve(cellStartPosition));

package/dist/cjs/plugin.js

@@ -356,10 +356,11 @@ var tablesPlugin = function tablesPlugin(_ref) {
             isHeaderColumnEnabled = _ref18.isHeaderColumnEnabled,
             isHeaderRowEnabled = _ref18.isHeaderRowEnabled,
             isDragAndDropEnabled = _ref18.isDragAndDropEnabled,
-            tableWrapperTarget = _ref18.tableWrapperTarget;
+            tableWrapperTarget = _ref18.tableWrapperTarget,
+            isCellMenuOpenByKeyboard = _ref18.isCellMenuOpenByKeyboard;
           var allowControls = pluginConfig.allowControls;
           var stickyHeader = stickyHeadersState ? (0, _stickyHeaders.findStickyHeaderForTable)(stickyHeadersState, tablePos) : undefined;
-          return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, targetCellPosition && tableRef && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/_react.default.createElement(_FloatingContextualButton.default, {
+          return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, targetCellPosition && (tableRef || (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/_react.default.createElement(_FloatingContextualButton.default, {
             isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
             editorView: editorView,
             tableNode: tableNode,
@@ -369,7 +370,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
             isContextualMenuOpen: isContextualMenuOpen,
             stickyHeader: stickyHeader,
-            tableWrapper: tableWrapperTarget
+            tableWrapper: tableWrapperTarget,
+            isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard
           }), allowControls && /*#__PURE__*/_react.default.createElement(_FloatingInsertButton.default, {
             tableNode: tableNode,
             tableRef: tableRef,
@@ -397,7 +399,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
             pluginConfig: pluginConfig,
             editorAnalyticsAPI: editorAnalyticsAPI,
             getEditorContainerWidth: defaultGetEditorContainerWidth,
-            getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags
+            getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags,
+            isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard
           }), isDragAndDropEnabled && /*#__PURE__*/_react.default.createElement(_FloatingDragMenu.default, {
             editorView: editorView,
             mountPoint: popupsMountPoint,

package/dist/cjs/pm-plugins/keymap.js

@@ -62,27 +62,28 @@ function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, dragAndDropEn
     (0, _keymaps.bindKeymapWithCommand)(_keymaps.deleteColumn.common, (0, _commandsWithAnalytics.deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut)(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
     (0, _keymaps.bindKeymapWithCommand)(_keymaps.deleteRow.common, (0, _commandsWithAnalytics.deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut)(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
   }
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-    (0, _keymaps.bindKeymapWithCommand)(_keymaps.startColumnResizing.common, (0, _columnResize.initiateKeyboardColumnResizing)({
-      ariaNotify: ariaNotifyPlugin,
-      getIntl: getIntl
-    }), list);
-    (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveRight.common, (0, _columnResize.activateNextResizeArea)({
-      direction: 1,
-      ariaNotify: ariaNotifyPlugin,
-      getIntl: getIntl
-    }), list);
-    (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveLeft.common, (0, _columnResize.activateNextResizeArea)({
-      direction: -1,
-      ariaNotify: ariaNotifyPlugin,
-      getIntl: getIntl
-    }), list);
-    (0, _keymaps.bindKeymapWithCommand)(_keymaps.decreaseMediaSize.common, (0, _commandsWithAnalytics.changeColumnWidthByStepWithAnalytics)(editorAnalyticsAPI)(-10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, _analytics.INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
-    (0, _keymaps.bindKeymapWithCommand)(_keymaps.increaseMediaSize.common, (0, _commandsWithAnalytics.changeColumnWidthByStepWithAnalytics)(editorAnalyticsAPI)(10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, _analytics.INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
-    (0, _keymaps.bindKeymapWithCommand)(_keymaps.escape.common, (0, _columnResize.stopKeyboardColumnResizing)({
-      ariaNotify: ariaNotifyPlugin,
-      getIntl: getIntl
-    }), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.startColumnResizing.common, (0, _columnResize.initiateKeyboardColumnResizing)({
+    ariaNotify: ariaNotifyPlugin,
+    getIntl: getIntl
+  }), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveRight.common, (0, _columnResize.activateNextResizeArea)({
+    direction: 1,
+    ariaNotify: ariaNotifyPlugin,
+    getIntl: getIntl
+  }), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveLeft.common, (0, _columnResize.activateNextResizeArea)({
+    direction: -1,
+    ariaNotify: ariaNotifyPlugin,
+    getIntl: getIntl
+  }), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.decreaseMediaSize.common, (0, _commandsWithAnalytics.changeColumnWidthByStepWithAnalytics)(editorAnalyticsAPI)(-10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, _analytics.INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.increaseMediaSize.common, (0, _commandsWithAnalytics.changeColumnWidthByStepWithAnalytics)(editorAnalyticsAPI)(10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, _analytics.INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.escape.common, (0, _columnResize.stopKeyboardColumnResizing)({
+    ariaNotify: ariaNotifyPlugin,
+    getIntl: getIntl
+  }), list);
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
+    (0, _keymaps.bindKeymapWithCommand)(_keymaps.focusToContextMenuTrigger.common, (0, _commands2.setFocusToCellMenu)(), list);
   }
   return (0, _keymap.keymap)(list);
 }

package/dist/cjs/pm-plugins/main.js

@@ -117,31 +117,29 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
               tableRef = parent.querySelector('table') || undefined;
             }
             var tableNode = (0, _utils3.findTable)(state.selection);
-            if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-              // when keyboard cursor leaves the table we need to stop column resizing
-              var pluginPrevState = (0, _pluginFactory.getPluginState)(prevState);
-              var isStopKeyboardColumResizing = pluginPrevState.isResizeHandleWidgetAdded && pluginPrevState.isKeyboardResize;
-              if (isStopKeyboardColumResizing) {
-                var isTableNodesDifferent = (pluginPrevState === null || pluginPrevState === void 0 ? void 0 : pluginPrevState.tableNode) !== (tableNode === null || tableNode === void 0 ? void 0 : tableNode.node);
-                if (pluginPrevState !== null && pluginPrevState !== void 0 && pluginPrevState.tableNode && tableNode && isTableNodesDifferent) {
-                  var oldRowsNumber = _editorTables.TableMap.get(pluginPrevState.tableNode).height;
-                  var newRowsNumber = _editorTables.TableMap.get(tableNode.node).height;
-                  if (oldRowsNumber !== newRowsNumber ||
-                  // Add/delete row
-                  tableNode.node.attrs.localId !== pluginPrevState.tableNode.attrs.localId) {
-                    // Jump to another table
-                    (0, _columnResize.stopKeyboardColumnResizing)({
-                      ariaNotify: ariaNotifyPlugin,
-                      getIntl: getIntl
-                    })(state, dispatch);
-                  }
-                } else if (!tableNode) {
-                  // selection outside of table
+            // when keyboard cursor leaves the table we need to stop column resizing
+            var pluginPrevState = (0, _pluginFactory.getPluginState)(prevState);
+            var isStopKeyboardColumResizing = pluginPrevState.isResizeHandleWidgetAdded && pluginPrevState.isKeyboardResize;
+            if (isStopKeyboardColumResizing) {
+              var isTableNodesDifferent = (pluginPrevState === null || pluginPrevState === void 0 ? void 0 : pluginPrevState.tableNode) !== (tableNode === null || tableNode === void 0 ? void 0 : tableNode.node);
+              if (pluginPrevState !== null && pluginPrevState !== void 0 && pluginPrevState.tableNode && tableNode && isTableNodesDifferent) {
+                var oldRowsNumber = _editorTables.TableMap.get(pluginPrevState.tableNode).height;
+                var newRowsNumber = _editorTables.TableMap.get(tableNode.node).height;
+                if (oldRowsNumber !== newRowsNumber ||
+                // Add/delete row
+                tableNode.node.attrs.localId !== pluginPrevState.tableNode.attrs.localId) {
+                  // Jump to another table
                   (0, _columnResize.stopKeyboardColumnResizing)({
                     ariaNotify: ariaNotifyPlugin,
                     getIntl: getIntl
                   })(state, dispatch);
                 }
+              } else if (!tableNode) {
+                // selection outside of table
+                (0, _columnResize.stopKeyboardColumnResizing)({
+                  ariaNotify: ariaNotifyPlugin,
+                  getIntl: getIntl
+                })(state, dispatch);
               }
             }
           }
@@ -243,16 +241,14 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
       handleTextInput: function handleTextInput(view, _from, _to, text) {
         var state = view.state,
           dispatch = view.dispatch;
-        if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-          var _getPluginState = (0, _pluginFactory.getPluginState)(state),
-            isKeyboardResize = _getPluginState.isKeyboardResize;
-          if (isKeyboardResize) {
-            (0, _columnResize.stopKeyboardColumnResizing)({
-              ariaNotify: ariaNotifyPlugin,
-              getIntl: getIntl
-            })(state, dispatch);
-            return false;
-          }
+        var _getPluginState = (0, _pluginFactory.getPluginState)(state),
+          isKeyboardResize = _getPluginState.isKeyboardResize;
+        if (isKeyboardResize) {
+          (0, _columnResize.stopKeyboardColumnResizing)({
+            ariaNotify: ariaNotifyPlugin,
+            getIntl: getIntl
+          })(state, dispatch);
+          return false;
         }
         var tr = (0, _transforms2.replaceSelectedTable)(state, text, _analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsAPI);
         if (tr.selectionSet) {

package/dist/cjs/pm-plugins/table-resizing/event-handlers.js

@@ -115,15 +115,11 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
 
     // If we let go in the same place we started, don't need to do anything.
     if (dragging && clientX === dragging.startX) {
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-        if (isKeyboardResize || !isTableHovered) {
-          /** if column resize had started via keyboard but continued by mouse
-           *  or mouse pointer leaves the table but mouse button still pressed
-           */
-          return (0, _columnResize.stopKeyboardColumnResizing)({})(state, dispatch, view);
-        } else {
-          return (0, _commands.stopResizing)()(state, dispatch);
-        }
+      if (isKeyboardResize || !isTableHovered) {
+        /** if column resize had started via keyboard but continued by mouse
+         *  or mouse pointer leaves the table but mouse button still pressed
+         */
+        return (0, _columnResize.stopKeyboardColumnResizing)({})(state, dispatch, view);
       } else {
         return (0, _commands.stopResizing)()(state, dispatch);
       }
@@ -190,17 +186,13 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
           }
         })(tr);
       }
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-        if (isKeyboardResize || !isTableHovered) {
-          /** if column resize had started via keyboard but continued by mouse
-           *  or mouse pointer leaves the table but mouse button still pressed
-           */
-          return (0, _columnResize.stopKeyboardColumnResizing)({
-            originalTr: tr
-          })(state, dispatch, view);
-        } else {
-          return (0, _commands.stopResizing)(tr)(state, dispatch);
-        }
+      if (isKeyboardResize || !isTableHovered) {
+        /** if column resize had started via keyboard but continued by mouse
+         *  or mouse pointer leaves the table but mouse button still pressed
+         */
+        return (0, _columnResize.stopKeyboardColumnResizing)({
+          originalTr: tr
+        })(state, dispatch, view);
       } else {
         return (0, _commands.stopResizing)(tr)(state, dispatch);
       }
@@ -215,7 +207,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
       resizeHandlePos = _getPluginState2.resizeHandlePos;
     var _getTablePluginState3 = (0, _pluginFactory.getPluginState)(state),
       isTableHovered = _getTablePluginState3.isTableHovered;
-    if (!which || !dragging || resizeHandlePos === null || !(0, _utils3.pointsAtCell)(state.doc.resolve(resizeHandlePos)) || !isTableHovered && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
+    if (!which || !dragging || resizeHandlePos === null || !(0, _utils3.pointsAtCell)(state.doc.resolve(resizeHandlePos)) || !isTableHovered) {
       return finish(event);
     }
     var $cell = state.doc.resolve(resizeHandlePos);

package/dist/cjs/pm-plugins/table-resizing/plugin.js

@@ -8,7 +8,6 @@ exports.createPlugin = createPlugin;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../../types");
 var _pluginFactory = require("../plugin-factory");
 var _commands = require("./commands");
@@ -44,16 +43,14 @@ function createPlugin(dispatch, _ref, getEditorContainerWidth, getEditorFeatureF
           var _getPluginState = (0, _pluginFactory2.getPluginState)(state),
             dragging = _getPluginState.dragging;
           var isColumnKeyboardResizeStarted = false;
-          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-column-resizing_emcvz')) {
-            /*
-                    We need to start listening mouse events if column resize started from keyboard.
-                    This will allow continue resizing via mouse
-                  */
-            var _getTablePluginState = (0, _pluginFactory.getPluginState)(state),
-              isKeyboardResize = _getTablePluginState.isKeyboardResize;
-            if (isKeyboardResize) {
-              isColumnKeyboardResizeStarted = isKeyboardResize;
-            }
+          /*
+          	We need to start listening mouse events if column resize started from keyboard.
+          	This will allow continue resizing via mouse
+          */
+          var _getTablePluginState = (0, _pluginFactory.getPluginState)(state),
+            isKeyboardResize = _getTablePluginState.isKeyboardResize;
+          if (isKeyboardResize) {
+            isColumnKeyboardResizeStarted = isKeyboardResize;
           }
           if (resizeHandlePos !== null && (!dragging || isColumnKeyboardResizeStarted)) {
             if ((0, _eventHandlers.handleMouseDown)(view, event, resizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled || false, editorAnalyticsAPI, isNewColumnResizingEnabled)) {

package/dist/cjs/reducer.js

@@ -102,6 +102,7 @@ var _default = exports.default = function _default(pluginState, action) {
     case 'HOVER_CELL':
     case 'SHOW_RESIZE_HANDLE_LINE':
     case 'SET_EDITOR_FOCUS':
+    case 'SET_CELL_MENU_OPEN':
       return _objectSpread(_objectSpread({}, pluginState), action.data);
     default:
       return pluginState;

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

@@ -1,11 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -16,10 +17,13 @@ var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../../commands");
 var _types = require("../../types");
 var _FixedButton = _interopRequireDefault(require("./FixedButton"));
 var _styles = require("./styles");
+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); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /** @jsx jsx */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -33,6 +37,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
     stickyHeader = props.stickyHeader,
     tableWrapper = props.tableWrapper,
     targetCellPosition = props.targetCellPosition,
+    isCellMenuOpenByKeyboard = props.isCellMenuOpenByKeyboard,
     formatMessage = props.intl.formatMessage; //  : Props & WrappedComponentProps
 
   var handleClick = function handleClick() {
@@ -50,6 +55,16 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
   var domAtPos = editorView.domAtPos.bind(editorView);
   var targetCellRef;
   targetCellRef = (0, _utils.findDomRefAtPos)(targetCellPosition, domAtPos);
+  (0, _react.useEffect)(function () {
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c')) {
+      if (isCellMenuOpenByKeyboard && !isContextualMenuOpen) {
+        var state = editorView.state,
+          dispatch = editorView.dispatch;
+        // open the menu when the keyboard shortcut is pressed
+        (0, _commands.toggleContextualMenu)()(state, dispatch);
+      }
+    }
+  }, [isCellMenuOpenByKeyboard, isContextualMenuOpen, editorView]);
   if (!targetCellRef || !(targetCellRef instanceof HTMLElement)) {
     return null;
   }
@@ -70,7 +85,8 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
     iconBefore: (0, _react2.jsx)(_chevronDown.default, {
       label: ""
     }),
-    "aria-label": labelCellOptions
+    "aria-label": labelCellOptions,
+    "aria-expanded": (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-context-menu_y4c9c') ? isContextualMenuOpen : undefined
   }));
   var parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
   if (stickyHeader && parentSticky && tableWrapper) {