@atlaskit/editor-plugin-table 7.19.7 → 7.19.9

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-table
 
+## 7.19.9
+
+### Patch Changes
+
+- [#117916](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117916)
+  [`49fc126d779b0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/49fc126d779b0) -
+  ECA11Y-111: A11y table resizing feature flag removal
+- Updated dependencies
+
+## 7.19.8
+
+### Patch Changes
+
+- [`7c716627bd4f4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7c716627bd4f4) -
+  Table Drag move column/row logic FF cleanup
+- Updated dependencies
+
 ## 7.19.7
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableResizer.js

@@ -21,7 +21,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _utils2 = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commandsWithAnalytics = require("../commands-with-analytics");
 var _misc = require("../commands/misc");
 var _tableAnalytics = require("../pm-plugins/table-analytics");
@@ -312,18 +311,16 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
     }
     displayGapCursor(true);
     dispatch(tr);
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-resizing_uapcv')) {
-      if (delta.width < 0) {
-        var _pluginInjectionApi$a3;
-        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a3 === void 0 || _pluginInjectionApi$a3.actions.ariaNotify(formatMessage(_messages.tableMessages.tableSizeDecreaseScreenReaderInformation, {
-          newWidth: newWidth
-        }));
-      } else if (delta.width > 0) {
-        var _pluginInjectionApi$a4;
-        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a4 === void 0 || _pluginInjectionApi$a4.actions.ariaNotify(formatMessage(_messages.tableMessages.tableSizeIncreaseScreenReaderInformation, {
-          newWidth: newWidth
-        }));
-      }
+    if (delta.width < 0) {
+      var _pluginInjectionApi$a3;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a3 === void 0 || _pluginInjectionApi$a3.actions.ariaNotify(formatMessage(_messages.tableMessages.tableSizeDecreaseScreenReaderInformation, {
+        newWidth: newWidth
+      }));
+    } else if (delta.width > 0) {
+      var _pluginInjectionApi$a4;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a4 === void 0 || _pluginInjectionApi$a4.actions.ariaNotify(formatMessage(_messages.tableMessages.tableSizeIncreaseScreenReaderInformation, {
+        newWidth: newWidth
+      }));
     }
 
     // Hide guidelines when resizing stops
@@ -375,45 +372,41 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
     return;
   }, [areResizeMetaKeysPressed]);
   (0, _react.useLayoutEffect)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-resizing_uapcv')) {
-      if (!resizerRef.current) {
+    if (!resizerRef.current) {
+      return;
+    }
+    var resizeHandleThumbEl = resizerRef.current.getResizerThumbEl();
+    var globalKeyDownHandler = function globalKeyDownHandler(event) {
+      var metaKey = _utils.browser.mac ? event.metaKey : event.ctrlKey;
+      if (!isTableSelected) {
         return;
       }
-      var resizeHandleThumbEl = resizerRef.current.getResizerThumbEl();
-      var globalKeyDownHandler = function globalKeyDownHandler(event) {
-        var metaKey = _utils.browser.mac ? event.metaKey : event.ctrlKey;
-        if (!isTableSelected) {
+      if (event.altKey && event.shiftKey && metaKey && event.code === 'KeyR') {
+        event.preventDefault();
+        if (!resizeHandleThumbEl) {
           return;
         }
-        if (event.altKey && event.shiftKey && metaKey && event.code === 'KeyR') {
-          event.preventDefault();
-          if (!resizeHandleThumbEl) {
-            return;
-          }
-          resizeHandleThumbEl.focus();
-          resizeHandleThumbEl.scrollIntoView({
-            behavior: 'smooth',
-            block: 'center',
-            inline: 'nearest'
-          });
-        }
-      };
-      var editorViewDom = editorView === null || editorView === void 0 ? void 0 : editorView.dom;
-      editorViewDom === null || editorViewDom === void 0 || editorViewDom.addEventListener('keydown', globalKeyDownHandler);
-      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.addEventListener('keydown', handleKeyDown);
-      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.addEventListener('keyup', handleKeyUp);
-      return function () {
-        editorViewDom === null || editorViewDom === void 0 || editorViewDom.removeEventListener('keydown', globalKeyDownHandler);
-        resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.removeEventListener('keydown', handleKeyDown);
-        resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.removeEventListener('keyup', handleKeyUp);
-      };
-    }
+        resizeHandleThumbEl.focus();
+        resizeHandleThumbEl.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center',
+          inline: 'nearest'
+        });
+      }
+    };
+    var editorViewDom = editorView === null || editorView === void 0 ? void 0 : editorView.dom;
+    editorViewDom === null || editorViewDom === void 0 || editorViewDom.addEventListener('keydown', globalKeyDownHandler);
+    resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.addEventListener('keydown', handleKeyDown);
+    resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.addEventListener('keyup', handleKeyUp);
+    return function () {
+      editorViewDom === null || editorViewDom === void 0 || editorViewDom.removeEventListener('keydown', globalKeyDownHandler);
+      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.removeEventListener('keydown', handleKeyDown);
+      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.removeEventListener('keyup', handleKeyUp);
+    };
   }, [resizerRef, editorView, handleResizeStop, isTableSelected, handleKeyDown, handleKeyUp]);
   (0, _react.useLayoutEffect)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-resizing_uapcv')) {
-      var _updateTooltip$curren;
-      (_updateTooltip$curren = updateTooltip.current) === null || _updateTooltip$curren === void 0 || _updateTooltip$curren.call(updateTooltip);
-    }
+    var _updateTooltip$curren;
+    (_updateTooltip$curren = updateTooltip.current) === null || _updateTooltip$curren === void 0 || _updateTooltip$curren.call(updateTooltip);
   }, [width]);
   var resizeRatio = !isTableAlignmentEnabled || isTableAlignmentEnabled && (0, _alignment.normaliseAlignment)(node.attrs.layout) === _alignment.ALIGN_CENTER ? 2 : 1;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_resizer.ResizerNext, {
@@ -436,13 +429,13 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
     needExtendedResizeZone: !isTableSelected,
     appearance: isTableSelected && isWholeTableInDanger ? 'danger' : undefined,
     handleHighlight: "shadow",
-    handleTooltipContent: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-table-resizing_uapcv') ? function (_ref4) {
+    handleTooltipContent: function handleTooltipContent(_ref4) {
       var update = _ref4.update;
       updateTooltip.current = update;
       return /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
         description: formatMessage(_messages.tableMessages.resizeTable),
         keymap: _keymaps.focusTableResizer
       });
-    } : formatMessage(_messages.tableMessages.resizeTable)
+    }
   }, children));
 };

package/dist/cjs/ui/FloatingDragMenu/DragMenu.js

@@ -23,7 +23,6 @@ var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils2 = require("@atlaskit/editor-tables/utils");
 var _backgroundColor = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/background-color"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _toggle = _interopRequireDefault(require("@atlaskit/toggle"));
 var _commands = require("../../commands");
 var _commandsWithAnalytics = require("../../commands-with-analytics");
@@ -186,7 +185,7 @@ var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, for
 };
 var ColorPaletteWithListeners = (0, _ui.withOuterListeners)(_uiColor.ColorPalette);
 var DragMenu = exports.DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
-  var _pluginConfig$allowBa;
+  var _tableMap$hasMergedCe, _pluginConfig$allowBa;
   var _ref$direction = _ref.direction,
     direction = _ref$direction === void 0 ? 'row' : _ref$direction,
     index = _ref.index,
@@ -220,19 +219,9 @@ var DragMenu = exports.DragMenu = /*#__PURE__*/_react.default.memo(function (_re
   var _getPluginState = (0, _pluginFactory.getPluginState)(state),
     isKeyboardModeActive = _getPluginState.isKeyboardModeActive;
   var selectionRect = (0, _utils2.isSelectionType)(selection, 'cell') ? (0, _utils2.getSelectionRect)(selection) : (0, _utils2.findCellRectClosestToPos)(selection.$from);
-  var shouldMoveDisabled;
-  var hasMergedCellsInTable;
-  if ((0, _platformFeatureFlags.fg)('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
-    var _tableMap$hasMergedCe;
-    shouldMoveDisabled = false;
-    hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
-  } else {
-    var hasMergedCells = direction === 'row' ? _utils3.hasMergedCellsInRow : _utils3.hasMergedCellsInColumn;
-    shouldMoveDisabled = index !== undefined && hasMergedCells(index)(selection);
-    hasMergedCellsInTable = (0, _utils3.getMergedCellsPositions)(state.tr).length > 0;
-  }
+  var hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
   var allowBackgroundColor = (_pluginConfig$allowBa = pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.allowBackgroundColor) !== null && _pluginConfig$allowBa !== void 0 ? _pluginConfig$allowBa : false;
-  var dragMenuConfig = (0, _dragMenu.getDragMenuConfig)(direction, getEditorContainerWidth, !shouldMoveDisabled, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder);
+  var dragMenuConfig = (0, _dragMenu.getDragMenuConfig)(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder);
   var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, tableSortColumnReorder, selectionRect),
     menuItems = _convertToDropdownIte.menuItems,
     menuCallback = _convertToDropdownIte.menuCallback;

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

@@ -18,7 +18,6 @@ var _layoutThreeEqual = _interopRequireDefault(require("@atlaskit/icon/glyph/edi
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 var _chevronDoubleDown = _interopRequireDefault(require("@atlaskit/icon/glyph/hipchat/chevron-double-down"));
 var _chevronDoubleUp = _interopRequireDefault(require("@atlaskit/icon/glyph/hipchat/chevron-double-up"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commandsWithAnalytics = require("../commands-with-analytics");
 var _commandsWithAnalytics2 = require("../pm-plugins/drag-and-drop/commands-with-analytics");
 var _resizeState = require("../pm-plugins/table-resizing/utils/resize-state");
@@ -47,17 +46,10 @@ var canMove = exports.canMove = function canMove(sourceType, direction, totalIte
   if (hasMergedCellsInTarget) {
     return false;
   }
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
-    // We can't move if selection in the source is not a rectangle
-    if ((0, _mergedCells.hasMergedCellsInSelection)(selectedIndexes, isRow ? 'row' : 'column')(selection)) {
-      return false;
-    }
-  } else {
-    // Currently we can't move in any direction if there are merged cells in the source
-    var hasMergedCellsInSource = isRow ? (0, _mergedCells.hasMergedCellsInRow)(selectedIndexes)(selection) : (0, _mergedCells.hasMergedCellsInColumn)(selectedIndexes)(selection);
-    if (hasMergedCellsInSource) {
-      return false;
-    }
+
+  // We can't move if selection in the source is not a rectangle
+  if ((0, _mergedCells.hasMergedCellsInSelection)(selectedIndexes, isRow ? 'row' : 'column')(selection)) {
+    return false;
   }
   return true;
 };
@@ -75,13 +67,13 @@ var defaultSelectionRect = {
   right: 0,
   bottom: 0
 };
-var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, canDrag, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired) {
+var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired) {
   var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
-  var isTableScalingEnabled = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
-  var tableDuplicateCellColouring = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
-  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 14 && arguments[14] !== undefined ? arguments[14] : false;
-  var tableSortColumnReorder = arguments.length > 15 && arguments[15] !== undefined ? arguments[15] : false;
+  var isTableScalingEnabled = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
+  var tableDuplicateCellColouring = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : false;
+  var tableSortColumnReorder = arguments.length > 14 && arguments[14] !== undefined ? arguments[14] : false;
   var selection = editorView.state.selection;
   var addOptions = direction === 'row' ? [{
     label: 'above',
@@ -108,7 +100,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     label: 'up',
     icon: _arrowUp.default,
     keymap: _keymaps.moveRowUp,
-    canMove: canDrag && canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
+    canMove: canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
     getOriginIndexes: _selection.getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.top - 1;
@@ -117,7 +109,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     label: 'down',
     icon: _arrowDown.default,
     keymap: _keymaps.moveRowDown,
-    canMove: canDrag && canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
+    canMove: canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
     getOriginIndexes: _selection.getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.bottom;
@@ -126,7 +118,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     label: 'left',
     icon: _arrowLeft.default,
     keymap: _keymaps.moveColumnLeft,
-    canMove: canDrag && canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
+    canMove: canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
     getOriginIndexes: _selection.getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.left - 1;
@@ -135,7 +127,7 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     label: 'right',
     icon: _arrowRight.default,
     keymap: _keymaps.moveColumnRight,
-    canMove: canDrag && canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
+    canMove: canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
     getOriginIndexes: _selection.getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.right;

package/dist/es2019/nodeviews/TableResizer.js

@@ -11,7 +11,6 @@ import { browser } from '@atlaskit/editor-common/utils';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../commands-with-analytics';
 import { updateWidthToWidest } from '../commands/misc';
 import { META_KEYS } from '../pm-plugins/table-analytics';
@@ -308,18 +307,16 @@ export const TableResizer = ({
     }
     displayGapCursor(true);
     dispatch(tr);
-    if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-      if (delta.width < 0) {
-        var _pluginInjectionApi$a3;
-        pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions.ariaNotify(formatMessage(messages.tableSizeDecreaseScreenReaderInformation, {
-          newWidth: newWidth
-        }));
-      } else if (delta.width > 0) {
-        var _pluginInjectionApi$a4;
-        pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions.ariaNotify(formatMessage(messages.tableSizeIncreaseScreenReaderInformation, {
-          newWidth: newWidth
-        }));
-      }
+    if (delta.width < 0) {
+      var _pluginInjectionApi$a3;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions.ariaNotify(formatMessage(messages.tableSizeDecreaseScreenReaderInformation, {
+        newWidth: newWidth
+      }));
+    } else if (delta.width > 0) {
+      var _pluginInjectionApi$a4;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions.ariaNotify(formatMessage(messages.tableSizeIncreaseScreenReaderInformation, {
+        newWidth: newWidth
+      }));
     }
 
     // Hide guidelines when resizing stops
@@ -371,45 +368,41 @@ export const TableResizer = ({
     return;
   }, [areResizeMetaKeysPressed]);
   useLayoutEffect(() => {
-    if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-      if (!resizerRef.current) {
+    if (!resizerRef.current) {
+      return;
+    }
+    const resizeHandleThumbEl = resizerRef.current.getResizerThumbEl();
+    const globalKeyDownHandler = event => {
+      const metaKey = browser.mac ? event.metaKey : event.ctrlKey;
+      if (!isTableSelected) {
         return;
       }
-      const resizeHandleThumbEl = resizerRef.current.getResizerThumbEl();
-      const globalKeyDownHandler = event => {
-        const metaKey = browser.mac ? event.metaKey : event.ctrlKey;
-        if (!isTableSelected) {
+      if (event.altKey && event.shiftKey && metaKey && event.code === 'KeyR') {
+        event.preventDefault();
+        if (!resizeHandleThumbEl) {
           return;
         }
-        if (event.altKey && event.shiftKey && metaKey && event.code === 'KeyR') {
-          event.preventDefault();
-          if (!resizeHandleThumbEl) {
-            return;
-          }
-          resizeHandleThumbEl.focus();
-          resizeHandleThumbEl.scrollIntoView({
-            behavior: 'smooth',
-            block: 'center',
-            inline: 'nearest'
-          });
-        }
-      };
-      const editorViewDom = editorView === null || editorView === void 0 ? void 0 : editorView.dom;
-      editorViewDom === null || editorViewDom === void 0 ? void 0 : editorViewDom.addEventListener('keydown', globalKeyDownHandler);
-      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 ? void 0 : resizeHandleThumbEl.addEventListener('keydown', handleKeyDown);
-      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 ? void 0 : resizeHandleThumbEl.addEventListener('keyup', handleKeyUp);
-      return () => {
-        editorViewDom === null || editorViewDom === void 0 ? void 0 : editorViewDom.removeEventListener('keydown', globalKeyDownHandler);
-        resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 ? void 0 : resizeHandleThumbEl.removeEventListener('keydown', handleKeyDown);
-        resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 ? void 0 : resizeHandleThumbEl.removeEventListener('keyup', handleKeyUp);
-      };
-    }
+        resizeHandleThumbEl.focus();
+        resizeHandleThumbEl.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center',
+          inline: 'nearest'
+        });
+      }
+    };
+    const editorViewDom = editorView === null || editorView === void 0 ? void 0 : editorView.dom;
+    editorViewDom === null || editorViewDom === void 0 ? void 0 : editorViewDom.addEventListener('keydown', globalKeyDownHandler);
+    resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 ? void 0 : resizeHandleThumbEl.addEventListener('keydown', handleKeyDown);
+    resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 ? void 0 : resizeHandleThumbEl.addEventListener('keyup', handleKeyUp);
+    return () => {
+      editorViewDom === null || editorViewDom === void 0 ? void 0 : editorViewDom.removeEventListener('keydown', globalKeyDownHandler);
+      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 ? void 0 : resizeHandleThumbEl.removeEventListener('keydown', handleKeyDown);
+      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 ? void 0 : resizeHandleThumbEl.removeEventListener('keyup', handleKeyUp);
+    };
   }, [resizerRef, editorView, handleResizeStop, isTableSelected, handleKeyDown, handleKeyUp]);
   useLayoutEffect(() => {
-    if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-      var _updateTooltip$curren;
-      (_updateTooltip$curren = updateTooltip.current) === null || _updateTooltip$curren === void 0 ? void 0 : _updateTooltip$curren.call(updateTooltip);
-    }
+    var _updateTooltip$curren;
+    (_updateTooltip$curren = updateTooltip.current) === null || _updateTooltip$curren === void 0 ? void 0 : _updateTooltip$curren.call(updateTooltip);
   }, [width]);
   const resizeRatio = !isTableAlignmentEnabled || isTableAlignmentEnabled && normaliseAlignment(node.attrs.layout) === ALIGN_CENTER ? 2 : 1;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ResizerNext, {
@@ -432,7 +425,7 @@ export const TableResizer = ({
     needExtendedResizeZone: !isTableSelected,
     appearance: isTableSelected && isWholeTableInDanger ? 'danger' : undefined,
     handleHighlight: "shadow",
-    handleTooltipContent: getBooleanFF('platform.editor.a11y-table-resizing_uapcv') ? ({
+    handleTooltipContent: ({
       update
     }) => {
       updateTooltip.current = update;
@@ -440,6 +433,6 @@ export const TableResizer = ({
         description: formatMessage(messages.resizeTable),
         keymap: focusTableResizer
       });
-    } : formatMessage(messages.resizeTable)
+    }
   }, children));
 };

package/dist/es2019/ui/FloatingDragMenu/DragMenu.js

@@ -18,7 +18,6 @@ import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Toggle from '@atlaskit/toggle';
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../commands';
 import { setColorWithAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics } from '../../commands-with-analytics';
@@ -26,7 +25,7 @@ import { toggleDragMenu } from '../../pm-plugins/drag-and-drop/commands';
 import { getPluginState } from '../../pm-plugins/drag-and-drop/plugin-factory';
 import { getPluginState as getTablePluginState } from '../../pm-plugins/plugin-factory';
 import { TableCssClassName as ClassName } from '../../types';
-import { checkIfHeaderColumnEnabled, checkIfHeaderRowEnabled, checkIfNumberColumnEnabled, getMergedCellsPositions, getSelectedColumnIndexes, getSelectedRowIndexes, hasMergedCellsInColumn, hasMergedCellsInRow } from '../../utils';
+import { checkIfHeaderColumnEnabled, checkIfHeaderRowEnabled, checkIfNumberColumnEnabled, getSelectedColumnIndexes, getSelectedRowIndexes } from '../../utils';
 import { getDragMenuConfig } from '../../utils/drag-menu';
 import { colorPalletteColumns } from '../consts';
 import { DropdownMenu } from './DropdownMenu';
@@ -193,7 +192,7 @@ export const DragMenu = /*#__PURE__*/React.memo(({
   isTableFixedColumnWidthsOptionEnabled,
   tableSortColumnReorder
 }) => {
-  var _pluginConfig$allowBa;
+  var _tableMap$hasMergedCe, _pluginConfig$allowBa;
   const {
     state,
     dispatch
@@ -207,19 +206,9 @@ export const DragMenu = /*#__PURE__*/React.memo(({
     isKeyboardModeActive
   } = getPluginState(state);
   const selectionRect = isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
-  let shouldMoveDisabled;
-  let hasMergedCellsInTable;
-  if (fg('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
-    var _tableMap$hasMergedCe;
-    shouldMoveDisabled = false;
-    hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
-  } else {
-    const hasMergedCells = direction === 'row' ? hasMergedCellsInRow : hasMergedCellsInColumn;
-    shouldMoveDisabled = index !== undefined && hasMergedCells(index)(selection);
-    hasMergedCellsInTable = getMergedCellsPositions(state.tr).length > 0;
-  }
+  const hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
   const allowBackgroundColor = (_pluginConfig$allowBa = pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.allowBackgroundColor) !== null && _pluginConfig$allowBa !== void 0 ? _pluginConfig$allowBa : false;
-  const dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, !shouldMoveDisabled, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder);
+  const dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder);
   const {
     menuItems,
     menuCallback

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

@@ -10,13 +10,12 @@ import EditorLayoutThreeEqualIcon from '@atlaskit/icon/glyph/editor/layout-three
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import HipchatChevronDoubleDownIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-down';
 import HipchatChevronDoubleUpIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-up';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, sortColumnWithAnalytics } from '../commands-with-analytics';
 import { moveSourceWithAnalytics } from '../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getNewResizeStateFromSelectedColumns } from '../pm-plugins/table-resizing/utils/resize-state';
 import { getClosestSelectionRect } from '../toolbar';
 import { AddColLeftIcon, AddColRightIcon, AddRowAboveIcon, AddRowBelowIcon } from '../ui/icons';
-import { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInSelection, hasMergedCellsWithColumnNextToColumnIndex, hasMergedCellsWithRowNextToRowIndex } from './merged-cells';
+import { hasMergedCellsInSelection, hasMergedCellsWithColumnNextToColumnIndex, hasMergedCellsWithRowNextToRowIndex } from './merged-cells';
 import { getSelectedColumnIndexes, getSelectedRowIndexes } from './selection';
 export const getTargetIndex = (selectedIndexes, direction) => Math[direction < 0 ? 'min' : 'max'](...selectedIndexes) + direction;
 export const canMove = (sourceType, direction, totalItemsOfSourceTypeCount, selection, selectionRect) => {
@@ -37,17 +36,10 @@ export const canMove = (sourceType, direction, totalItemsOfSourceTypeCount, sele
   if (hasMergedCellsInTarget) {
     return false;
   }
-  if (getBooleanFF('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
-    // We can't move if selection in the source is not a rectangle
-    if (hasMergedCellsInSelection(selectedIndexes, isRow ? 'row' : 'column')(selection)) {
-      return false;
-    }
-  } else {
-    // Currently we can't move in any direction if there are merged cells in the source
-    const hasMergedCellsInSource = isRow ? hasMergedCellsInRow(selectedIndexes)(selection) : hasMergedCellsInColumn(selectedIndexes)(selection);
-    if (hasMergedCellsInSource) {
-      return false;
-    }
+
+  // We can't move if selection in the source is not a rectangle
+  if (hasMergedCellsInSelection(selectedIndexes, isRow ? 'row' : 'column')(selection)) {
+    return false;
   }
   return true;
 };
@@ -65,7 +57,7 @@ const defaultSelectionRect = {
   right: 0,
   bottom: 0
 };
-export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired, isTableScalingEnabled = false, tableDuplicateCellColouring = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, tableSortColumnReorder = false) => {
+export const getDragMenuConfig = (direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired, isTableScalingEnabled = false, tableDuplicateCellColouring = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, tableSortColumnReorder = false) => {
   var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
   const {
     selection
@@ -95,28 +87,28 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, canDrag, h
     label: 'up',
     icon: ArrowUpIcon,
     keymap: moveRowUp,
-    canMove: canDrag && canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
+    canMove: canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: selectionRect => selectionRect.top - 1
   }, {
     label: 'down',
     icon: ArrowDownIcon,
     keymap: moveRowDown,
-    canMove: canDrag && canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
+    canMove: canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: selectionRect => selectionRect.bottom
   }] : [{
     label: 'left',
     icon: ArrowLeftIcon,
     keymap: moveColumnLeft,
-    canMove: canDrag && canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
+    canMove: canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: selectionRect => selectionRect.left - 1
   }, {
     label: 'right',
     icon: ArrowRightIcon,
     keymap: moveColumnRight,
-    canMove: canDrag && canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
+    canMove: canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: selectionRect => selectionRect.right
   }];

package/dist/esm/nodeviews/TableResizer.js

@@ -15,7 +15,6 @@ import { browser } from '@atlaskit/editor-common/utils';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../commands-with-analytics';
 import { updateWidthToWidest } from '../commands/misc';
 import { META_KEYS } from '../pm-plugins/table-analytics';
@@ -302,18 +301,16 @@ export var TableResizer = function TableResizer(_ref) {
     }
     displayGapCursor(true);
     dispatch(tr);
-    if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-      if (delta.width < 0) {
-        var _pluginInjectionApi$a3;
-        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a3 === void 0 || _pluginInjectionApi$a3.actions.ariaNotify(formatMessage(messages.tableSizeDecreaseScreenReaderInformation, {
-          newWidth: newWidth
-        }));
-      } else if (delta.width > 0) {
-        var _pluginInjectionApi$a4;
-        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a4 === void 0 || _pluginInjectionApi$a4.actions.ariaNotify(formatMessage(messages.tableSizeIncreaseScreenReaderInformation, {
-          newWidth: newWidth
-        }));
-      }
+    if (delta.width < 0) {
+      var _pluginInjectionApi$a3;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a3 === void 0 || _pluginInjectionApi$a3.actions.ariaNotify(formatMessage(messages.tableSizeDecreaseScreenReaderInformation, {
+        newWidth: newWidth
+      }));
+    } else if (delta.width > 0) {
+      var _pluginInjectionApi$a4;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.accessibilityUtils) === null || _pluginInjectionApi$a4 === void 0 || _pluginInjectionApi$a4.actions.ariaNotify(formatMessage(messages.tableSizeIncreaseScreenReaderInformation, {
+        newWidth: newWidth
+      }));
     }
 
     // Hide guidelines when resizing stops
@@ -365,45 +362,41 @@ export var TableResizer = function TableResizer(_ref) {
     return;
   }, [areResizeMetaKeysPressed]);
   useLayoutEffect(function () {
-    if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-      if (!resizerRef.current) {
+    if (!resizerRef.current) {
+      return;
+    }
+    var resizeHandleThumbEl = resizerRef.current.getResizerThumbEl();
+    var globalKeyDownHandler = function globalKeyDownHandler(event) {
+      var metaKey = browser.mac ? event.metaKey : event.ctrlKey;
+      if (!isTableSelected) {
         return;
       }
-      var resizeHandleThumbEl = resizerRef.current.getResizerThumbEl();
-      var globalKeyDownHandler = function globalKeyDownHandler(event) {
-        var metaKey = browser.mac ? event.metaKey : event.ctrlKey;
-        if (!isTableSelected) {
+      if (event.altKey && event.shiftKey && metaKey && event.code === 'KeyR') {
+        event.preventDefault();
+        if (!resizeHandleThumbEl) {
           return;
         }
-        if (event.altKey && event.shiftKey && metaKey && event.code === 'KeyR') {
-          event.preventDefault();
-          if (!resizeHandleThumbEl) {
-            return;
-          }
-          resizeHandleThumbEl.focus();
-          resizeHandleThumbEl.scrollIntoView({
-            behavior: 'smooth',
-            block: 'center',
-            inline: 'nearest'
-          });
-        }
-      };
-      var editorViewDom = editorView === null || editorView === void 0 ? void 0 : editorView.dom;
-      editorViewDom === null || editorViewDom === void 0 || editorViewDom.addEventListener('keydown', globalKeyDownHandler);
-      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.addEventListener('keydown', handleKeyDown);
-      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.addEventListener('keyup', handleKeyUp);
-      return function () {
-        editorViewDom === null || editorViewDom === void 0 || editorViewDom.removeEventListener('keydown', globalKeyDownHandler);
-        resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.removeEventListener('keydown', handleKeyDown);
-        resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.removeEventListener('keyup', handleKeyUp);
-      };
-    }
+        resizeHandleThumbEl.focus();
+        resizeHandleThumbEl.scrollIntoView({
+          behavior: 'smooth',
+          block: 'center',
+          inline: 'nearest'
+        });
+      }
+    };
+    var editorViewDom = editorView === null || editorView === void 0 ? void 0 : editorView.dom;
+    editorViewDom === null || editorViewDom === void 0 || editorViewDom.addEventListener('keydown', globalKeyDownHandler);
+    resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.addEventListener('keydown', handleKeyDown);
+    resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.addEventListener('keyup', handleKeyUp);
+    return function () {
+      editorViewDom === null || editorViewDom === void 0 || editorViewDom.removeEventListener('keydown', globalKeyDownHandler);
+      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.removeEventListener('keydown', handleKeyDown);
+      resizeHandleThumbEl === null || resizeHandleThumbEl === void 0 || resizeHandleThumbEl.removeEventListener('keyup', handleKeyUp);
+    };
   }, [resizerRef, editorView, handleResizeStop, isTableSelected, handleKeyDown, handleKeyUp]);
   useLayoutEffect(function () {
-    if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-      var _updateTooltip$curren;
-      (_updateTooltip$curren = updateTooltip.current) === null || _updateTooltip$curren === void 0 || _updateTooltip$curren.call(updateTooltip);
-    }
+    var _updateTooltip$curren;
+    (_updateTooltip$curren = updateTooltip.current) === null || _updateTooltip$curren === void 0 || _updateTooltip$curren.call(updateTooltip);
   }, [width]);
   var resizeRatio = !isTableAlignmentEnabled || isTableAlignmentEnabled && normaliseAlignment(node.attrs.layout) === ALIGN_CENTER ? 2 : 1;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ResizerNext, {
@@ -426,13 +419,13 @@ export var TableResizer = function TableResizer(_ref) {
     needExtendedResizeZone: !isTableSelected,
     appearance: isTableSelected && isWholeTableInDanger ? 'danger' : undefined,
     handleHighlight: "shadow",
-    handleTooltipContent: getBooleanFF('platform.editor.a11y-table-resizing_uapcv') ? function (_ref4) {
+    handleTooltipContent: function handleTooltipContent(_ref4) {
       var update = _ref4.update;
       updateTooltip.current = update;
       return /*#__PURE__*/React.createElement(ToolTipContent, {
         description: formatMessage(messages.resizeTable),
         keymap: focusTableResizer
       });
-    } : formatMessage(messages.resizeTable)
+    }
   }, children));
 };

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

@@ -20,7 +20,6 @@ import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findCellRectClosestToPos, getSelectionRect, isSelectionType } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Toggle from '@atlaskit/toggle';
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../commands';
 import { setColorWithAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics } from '../../commands-with-analytics';
@@ -28,7 +27,7 @@ import { toggleDragMenu } from '../../pm-plugins/drag-and-drop/commands';
 import { getPluginState } from '../../pm-plugins/drag-and-drop/plugin-factory';
 import { getPluginState as getTablePluginState } from '../../pm-plugins/plugin-factory';
 import { TableCssClassName as ClassName } from '../../types';
-import { checkIfHeaderColumnEnabled, checkIfHeaderRowEnabled, checkIfNumberColumnEnabled, getMergedCellsPositions, getSelectedColumnIndexes, getSelectedRowIndexes, hasMergedCellsInColumn, hasMergedCellsInRow } from '../../utils';
+import { checkIfHeaderColumnEnabled, checkIfHeaderRowEnabled, checkIfNumberColumnEnabled, getSelectedColumnIndexes, getSelectedRowIndexes } from '../../utils';
 import { getDragMenuConfig } from '../../utils/drag-menu';
 import { colorPalletteColumns } from '../consts';
 import { DropdownMenu } from './DropdownMenu';
@@ -175,7 +174,7 @@ var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, for
 };
 var ColorPaletteWithListeners = withOuterListeners(ColorPalette);
 export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
-  var _pluginConfig$allowBa;
+  var _tableMap$hasMergedCe, _pluginConfig$allowBa;
   var _ref$direction = _ref.direction,
     direction = _ref$direction === void 0 ? 'row' : _ref$direction,
     index = _ref.index,
@@ -209,19 +208,9 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
   var _getPluginState = getPluginState(state),
     isKeyboardModeActive = _getPluginState.isKeyboardModeActive;
   var selectionRect = isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
-  var shouldMoveDisabled;
-  var hasMergedCellsInTable;
-  if (fg('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
-    var _tableMap$hasMergedCe;
-    shouldMoveDisabled = false;
-    hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
-  } else {
-    var hasMergedCells = direction === 'row' ? hasMergedCellsInRow : hasMergedCellsInColumn;
-    shouldMoveDisabled = index !== undefined && hasMergedCells(index)(selection);
-    hasMergedCellsInTable = getMergedCellsPositions(state.tr).length > 0;
-  }
+  var hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
   var allowBackgroundColor = (_pluginConfig$allowBa = pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.allowBackgroundColor) !== null && _pluginConfig$allowBa !== void 0 ? _pluginConfig$allowBa : false;
-  var dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, !shouldMoveDisabled, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder);
+  var dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder);
   var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, tableSortColumnReorder, selectionRect),
     menuItems = _convertToDropdownIte.menuItems,
     menuCallback = _convertToDropdownIte.menuCallback;

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

@@ -11,13 +11,12 @@ import EditorLayoutThreeEqualIcon from '@atlaskit/icon/glyph/editor/layout-three
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import HipchatChevronDoubleDownIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-down';
 import HipchatChevronDoubleUpIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-up';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, sortColumnWithAnalytics } from '../commands-with-analytics';
 import { moveSourceWithAnalytics } from '../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getNewResizeStateFromSelectedColumns } from '../pm-plugins/table-resizing/utils/resize-state';
 import { getClosestSelectionRect } from '../toolbar';
 import { AddColLeftIcon, AddColRightIcon, AddRowAboveIcon, AddRowBelowIcon } from '../ui/icons';
-import { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInSelection, hasMergedCellsWithColumnNextToColumnIndex, hasMergedCellsWithRowNextToRowIndex } from './merged-cells';
+import { hasMergedCellsInSelection, hasMergedCellsWithColumnNextToColumnIndex, hasMergedCellsWithRowNextToRowIndex } from './merged-cells';
 import { getSelectedColumnIndexes, getSelectedRowIndexes } from './selection';
 export var getTargetIndex = function getTargetIndex(selectedIndexes, direction) {
   return Math[direction < 0 ? 'min' : 'max'].apply(Math, _toConsumableArray(selectedIndexes)) + direction;
@@ -40,17 +39,10 @@ export var canMove = function canMove(sourceType, direction, totalItemsOfSourceT
   if (hasMergedCellsInTarget) {
     return false;
   }
-  if (getBooleanFF('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
-    // We can't move if selection in the source is not a rectangle
-    if (hasMergedCellsInSelection(selectedIndexes, isRow ? 'row' : 'column')(selection)) {
-      return false;
-    }
-  } else {
-    // Currently we can't move in any direction if there are merged cells in the source
-    var hasMergedCellsInSource = isRow ? hasMergedCellsInRow(selectedIndexes)(selection) : hasMergedCellsInColumn(selectedIndexes)(selection);
-    if (hasMergedCellsInSource) {
-      return false;
-    }
+
+  // We can't move if selection in the source is not a rectangle
+  if (hasMergedCellsInSelection(selectedIndexes, isRow ? 'row' : 'column')(selection)) {
+    return false;
   }
   return true;
 };
@@ -68,13 +60,13 @@ var defaultSelectionRect = {
   right: 0,
   bottom: 0
 };
-export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, canDrag, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired) {
+export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired) {
   var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
-  var isTableScalingEnabled = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
-  var tableDuplicateCellColouring = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
-  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 14 && arguments[14] !== undefined ? arguments[14] : false;
-  var tableSortColumnReorder = arguments.length > 15 && arguments[15] !== undefined ? arguments[15] : false;
+  var isTableScalingEnabled = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
+  var tableDuplicateCellColouring = arguments.length > 11 && arguments[11] !== undefined ? arguments[11] : false;
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 12 && arguments[12] !== undefined ? arguments[12] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 13 && arguments[13] !== undefined ? arguments[13] : false;
+  var tableSortColumnReorder = arguments.length > 14 && arguments[14] !== undefined ? arguments[14] : false;
   var selection = editorView.state.selection;
   var addOptions = direction === 'row' ? [{
     label: 'above',
@@ -101,7 +93,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     label: 'up',
     icon: ArrowUpIcon,
     keymap: moveRowUp,
-    canMove: canDrag && canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
+    canMove: canMove('table-row', -1, (_tableMap$height = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height !== void 0 ? _tableMap$height : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.top - 1;
@@ -110,7 +102,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     label: 'down',
     icon: ArrowDownIcon,
     keymap: moveRowDown,
-    canMove: canDrag && canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
+    canMove: canMove('table-row', 1, (_tableMap$height2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.height) !== null && _tableMap$height2 !== void 0 ? _tableMap$height2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedRowIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.bottom;
@@ -119,7 +111,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     label: 'left',
     icon: ArrowLeftIcon,
     keymap: moveColumnLeft,
-    canMove: canDrag && canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
+    canMove: canMove('table-column', -1, (_tableMap$width = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width !== void 0 ? _tableMap$width : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.left - 1;
@@ -128,7 +120,7 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     label: 'right',
     icon: ArrowRightIcon,
     keymap: moveColumnRight,
-    canMove: canDrag && canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
+    canMove: canMove('table-column', 1, (_tableMap$width2 = tableMap === null || tableMap === void 0 ? void 0 : tableMap.width) !== null && _tableMap$width2 !== void 0 ? _tableMap$width2 : 0, selection, selectionRect),
     getOriginIndexes: getSelectedColumnIndexes,
     getTargetIndex: function getTargetIndex(selectionRect) {
       return selectionRect.right;

package/dist/types/utils/drag-menu.d.ts

@@ -13,4 +13,4 @@ export interface DragMenuConfig extends Omit<DropdownOptionT<Command>, 'icon'> {
     icon?: React.ComponentType<React.PropsWithChildren<IconProps>>;
     keymap?: string;
 }
-export declare const getDragMenuConfig: (direction: TableDirection, getEditorContainerWidth: GetEditorContainerWidth, canDrag: boolean, hasMergedCellsInTable: boolean, editorView: EditorView, tableMap?: TableMap, index?: number, targetCellPosition?: number, selectionRect?: Rect, editorAnalyticsAPI?: EditorAnalyticsAPI, isHeaderRowRequired?: boolean, isTableScalingEnabled?: boolean, tableDuplicateCellColouring?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, tableSortColumnReorder?: boolean) => DragMenuConfig[];
+export declare const getDragMenuConfig: (direction: TableDirection, getEditorContainerWidth: GetEditorContainerWidth, hasMergedCellsInTable: boolean, editorView: EditorView, tableMap?: TableMap, index?: number, targetCellPosition?: number, selectionRect?: Rect, editorAnalyticsAPI?: EditorAnalyticsAPI, isHeaderRowRequired?: boolean, isTableScalingEnabled?: boolean, tableDuplicateCellColouring?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, tableSortColumnReorder?: boolean) => DragMenuConfig[];

package/dist/types-ts4.5/utils/drag-menu.d.ts

@@ -13,4 +13,4 @@ export interface DragMenuConfig extends Omit<DropdownOptionT<Command>, 'icon'> {
     icon?: React.ComponentType<React.PropsWithChildren<IconProps>>;
     keymap?: string;
 }
-export declare const getDragMenuConfig: (direction: TableDirection, getEditorContainerWidth: GetEditorContainerWidth, canDrag: boolean, hasMergedCellsInTable: boolean, editorView: EditorView, tableMap?: TableMap, index?: number, targetCellPosition?: number, selectionRect?: Rect, editorAnalyticsAPI?: EditorAnalyticsAPI, isHeaderRowRequired?: boolean, isTableScalingEnabled?: boolean, tableDuplicateCellColouring?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, tableSortColumnReorder?: boolean) => DragMenuConfig[];
+export declare const getDragMenuConfig: (direction: TableDirection, getEditorContainerWidth: GetEditorContainerWidth, hasMergedCellsInTable: boolean, editorView: EditorView, tableMap?: TableMap, index?: number, targetCellPosition?: number, selectionRect?: Rect, editorAnalyticsAPI?: EditorAnalyticsAPI, isHeaderRowRequired?: boolean, isTableScalingEnabled?: boolean, tableDuplicateCellColouring?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, tableSortColumnReorder?: boolean) => DragMenuConfig[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "7.19.7",
+	"version": "7.19.9",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,9 +29,9 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^39.0.3",
-		"@atlaskit/button": "^18.1.0",
+		"@atlaskit/button": "^18.2.0",
 		"@atlaskit/custom-steps": "^0.4.0",
-		"@atlaskit/editor-common": "^84.0.0",
+		"@atlaskit/editor-common": "^84.2.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
@@ -43,13 +43,13 @@
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.12.0",
 		"@atlaskit/editor-tables": "^2.7.0",
-		"@atlaskit/icon": "^22.5.0",
-		"@atlaskit/menu": "^2.6.0",
+		"@atlaskit/icon": "^22.6.0",
+		"@atlaskit/menu": "^2.7.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.4.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
-		"@atlaskit/primitives": "^10.0.0",
+		"@atlaskit/primitives": "^10.1.0",
 		"@atlaskit/theme": "^12.11.0",
 		"@atlaskit/toggle": "^13.2.0",
 		"@atlaskit/tokens": "^1.53.0",
@@ -102,12 +102,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform.editor.table.drag-move-options-logic-update_fp7xw": {
-			"type": "boolean"
-		},
-		"platform.editor.a11y-table-resizing_uapcv": {
-			"type": "boolean"
-		},
 		"platform.editor.a11y-help-dialog-shortcut-keys-position_aghfg": {
 			"type": "boolean"
 		},

package/src/nodeviews/TableResizer.tsx

@@ -24,7 +24,6 @@ import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/stat
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { token } from '@atlaskit/tokens';
 
 import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../commands-with-analytics';
@@ -560,20 +559,18 @@ export const TableResizer = ({
 			displayGapCursor(true);
 			dispatch(tr);
 
-			if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-				if (delta.width < 0) {
-					pluginInjectionApi?.accessibilityUtils?.actions.ariaNotify(
-						formatMessage(messages.tableSizeDecreaseScreenReaderInformation, {
-							newWidth: newWidth,
-						}),
-					);
-				} else if (delta.width > 0) {
-					pluginInjectionApi?.accessibilityUtils?.actions.ariaNotify(
-						formatMessage(messages.tableSizeIncreaseScreenReaderInformation, {
-							newWidth: newWidth,
-						}),
-					);
-				}
+			if (delta.width < 0) {
+				pluginInjectionApi?.accessibilityUtils?.actions.ariaNotify(
+					formatMessage(messages.tableSizeDecreaseScreenReaderInformation, {
+						newWidth: newWidth,
+					}),
+				);
+			} else if (delta.width > 0) {
+				pluginInjectionApi?.accessibilityUtils?.actions.ariaNotify(
+					formatMessage(messages.tableSizeIncreaseScreenReaderInformation, {
+						newWidth: newWidth,
+					}),
+				);
 			}
 
 			// Hide guidelines when resizing stops
@@ -658,49 +655,45 @@ export const TableResizer = ({
 	);
 
 	useLayoutEffect(() => {
-		if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-			if (!resizerRef.current) {
+		if (!resizerRef.current) {
+			return;
+		}
+		const resizeHandleThumbEl = resizerRef.current.getResizerThumbEl();
+
+		const globalKeyDownHandler = (event: KeyboardEvent): void => {
+			const metaKey = browser.mac ? event.metaKey : event.ctrlKey;
+
+			if (!isTableSelected) {
 				return;
 			}
-			const resizeHandleThumbEl = resizerRef.current.getResizerThumbEl();
-
-			const globalKeyDownHandler = (event: KeyboardEvent): void => {
-				const metaKey = browser.mac ? event.metaKey : event.ctrlKey;
+			if (event.altKey && event.shiftKey && metaKey && event.code === 'KeyR') {
+				event.preventDefault();
 
-				if (!isTableSelected) {
+				if (!resizeHandleThumbEl) {
 					return;
 				}
-				if (event.altKey && event.shiftKey && metaKey && event.code === 'KeyR') {
-					event.preventDefault();
+				resizeHandleThumbEl.focus();
+				resizeHandleThumbEl.scrollIntoView({
+					behavior: 'smooth',
+					block: 'center',
+					inline: 'nearest',
+				});
+			}
+		};
 
-					if (!resizeHandleThumbEl) {
-						return;
-					}
-					resizeHandleThumbEl.focus();
-					resizeHandleThumbEl.scrollIntoView({
-						behavior: 'smooth',
-						block: 'center',
-						inline: 'nearest',
-					});
-				}
-			};
-
-			const editorViewDom = editorView?.dom as HTMLElement | undefined;
-			editorViewDom?.addEventListener('keydown', globalKeyDownHandler);
-			resizeHandleThumbEl?.addEventListener('keydown', handleKeyDown);
-			resizeHandleThumbEl?.addEventListener('keyup', handleKeyUp);
-			return () => {
-				editorViewDom?.removeEventListener('keydown', globalKeyDownHandler);
-				resizeHandleThumbEl?.removeEventListener('keydown', handleKeyDown);
-				resizeHandleThumbEl?.removeEventListener('keyup', handleKeyUp);
-			};
-		}
+		const editorViewDom = editorView?.dom as HTMLElement | undefined;
+		editorViewDom?.addEventListener('keydown', globalKeyDownHandler);
+		resizeHandleThumbEl?.addEventListener('keydown', handleKeyDown);
+		resizeHandleThumbEl?.addEventListener('keyup', handleKeyUp);
+		return () => {
+			editorViewDom?.removeEventListener('keydown', globalKeyDownHandler);
+			resizeHandleThumbEl?.removeEventListener('keydown', handleKeyDown);
+			resizeHandleThumbEl?.removeEventListener('keyup', handleKeyUp);
+		};
 	}, [resizerRef, editorView, handleResizeStop, isTableSelected, handleKeyDown, handleKeyUp]);
 
 	useLayoutEffect(() => {
-		if (getBooleanFF('platform.editor.a11y-table-resizing_uapcv')) {
-			updateTooltip.current?.();
-		}
+		updateTooltip.current?.();
 	}, [width]);
 
 	const resizeRatio =
@@ -731,19 +724,15 @@ export const TableResizer = ({
 				needExtendedResizeZone={!isTableSelected}
 				appearance={isTableSelected && isWholeTableInDanger ? 'danger' : undefined}
 				handleHighlight="shadow"
-				handleTooltipContent={
-					getBooleanFF('platform.editor.a11y-table-resizing_uapcv')
-						? ({ update }) => {
-								updateTooltip.current = update;
-								return (
-									<ToolTipContent
-										description={formatMessage(messages.resizeTable)}
-										keymap={focusTableResizer}
-									/>
-								);
-							}
-						: formatMessage(messages.resizeTable)
-				}
+				handleTooltipContent={({ update }) => {
+					updateTooltip.current = update;
+					return (
+						<ToolTipContent
+							description={formatMessage(messages.resizeTable)}
+							keymap={focusTableResizer}
+						/>
+					);
+				}}
 			>
 				{children}
 			</ResizerNext>

package/src/ui/FloatingDragMenu/DragMenu.tsx

@@ -39,7 +39,6 @@ import {
 	isSelectionType,
 } from '@atlaskit/editor-tables/utils';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Toggle from '@atlaskit/toggle';
 
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../commands';
@@ -58,11 +57,8 @@ import {
 	checkIfHeaderColumnEnabled,
 	checkIfHeaderRowEnabled,
 	checkIfNumberColumnEnabled,
-	getMergedCellsPositions,
 	getSelectedColumnIndexes,
 	getSelectedRowIndexes,
-	hasMergedCellsInColumn,
-	hasMergedCellsInRow,
 } from '../../utils';
 import type { DragMenuConfig, DragMenuOptionIdType } from '../../utils/drag-menu';
 import { getDragMenuConfig } from '../../utils/drag-menu';
@@ -290,25 +286,12 @@ export const DragMenu = React.memo(
 			? getSelectionRect(selection)!
 			: findCellRectClosestToPos(selection.$from);
 
-		let shouldMoveDisabled;
-		let hasMergedCellsInTable;
-		if (fg('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
-			shouldMoveDisabled = false;
-			hasMergedCellsInTable = tableMap?.hasMergedCells() ?? false;
-		} else {
-			const hasMergedCells = direction === 'row' ? hasMergedCellsInRow : hasMergedCellsInColumn;
-
-			shouldMoveDisabled = index !== undefined && hasMergedCells(index)(selection);
-
-			hasMergedCellsInTable = getMergedCellsPositions(state.tr).length > 0;
-		}
-
+		const hasMergedCellsInTable = tableMap?.hasMergedCells() ?? false;
 		const allowBackgroundColor = pluginConfig?.allowBackgroundColor ?? false;
 
 		const dragMenuConfig = getDragMenuConfig(
 			direction,
 			getEditorContainerWidth,
-			!shouldMoveDisabled,
 			hasMergedCellsInTable,
 			editorView,
 			tableMap,

package/src/utils/drag-menu.ts

@@ -34,7 +34,6 @@ import EditorLayoutThreeEqualIcon from '@atlaskit/icon/glyph/editor/layout-three
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import HipchatChevronDoubleDownIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-down';
 import HipchatChevronDoubleUpIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-up';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 import {
 	deleteColumnsWithAnalytics,
@@ -52,8 +51,6 @@ import type { DraggableData, DraggableType, TableDirection } from '../types';
 import { AddColLeftIcon, AddColRightIcon, AddRowAboveIcon, AddRowBelowIcon } from '../ui/icons';
 
 import {
-	hasMergedCellsInColumn,
-	hasMergedCellsInRow,
 	hasMergedCellsInSelection,
 	hasMergedCellsWithColumnNextToColumnIndex,
 	hasMergedCellsWithRowNextToRowIndex,
@@ -94,20 +91,9 @@ export const canMove = (
 		return false;
 	}
 
-	if (getBooleanFF('platform.editor.table.drag-move-options-logic-update_fp7xw')) {
-		// We can't move if selection in the source is not a rectangle
-		if (hasMergedCellsInSelection(selectedIndexes, isRow ? 'row' : 'column')(selection)) {
-			return false;
-		}
-	} else {
-		// Currently we can't move in any direction if there are merged cells in the source
-		const hasMergedCellsInSource = isRow
-			? hasMergedCellsInRow(selectedIndexes)(selection)
-			: hasMergedCellsInColumn(selectedIndexes)(selection);
-
-		if (hasMergedCellsInSource) {
-			return false;
-		}
+	// We can't move if selection in the source is not a rectangle
+	if (hasMergedCellsInSelection(selectedIndexes, isRow ? 'row' : 'column')(selection)) {
+		return false;
 	}
 
 	return true;
@@ -149,7 +135,6 @@ const defaultSelectionRect = { left: 0, top: 0, right: 0, bottom: 0 };
 export const getDragMenuConfig = (
 	direction: TableDirection,
 	getEditorContainerWidth: GetEditorContainerWidth,
-	canDrag: boolean,
 	hasMergedCellsInTable: boolean,
 	editorView: EditorView,
 	tableMap?: TableMap,
@@ -202,8 +187,7 @@ export const getDragMenuConfig = (
 						label: 'up',
 						icon: ArrowUpIcon,
 						keymap: moveRowUp,
-						canMove:
-							canDrag && canMove('table-row', -1, tableMap?.height ?? 0, selection, selectionRect),
+						canMove: canMove('table-row', -1, tableMap?.height ?? 0, selection, selectionRect),
 						getOriginIndexes: getSelectedRowIndexes,
 						getTargetIndex: (selectionRect: Rect) => selectionRect.top - 1,
 					},
@@ -211,8 +195,7 @@ export const getDragMenuConfig = (
 						label: 'down',
 						icon: ArrowDownIcon,
 						keymap: moveRowDown,
-						canMove:
-							canDrag && canMove('table-row', 1, tableMap?.height ?? 0, selection, selectionRect),
+						canMove: canMove('table-row', 1, tableMap?.height ?? 0, selection, selectionRect),
 						getOriginIndexes: getSelectedRowIndexes,
 						getTargetIndex: (selectionRect: Rect) => selectionRect.bottom,
 					},
@@ -222,9 +205,7 @@ export const getDragMenuConfig = (
 						label: 'left',
 						icon: ArrowLeftIcon,
 						keymap: moveColumnLeft,
-						canMove:
-							canDrag &&
-							canMove('table-column', -1, tableMap?.width ?? 0, selection, selectionRect),
+						canMove: canMove('table-column', -1, tableMap?.width ?? 0, selection, selectionRect),
 						getOriginIndexes: getSelectedColumnIndexes,
 						getTargetIndex: (selectionRect: Rect) => selectionRect.left - 1,
 					},
@@ -232,8 +213,7 @@ export const getDragMenuConfig = (
 						label: 'right',
 						icon: ArrowRightIcon,
 						keymap: moveColumnRight,
-						canMove:
-							canDrag && canMove('table-column', 1, tableMap?.width ?? 0, selection, selectionRect),
+						canMove: canMove('table-column', 1, tableMap?.width ?? 0, selection, selectionRect),
 						getOriginIndexes: getSelectedColumnIndexes,
 						getTargetIndex: (selectionRect: Rect) => selectionRect.right,
 					},