@atlaskit/editor-plugin-table 7.18.2 → 7.18.4

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

@@ -65,9 +65,6 @@ export var initiateKeyboardColumnResizing = function initiateKeyboardColumnResiz
   var ariaNotify = _ref.ariaNotify,
     getIntl = _ref.getIntl;
   return function (state, dispatch, view) {
-    if (!getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-      return false;
-    }
     var selection = state.selection;
     var selectionRect = isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
     var cell = findCellClosestToPos(selection.$from);
@@ -87,9 +84,6 @@ export var activateNextResizeArea = function activateNextResizeArea(_ref2) {
     ariaNotify = _ref2.ariaNotify,
     getIntl = _ref2.getIntl;
   return function (state, dispatch, view) {
-    if (!getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-      return false;
-    }
     var _ref3 = getTableResizingPluginState(state) || {},
       resizeHandlePos = _ref3.resizeHandlePos;
     // If No resizing has initiated, skip to regular handler
@@ -162,9 +156,6 @@ export var changeColumnWidthByStep = function changeColumnWidthByStep(_ref4) {
     var fakeDispatch = function fakeDispatch(tr) {
       customTr = tr;
     };
-    if (!getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-      return false;
-    }
     var _getTableResizingPlug = getTableResizingPluginState(state),
       resizeHandlePos = _getTableResizingPlug.resizeHandlePos;
     var cell = findCellClosestToPos(state.selection.$from);
@@ -252,9 +243,6 @@ export var stopKeyboardColumnResizing = function stopKeyboardColumnResizing(_ref
     getIntl = _ref5.getIntl,
     originalTr = _ref5.originalTr;
   return function (state, dispatch) {
-    if (!getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-      return false;
-    }
     var customTr = originalTr || state.tr;
     var fakeDispatch = function fakeDispatch(tr) {
       customTr = tr;

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

@@ -4,7 +4,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { goToNextCell as baseGotoNextCell, findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { insertRowWithAnalytics } from '../commands-with-analytics';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { stopKeyboardColumnResizing } from './column-resize';
@@ -13,20 +12,18 @@ var TAB_BACKWARD_DIRECTION = -1;
 export var goToNextCell = function goToNextCell(editorAnalyticsAPI, ariaNotify, getIntl) {
   return function (direction) {
     return function (state, dispatch, view) {
+      var _getPluginState;
       var table = findTable(state.selection);
       if (!table) {
         return false;
       }
-      if (getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-        var _getPluginState;
-        var isColumnResizing = (_getPluginState = getPluginState(state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.isKeyboardResize;
-        if (isColumnResizing) {
-          stopKeyboardColumnResizing({
-            ariaNotify: ariaNotify,
-            getIntl: getIntl
-          })(state, dispatch, view);
-          return true;
-        }
+      var isColumnResizing = (_getPluginState = getPluginState(state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.isKeyboardResize;
+      if (isColumnResizing) {
+        stopKeyboardColumnResizing({
+          ariaNotify: ariaNotify,
+          getIntl: getIntl
+        })(state, dispatch, view);
+        return true;
       }
       var map = TableMap.get(table.node);
       var _state$schema$nodes = state.schema.nodes,

package/dist/esm/commands/index.js

@@ -2,7 +2,7 @@ export { hoverColumns, hoverRows, hoverTable, hoverCell, hoverMergedCells, clear
 export { insertColumn, insertRow, createTable } from './insert';
 export { getNextLayout, toggleContextualMenu, toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn, toggleTableLayout } from './toggle';
 export { clearMultipleCells } from './clear';
-export { autoSizeTable, convertFirstRowToHeader, deleteTable, hideInsertColumnOrRowButton, moveCursorBackward, selectColumn, selectColumns, selectRow, selectRows, setCellAttr, setEditorFocus, setMultipleCellAttrs, setTableRef, showInsertColumnButton, showInsertRowButton, transformSliceToAddTableHeaders, triggerUnlessTableHeader, addBoldInEmptyHeaderCells, addResizeHandleDecorations, updateWidthToWidest } from './misc';
+export { autoSizeTable, convertFirstRowToHeader, deleteTable, hideInsertColumnOrRowButton, moveCursorBackward, selectColumn, selectColumns, selectRow, selectRows, setCellAttr, setEditorFocus, setMultipleCellAttrs, setTableRef, showInsertColumnButton, showInsertRowButton, transformSliceToAddTableHeaders, triggerUnlessTableHeader, addBoldInEmptyHeaderCells, addResizeHandleDecorations, updateWidthToWidest, setFocusToCellMenu } from './misc';
 export { sortByColumn } from './sort';
 export { goToNextCell } from './go-to-next-cell';
 export { removeDescendantNodes } from './referentiality';

package/dist/esm/commands/misc.js

@@ -619,4 +619,18 @@ export var setTableAlignmentWithTableContentWithPos = function setTableAlignment
     tr.setNodeMarkup(tableNodeWithPos.pos, undefined, nextTableAttrs).setMeta('scrollIntoView', false);
     return tr;
   };
+};
+export var setFocusToCellMenu = function setFocusToCellMenu() {
+  var isCellMenuOpenByKeyboard = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  var originalTr = arguments.length > 1 ? arguments[1] : undefined;
+  return createCommand(function () {
+    return {
+      type: 'SET_CELL_MENU_OPEN',
+      data: {
+        isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard
+      }
+    };
+  }, function (tr) {
+    return (originalTr || tr).setMeta('addToHistory', false);
+  });
 };

package/dist/esm/commands/selection.js

@@ -3,7 +3,6 @@ import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, isColumnSelected, isRowSelected, isTableSelected, selectedRect } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { selectColumn, selectRow } from '../commands/misc';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { getClosestSelectionRect } from '../toolbar';
@@ -196,11 +195,8 @@ var arrowLeftFromText = function arrowLeftFromText(editorSelectionAPI) {
       var table = findTable(selection);
       if (table) {
         var $from = selection.$from;
-        var isColumnResizing = false;
-        if (getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-          var columResizePluginState = getPluginState(state) || {};
-          isColumnResizing = Boolean(columResizePluginState === null || columResizePluginState === void 0 ? void 0 : columResizePluginState.isKeyboardResize);
-        }
+        var columResizePluginState = 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) {
@@ -230,11 +226,8 @@ var arrowRightFromText = function arrowRightFromText(editorSelectionAPI) {
       var table = findTable(selection);
       if (table) {
         var $to = selection.$to;
-        var isColumnResizing = false;
-        if (getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-          var columResizePluginState = getPluginState(state) || {};
-          isColumnResizing = Boolean(columResizePluginState === null || columResizePluginState === void 0 ? void 0 : columResizePluginState.isKeyboardResize);
-        }
+        var columResizePluginState = 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/esm/event-handlers.js

@@ -190,17 +190,13 @@ export var handleMouseOut = function handleMouseOut(view, mouseEvent) {
   if (isResizeHandleDecoration(target) && !isResizeHandleDecoration(relatedTarget)) {
     var _state2 = view.state,
       _dispatch3 = view.dispatch;
-    if (getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-      var _getPluginState3 = getPluginState(_state2),
-        isKeyboardResize = _getPluginState3.isKeyboardResize;
-      if (isKeyboardResize) {
-        // no need to hide decoration if column resizing started by keyboard
-        return false;
-      }
-      return hideResizeHandleLine()(_state2, _dispatch3);
-    } else {
-      return hideResizeHandleLine()(_state2, _dispatch3);
+    var _getPluginState3 = getPluginState(_state2),
+      isKeyboardResize = _getPluginState3.isKeyboardResize;
+    if (isKeyboardResize) {
+      // no need to hide decoration if column resizing started by keyboard
+      return false;
     }
+    return hideResizeHandleLine()(_state2, _dispatch3);
   }
   return false;
 };
@@ -293,7 +289,7 @@ var handleMouseMoveDebounce = rafSchedule(function (view, event, offsetX) {
       var _getPluginState8 = getPluginState(_state4),
         resizeHandleColumnIndex = _getPluginState8.resizeHandleColumnIndex,
         resizeHandleRowIndex = _getPluginState8.resizeHandleRowIndex;
-      var isKeyboardResize = getBooleanFF('platform.editor.a11y-column-resizing_emcvz') ? getPluginState(_state4).isKeyboardResize : false;
+      var isKeyboardResize = getPluginState(_state4).isKeyboardResize;
       var tableCell = closestElement(element, 'td, th');
       var cellStartPosition = view.posAtDOM(tableCell, 0);
       var rect = findCellRectClosestToPos(_state4.doc.resolve(cellStartPosition));

package/dist/esm/plugin.js

@@ -349,10 +349,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 ? findStickyHeaderForTable(stickyHeadersState, tablePos) : undefined;
-          return /*#__PURE__*/React.createElement(React.Fragment, null, targetCellPosition && tableRef && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/React.createElement(FloatingContextualButton, {
+          return /*#__PURE__*/React.createElement(React.Fragment, null, targetCellPosition && (tableRef || getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') && isCellMenuOpenByKeyboard) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/React.createElement(FloatingContextualButton, {
             isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
             editorView: editorView,
             tableNode: tableNode,
@@ -362,7 +363,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
             isContextualMenuOpen: isContextualMenuOpen,
             stickyHeader: stickyHeader,
-            tableWrapper: tableWrapperTarget
+            tableWrapper: tableWrapperTarget,
+            isCellMenuOpenByKeyboard: isCellMenuOpenByKeyboard
           }), allowControls && /*#__PURE__*/React.createElement(FloatingInsertButton, {
             tableNode: tableNode,
             tableRef: tableRef,
@@ -390,7 +392,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.createElement(FloatingDragMenu, {
             editorView: editorView,
             mountPoint: popupsMountPoint,

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

@@ -1,9 +1,9 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addColumnAfter, addColumnAfterVO, addColumnBefore, addColumnBeforeVO, addRowAfter, addRowAfterVO, addRowBefore, addRowBeforeVO, backspace, bindKeymapWithCommand, decreaseMediaSize, deleteColumn, deleteRow, escape, increaseMediaSize, moveColumnLeft, moveColumnRight, moveLeft, moveRight, moveRowDown, moveRowUp, nextCell, previousCell, startColumnResizing, toggleTable } from '@atlaskit/editor-common/keymaps';
+import { addColumnAfter, addColumnAfterVO, addColumnBefore, addColumnBeforeVO, addRowAfter, addRowAfterVO, addRowBefore, addRowBeforeVO, backspace, bindKeymapWithCommand, decreaseMediaSize, deleteColumn, deleteRow, escape, focusToContextMenuTrigger, increaseMediaSize, moveColumnLeft, moveColumnRight, moveLeft, moveRight, moveRowDown, moveRowUp, nextCell, previousCell, startColumnResizing, toggleTable } from '@atlaskit/editor-common/keymaps';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { goToNextCell, moveCursorBackward } from '../commands';
+import { goToNextCell, moveCursorBackward, setFocusToCellMenu } from '../commands';
 import { addRowAroundSelection, changeColumnWidthByStepWithAnalytics, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut, deleteTableIfSelectedWithAnalytics, emptyMultipleCellsWithAnalytics } from '../commands-with-analytics';
 import { activateNextResizeArea, initiateKeyboardColumnResizing, stopKeyboardColumnResizing } from '../commands/column-resize';
 import { addColumnAfter as addColumnAfterCommand, addColumnBefore as addColumnBeforeCommand, createTable } from '../commands/insert';
@@ -55,27 +55,28 @@ export function keymapPlugin(getEditorContainerWidth, editorAnalyticsAPI, dragAn
     bindKeymapWithCommand(deleteColumn.common, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
     bindKeymapWithCommand(deleteRow.common, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut(editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent), list);
   }
-  if (getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-    bindKeymapWithCommand(startColumnResizing.common, initiateKeyboardColumnResizing({
-      ariaNotify: ariaNotifyPlugin,
-      getIntl: getIntl
-    }), list);
-    bindKeymapWithCommand(moveRight.common, activateNextResizeArea({
-      direction: 1,
-      ariaNotify: ariaNotifyPlugin,
-      getIntl: getIntl
-    }), list);
-    bindKeymapWithCommand(moveLeft.common, activateNextResizeArea({
-      direction: -1,
-      ariaNotify: ariaNotifyPlugin,
-      getIntl: getIntl
-    }), list);
-    bindKeymapWithCommand(decreaseMediaSize.common, changeColumnWidthByStepWithAnalytics(editorAnalyticsAPI)(-10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
-    bindKeymapWithCommand(increaseMediaSize.common, changeColumnWidthByStepWithAnalytics(editorAnalyticsAPI)(10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
-    bindKeymapWithCommand(escape.common, stopKeyboardColumnResizing({
-      ariaNotify: ariaNotifyPlugin,
-      getIntl: getIntl
-    }), list);
+  bindKeymapWithCommand(startColumnResizing.common, initiateKeyboardColumnResizing({
+    ariaNotify: ariaNotifyPlugin,
+    getIntl: getIntl
+  }), list);
+  bindKeymapWithCommand(moveRight.common, activateNextResizeArea({
+    direction: 1,
+    ariaNotify: ariaNotifyPlugin,
+    getIntl: getIntl
+  }), list);
+  bindKeymapWithCommand(moveLeft.common, activateNextResizeArea({
+    direction: -1,
+    ariaNotify: ariaNotifyPlugin,
+    getIntl: getIntl
+  }), list);
+  bindKeymapWithCommand(decreaseMediaSize.common, changeColumnWidthByStepWithAnalytics(editorAnalyticsAPI)(-10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
+  bindKeymapWithCommand(increaseMediaSize.common, changeColumnWidthByStepWithAnalytics(editorAnalyticsAPI)(10, getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, INPUT_METHOD.SHORTCUT, ariaNotifyPlugin, getIntl), list);
+  bindKeymapWithCommand(escape.common, stopKeyboardColumnResizing({
+    ariaNotify: ariaNotifyPlugin,
+    getIntl: getIntl
+  }), list);
+  if (getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c')) {
+    bindKeymapWithCommand(focusToContextMenuTrigger.common, setFocusToCellMenu(), list);
   }
   return keymap(list);
 }

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

@@ -110,31 +110,29 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
               tableRef = parent.querySelector('table') || undefined;
             }
             var tableNode = findTable(state.selection);
-            if (getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-              // when keyboard cursor leaves the table we need to stop column resizing
-              var pluginPrevState = 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 = TableMap.get(pluginPrevState.tableNode).height;
-                  var newRowsNumber = TableMap.get(tableNode.node).height;
-                  if (oldRowsNumber !== newRowsNumber ||
-                  // Add/delete row
-                  tableNode.node.attrs.localId !== pluginPrevState.tableNode.attrs.localId) {
-                    // Jump to another table
-                    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 = 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 = TableMap.get(pluginPrevState.tableNode).height;
+                var newRowsNumber = TableMap.get(tableNode.node).height;
+                if (oldRowsNumber !== newRowsNumber ||
+                // Add/delete row
+                tableNode.node.attrs.localId !== pluginPrevState.tableNode.attrs.localId) {
+                  // Jump to another table
                   stopKeyboardColumnResizing({
                     ariaNotify: ariaNotifyPlugin,
                     getIntl: getIntl
                   })(state, dispatch);
                 }
+              } else if (!tableNode) {
+                // selection outside of table
+                stopKeyboardColumnResizing({
+                  ariaNotify: ariaNotifyPlugin,
+                  getIntl: getIntl
+                })(state, dispatch);
               }
             }
           }
@@ -236,16 +234,14 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
       handleTextInput: function handleTextInput(view, _from, _to, text) {
         var state = view.state,
           dispatch = view.dispatch;
-        if (getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-          var _getPluginState = getPluginState(state),
-            isKeyboardResize = _getPluginState.isKeyboardResize;
-          if (isKeyboardResize) {
-            stopKeyboardColumnResizing({
-              ariaNotify: ariaNotifyPlugin,
-              getIntl: getIntl
-            })(state, dispatch);
-            return false;
-          }
+        var _getPluginState = getPluginState(state),
+          isKeyboardResize = _getPluginState.isKeyboardResize;
+        if (isKeyboardResize) {
+          stopKeyboardColumnResizing({
+            ariaNotify: ariaNotifyPlugin,
+            getIntl: getIntl
+          })(state, dispatch);
+          return false;
         }
         var tr = replaceSelectedTable(state, text, INPUT_METHOD.KEYBOARD, editorAnalyticsAPI);
         if (tr.selectionSet) {

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

@@ -109,15 +109,11 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
 
     // If we let go in the same place we started, don't need to do anything.
     if (dragging && clientX === dragging.startX) {
-      if (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 stopKeyboardColumnResizing({})(state, dispatch, view);
-        } else {
-          return 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 stopKeyboardColumnResizing({})(state, dispatch, view);
       } else {
         return stopResizing()(state, dispatch);
       }
@@ -184,17 +180,13 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
           }
         })(tr);
       }
-      if (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 stopKeyboardColumnResizing({
-            originalTr: tr
-          })(state, dispatch, view);
-        } else {
-          return 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 stopKeyboardColumnResizing({
+          originalTr: tr
+        })(state, dispatch, view);
       } else {
         return stopResizing(tr)(state, dispatch);
       }
@@ -209,7 +201,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
       resizeHandlePos = _getPluginState2.resizeHandlePos;
     var _getTablePluginState3 = getTablePluginState(state),
       isTableHovered = _getTablePluginState3.isTableHovered;
-    if (!which || !dragging || resizeHandlePos === null || !pointsAtCell(state.doc.resolve(resizeHandlePos)) || !isTableHovered && getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
+    if (!which || !dragging || resizeHandlePos === null || !pointsAtCell(state.doc.resolve(resizeHandlePos)) || !isTableHovered) {
       return finish(event);
     }
     var $cell = state.doc.resolve(resizeHandlePos);

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

@@ -1,7 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import classnames from 'classnames';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { TableCssClassName as ClassName } from '../../types';
 import { getPluginState as getTablePluginState } from '../plugin-factory';
 import { setResizeHandlePos } from './commands';
@@ -37,16 +36,14 @@ export function createPlugin(dispatch, _ref, getEditorContainerWidth, getEditorF
           var _getPluginState = getPluginState(state),
             dragging = _getPluginState.dragging;
           var isColumnKeyboardResizeStarted = false;
-          if (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 = getTablePluginState(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 = getTablePluginState(state),
+            isKeyboardResize = _getTablePluginState.isKeyboardResize;
+          if (isKeyboardResize) {
+            isColumnKeyboardResizeStarted = isKeyboardResize;
           }
           if (resizeHandlePos !== null && (!dragging || isColumnKeyboardResizeStarted)) {
             if (handleMouseDown(view, event, resizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, isTableScalingEnabled || false, editorAnalyticsAPI, isNewColumnResizingEnabled)) {

package/dist/esm/reducer.js

@@ -95,6 +95,7 @@ export default (function (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/esm/ui/FloatingContextualButton/index.js

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import React from 'react';
+import React, { useEffect } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
@@ -12,6 +12,7 @@ import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { toggleContextualMenu } from '../../commands';
 import { TableCssClassName as ClassName } from '../../types';
 import FixedButton from './FixedButton';
@@ -25,6 +26,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
     stickyHeader = props.stickyHeader,
     tableWrapper = props.tableWrapper,
     targetCellPosition = props.targetCellPosition,
+    isCellMenuOpenByKeyboard = props.isCellMenuOpenByKeyboard,
     formatMessage = props.intl.formatMessage; //  : Props & WrappedComponentProps
 
   var handleClick = function handleClick() {
@@ -42,6 +44,16 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
   var domAtPos = editorView.domAtPos.bind(editorView);
   var targetCellRef;
   targetCellRef = findDomRefAtPos(targetCellPosition, domAtPos);
+  useEffect(function () {
+    if (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
+        toggleContextualMenu()(state, dispatch);
+      }
+    }
+  }, [isCellMenuOpenByKeyboard, isContextualMenuOpen, editorView]);
   if (!targetCellRef || !(targetCellRef instanceof HTMLElement)) {
     return null;
   }
@@ -62,7 +74,8 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
     iconBefore: jsx(ExpandIcon, {
       label: ""
     }),
-    "aria-label": labelCellOptions
+    "aria-label": labelCellOptions,
+    "aria-expanded": getBooleanFF('platform.editor.a11y-table-context-menu_y4c9c') ? isContextualMenuOpen : undefined
   }));
   var parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
   if (stickyHeader && parentSticky && tableWrapper) {