@atlaskit/editor-plugin-table 7.29.6 → 7.29.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-table
 
+## 7.29.7
+
+### Patch Changes
+
+- [#152968](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/152968)
+  [`501e975100eab`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/501e975100eab) -
+  [ED-24137] feature flag clean up for the Cell Options menu a11y work
+
 ## 7.29.6
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -18,7 +18,6 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _pmPlugins = require("@atlaskit/editor-tables/pm-plugins");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _insert = require("./commands/insert");
 var _createPluginConfig = require("./create-plugin-config");
 var _plugin = require("./pm-plugins/analytics/plugin");
@@ -393,7 +392,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
             isCellMenuOpenByKeyboard = _ref20.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 || isCellMenuOpenByKeyboard && (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/_react.default.createElement(_FloatingContextualButton.default, {
+          return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, targetCellPosition && (tableRef || isCellMenuOpenByKeyboard) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/_react.default.createElement(_FloatingContextualButton.default, {
             isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
             editorView: editorView,
             tableNode: tableNode,

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

@@ -9,7 +9,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands2 = require("../commands");
 var _commandsWithAnalytics = require("../commands-with-analytics");
 var _columnResize = require("../commands/column-resize");
@@ -83,9 +82,7 @@ function keymapPlugin(getEditorContainerWidth, api, editorAnalyticsAPI, dragAndD
     ariaNotify: ariaNotifyPlugin,
     getIntl: getIntl
   }), list);
-  if ((0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) {
-    (0, _keymaps.bindKeymapWithCommand)(_keymaps.focusToContextMenuTrigger.common, (0, _commands2.setFocusToCellMenu)(), list);
-  }
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.focusToContextMenuTrigger.common, (0, _commands2.setFocusToCellMenu)(), list);
   return (0, _keymap.keymap)(list);
 }
 var _default = exports.default = keymapPlugin;

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

@@ -18,7 +18,6 @@ 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/utility/migration/chevron-down"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../../commands");
 var _types = require("../../types");
 var _FixedButton = _interopRequireDefault(require("./FixedButton"));
@@ -60,13 +59,11 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
   var targetCellRef;
   targetCellRef = (0, _utils.findDomRefAtPos)(targetCellPosition, domAtPos);
   (0, _react.useEffect)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) {
-      if (isCellMenuOpenByKeyboard && !isContextualMenuOpen) {
-        var state = editorView.state,
-          dispatch = editorView.dispatch;
-        // open the menu when the keyboard shortcut is pressed
-        (0, _commands.toggleContextualMenu)()(state, dispatch);
-      }
+    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)) {
@@ -85,7 +82,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
     className: _types.TableCssClassName.CONTEXTUAL_MENU_BUTTON,
     selected: isContextualMenuOpen,
     title: labelCellOptions,
-    keymap: (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu') ? _keymaps.focusToContextMenuTrigger : undefined,
+    keymap: _keymaps.focusToContextMenuTrigger,
     onClick: handleClick,
     iconBefore: (0, _react2.jsx)(_chevronDown.default, {
       label: "",
@@ -93,7 +90,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
       isFacadeDisabled: true
     }),
     "aria-label": labelCellOptions,
-    "aria-expanded": (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu') ? isContextualMenuOpen : undefined
+    "aria-expanded": isContextualMenuOpen
   }));
   var parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
   if (stickyHeader && parentSticky && tableWrapper) {

package/dist/cjs/ui/FloatingContextualMenu/ContextualMenu.js

@@ -39,7 +39,6 @@ var _tableColumnAddRight = _interopRequireDefault(require("@atlaskit/icon/core/t
 var _tableColumnDelete = _interopRequireDefault(require("@atlaskit/icon/core/table-column-delete"));
 var _tableRowAddBelow = _interopRequireDefault(require("@atlaskit/icon/core/table-row-add-below"));
 var _tableRowDelete = _interopRequireDefault(require("@atlaskit/icon/core/table-row-delete"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _commands = require("../../commands");
 var _commandsWithAnalytics = require("../../commands-with-analytics");
@@ -106,16 +105,14 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         targetCellPosition = _getPluginState.targetCellPosition,
         isDragAndDropEnabled = _getPluginState.isDragAndDropEnabled;
       if (allowBackgroundColor) {
-        var _node$attrs, _node$attrs2, _node$attrs3;
+        var _node$attrs, _node$attrs2;
         var node = isOpen && targetCellPosition ? state.doc.nodeAt(targetCellPosition) : null;
         var background = (0, _editorPalette.hexToEditorBackgroundPaletteColor)((node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.background) || '#ffffff');
         var selectedRowIndex;
         var selectedColumnIndex;
-        if ((0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) {
-          var selectedRowAndColumnFromPalette = (0, _uiColor.getSelectedRowAndColumnFromPalette)(_uiColor.cellBackgroundColorPalette, background, _consts.colorPalletteColumns);
-          selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
-          selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
-        }
+        var selectedRowAndColumnFromPalette = (0, _uiColor.getSelectedRowAndColumnFromPalette)(_uiColor.cellBackgroundColorPalette, background, _consts.colorPalletteColumns);
+        selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
+        selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
         return {
           content: isDragAndDropEnabled ? formatMessage(_messages.tableMessages.backgroundColor) : formatMessage(_messages.tableMessages.cellBackground),
           value: {
@@ -139,7 +136,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             ,
             className: isDragAndDropEnabled ? _types.TableCssClassName.CONTEXTUAL_MENU_ICON_SMALL : _types.TableCssClassName.CONTEXTUAL_MENU_ICON
-          }), (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu') ? isSubmenuOpen && (0, _react2.jsx)("div", {
+          }), isSubmenuOpen && (0, _react2.jsx)("div", {
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             className: _types.TableCssClassName.CONTEXTUAL_SUBMENU,
             ref: _this.handleSubMenuRef
@@ -169,22 +166,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
               paletteColorTooltipMessages: _uiColor.backgroundPaletteTooltipMessages,
               hexToPaletteColor: _editorPalette.hexToEditorBackgroundPaletteColor
             }
-          }))) : isSubmenuOpen &&
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-          (0, _react2.jsx)("div", {
-            className: _types.TableCssClassName.CONTEXTUAL_SUBMENU,
-            ref: _this.handleSubMenuRef
-          }, (0, _react2.jsx)(_uiColor.ColorPalette, {
-            cols: 7,
-            onClick: _this.setColor,
-            selectedColor: (node === null || node === void 0 || (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.background) || '#ffffff',
-            paletteOptions: {
-              palette: _uiColor.cellBackgroundColorPalette,
-              paletteColorTooltipMessages: _uiColor.backgroundPaletteTooltipMessages,
-              hexToPaletteColor: _editorPalette.hexToEditorBackgroundPaletteColor
-            }
-          }))),
-          'aria-expanded': (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu') ? isSubmenuOpen : undefined
+          })))),
+          'aria-expanded': isSubmenuOpen
         };
       }
     });
@@ -510,7 +493,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         tableWithFixedColumnWidthsOption = _ref4$tableWithFixedC === void 0 ? false : _ref4$tableWithFixedC;
       // context menu opened by keyboard and any item except 'background' activated
       // or color has been chosen from color palette
-      if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && _this.state.isSubmenuOpen) && (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) {
+      if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && _this.state.isSubmenuOpen)) {
         var tr = state.tr;
         tr.setMeta(_pluginKey.pluginKey, {
           type: 'SET_CELL_MENU_OPEN',
@@ -579,7 +562,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
             // 1st time when user chooses the background color item.
             // 2nd when color has been chosen from color palette.
             // here we are handling the 1st call relying on the isSubmenuOpen state value
-            if (isCellMenuOpenByKeyboard && !_this.state.isSubmenuOpen && (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) {
+            if (isCellMenuOpenByKeyboard && !_this.state.isSubmenuOpen) {
               _this.setState({
                 isSubmenuOpen: true
               });
@@ -608,39 +591,32 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         dispatch = _this$props12$editorV.dispatch,
         dom = _this$props12$editorV.dom,
         isCellMenuOpenByKeyboard = _this$props12.isCellMenuOpenByKeyboard;
-      if ((0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) {
-        if (payload) {
-          var event = payload.event;
-          if (event && event instanceof KeyboardEvent) {
-            if (!_this.state.isSubmenuOpen) {
-              if (arrowsList.has(event.key)) {
-                // preventing default behavior for avoiding cursor jump to next/previous table column
-                // when left/right arrow pressed.
-                event.preventDefault();
-              }
-              (0, _commands.toggleContextualMenu)()(state, dispatch);
-              _this.setState({
-                isSubmenuOpen: false
-              });
-              (0, _commands.setFocusToCellMenu)(false)(state, dispatch);
-              dom.focus();
+      if (payload) {
+        var event = payload.event;
+        if (event && event instanceof KeyboardEvent) {
+          if (!_this.state.isSubmenuOpen) {
+            if (arrowsList.has(event.key)) {
+              // preventing default behavior for avoiding cursor jump to next/previous table column
+              // when left/right arrow pressed.
+              event.preventDefault();
             }
-          } else {
-            // mouse click outside
             (0, _commands.toggleContextualMenu)()(state, dispatch);
             _this.setState({
               isSubmenuOpen: false
             });
-            if (isCellMenuOpenByKeyboard) {
-              (0, _commands.setFocusToCellMenu)(false)(state, dispatch);
-            }
+            (0, _commands.setFocusToCellMenu)(false)(state, dispatch);
+            dom.focus();
+          }
+        } else {
+          // mouse click outside
+          (0, _commands.toggleContextualMenu)()(state, dispatch);
+          _this.setState({
+            isSubmenuOpen: false
+          });
+          if (isCellMenuOpenByKeyboard) {
+            (0, _commands.setFocusToCellMenu)(false)(state, dispatch);
           }
         }
-      } else {
-        (0, _commands.toggleContextualMenu)()(state, dispatch);
-        _this.setState({
-          isSubmenuOpen: false
-        });
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseEnter", function (_ref5) {
@@ -700,17 +676,15 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
   (0, _createClass2.default)(ContextualMenu, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) {
-        // ArrowKeyNavigationProvider in DropdownMenu expects that menu handle will stay focused
-        // until user pressed ArrowDown.
-        // Behavior above fails the A11Y requirement about first item in menu should be focused immediately.
-        // so here is triggering componentDidUpdate inside dropdown to set focus on first element
-        var isCellMenuOpenByKeyboard = this.props.isCellMenuOpenByKeyboard;
-        if (isCellMenuOpenByKeyboard) {
-          this.setState(_objectSpread(_objectSpread({}, this.state), {}, {
-            isOpenAllowed: isCellMenuOpenByKeyboard
-          }));
-        }
+      // ArrowKeyNavigationProvider in DropdownMenu expects that menu handle will stay focused
+      // until user pressed ArrowDown.
+      // Behavior above fails the A11Y requirement about first item in menu should be focused immediately.
+      // so here is triggering componentDidUpdate inside dropdown to set focus on first element
+      var isCellMenuOpenByKeyboard = this.props.isCellMenuOpenByKeyboard;
+      if (isCellMenuOpenByKeyboard) {
+        this.setState(_objectSpread(_objectSpread({}, this.state), {}, {
+          isOpenAllowed: isCellMenuOpenByKeyboard
+        }));
       }
     }
   }, {
@@ -727,11 +701,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         isDragAndDropEnabled = _getPluginState13.isDragAndDropEnabled;
       var items = isDragAndDropEnabled ? this.createNewContextMenuItems() : this.createOriginalContextMenuItems();
       var isOpenAllowed = false;
-      if ((0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu')) {
-        isOpenAllowed = isCellMenuOpenByKeyboard ? this.state.isOpenAllowed : isOpen;
-      } else {
-        isOpenAllowed = isOpen;
-      }
+      isOpenAllowed = isCellMenuOpenByKeyboard ? this.state.isOpenAllowed : isOpen;
       return (0, _react2.jsx)("div", {
         "data-testid": "table-cell-contextual-menu",
         onMouseLeave: this.closeSubmenu,
@@ -743,7 +713,7 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         ,
         arrowKeyNavigationProviderOptions: {
           type: _uiMenu.ArrowKeyNavigationType.MENU,
-          disableArrowKeyNavigation: isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen && (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu') ? false : true
+          disableArrowKeyNavigation: !isCellMenuOpenByKeyboard || this.state.isSubmenuOpen
         },
         items: items,
         isOpen: isOpenAllowed,
@@ -753,15 +723,15 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         onMouseLeave: this.handleItemMouseLeave,
         fitHeight: 188,
         fitWidth: isDragAndDropEnabled ? _consts.contextualMenuDropdownWidthDnD : _consts.contextualMenuDropdownWidth,
-        shouldFocusFirstItem: (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu') ? function () {
+        shouldFocusFirstItem: function shouldFocusFirstItem() {
           return Boolean(isCellMenuOpenByKeyboard);
-        } : undefined,
+        },
         boundariesElement: boundariesElement,
         offset: offset,
         section: isDragAndDropEnabled ? {
           hasSeparator: true
         } : undefined,
-        allowEnterDefaultBehavior: (0, _platformFeatureFlags.fg)('platform_editor_a11y_table_context_menu') ? this.state.isSubmenuOpen : false
+        allowEnterDefaultBehavior: this.state.isSubmenuOpen
       }));
     }
   }]);

package/dist/es2019/plugin.js

@@ -10,7 +10,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { tableEditing } from '@atlaskit/editor-tables/pm-plugins';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { insertTableWithSize } from './commands/insert';
 import { pluginConfig } from './create-plugin-config';
 import { createPlugin as createTableAnalyticsPlugin } from './pm-plugins/analytics/plugin';
@@ -387,7 +386,7 @@ const tablesPlugin = ({
             allowControls
           } = pluginConfig;
           const stickyHeader = stickyHeadersState ? findStickyHeaderForTable(stickyHeadersState, tablePos) : undefined;
-          return /*#__PURE__*/React.createElement(React.Fragment, null, targetCellPosition && (tableRef || isCellMenuOpenByKeyboard && fg('platform_editor_a11y_table_context_menu')) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/React.createElement(FloatingContextualButton, {
+          return /*#__PURE__*/React.createElement(React.Fragment, null, targetCellPosition && (tableRef || isCellMenuOpenByKeyboard) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/React.createElement(FloatingContextualButton, {
             isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
             editorView: editorView,
             tableNode: tableNode,

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

@@ -2,7 +2,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 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 { fg } from '@atlaskit/platform-feature-flags';
 import { goToNextCell, moveCursorBackward, setFocusToCellMenu } from '../commands';
 import { addRowAroundSelection, changeColumnWidthByStepWithAnalytics, deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut, deleteTableIfSelectedWithAnalytics, emptyMultipleCellsWithAnalytics } from '../commands-with-analytics';
 import { activateNextResizeArea, initiateKeyboardColumnResizing, stopKeyboardColumnResizing } from '../commands/column-resize';
@@ -65,9 +64,7 @@ export function keymapPlugin(getEditorContainerWidth, api, editorAnalyticsAPI, d
     ariaNotify: ariaNotifyPlugin,
     getIntl: getIntl
   }), list);
-  if (fg('platform_editor_a11y_table_context_menu')) {
-    bindKeymapWithCommand(focusToContextMenuTrigger.common, setFocusToCellMenu(), list);
-  }
+  bindKeymapWithCommand(focusToContextMenuTrigger.common, setFocusToCellMenu(), list);
   return keymap(list);
 }
 export default keymapPlugin;

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

@@ -16,7 +16,6 @@ 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/utility/migration/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { toggleContextualMenu } from '../../commands';
 import { TableCssClassName as ClassName } from '../../types';
 import FixedButton from './FixedButton';
@@ -55,15 +54,13 @@ const FloatingContextualButtonInner = /*#__PURE__*/React.memo(props => {
   let targetCellRef;
   targetCellRef = findDomRefAtPos(targetCellPosition, domAtPos);
   useEffect(() => {
-    if (fg('platform_editor_a11y_table_context_menu')) {
-      if (isCellMenuOpenByKeyboard && !isContextualMenuOpen) {
-        const {
-          state,
-          dispatch
-        } = editorView;
-        // open the menu when the keyboard shortcut is pressed
-        toggleContextualMenu()(state, dispatch);
-      }
+    if (isCellMenuOpenByKeyboard && !isContextualMenuOpen) {
+      const {
+        state,
+        dispatch
+      } = editorView;
+      // open the menu when the keyboard shortcut is pressed
+      toggleContextualMenu()(state, dispatch);
     }
   }, [isCellMenuOpenByKeyboard, isContextualMenuOpen, editorView]);
   if (!targetCellRef || !(targetCellRef instanceof HTMLElement)) {
@@ -82,7 +79,7 @@ const FloatingContextualButtonInner = /*#__PURE__*/React.memo(props => {
     className: ClassName.CONTEXTUAL_MENU_BUTTON,
     selected: isContextualMenuOpen,
     title: labelCellOptions,
-    keymap: fg('platform_editor_a11y_table_context_menu') ? focusToContextMenuTrigger : undefined,
+    keymap: focusToContextMenuTrigger,
     onClick: handleClick,
     iconBefore: jsx(ExpandIcon, {
       label: "",
@@ -90,7 +87,7 @@ const FloatingContextualButtonInner = /*#__PURE__*/React.memo(props => {
       isFacadeDisabled: true
     }),
     "aria-label": labelCellOptions,
-    "aria-expanded": fg('platform_editor_a11y_table_context_menu') ? isContextualMenuOpen : undefined
+    "aria-expanded": isContextualMenuOpen
   }));
   const parentSticky = targetCellRef.parentElement && targetCellRef.parentElement.className.indexOf('sticky') > -1;
   if (stickyHeader && parentSticky && tableWrapper) {

package/dist/es2019/ui/FloatingContextualMenu/ContextualMenu.js

@@ -30,7 +30,6 @@ import TableColumnAddRightIcon from '@atlaskit/icon/core/table-column-add-right'
 import TableColumnDeleteIcon from '@atlaskit/icon/core/table-column-delete';
 import TableRowAddBelowIcon from '@atlaskit/icon/core/table-row-add-below';
 import TableRowDeleteIcon from '@atlaskit/icon/core/table-row-delete';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import { clearHoverSelection, hoverColumns, hoverMergedCells, hoverRows, setFocusToCellMenu, toggleContextualMenu } from '../../commands';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, mergeCellsWithAnalytics, setColorWithAnalytics, sortColumnWithAnalytics, splitCellWithAnalytics } from '../../commands-with-analytics';
@@ -89,16 +88,14 @@ export class ContextualMenu extends Component {
         isDragAndDropEnabled
       } = getPluginState(editorView.state);
       if (allowBackgroundColor) {
-        var _node$attrs, _node$attrs2, _node$attrs3;
+        var _node$attrs, _node$attrs2;
         const node = isOpen && targetCellPosition ? state.doc.nodeAt(targetCellPosition) : null;
         const background = hexToEditorBackgroundPaletteColor((node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.background) || '#ffffff');
         let selectedRowIndex;
         let selectedColumnIndex;
-        if (fg('platform_editor_a11y_table_context_menu')) {
-          const selectedRowAndColumnFromPalette = getSelectedRowAndColumnFromPalette(cellBackgroundColorPalette, background, colorPalletteColumns);
-          selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
-          selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
-        }
+        const selectedRowAndColumnFromPalette = getSelectedRowAndColumnFromPalette(cellBackgroundColorPalette, background, colorPalletteColumns);
+        selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
+        selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
         return {
           content: isDragAndDropEnabled ? formatMessage(messages.backgroundColor) : formatMessage(messages.cellBackground),
           value: {
@@ -122,7 +119,7 @@ export class ContextualMenu extends Component {
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             ,
             className: isDragAndDropEnabled ? ClassName.CONTEXTUAL_MENU_ICON_SMALL : ClassName.CONTEXTUAL_MENU_ICON
-          }), fg('platform_editor_a11y_table_context_menu') ? isSubmenuOpen && jsx("div", {
+          }), isSubmenuOpen && jsx("div", {
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             className: ClassName.CONTEXTUAL_SUBMENU,
             ref: this.handleSubMenuRef
@@ -152,22 +149,8 @@ export class ContextualMenu extends Component {
               paletteColorTooltipMessages: backgroundPaletteTooltipMessages,
               hexToPaletteColor: hexToEditorBackgroundPaletteColor
             }
-          }))) : isSubmenuOpen &&
-          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-          jsx("div", {
-            className: ClassName.CONTEXTUAL_SUBMENU,
-            ref: this.handleSubMenuRef
-          }, jsx(ColorPalette, {
-            cols: 7,
-            onClick: this.setColor,
-            selectedColor: (node === null || node === void 0 ? void 0 : (_node$attrs3 = node.attrs) === null || _node$attrs3 === void 0 ? void 0 : _node$attrs3.background) || '#ffffff',
-            paletteOptions: {
-              palette: cellBackgroundColorPalette,
-              paletteColorTooltipMessages: backgroundPaletteTooltipMessages,
-              hexToPaletteColor: hexToEditorBackgroundPaletteColor
-            }
-          }))),
-          'aria-expanded': fg('platform_editor_a11y_table_context_menu') ? isSubmenuOpen : undefined
+          })))),
+          'aria-expanded': isSubmenuOpen
         };
       }
     });
@@ -541,7 +524,7 @@ export class ContextualMenu extends Component {
       } = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
       // context menu opened by keyboard and any item except 'background' activated
       // or color has been chosen from color palette
-      if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && this.state.isSubmenuOpen) && fg('platform_editor_a11y_table_context_menu')) {
+      if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && this.state.isSubmenuOpen)) {
         const {
           tr
         } = state;
@@ -615,7 +598,7 @@ export class ContextualMenu extends Component {
             // 1st time when user chooses the background color item.
             // 2nd when color has been chosen from color palette.
             // here we are handling the 1st call relying on the isSubmenuOpen state value
-            if (isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen && fg('platform_editor_a11y_table_context_menu')) {
+            if (isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen) {
               this.setState({
                 isSubmenuOpen: true
               });
@@ -648,41 +631,34 @@ export class ContextualMenu extends Component {
         },
         isCellMenuOpenByKeyboard
       } = this.props;
-      if (fg('platform_editor_a11y_table_context_menu')) {
-        if (payload) {
-          const {
-            event
-          } = payload;
-          if (event && event instanceof KeyboardEvent) {
-            if (!this.state.isSubmenuOpen) {
-              if (arrowsList.has(event.key)) {
-                // preventing default behavior for avoiding cursor jump to next/previous table column
-                // when left/right arrow pressed.
-                event.preventDefault();
-              }
-              toggleContextualMenu()(state, dispatch);
-              this.setState({
-                isSubmenuOpen: false
-              });
-              setFocusToCellMenu(false)(state, dispatch);
-              dom.focus();
+      if (payload) {
+        const {
+          event
+        } = payload;
+        if (event && event instanceof KeyboardEvent) {
+          if (!this.state.isSubmenuOpen) {
+            if (arrowsList.has(event.key)) {
+              // preventing default behavior for avoiding cursor jump to next/previous table column
+              // when left/right arrow pressed.
+              event.preventDefault();
             }
-          } else {
-            // mouse click outside
             toggleContextualMenu()(state, dispatch);
             this.setState({
               isSubmenuOpen: false
             });
-            if (isCellMenuOpenByKeyboard) {
-              setFocusToCellMenu(false)(state, dispatch);
-            }
+            setFocusToCellMenu(false)(state, dispatch);
+            dom.focus();
+          }
+        } else {
+          // mouse click outside
+          toggleContextualMenu()(state, dispatch);
+          this.setState({
+            isSubmenuOpen: false
+          });
+          if (isCellMenuOpenByKeyboard) {
+            setFocusToCellMenu(false)(state, dispatch);
           }
         }
-      } else {
-        toggleContextualMenu()(state, dispatch);
-        this.setState({
-          isSubmenuOpen: false
-        });
       }
     });
     _defineProperty(this, "handleItemMouseEnter", ({
@@ -747,20 +723,18 @@ export class ContextualMenu extends Component {
     });
   }
   componentDidMount() {
-    if (fg('platform_editor_a11y_table_context_menu')) {
-      // ArrowKeyNavigationProvider in DropdownMenu expects that menu handle will stay focused
-      // until user pressed ArrowDown.
-      // Behavior above fails the A11Y requirement about first item in menu should be focused immediately.
-      // so here is triggering componentDidUpdate inside dropdown to set focus on first element
-      const {
-        isCellMenuOpenByKeyboard
-      } = this.props;
-      if (isCellMenuOpenByKeyboard) {
-        this.setState({
-          ...this.state,
-          isOpenAllowed: isCellMenuOpenByKeyboard
-        });
-      }
+    // ArrowKeyNavigationProvider in DropdownMenu expects that menu handle will stay focused
+    // until user pressed ArrowDown.
+    // Behavior above fails the A11Y requirement about first item in menu should be focused immediately.
+    // so here is triggering componentDidUpdate inside dropdown to set focus on first element
+    const {
+      isCellMenuOpenByKeyboard
+    } = this.props;
+    if (isCellMenuOpenByKeyboard) {
+      this.setState({
+        ...this.state,
+        isOpenAllowed: isCellMenuOpenByKeyboard
+      });
     }
   }
   render() {
@@ -777,11 +751,7 @@ export class ContextualMenu extends Component {
     } = getPluginState(editorView.state);
     const items = isDragAndDropEnabled ? this.createNewContextMenuItems() : this.createOriginalContextMenuItems();
     let isOpenAllowed = false;
-    if (fg('platform_editor_a11y_table_context_menu')) {
-      isOpenAllowed = isCellMenuOpenByKeyboard ? this.state.isOpenAllowed : isOpen;
-    } else {
-      isOpenAllowed = isOpen;
-    }
+    isOpenAllowed = isCellMenuOpenByKeyboard ? this.state.isOpenAllowed : isOpen;
     return jsx("div", {
       "data-testid": "table-cell-contextual-menu",
       onMouseLeave: this.closeSubmenu,
@@ -793,7 +763,7 @@ export class ContextualMenu extends Component {
       ,
       arrowKeyNavigationProviderOptions: {
         type: ArrowKeyNavigationType.MENU,
-        disableArrowKeyNavigation: isCellMenuOpenByKeyboard && !this.state.isSubmenuOpen && fg('platform_editor_a11y_table_context_menu') ? false : true
+        disableArrowKeyNavigation: !isCellMenuOpenByKeyboard || this.state.isSubmenuOpen
       },
       items: items,
       isOpen: isOpenAllowed,
@@ -803,15 +773,15 @@ export class ContextualMenu extends Component {
       onMouseLeave: this.handleItemMouseLeave,
       fitHeight: 188,
       fitWidth: isDragAndDropEnabled ? contextualMenuDropdownWidthDnD : contextualMenuDropdownWidth,
-      shouldFocusFirstItem: fg('platform_editor_a11y_table_context_menu') ? () => {
+      shouldFocusFirstItem: () => {
         return Boolean(isCellMenuOpenByKeyboard);
-      } : undefined,
+      },
       boundariesElement: boundariesElement,
       offset: offset,
       section: isDragAndDropEnabled ? {
         hasSeparator: true
       } : undefined,
-      allowEnterDefaultBehavior: fg('platform_editor_a11y_table_context_menu') ? this.state.isSubmenuOpen : false
+      allowEnterDefaultBehavior: this.state.isSubmenuOpen
     }));
   }
 }

package/dist/esm/plugin.js

@@ -13,7 +13,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { tableEditing } from '@atlaskit/editor-tables/pm-plugins';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { insertTableWithSize } from './commands/insert';
 import { pluginConfig } from './create-plugin-config';
 import { createPlugin as createTableAnalyticsPlugin } from './pm-plugins/analytics/plugin';
@@ -386,7 +385,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
             isCellMenuOpenByKeyboard = _ref20.isCellMenuOpenByKeyboard;
           var allowControls = pluginConfig.allowControls;
           var stickyHeader = stickyHeadersState ? findStickyHeaderForTable(stickyHeadersState, tablePos) : undefined;
-          return /*#__PURE__*/React.createElement(React.Fragment, null, targetCellPosition && (tableRef || isCellMenuOpenByKeyboard && fg('platform_editor_a11y_table_context_menu')) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/React.createElement(FloatingContextualButton, {
+          return /*#__PURE__*/React.createElement(React.Fragment, null, targetCellPosition && (tableRef || isCellMenuOpenByKeyboard) && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/React.createElement(FloatingContextualButton, {
             isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
             editorView: editorView,
             tableNode: tableNode,