@atlaskit/editor-plugin-table 24.5.4 → 24.5.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-table
 
+## 24.5.5
+
+### Patch Changes
+
+- [`6e8461981e75d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6e8461981e75d) -
+  Disable row and column move options when merged cells prevent reordering behind the
+  platform_editor_table_menu_updates_patch_2 experiment
+- Updated dependencies
+
 ## 24.5.4
 
 ### Patch Changes

package/dist/cjs/ui/TableMenu/column/items/MoveColumnLeftItem.js

@@ -12,8 +12,13 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _informationCircleIcon = require("@atlaskit/editor-toolbar/information-circle-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
 var _tableColumnMoveLeft = _interopRequireDefault(require("@atlaskit/icon/core/table-column-move-left"));
+var _compiled = require("@atlaskit/primitives/compiled");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/drag-and-drop/commands-with-analytics");
 var _pluginFactory = require("../../../../pm-plugins/plugin-factory");
@@ -55,17 +60,46 @@ var MoveColumnLeftItem = exports.MoveColumnLeftItem = function MoveColumnLeftIte
   if (!tableNode || !shouldShowMoveColumnLeft(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn)) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  var label = formatMessage(_messages.tableMessages.moveColumnLeft, {
+    0: selectedColumnCount
+  });
+  var canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveColumnLeft);
+  var isMoveDisabled = (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/_react.default.createElement(_tableColumnMoveLeft.default, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
+        content: formatMessage(_messages.tableMessages.canNotMoveColumnLeftWithMergedCells),
+        position: "top"
+      }, function (tooltipProps) {
+        return (
+          /*#__PURE__*/
+          // Ignored via go/ees005
+          // eslint-disable-next-line react/jsx-props-no-spreading
+          _react.default.createElement("span", tooltipProps, /*#__PURE__*/_react.default.createElement(_informationCircleIcon.InformationCircleIcon, {
+            label: "",
+            size: "small",
+            color: "var(--ds-icon, #292A2E)"
+          }))
+        );
+      })
+    }, /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_tableColumnMoveLeft.default, {
       color: "currentColor",
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.moveColumnLeft)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(_messages.tableMessages.moveColumnLeft, {
-    0: selectedColumnCount
-  }));
+  }, label);
 };

package/dist/cjs/ui/TableMenu/column/items/MoveColumnRightItem.js

@@ -12,7 +12,13 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _columnMoveRightIcon = require("@atlaskit/editor-toolbar/column-move-right-icon");
+var _informationCircleIcon = require("@atlaskit/editor-toolbar/information-circle-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
+var _compiled = require("@atlaskit/primitives/compiled");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/drag-and-drop/commands-with-analytics");
 var _pluginFactory = require("../../../../pm-plugins/plugin-factory");
@@ -54,17 +60,46 @@ var MoveColumnRightItem = exports.MoveColumnRightItem = function MoveColumnRight
   if (!tableNode || !shouldShowMoveColumnRight(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastColumn)) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  var label = formatMessage(_messages.tableMessages.moveColumnRight, {
+    0: selectedColumnCount
+  });
+  var canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveColumnRight);
+  var isMoveDisabled = (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/_react.default.createElement(_columnMoveRightIcon.TableColumnMoveRightIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
+        content: formatMessage(_messages.tableMessages.canNotMoveColumnRightWithMergedCells),
+        position: "top"
+      }, function (tooltipProps) {
+        return (
+          /*#__PURE__*/
+          // Ignored via go/ees005
+          // eslint-disable-next-line react/jsx-props-no-spreading
+          _react.default.createElement("span", tooltipProps, /*#__PURE__*/_react.default.createElement(_informationCircleIcon.InformationCircleIcon, {
+            label: "",
+            size: "small",
+            color: "var(--ds-icon, #292A2E)"
+          }))
+        );
+      })
+    }, /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TableColumnMoveRightIcon, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_columnMoveRightIcon.TableColumnMoveRightIcon, {
       color: "currentColor",
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.moveColumnRight)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(_messages.tableMessages.moveColumnRight, {
-    0: selectedColumnCount
-  }));
+  }, label);
 };

package/dist/cjs/ui/TableMenu/column/items/SortDecreasingItem.js

@@ -18,6 +18,7 @@ var _utils = require("@atlaskit/editor-tables/utils");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
@@ -72,7 +73,9 @@ var SortDecreasingItem = exports.SortDecreasingItem = function SortDecreasingIte
           color: "var(--ds-icon, #292A2E)"
         }));
       })
-    }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+    }, (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+      color: "color.text.disabled"
+    }, formatMessage(_messages.tableMessages.sortColumnDecreasing)) : /*#__PURE__*/_react.default.createElement(_compiled.Box, {
       as: "span",
       xcss: styles.disabledLabel
     }, formatMessage(_messages.tableMessages.sortColumnDecreasing)));

package/dist/cjs/ui/TableMenu/column/items/SortIncreasingItem.js

@@ -18,6 +18,7 @@ var _utils = require("@atlaskit/editor-tables/utils");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
@@ -72,7 +73,9 @@ var SortIncreasingItem = exports.SortIncreasingItem = function SortIncreasingIte
           color: "var(--ds-icon, #292A2E)"
         }));
       })
-    }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+    }, (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+      color: "color.text.disabled"
+    }, formatMessage(_messages.tableMessages.sortColumnIncreasing)) : /*#__PURE__*/_react.default.createElement(_compiled.Box, {
       as: "span",
       xcss: styles.disabledLabel
     }, formatMessage(_messages.tableMessages.sortColumnIncreasing)));

package/dist/cjs/ui/TableMenu/row/items/MoveRowDownItem.js

@@ -12,7 +12,13 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _informationCircleIcon = require("@atlaskit/editor-toolbar/information-circle-icon");
+var _rowMoveDownIcon = require("@atlaskit/editor-toolbar/row-move-down-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
+var _compiled = require("@atlaskit/primitives/compiled");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/drag-and-drop/commands-with-analytics");
 var _pluginFactory = require("../../../../pm-plugins/plugin-factory");
@@ -54,17 +60,46 @@ var MoveRowDownItem = exports.MoveRowDownItem = function MoveRowDownItem(props)
   if (!tableNode || !shouldShowMoveRowDown(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastRow)) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  var label = formatMessage(_messages.tableMessages.moveRowDown, {
+    0: selectedRowCount
+  });
+  var canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveRowDown);
+  var isMoveDisabled = (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/_react.default.createElement(_rowMoveDownIcon.TableRowMoveDownIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
+        content: formatMessage(_messages.tableMessages.canNotMoveRowDownWithMergedCells),
+        position: "top"
+      }, function (tooltipProps) {
+        return (
+          /*#__PURE__*/
+          // Ignored via go/ees005
+          // eslint-disable-next-line react/jsx-props-no-spreading
+          _react.default.createElement("span", tooltipProps, /*#__PURE__*/_react.default.createElement(_informationCircleIcon.InformationCircleIcon, {
+            label: "",
+            size: "small",
+            color: "var(--ds-icon, #292A2E)"
+          }))
+        );
+      })
+    }, /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TableRowMoveDownIcon, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_rowMoveDownIcon.TableRowMoveDownIcon, {
       color: "currentColor",
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.moveRowDown)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(_messages.tableMessages.moveRowDown, {
-    0: selectedRowCount
-  }));
+  }, label);
 };

package/dist/cjs/ui/TableMenu/row/items/MoveRowUpItem.js

@@ -12,7 +12,13 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _informationCircleIcon = require("@atlaskit/editor-toolbar/information-circle-icon");
+var _rowMoveUpIcon = require("@atlaskit/editor-toolbar/row-move-up-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
+var _compiled = require("@atlaskit/primitives/compiled");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/drag-and-drop/commands-with-analytics");
 var _pluginFactory = require("../../../../pm-plugins/plugin-factory");
@@ -54,17 +60,46 @@ var MoveRowUpItem = exports.MoveRowUpItem = function MoveRowUpItem(props) {
   if (!tableNode || !shouldShowMoveRowUp(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstRow)) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  var label = formatMessage(_messages.tableMessages.moveRowUp, {
+    0: selectedRowCount
+  });
+  var canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveRowUp);
+  var isMoveDisabled = (0, _expValEquals.expValEquals)('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/_react.default.createElement(_rowMoveUpIcon.TableRowMoveUpIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
+        content: formatMessage(_messages.tableMessages.canNotMoveRowUpWithMergedCells),
+        position: "top"
+      }, function (tooltipProps) {
+        return (
+          /*#__PURE__*/
+          // Ignored via go/ees005
+          // eslint-disable-next-line react/jsx-props-no-spreading
+          _react.default.createElement("span", tooltipProps, /*#__PURE__*/_react.default.createElement(_informationCircleIcon.InformationCircleIcon, {
+            label: "",
+            size: "small",
+            color: "var(--ds-icon, #292A2E)"
+          }))
+        );
+      })
+    }, /*#__PURE__*/_react.default.createElement(_compiled.Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TableRowMoveUpIcon, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_rowMoveUpIcon.TableRowMoveUpIcon, {
       color: "currentColor",
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.moveRowUp)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(_messages.tableMessages.moveRowUp, {
-    0: selectedRowCount
-  }));
+  }, label);
 };

package/dist/cjs/ui/TableMenu/shared/TableMenu.js

@@ -15,6 +15,7 @@ var _toolbarMenuContainer = require("@atlaskit/editor-toolbar/toolbar-menu-conta
 var _editorUiControlModel = require("@atlaskit/editor-ui-control-model");
 var _splitCell = require("../../../pm-plugins/commands/split-cell");
 var _merge = require("../../../pm-plugins/transforms/merge");
+var _dragMenu = require("../../../pm-plugins/utils/drag-menu");
 var _TableMenuContext = require("./TableMenuContext");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -54,6 +55,10 @@ var TableMenu = exports.TableMenu = /*#__PURE__*/(0, _react.memo)(function (_ref
       return cellOps;
     }
     return _objectSpread(_objectSpread({}, cellOps), {}, {
+      canMoveRowUp: (0, _dragMenu.canMove)('table-row', -1, tableMap.height, editorView.state.selection, selectionRect),
+      canMoveRowDown: (0, _dragMenu.canMove)('table-row', 1, tableMap.height, editorView.state.selection, selectionRect),
+      canMoveColumnLeft: (0, _dragMenu.canMove)('table-column', -1, tableMap.width, editorView.state.selection, selectionRect),
+      canMoveColumnRight: (0, _dragMenu.canMove)('table-column', 1, tableMap.width, editorView.state.selection, selectionRect),
       isFirstRow: selectionRect.top === 0,
       isLastRow: selectionRect.bottom === tableMap.height,
       selectedRowCount: selectionRect.bottom - selectionRect.top,

package/dist/es2019/ui/TableMenu/column/items/MoveColumnLeftItem.js

@@ -5,8 +5,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { moveColumnLeft, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { InformationCircleIcon } from '@atlaskit/editor-toolbar/information-circle-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import TableColumnMoveLeftIcon from '@atlaskit/icon/core/table-column-move-left';
+import { Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
@@ -51,6 +56,34 @@ export const MoveColumnLeftItem = props => {
   if (!tableNode || !shouldShowMoveColumnLeft(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn)) {
     return null;
   }
+  const label = formatMessage(messages.moveColumnLeft, {
+    0: selectedColumnCount
+  });
+  const canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveColumnLeft);
+  const isMoveDisabled = expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveLeftIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(Tooltip, {
+        content: formatMessage(messages.canNotMoveColumnLeftWithMergedCells),
+        position: "top"
+      }, tooltipProps =>
+      /*#__PURE__*/
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      React.createElement("span", tooltipProps, /*#__PURE__*/React.createElement(InformationCircleIcon, {
+        label: "",
+        size: "small",
+        color: "var(--ds-icon, #292A2E)"
+      })))
+    }, /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveLeftIcon, {
@@ -61,7 +94,5 @@ export const MoveColumnLeftItem = props => {
     elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(moveColumnLeft)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(messages.moveColumnLeft, {
-    0: selectedColumnCount
-  }));
+  }, label);
 };

package/dist/es2019/ui/TableMenu/column/items/MoveColumnRightItem.js

@@ -5,7 +5,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { moveColumnRight, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { TableColumnMoveRightIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { TableColumnMoveRightIcon } from '@atlaskit/editor-toolbar/column-move-right-icon';
+import { InformationCircleIcon } from '@atlaskit/editor-toolbar/information-circle-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
+import { Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
@@ -50,6 +56,34 @@ export const MoveColumnRightItem = props => {
   if (!tableNode || !shouldShowMoveColumnRight(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastColumn)) {
     return null;
   }
+  const label = formatMessage(messages.moveColumnRight, {
+    0: selectedColumnCount
+  });
+  const canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveColumnRight);
+  const isMoveDisabled = expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveRightIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(Tooltip, {
+        content: formatMessage(messages.canNotMoveColumnRightWithMergedCells),
+        position: "top"
+      }, tooltipProps =>
+      /*#__PURE__*/
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      React.createElement("span", tooltipProps, /*#__PURE__*/React.createElement(InformationCircleIcon, {
+        label: "",
+        size: "small",
+        color: "var(--ds-icon, #292A2E)"
+      })))
+    }, /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveRightIcon, {
@@ -60,7 +94,5 @@ export const MoveColumnRightItem = props => {
     elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(moveColumnRight)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(messages.moveColumnRight, {
-    0: selectedColumnCount
-  }));
+  }, label);
 };

package/dist/es2019/ui/TableMenu/column/items/SortDecreasingItem.js

@@ -10,7 +10,8 @@ import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { InformationCircleIcon, SortDescendingIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { Box } from '@atlaskit/primitives/compiled';
+import { Box, Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { sortColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
@@ -66,7 +67,9 @@ export const SortDecreasingItem = ({
         size: "small",
         color: "var(--ds-icon, #292A2E)"
       })))
-    }, /*#__PURE__*/React.createElement(Box, {
+    }, expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) ? /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, formatMessage(messages.sortColumnDecreasing)) : /*#__PURE__*/React.createElement(Box, {
       as: "span",
       xcss: styles.disabledLabel
     }, formatMessage(messages.sortColumnDecreasing)));

package/dist/es2019/ui/TableMenu/column/items/SortIncreasingItem.js

@@ -10,7 +10,8 @@ import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { InformationCircleIcon, SortAscendingIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { Box } from '@atlaskit/primitives/compiled';
+import { Box, Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { sortColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
@@ -66,7 +67,9 @@ export const SortIncreasingItem = ({
         size: "small",
         color: "var(--ds-icon, #292A2E)"
       })))
-    }, /*#__PURE__*/React.createElement(Box, {
+    }, expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) ? /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, formatMessage(messages.sortColumnIncreasing)) : /*#__PURE__*/React.createElement(Box, {
       as: "span",
       xcss: styles.disabledLabel
     }, formatMessage(messages.sortColumnIncreasing)));

package/dist/es2019/ui/TableMenu/row/items/MoveRowDownItem.js

@@ -5,7 +5,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { moveRowDown, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { TableRowMoveDownIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { InformationCircleIcon } from '@atlaskit/editor-toolbar/information-circle-icon';
+import { TableRowMoveDownIcon } from '@atlaskit/editor-toolbar/row-move-down-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
+import { Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
@@ -50,6 +56,34 @@ export const MoveRowDownItem = props => {
   if (!tableNode || !shouldShowMoveRowDown(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastRow)) {
     return null;
   }
+  const label = formatMessage(messages.moveRowDown, {
+    0: selectedRowCount
+  });
+  const canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveRowDown);
+  const isMoveDisabled = expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/React.createElement(TableRowMoveDownIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(Tooltip, {
+        content: formatMessage(messages.canNotMoveRowDownWithMergedCells),
+        position: "top"
+      }, tooltipProps =>
+      /*#__PURE__*/
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      React.createElement("span", tooltipProps, /*#__PURE__*/React.createElement(InformationCircleIcon, {
+        label: "",
+        size: "small",
+        color: "var(--ds-icon, #292A2E)"
+      })))
+    }, /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableRowMoveDownIcon, {
@@ -60,7 +94,5 @@ export const MoveRowDownItem = props => {
     elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(moveRowDown)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(messages.moveRowDown, {
-    0: selectedRowCount
-  }));
+  }, label);
 };

package/dist/es2019/ui/TableMenu/row/items/MoveRowUpItem.js

@@ -5,7 +5,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { moveRowUp, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { TableRowMoveUpIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { InformationCircleIcon } from '@atlaskit/editor-toolbar/information-circle-icon';
+import { TableRowMoveUpIcon } from '@atlaskit/editor-toolbar/row-move-up-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
+import { Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
@@ -50,6 +56,34 @@ export const MoveRowUpItem = props => {
   if (!tableNode || !shouldShowMoveRowUp(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstRow)) {
     return null;
   }
+  const label = formatMessage(messages.moveRowUp, {
+    0: selectedRowCount
+  });
+  const canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveRowUp);
+  const isMoveDisabled = expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/React.createElement(TableRowMoveUpIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(Tooltip, {
+        content: formatMessage(messages.canNotMoveRowUpWithMergedCells),
+        position: "top"
+      }, tooltipProps =>
+      /*#__PURE__*/
+      // Ignored via go/ees005
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      React.createElement("span", tooltipProps, /*#__PURE__*/React.createElement(InformationCircleIcon, {
+        label: "",
+        size: "small",
+        color: "var(--ds-icon, #292A2E)"
+      })))
+    }, /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableRowMoveUpIcon, {
@@ -60,7 +94,5 @@ export const MoveRowUpItem = props => {
     elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(moveRowUp)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(messages.moveRowUp, {
-    0: selectedRowCount
-  }));
+  }, label);
 };

package/dist/es2019/ui/TableMenu/shared/TableMenu.js

@@ -6,6 +6,7 @@ import { ToolbarMenuContainer } from '@atlaskit/editor-toolbar/toolbar-menu-cont
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { canSplitCellSelection } from '../../../pm-plugins/commands/split-cell';
 import { canMergeCellSelection } from '../../../pm-plugins/transforms/merge';
+import { canMove } from '../../../pm-plugins/utils/drag-menu';
 import { TableMenuProvider } from './TableMenuContext';
 export const TableMenu = /*#__PURE__*/memo(({
   api,
@@ -45,6 +46,10 @@ export const TableMenu = /*#__PURE__*/memo(({
     }
     return {
       ...cellOps,
+      canMoveRowUp: canMove('table-row', -1, tableMap.height, editorView.state.selection, selectionRect),
+      canMoveRowDown: canMove('table-row', 1, tableMap.height, editorView.state.selection, selectionRect),
+      canMoveColumnLeft: canMove('table-column', -1, tableMap.width, editorView.state.selection, selectionRect),
+      canMoveColumnRight: canMove('table-column', 1, tableMap.width, editorView.state.selection, selectionRect),
       isFirstRow: selectionRect.top === 0,
       isLastRow: selectionRect.bottom === tableMap.height,
       selectedRowCount: selectionRect.bottom - selectionRect.top,

package/dist/esm/ui/TableMenu/column/items/MoveColumnLeftItem.js

@@ -5,8 +5,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { moveColumnLeft, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { InformationCircleIcon } from '@atlaskit/editor-toolbar/information-circle-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import TableColumnMoveLeftIcon from '@atlaskit/icon/core/table-column-move-left';
+import { Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
@@ -48,6 +53,37 @@ export var MoveColumnLeftItem = function MoveColumnLeftItem(props) {
   if (!tableNode || !shouldShowMoveColumnLeft(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn)) {
     return null;
   }
+  var label = formatMessage(messages.moveColumnLeft, {
+    0: selectedColumnCount
+  });
+  var canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveColumnLeft);
+  var isMoveDisabled = expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveLeftIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(Tooltip, {
+        content: formatMessage(messages.canNotMoveColumnLeftWithMergedCells),
+        position: "top"
+      }, function (tooltipProps) {
+        return (
+          /*#__PURE__*/
+          // Ignored via go/ees005
+          // eslint-disable-next-line react/jsx-props-no-spreading
+          React.createElement("span", tooltipProps, /*#__PURE__*/React.createElement(InformationCircleIcon, {
+            label: "",
+            size: "small",
+            color: "var(--ds-icon, #292A2E)"
+          }))
+        );
+      })
+    }, /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveLeftIcon, {
@@ -58,7 +94,5 @@ export var MoveColumnLeftItem = function MoveColumnLeftItem(props) {
     elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(moveColumnLeft)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(messages.moveColumnLeft, {
-    0: selectedColumnCount
-  }));
+  }, label);
 };

package/dist/esm/ui/TableMenu/column/items/MoveColumnRightItem.js

@@ -5,7 +5,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { moveColumnRight, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { TableColumnMoveRightIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { TableColumnMoveRightIcon } from '@atlaskit/editor-toolbar/column-move-right-icon';
+import { InformationCircleIcon } from '@atlaskit/editor-toolbar/information-circle-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
+import { Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
@@ -47,6 +53,37 @@ export var MoveColumnRightItem = function MoveColumnRightItem(props) {
   if (!tableNode || !shouldShowMoveColumnRight(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastColumn)) {
     return null;
   }
+  var label = formatMessage(messages.moveColumnRight, {
+    0: selectedColumnCount
+  });
+  var canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveColumnRight);
+  var isMoveDisabled = expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveRightIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(Tooltip, {
+        content: formatMessage(messages.canNotMoveColumnRightWithMergedCells),
+        position: "top"
+      }, function (tooltipProps) {
+        return (
+          /*#__PURE__*/
+          // Ignored via go/ees005
+          // eslint-disable-next-line react/jsx-props-no-spreading
+          React.createElement("span", tooltipProps, /*#__PURE__*/React.createElement(InformationCircleIcon, {
+            label: "",
+            size: "small",
+            color: "var(--ds-icon, #292A2E)"
+          }))
+        );
+      })
+    }, /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveRightIcon, {
@@ -57,7 +94,5 @@ export var MoveColumnRightItem = function MoveColumnRightItem(props) {
     elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(moveColumnRight)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(messages.moveColumnRight, {
-    0: selectedColumnCount
-  }));
+  }, label);
 };

package/dist/esm/ui/TableMenu/column/items/SortDecreasingItem.js

@@ -10,7 +10,8 @@ import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { InformationCircleIcon, SortDescendingIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { Box } from '@atlaskit/primitives/compiled';
+import { Box, Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { sortColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
@@ -65,7 +66,9 @@ export var SortDecreasingItem = function SortDecreasingItem(_ref) {
           color: "var(--ds-icon, #292A2E)"
         }));
       })
-    }, /*#__PURE__*/React.createElement(Box, {
+    }, expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) ? /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, formatMessage(messages.sortColumnDecreasing)) : /*#__PURE__*/React.createElement(Box, {
       as: "span",
       xcss: styles.disabledLabel
     }, formatMessage(messages.sortColumnDecreasing)));

package/dist/esm/ui/TableMenu/column/items/SortIncreasingItem.js

@@ -10,7 +10,8 @@ import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { InformationCircleIcon, SortAscendingIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { Box } from '@atlaskit/primitives/compiled';
+import { Box, Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { sortColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
@@ -65,7 +66,9 @@ export var SortIncreasingItem = function SortIncreasingItem(_ref) {
           color: "var(--ds-icon, #292A2E)"
         }));
       })
-    }, /*#__PURE__*/React.createElement(Box, {
+    }, expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) ? /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, formatMessage(messages.sortColumnIncreasing)) : /*#__PURE__*/React.createElement(Box, {
       as: "span",
       xcss: styles.disabledLabel
     }, formatMessage(messages.sortColumnIncreasing)));

package/dist/esm/ui/TableMenu/row/items/MoveRowDownItem.js

@@ -5,7 +5,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { moveRowDown, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { TableRowMoveDownIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { InformationCircleIcon } from '@atlaskit/editor-toolbar/information-circle-icon';
+import { TableRowMoveDownIcon } from '@atlaskit/editor-toolbar/row-move-down-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
+import { Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
@@ -47,6 +53,37 @@ export var MoveRowDownItem = function MoveRowDownItem(props) {
   if (!tableNode || !shouldShowMoveRowDown(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastRow)) {
     return null;
   }
+  var label = formatMessage(messages.moveRowDown, {
+    0: selectedRowCount
+  });
+  var canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveRowDown);
+  var isMoveDisabled = expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/React.createElement(TableRowMoveDownIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(Tooltip, {
+        content: formatMessage(messages.canNotMoveRowDownWithMergedCells),
+        position: "top"
+      }, function (tooltipProps) {
+        return (
+          /*#__PURE__*/
+          // Ignored via go/ees005
+          // eslint-disable-next-line react/jsx-props-no-spreading
+          React.createElement("span", tooltipProps, /*#__PURE__*/React.createElement(InformationCircleIcon, {
+            label: "",
+            size: "small",
+            color: "var(--ds-icon, #292A2E)"
+          }))
+        );
+      })
+    }, /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableRowMoveDownIcon, {
@@ -57,7 +94,5 @@ export var MoveRowDownItem = function MoveRowDownItem(props) {
     elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(moveRowDown)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(messages.moveRowDown, {
-    0: selectedRowCount
-  }));
+  }, label);
 };

package/dist/esm/ui/TableMenu/row/items/MoveRowUpItem.js

@@ -5,7 +5,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { moveRowUp, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { TableRowMoveUpIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { InformationCircleIcon } from '@atlaskit/editor-toolbar/information-circle-icon';
+import { TableRowMoveUpIcon } from '@atlaskit/editor-toolbar/row-move-up-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
+import { Text } from '@atlaskit/primitives/compiled';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { closeActiveTableMenu } from '../../../../pm-plugins/commands';
 import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState } from '../../../../pm-plugins/plugin-factory';
@@ -47,6 +53,37 @@ export var MoveRowUpItem = function MoveRowUpItem(props) {
   if (!tableNode || !shouldShowMoveRowUp(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstRow)) {
     return null;
   }
+  var label = formatMessage(messages.moveRowUp, {
+    0: selectedRowCount
+  });
+  var canMove = Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.canMoveRowUp);
+  var isMoveDisabled = expValEquals('platform_editor_table_menu_updates_patch_2', 'isEnabled', true) && !canMove;
+  if (isMoveDisabled) {
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+      elemBefore: /*#__PURE__*/React.createElement(TableRowMoveUpIcon, {
+        color: "var(--ds-text-disabled, #080F214A)",
+        label: "",
+        size: "small"
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(Tooltip, {
+        content: formatMessage(messages.canNotMoveRowUpWithMergedCells),
+        position: "top"
+      }, function (tooltipProps) {
+        return (
+          /*#__PURE__*/
+          // Ignored via go/ees005
+          // eslint-disable-next-line react/jsx-props-no-spreading
+          React.createElement("span", tooltipProps, /*#__PURE__*/React.createElement(InformationCircleIcon, {
+            label: "",
+            size: "small",
+            color: "var(--ds-icon, #292A2E)"
+          }))
+        );
+      })
+    }, /*#__PURE__*/React.createElement(Text, {
+      color: "color.text.disabled"
+    }, label));
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableRowMoveUpIcon, {
@@ -57,7 +94,5 @@ export var MoveRowUpItem = function MoveRowUpItem(props) {
     elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = tooltip(moveRowUp)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(messages.moveRowUp, {
-    0: selectedRowCount
-  }));
+  }, label);
 };

package/dist/esm/ui/TableMenu/shared/TableMenu.js

@@ -9,6 +9,7 @@ import { ToolbarMenuContainer } from '@atlaskit/editor-toolbar/toolbar-menu-cont
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { canSplitCellSelection } from '../../../pm-plugins/commands/split-cell';
 import { canMergeCellSelection } from '../../../pm-plugins/transforms/merge';
+import { canMove } from '../../../pm-plugins/utils/drag-menu';
 import { TableMenuProvider } from './TableMenuContext';
 export var TableMenu = /*#__PURE__*/memo(function (_ref) {
   var api = _ref.api,
@@ -45,6 +46,10 @@ export var TableMenu = /*#__PURE__*/memo(function (_ref) {
       return cellOps;
     }
     return _objectSpread(_objectSpread({}, cellOps), {}, {
+      canMoveRowUp: canMove('table-row', -1, tableMap.height, editorView.state.selection, selectionRect),
+      canMoveRowDown: canMove('table-row', 1, tableMap.height, editorView.state.selection, selectionRect),
+      canMoveColumnLeft: canMove('table-column', -1, tableMap.width, editorView.state.selection, selectionRect),
+      canMoveColumnRight: canMove('table-column', 1, tableMap.width, editorView.state.selection, selectionRect),
       isFirstRow: selectionRect.top === 0,
       isLastRow: selectionRect.bottom === tableMap.height,
       selectedRowCount: selectionRect.bottom - selectionRect.top,

package/dist/types/ui/TableMenu/shared/TableMenuContext.d.ts

@@ -2,6 +2,10 @@ import React from 'react';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export type TableMenuContextValue = {
     canMergeCells?: boolean;
+    canMoveColumnLeft?: boolean;
+    canMoveColumnRight?: boolean;
+    canMoveRowDown?: boolean;
+    canMoveRowUp?: boolean;
     canSplitCell?: boolean;
     editorView?: EditorView;
     hasMergedCellsInTable?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "24.5.4",
+	"version": "24.5.5",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -52,7 +52,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^3.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^2.0.0",
 		"@atlaskit/primitives": "^22.2.0",
-		"@atlaskit/tmp-editor-statsig": "^135.10.0",
+		"@atlaskit/tmp-editor-statsig": "^135.11.0",
 		"@atlaskit/toggle": "^17.1.0",
 		"@atlaskit/tokens": "^16.3.0",
 		"@atlaskit/tooltip": "^24.0.0",