@atlaskit/editor-plugin-table 7.19.6 → 7.19.8

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-table
 
+## 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
+
+- [`d9b562bd66f8e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d9b562bd66f8e) -
+  [ux] [ED-23947] restoring the original order of the typeahead menu so that actions, media,
+  mentions and emojis are above the fold (in the top 5 results). this change is a major because it
+  removes the `getEditorFeatureFlags prop` for plugins. if any consumers who have adopted these
+  changes to the public API, they should remove them on their side too.
+- Updated dependencies
+
 ## 7.19.6
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -442,14 +442,13 @@ var tablesPlugin = function tablesPlugin(_ref) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(_ref19) {
-        var _options$getEditorFea3;
         var formatMessage = _ref19.formatMessage;
         return [{
           id: 'table',
           title: formatMessage(_messages.toolbarInsertBlockMessages.table),
           description: formatMessage(_messages.toolbarInsertBlockMessages.tableDescription),
           keywords: ['cell', 'table'],
-          priority: options !== null && options !== void 0 && (_options$getEditorFea3 = options.getEditorFeatureFlags) !== null && _options$getEditorFea3 !== void 0 && _options$getEditorFea3.call(options).platformEditorTypeaheadImprovedRelevancy ? 800 : 600,
+          priority: 600,
           keyshortcut: (0, _keymaps.tooltip)(_keymaps.toggleTable),
           icon: function icon() {
             return /*#__PURE__*/_react.default.createElement(_icons.IconTable, null);

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

@@ -21,7 +21,7 @@ var cellColourPreviewStyles = exports.cellColourPreviewStyles = function cellCol
   });
 };
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var elementBeforeIconStyles = exports.elementBeforeIconStyles = (0, _react.css)({
   marginRight: "var(--ds-space-negative-075, -6px)",
   display: 'flex'

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/ui/FloatingDragMenu/styles.js

@@ -21,7 +21,7 @@ var cellColourPreviewStyles = exports.cellColourPreviewStyles = function cellCol
   });
 };
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var elementBeforeIconStyles = exports.elementBeforeIconStyles = (0, _react.css)({
   marginRight: "var(--ds-space-negative-075, -6px)",
   display: 'flex'
@@ -33,7 +33,7 @@ var dragMenuBackgroundColorStyles = exports.dragMenuBackgroundColorStyles = func
   return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.", " {\n\t\tborder-radius: ", ";\n\t\tbackground: ", ";\n\t\tbox-shadow: ", ";\n\t\tdisplay: block;\n\t\tposition: absolute;\n\t\ttop: ", "px; // move the submenu down when 'sort increasing/decreasing' appear before background color picker\n\t\tleft: ", "px;\n\t\tpadding: ", ";\n\n\t\t> div {\n\t\t\tpadding: 0;\n\t\t}\n\t}\n\n\t.", " {\n\t\tdisplay: flex;\n\n\t\t&::before {\n\t\t\tcontent: '';\n\t\t\tdisplay: block;\n\t\t\tborder: 1px solid ", ";\n\t\t\tborder-radius: ", ";\n\t\t\twidth: 14px;\n\t\t\theight: 14px;\n\t\t}\n\n\t\t&::after {\n\t\t\tcontent: '\u203A';\n\t\t\tmargin-left: ", ";\n\t\t\tline-height: 14px;\n\t\t\tcolor: ", ";\n\t\t}\n\t}\n"])), _types.TableCssClassName.DRAG_SUBMENU, "var(--ds-border-radius, 3px)", "var(--ds-surface-overlay, white)", "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(_colors.N60A, ", 0 0 1px ").concat(_colors.N60A), ")"), tableSortColumnReorder ? _consts.TABLE_DRAG_MENU_PADDING_TOP + _consts.TABLE_DRAG_MENU_SORT_GROUP_HEIGHT + _consts.TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT : 0, _consts.dragMenuDropdownWidth, "var(--ds-space-100, 8px)", _types.TableCssClassName.DRAG_SUBMENU_ICON, _adfSchema.tableBackgroundBorderColor, "var(--ds-border-radius, 3px)", "var(--ds-space-050, 4px)", "var(--ds-icon, ".concat(_colors.N90, ")"));
 };
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var toggleStyles = exports.toggleStyles = (0, _react.css)({
   display: 'flex',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

package/dist/cjs/ui/common-styles.js

@@ -83,8 +83,8 @@ var tableStyles = exports.tableStyles = function tableStyles(props) {
   return (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t", "\n\t}\n\n\t.ProseMirror.", " {\n\t\t.", " {\n\t\t\toverflow-x: auto;\n\t\t\t", ";\n\t\t}\n\t}\n\n\t.ProseMirror.", " {\n\t\tcursor: col-resize;\n\t}\n\n\t", "\n"])), baseTableStyles(props), _types.TableCssClassName.IS_RESIZING, _types.TableCssClassName.TABLE_NODE_WRAPPER, _scrollbar.scrollbarStyles, _types.TableCssClassName.RESIZE_CURSOR, shadowSentinelStyles);
 };
 
-// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var tableFullPageEditorStyles = exports.tableFullPageEditorStyles = (0, _react.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror .", " > table {\n\t\tmargin-left: 0;\n\t\t// 1px border width offset added here to prevent unwanted overflow and scolling - ED-16212\n\t\tmargin-right: -1px;\n\t\twidth: 100%;\n\t}\n"])), _types.TableCssClassName.TABLE_NODE_WRAPPER);
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var tableCommentEditorStyles = exports.tableCommentEditorStyles = (0, _react.css)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror .", " > table {\n\t\tmargin-left: 0;\n\t\tmargin-right: 0;\n\t\t", ";\n\t}\n"])), _types.TableCssClassName.TABLE_NODE_WRAPPER, _scrollbar.scrollbarStyles);

package/dist/cjs/ui/ui-styles.js

@@ -141,7 +141,7 @@ var hoveredCell = exports.hoveredCell = function hoveredCell() {
   return (0, _react.css)(_templateObject20 || (_templateObject20 = (0, _taggedTemplateLiteral2.default)(["\n\t:not(.", ")\n\t\t.", ":not(.", ") {\n\t\t.", " {\n\t\t\tposition: relative;\n\t\t\tborder: 1px solid ", ";\n\t\t}\n\t\t.", ".", " {\n\t\t\tposition: relative;\n\t\t\tborder: 1px solid ", ";\n\t\t}\n\t}\n"])), _types.TableCssClassName.IS_RESIZING, _types.TableCssClassName.TABLE_CONTAINER, _types.TableCssClassName.HOVERED_DELETE_BUTTON, _types.TableCssClassName.HOVERED_CELL, _consts.tableBorderSelectedColor, _types.TableCssClassName.HOVERED_CELL, _types.TableCssClassName.HOVERED_NO_HIGHLIGHT, _consts.tableBorderColor);
 };
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var hoveredWarningCell = exports.hoveredWarningCell = (0, _react.css)(_templateObject21 || (_templateObject21 = (0, _taggedTemplateLiteral2.default)(["\n\t:not(.", ")\n\t\t.", ":not(.", ") {\n\t\ttd.", " {\n\t\t\tbackground-color: ", " !important; // We need to override the background-color added to the cell\n\t\t\tborder: 1px solid ", ";\n\t\t}\n\t}\n"])), _types.TableCssClassName.IS_RESIZING, _types.TableCssClassName.TABLE_CONTAINER, _types.TableCssClassName.HOVERED_DELETE_BUTTON, _types.TableCssClassName.HOVERED_CELL_WARNING, "var(--ds-background-warning, ".concat(_colors.Y50, ")"), "var(--ds-border-warning, ".concat(_colors.Y200, ")"));
 
 // Explicit pixel values required here to ensure correct positioning and sizes of column resize handle

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/plugin.js

@@ -437,40 +437,37 @@ const tablesPlugin = ({
     pluginsOptions: {
       quickInsert: ({
         formatMessage
-      }) => {
-        var _options$getEditorFea3;
-        return [{
-          id: 'table',
-          title: formatMessage(messages.table),
-          description: formatMessage(messages.tableDescription),
-          keywords: ['cell', 'table'],
-          priority: options !== null && options !== void 0 && (_options$getEditorFea3 = options.getEditorFeatureFlags) !== null && _options$getEditorFea3 !== void 0 && _options$getEditorFea3.call(options).platformEditorTypeaheadImprovedRelevancy ? 800 : 600,
-          keyshortcut: tooltip(toggleTable),
-          icon: () => /*#__PURE__*/React.createElement(IconTable, null),
-          action(insert, state) {
-            var _api$table;
-            // see comment on tablesPlugin.getSharedState on usage
-            const tableState = api === null || api === void 0 ? void 0 : (_api$table = api.table) === null || _api$table === void 0 ? void 0 : _api$table.sharedState.currentState();
-            const tableNode = createTableWithWidth({
-              isTableScalingEnabled: options === null || options === void 0 ? void 0 : options.isTableScalingEnabled,
-              isTableAlignmentEnabled: options === null || options === void 0 ? void 0 : options.isTableAlignmentEnabled,
-              isFullWidthModeEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isFullWidthModeEnabled
-            })(state.schema);
-            const tr = insert(tableNode);
-            editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: ACTION_SUBJECT_ID.TABLE,
-              attributes: {
-                inputMethod: INPUT_METHOD.QUICK_INSERT,
-                localId: tableNode.attrs.localId
-              },
-              eventType: EVENT_TYPE.TRACK
-            })(tr);
-            return tr;
-          }
-        }];
-      },
+      }) => [{
+        id: 'table',
+        title: formatMessage(messages.table),
+        description: formatMessage(messages.tableDescription),
+        keywords: ['cell', 'table'],
+        priority: 600,
+        keyshortcut: tooltip(toggleTable),
+        icon: () => /*#__PURE__*/React.createElement(IconTable, null),
+        action(insert, state) {
+          var _api$table;
+          // see comment on tablesPlugin.getSharedState on usage
+          const tableState = api === null || api === void 0 ? void 0 : (_api$table = api.table) === null || _api$table === void 0 ? void 0 : _api$table.sharedState.currentState();
+          const tableNode = createTableWithWidth({
+            isTableScalingEnabled: options === null || options === void 0 ? void 0 : options.isTableScalingEnabled,
+            isTableAlignmentEnabled: options === null || options === void 0 ? void 0 : options.isTableAlignmentEnabled,
+            isFullWidthModeEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isFullWidthModeEnabled
+          })(state.schema);
+          const tr = insert(tableNode);
+          editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+            action: ACTION.INSERTED,
+            actionSubject: ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: ACTION_SUBJECT_ID.TABLE,
+            attributes: {
+              inputMethod: INPUT_METHOD.QUICK_INSERT,
+              localId: tableNode.attrs.localId
+            },
+            eventType: EVENT_TYPE.TRACK
+          })(tr);
+          return tr;
+        }
+      }],
       floatingToolbar: getToolbarConfig(defaultGetEditorContainerWidth, editorAnalyticsAPI, (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags, () => editorViewRef.current, options, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(pluginConfig(options === null || options === void 0 ? void 0 : options.tableOptions))
     }
   };

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

@@ -11,7 +11,7 @@ export const cellColourPreviewStyles = selectedColor => css({
   }
 });
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const elementBeforeIconStyles = css({
   marginRight: "var(--ds-space-negative-075, -6px)",
   display: 'flex'

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/ui/FloatingDragMenu/styles.js

@@ -11,7 +11,7 @@ export const cellColourPreviewStyles = selectedColor => css({
   }
 });
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const elementBeforeIconStyles = css({
   marginRight: "var(--ds-space-negative-075, -6px)",
   display: 'flex'
@@ -55,7 +55,7 @@ export const dragMenuBackgroundColorStyles = (tableSortColumnReorder = false) =>
 	}
 `;
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const toggleStyles = css({
   display: 'flex',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

package/dist/es2019/ui/common-styles.js

@@ -1002,7 +1002,7 @@ export const tableStyles = props => css`
 	${shadowSentinelStyles}
 `;
 
-// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const tableFullPageEditorStyles = css`
 	.ProseMirror .${ClassName.TABLE_NODE_WRAPPER} > table {
 		margin-left: 0;
@@ -1012,7 +1012,7 @@ export const tableFullPageEditorStyles = css`
 	}
 `;
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const tableCommentEditorStyles = css`
 	.ProseMirror .${ClassName.TABLE_NODE_WRAPPER} > table {
 		margin-left: 0;

package/dist/es2019/ui/ui-styles.js

@@ -565,7 +565,7 @@ export const hoveredCell = () => css`
 	}
 `;
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const hoveredWarningCell = css`
 	:not(.${ClassName.IS_RESIZING})
 		.${ClassName.TABLE_CONTAINER}:not(.${ClassName.HOVERED_DELETE_BUTTON}) {

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/plugin.js

@@ -435,14 +435,13 @@ var tablesPlugin = function tablesPlugin(_ref) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(_ref19) {
-        var _options$getEditorFea3;
         var formatMessage = _ref19.formatMessage;
         return [{
           id: 'table',
           title: formatMessage(messages.table),
           description: formatMessage(messages.tableDescription),
           keywords: ['cell', 'table'],
-          priority: options !== null && options !== void 0 && (_options$getEditorFea3 = options.getEditorFeatureFlags) !== null && _options$getEditorFea3 !== void 0 && _options$getEditorFea3.call(options).platformEditorTypeaheadImprovedRelevancy ? 800 : 600,
+          priority: 600,
           keyshortcut: tooltip(toggleTable),
           icon: function icon() {
             return /*#__PURE__*/React.createElement(IconTable, null);

package/dist/esm/ui/FloatingContextualMenu/styles.js

@@ -15,7 +15,7 @@ export var cellColourPreviewStyles = function cellColourPreviewStyles(selectedCo
   });
 };
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var elementBeforeIconStyles = css({
   marginRight: "var(--ds-space-negative-075, -6px)",
   display: 'flex'

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/ui/FloatingDragMenu/styles.js

@@ -15,7 +15,7 @@ export var cellColourPreviewStyles = function cellColourPreviewStyles(selectedCo
   });
 };
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var elementBeforeIconStyles = css({
   marginRight: "var(--ds-space-negative-075, -6px)",
   display: 'flex'
@@ -27,7 +27,7 @@ export var dragMenuBackgroundColorStyles = function dragMenuBackgroundColorStyle
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t.", " {\n\t\tborder-radius: ", ";\n\t\tbackground: ", ";\n\t\tbox-shadow: ", ";\n\t\tdisplay: block;\n\t\tposition: absolute;\n\t\ttop: ", "px; // move the submenu down when 'sort increasing/decreasing' appear before background color picker\n\t\tleft: ", "px;\n\t\tpadding: ", ";\n\n\t\t> div {\n\t\t\tpadding: 0;\n\t\t}\n\t}\n\n\t.", " {\n\t\tdisplay: flex;\n\n\t\t&::before {\n\t\t\tcontent: '';\n\t\t\tdisplay: block;\n\t\t\tborder: 1px solid ", ";\n\t\t\tborder-radius: ", ";\n\t\t\twidth: 14px;\n\t\t\theight: 14px;\n\t\t}\n\n\t\t&::after {\n\t\t\tcontent: '\u203A';\n\t\t\tmargin-left: ", ";\n\t\t\tline-height: 14px;\n\t\t\tcolor: ", ";\n\t\t}\n\t}\n"])), ClassName.DRAG_SUBMENU, "var(--ds-border-radius, 3px)", "var(--ds-surface-overlay, white)", "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(N60A, ", 0 0 1px ").concat(N60A), ")"), tableSortColumnReorder ? TABLE_DRAG_MENU_PADDING_TOP + TABLE_DRAG_MENU_SORT_GROUP_HEIGHT + TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT : 0, dragMenuDropdownWidth, "var(--ds-space-100, 8px)", ClassName.DRAG_SUBMENU_ICON, tableBackgroundBorderColor, "var(--ds-border-radius, 3px)", "var(--ds-space-050, 4px)", "var(--ds-icon, ".concat(N90, ")"));
 };
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var toggleStyles = css({
   display: 'flex',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

package/dist/esm/ui/common-styles.js

@@ -77,8 +77,8 @@ export var tableStyles = function tableStyles(props) {
   return css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", "\n\t}\n\n\t.ProseMirror.", " {\n\t\t.", " {\n\t\t\toverflow-x: auto;\n\t\t\t", ";\n\t\t}\n\t}\n\n\t.ProseMirror.", " {\n\t\tcursor: col-resize;\n\t}\n\n\t", "\n"])), baseTableStyles(props), ClassName.IS_RESIZING, ClassName.TABLE_NODE_WRAPPER, scrollbarStyles, ClassName.RESIZE_CURSOR, shadowSentinelStyles);
 };
 
-// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var tableFullPageEditorStyles = css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n\t.ProseMirror .", " > table {\n\t\tmargin-left: 0;\n\t\t// 1px border width offset added here to prevent unwanted overflow and scolling - ED-16212\n\t\tmargin-right: -1px;\n\t\twidth: 100%;\n\t}\n"])), ClassName.TABLE_NODE_WRAPPER);
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var tableCommentEditorStyles = css(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n\t.ProseMirror .", " > table {\n\t\tmargin-left: 0;\n\t\tmargin-right: 0;\n\t\t", ";\n\t}\n"])), ClassName.TABLE_NODE_WRAPPER, scrollbarStyles);

package/dist/esm/ui/ui-styles.js

@@ -134,7 +134,7 @@ export var hoveredCell = function hoveredCell() {
   return css(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n\t:not(.", ")\n\t\t.", ":not(.", ") {\n\t\t.", " {\n\t\t\tposition: relative;\n\t\t\tborder: 1px solid ", ";\n\t\t}\n\t\t.", ".", " {\n\t\t\tposition: relative;\n\t\t\tborder: 1px solid ", ";\n\t\t}\n\t}\n"])), ClassName.IS_RESIZING, ClassName.TABLE_CONTAINER, ClassName.HOVERED_DELETE_BUTTON, ClassName.HOVERED_CELL, tableBorderSelectedColor, ClassName.HOVERED_CELL, ClassName.HOVERED_NO_HIGHLIGHT, tableBorderColor);
 };
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var hoveredWarningCell = css(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n\t:not(.", ")\n\t\t.", ":not(.", ") {\n\t\ttd.", " {\n\t\t\tbackground-color: ", " !important; // We need to override the background-color added to the cell\n\t\t\tborder: 1px solid ", ";\n\t\t}\n\t}\n"])), ClassName.IS_RESIZING, ClassName.TABLE_CONTAINER, ClassName.HOVERED_DELETE_BUTTON, ClassName.HOVERED_CELL_WARNING, "var(--ds-background-warning, ".concat(Y50, ")"), "var(--ds-border-warning, ".concat(Y200, ")"));
 
 // Explicit pixel values required here to ensure correct positioning and sizes of column resize handle

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.6",
+	"version": "7.19.8",
 	"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.0.0",
+		"@atlaskit/button": "^18.2.0",
 		"@atlaskit/custom-steps": "^0.4.0",
-		"@atlaskit/editor-common": "^83.5.0",
+		"@atlaskit/editor-common": "^84.1.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.1.0",
-		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.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,9 +102,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform.editor.table.drag-move-options-logic-update_fp7xw": {
-			"type": "boolean"
-		},
 		"platform.editor.a11y-table-resizing_uapcv": {
 			"type": "boolean"
 		},

package/src/plugin.tsx

@@ -654,9 +654,7 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 					title: formatMessage(messages.table),
 					description: formatMessage(messages.tableDescription),
 					keywords: ['cell', 'table'],
-					priority: options?.getEditorFeatureFlags?.().platformEditorTypeaheadImprovedRelevancy
-						? 800
-						: 600,
+					priority: 600,
 					keyshortcut: tooltip(toggleTable),
 					icon: () => <IconTable />,
 					action(insert, state) {

package/src/ui/FloatingContextualMenu/styles.ts

@@ -16,7 +16,7 @@ export const cellColourPreviewStyles = (selectedColor: string) =>
 		},
 	});
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const elementBeforeIconStyles = css({
 	marginRight: token('space.negative.075', '-6px'),
 	display: 'flex',

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/ui/FloatingDragMenu/styles.ts

@@ -21,7 +21,7 @@ export const cellColourPreviewStyles = (selectedColor: string) =>
 		},
 	});
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const elementBeforeIconStyles = css({
 	marginRight: token('space.negative.075', '-6px'),
 	display: 'flex',
@@ -69,7 +69,7 @@ export const dragMenuBackgroundColorStyles = (tableSortColumnReorder: boolean =
 	}
 `;
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const toggleStyles = css({
 	display: 'flex',
 	// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

package/src/ui/common-styles.ts

@@ -1082,7 +1082,7 @@ export const tableStyles = (props: { featureFlags?: FeatureFlags }) => css`
 	${shadowSentinelStyles}
 `;
 
-// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const tableFullPageEditorStyles = css`
 	.ProseMirror .${ClassName.TABLE_NODE_WRAPPER} > table {
 		margin-left: 0;
@@ -1092,7 +1092,7 @@ export const tableFullPageEditorStyles = css`
 	}
 `;
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const tableCommentEditorStyles = css`
 	.ProseMirror .${ClassName.TABLE_NODE_WRAPPER} > table {
 		margin-left: 0;

package/src/ui/ui-styles.ts

@@ -640,7 +640,7 @@ export const hoveredCell = () => css`
 	}
 `;
 
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const hoveredWarningCell = css`
 	:not(.${ClassName.IS_RESIZING})
 		.${ClassName.TABLE_CONTAINER}:not(.${ClassName.HOVERED_DELETE_BUTTON}) {

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,
 					},