@atlaskit/editor-plugin-table 7.31.1 → 7.31.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-table
 
+## 7.31.2
+
+### Patch Changes
+
+- [#164992](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/164992)
+  [`16878c96150af`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/16878c96150af) -
+  tidy table sort order experiment
+
 ## 7.31.1
 
 ### Patch Changes

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

@@ -423,14 +423,10 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createOriginalContextMenuItems", function () {
       var items = [];
-      var getEditorFeatureFlags = _this.props.getEditorFeatureFlags;
-      var _ref2 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
-        _ref2$tableSortColumn = _ref2.tableSortColumnReorder,
-        tableSortColumnReorder = _ref2$tableSortColumn === void 0 ? false : _ref2$tableSortColumn;
       var sortColumnItems = _this.createSortColumnItems();
       var backgroundColorItem = _this.createBackgroundColorItem();
       var distributeColumnsItem = _this.createDistributeColumnsItem();
-      tableSortColumnReorder && sortColumnItems && items.push.apply(items, (0, _toConsumableArray2.default)(sortColumnItems));
+      sortColumnItems && items.push.apply(items, (0, _toConsumableArray2.default)(sortColumnItems));
       backgroundColorItem && items.push(backgroundColorItem);
       items.push(_this.createInsertColumnItem());
       items.push(_this.createInsertRowItem());
@@ -438,7 +434,6 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
       items.push(_this.createDeleteRowItem());
       items.push.apply(items, (0, _toConsumableArray2.default)(_this.createMergeSplitCellItems()));
       distributeColumnsItem && items.push(distributeColumnsItem);
-      !tableSortColumnReorder && sortColumnItems && items.push.apply(items, (0, _toConsumableArray2.default)(sortColumnItems));
       items.push(_this.createClearCellsItem());
       return [{
         items: items
@@ -469,8 +464,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
       items[1].items.push(deleteRowItem);
       return items;
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMenuItemActivated", function (_ref3) {
-      var item = _ref3.item;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onMenuItemActivated", function (_ref2) {
+      var item = _ref2.item;
       var _this$props10 = _this.props,
         editorView = _this$props10.editorView,
         selectionRect = _this$props10.selectionRect,
@@ -486,11 +481,11 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         targetCellPosition = _getPluginState11.targetCellPosition,
         _getPluginState11$isT = _getPluginState11.isTableScalingEnabled,
         isTableScalingEnabled = _getPluginState11$isT === void 0 ? false : _getPluginState11$isT;
-      var _ref4 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
-        _ref4$tableDuplicateC = _ref4.tableDuplicateCellColouring,
-        tableDuplicateCellColouring = _ref4$tableDuplicateC === void 0 ? false : _ref4$tableDuplicateC,
-        _ref4$tableWithFixedC = _ref4.tableWithFixedColumnWidthsOption,
-        tableWithFixedColumnWidthsOption = _ref4$tableWithFixedC === void 0 ? false : _ref4$tableWithFixedC;
+      var _ref3 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
+        _ref3$tableDuplicateC = _ref3.tableDuplicateCellColouring,
+        tableDuplicateCellColouring = _ref3$tableDuplicateC === void 0 ? false : _ref3$tableDuplicateC,
+        _ref3$tableWithFixedC = _ref3.tableWithFixedColumnWidthsOption,
+        tableWithFixedColumnWidthsOption = _ref3$tableWithFixedC === void 0 ? false : _ref3$tableWithFixedC;
       // context menu opened by keyboard and any item except 'background' activated
       // or color has been chosen from color palette
       if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && _this.state.isSubmenuOpen)) {
@@ -619,8 +614,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         }
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseEnter", function (_ref5) {
-      var item = _ref5.item;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseEnter", function (_ref4) {
+      var item = _ref4.item;
       var _this$props13 = _this.props,
         _this$props13$editorV = _this$props13.editorView,
         state = _this$props13$editorV.state,
@@ -643,8 +638,8 @@ var ContextualMenu = exports.ContextualMenu = /*#__PURE__*/function (_Component)
         (0, _commands.hoverMergedCells)()(state, dispatch);
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseLeave", function (_ref6) {
-      var item = _ref6.item;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleItemMouseLeave", function (_ref5) {
+      var item = _ref5.item;
       var _this$props$editorVie = _this.props.editorView,
         state = _this$props$editorVie.state,
         dispatch = _this$props$editorVie.dispatch;

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

@@ -105,20 +105,18 @@ var MapDragMenuOptionIdToMessage = {
     plural: null
   }
 };
-var getGroupedDragMenuConfig = function getGroupedDragMenuConfig(tableSortColumnReorder) {
+var getGroupedDragMenuConfig = function getGroupedDragMenuConfig() {
   var groupedDragMenuConfig = [['add_row_above', 'add_row_below', 'add_column_left', 'add_column_right', 'distribute_columns', 'clear_cells', 'delete_row', 'delete_column'], ['move_column_left', 'move_column_right', 'move_row_up', 'move_row_down']];
   var sortColumnItems = ['sort_column_asc', 'sort_column_desc'];
-  tableSortColumnReorder ? groupedDragMenuConfig.unshift(sortColumnItems) : groupedDragMenuConfig.push(sortColumnItems);
+  groupedDragMenuConfig.unshift(sortColumnItems);
   return groupedDragMenuConfig;
 };
 var elementBeforeIconStyles = (0, _primitives.xcss)({
   marginRight: 'space.negative.075',
   display: 'flex'
 });
-var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, formatMessage) {
-  var tableSortColumnReorder = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var selectionRect = arguments.length > 3 ? arguments[3] : undefined;
-  var groupedDragMenuConfig = getGroupedDragMenuConfig(tableSortColumnReorder);
+var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect) {
+  var groupedDragMenuConfig = getGroupedDragMenuConfig();
   var menuItemsArr = (0, _toConsumableArray2.default)(Array(groupedDragMenuConfig.length)).map(function () {
     return [];
   });
@@ -216,7 +214,6 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
     tableDuplicateCellColouring = _ref.tableDuplicateCellColouring,
     shouldUseIncreasedScalingPercent = _ref.shouldUseIncreasedScalingPercent,
     isTableFixedColumnWidthsOptionEnabled = _ref.isTableFixedColumnWidthsOptionEnabled,
-    tableSortColumnReorder = _ref.tableSortColumnReorder,
     ariaNotifyPlugin = _ref.ariaNotifyPlugin,
     isCommentEditor = _ref.isCommentEditor;
   var state = editorView.state,
@@ -232,8 +229,8 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
   var selectionRect = (0, _utils2.isSelectionType)(selection, 'cell') ? (0, _utils2.getSelectionRect)(selection) : (0, _utils2.findCellRectClosestToPos)(selection.$from);
   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, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder, ariaNotifyPlugin, isCommentEditor);
-  var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, tableSortColumnReorder, selectionRect),
+  var dragMenuConfig = (0, _dragMenu.getDragMenuConfig)(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, ariaNotifyPlugin, isCommentEditor);
+  var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect),
     menuItems = _convertToDropdownIte.menuItems,
     menuCallback = _convertToDropdownIte.menuCallback;
   var handleSubMenuRef = function handleSubMenuRef(ref) {
@@ -282,7 +279,7 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
         className: _styles.DropdownMenuSharedCssClassName.SUBMENU
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         ,
-        css: (0, _styles2.dragMenuBackgroundColorStyles)(tableSortColumnReorder)
+        css: (0, _styles2.dragMenuBackgroundColorStyles)()
       }, (0, _react2.jsx)("div", {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         css: (0, _styles2.cellColourPreviewStyles)(background)
@@ -480,7 +477,7 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
     return null;
   }
   if (allowBackgroundColor) {
-    tableSortColumnReorder ? menuItems[1].items.unshift(createBackgroundColorMenuItem()) : menuItems[0].items.unshift(createBackgroundColorMenuItem());
+    menuItems[1].items.unshift(createBackgroundColorMenuItem());
   }
 
   // If first row, add toggle for Header row, default is true

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

@@ -43,9 +43,7 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     _ref2$tableDuplicateC = _ref2.tableDuplicateCellColouring,
     tableDuplicateCellColouring = _ref2$tableDuplicateC === void 0 ? false : _ref2$tableDuplicateC,
     _ref2$tableWithFixedC = _ref2.tableWithFixedColumnWidthsOption,
-    tableWithFixedColumnWidthsOption = _ref2$tableWithFixedC === void 0 ? false : _ref2$tableWithFixedC,
-    _ref2$tableSortColumn = _ref2.tableSortColumnReorder,
-    tableSortColumnReorder = _ref2$tableSortColumn === void 0 ? false : _ref2$tableSortColumn;
+    tableWithFixedColumnWidthsOption = _ref2$tableWithFixedC === void 0 ? false : _ref2$tableWithFixedC;
   var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (tableWithFixedColumnWidthsOption || isCommentEditor);
   return /*#__PURE__*/_react.default.createElement(_ui.Popup, {
     alignX: direction === 'row' ? 'right' : undefined,
@@ -84,7 +82,6 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     tableDuplicateCellColouring: tableDuplicateCellColouring,
     shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
     isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption,
-    tableSortColumnReorder: tableSortColumnReorder,
     ariaNotifyPlugin: ariaNotifyPlugin,
     api: api,
     isCommentEditor: isCommentEditor || false

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

@@ -23,8 +23,7 @@ var cellColourPreviewStyles = exports.cellColourPreviewStyles = function cellCol
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
 var dragMenuBackgroundColorStyles = exports.dragMenuBackgroundColorStyles = function dragMenuBackgroundColorStyles() {
-  var tableSortColumnReorder = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  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, ")"));
+  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), ")"), _consts.TABLE_DRAG_MENU_PADDING_TOP + _consts.TABLE_DRAG_MENU_SORT_GROUP_HEIGHT + _consts.TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT, _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 -- Ignored via go/DSP-18766

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

@@ -88,9 +88,8 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
   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 ariaNotifyPlugin = arguments.length > 16 ? arguments[16] : undefined;
-  var isCommentEditor = arguments.length > 17 && arguments[17] !== undefined ? arguments[17] : false;
+  var ariaNotifyPlugin = arguments.length > 15 ? arguments[15] : undefined;
+  var isCommentEditor = arguments.length > 16 && arguments[16] !== undefined ? arguments[16] : false;
   var selection = editorView.state.selection;
   var _getTablePluginState = (0, _pluginFactory.getPluginState)(editorView.state),
     getIntl = _getTablePluginState.getIntl;
@@ -281,6 +280,6 @@ var getDragMenuConfig = exports.getDragMenuConfig = function getDragMenuConfig(d
     };
   })));
   var allConfigs = (0, _toConsumableArray2.default)(restConfigs);
-  tableSortColumnReorder ? allConfigs.unshift.apply(allConfigs, (0, _toConsumableArray2.default)(sortConfigs)) : allConfigs.push.apply(allConfigs, (0, _toConsumableArray2.default)(sortConfigs));
+  allConfigs.unshift.apply(allConfigs, (0, _toConsumableArray2.default)(sortConfigs));
   return allConfigs.filter(Boolean);
 };

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

@@ -450,16 +450,10 @@ export class ContextualMenu extends Component {
     });
     _defineProperty(this, "createOriginalContextMenuItems", () => {
       let items = [];
-      const {
-        getEditorFeatureFlags
-      } = this.props;
-      const {
-        tableSortColumnReorder = false
-      } = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
       const sortColumnItems = this.createSortColumnItems();
       const backgroundColorItem = this.createBackgroundColorItem();
       const distributeColumnsItem = this.createDistributeColumnsItem();
-      tableSortColumnReorder && sortColumnItems && items.push(...sortColumnItems);
+      sortColumnItems && items.push(...sortColumnItems);
       backgroundColorItem && items.push(backgroundColorItem);
       items.push(this.createInsertColumnItem());
       items.push(this.createInsertRowItem());
@@ -467,7 +461,6 @@ export class ContextualMenu extends Component {
       items.push(this.createDeleteRowItem());
       items.push(...this.createMergeSplitCellItems());
       distributeColumnsItem && items.push(distributeColumnsItem);
-      !tableSortColumnReorder && sortColumnItems && items.push(...sortColumnItems);
       items.push(this.createClearCellsItem());
       return [{
         items

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

@@ -92,18 +92,18 @@ const MapDragMenuOptionIdToMessage = {
     plural: null
   }
 };
-const getGroupedDragMenuConfig = tableSortColumnReorder => {
+const getGroupedDragMenuConfig = () => {
   let groupedDragMenuConfig = [['add_row_above', 'add_row_below', 'add_column_left', 'add_column_right', 'distribute_columns', 'clear_cells', 'delete_row', 'delete_column'], ['move_column_left', 'move_column_right', 'move_row_up', 'move_row_down']];
   const sortColumnItems = ['sort_column_asc', 'sort_column_desc'];
-  tableSortColumnReorder ? groupedDragMenuConfig.unshift(sortColumnItems) : groupedDragMenuConfig.push(sortColumnItems);
+  groupedDragMenuConfig.unshift(sortColumnItems);
   return groupedDragMenuConfig;
 };
 const elementBeforeIconStyles = xcss({
   marginRight: 'space.negative.075',
   display: 'flex'
 });
-const convertToDropdownItems = (dragMenuConfig, formatMessage, tableSortColumnReorder = false, selectionRect) => {
-  const groupedDragMenuConfig = getGroupedDragMenuConfig(tableSortColumnReorder);
+const convertToDropdownItems = (dragMenuConfig, formatMessage, selectionRect) => {
+  const groupedDragMenuConfig = getGroupedDragMenuConfig();
   let menuItemsArr = [...Array(groupedDragMenuConfig.length)].map(() => []);
   let menuCallback = {};
   dragMenuConfig.forEach(item => {
@@ -199,7 +199,6 @@ const DragMenu = /*#__PURE__*/React.memo(({
   tableDuplicateCellColouring,
   shouldUseIncreasedScalingPercent,
   isTableFixedColumnWidthsOptionEnabled,
-  tableSortColumnReorder,
   ariaNotifyPlugin,
   isCommentEditor
 }) => {
@@ -219,11 +218,11 @@ const DragMenu = /*#__PURE__*/React.memo(({
   const selectionRect = isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
   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, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder, ariaNotifyPlugin, isCommentEditor);
+  const dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, ariaNotifyPlugin, isCommentEditor);
   const {
     menuItems,
     menuCallback
-  } = convertToDropdownItems(dragMenuConfig, formatMessage, tableSortColumnReorder, selectionRect);
+  } = convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect);
   const handleSubMenuRef = ref => {
     const parent = closestElement(editorView.dom, '.fabric-editor-popup-scroll-parent');
     if (!(parent && ref)) {
@@ -274,7 +273,7 @@ const DragMenu = /*#__PURE__*/React.memo(({
         className: DropdownMenuSharedCssClassName.SUBMENU
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         ,
-        css: dragMenuBackgroundColorStyles(tableSortColumnReorder)
+        css: dragMenuBackgroundColorStyles()
       }, jsx("div", {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         css: cellColourPreviewStyles(background)
@@ -477,7 +476,7 @@ const DragMenu = /*#__PURE__*/React.memo(({
     return null;
   }
   if (allowBackgroundColor) {
-    tableSortColumnReorder ? menuItems[1].items.unshift(createBackgroundColorMenuItem()) : menuItems[0].items.unshift(createBackgroundColorMenuItem());
+    menuItems[1].items.unshift(createBackgroundColorMenuItem());
   }
 
   // If first row, add toggle for Header row, default is true

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

@@ -35,8 +35,7 @@ const FloatingDragMenu = ({
   }
   const {
     tableDuplicateCellColouring = false,
-    tableWithFixedColumnWidthsOption = false,
-    tableSortColumnReorder = false
+    tableWithFixedColumnWidthsOption = false
   } = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
   const shouldUseIncreasedScalingPercent = isTableScalingEnabled && (tableWithFixedColumnWidthsOption || isCommentEditor);
   return /*#__PURE__*/React.createElement(Popup, {
@@ -76,7 +75,6 @@ const FloatingDragMenu = ({
     tableDuplicateCellColouring: tableDuplicateCellColouring,
     shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
     isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption,
-    tableSortColumnReorder: tableSortColumnReorder,
     ariaNotifyPlugin: ariaNotifyPlugin,
     api: api,
     isCommentEditor: isCommentEditor || false

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

@@ -12,14 +12,14 @@ export const cellColourPreviewStyles = selectedColor => css({
 });
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
-export const dragMenuBackgroundColorStyles = (tableSortColumnReorder = false) => css`
+export const dragMenuBackgroundColorStyles = () => css`
 	.${ClassName.DRAG_SUBMENU} {
 		border-radius: ${"var(--ds-border-radius, 3px)"};
 		background: ${"var(--ds-surface-overlay, white)"};
 		box-shadow: ${`var(--ds-shadow-overlay, ${`0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`})`};
 		display: block;
 		position: absolute;
-		top: ${tableSortColumnReorder ? TABLE_DRAG_MENU_PADDING_TOP + TABLE_DRAG_MENU_SORT_GROUP_HEIGHT + TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT : 0}px; // move the submenu down when 'sort increasing/decreasing' appear before background color picker
+		top: ${TABLE_DRAG_MENU_PADDING_TOP + TABLE_DRAG_MENU_SORT_GROUP_HEIGHT + TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT}px; // move the submenu down when 'sort increasing/decreasing' appear before background color picker
 		left: ${dragMenuDropdownWidth}px;
 		padding: ${"var(--ds-space-100, 8px)"};
 

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

@@ -72,7 +72,7 @@ const defaultSelectionRect = {
   right: 0,
   bottom: 0
 };
-export const getDragMenuConfig = (direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired, isTableScalingEnabled = false, tableDuplicateCellColouring = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, tableSortColumnReorder = false, ariaNotifyPlugin, isCommentEditor = false) => {
+export const getDragMenuConfig = (direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, isHeaderRowRequired, isTableScalingEnabled = false, tableDuplicateCellColouring = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, ariaNotifyPlugin, isCommentEditor = false) => {
   var _tableMap$height, _tableMap$height2, _tableMap$width, _tableMap$width2;
   const {
     selection
@@ -256,6 +256,6 @@ export const getDragMenuConfig = (direction, getEditorContainerWidth, hasMergedC
     keymap: keymap && tooltip(keymap)
   }))];
   let allConfigs = [...restConfigs];
-  tableSortColumnReorder ? allConfigs.unshift(...sortConfigs) : allConfigs.push(...sortConfigs);
+  allConfigs.unshift(...sortConfigs);
   return allConfigs.filter(Boolean);
 };

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

@@ -416,14 +416,10 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "createOriginalContextMenuItems", function () {
       var items = [];
-      var getEditorFeatureFlags = _this.props.getEditorFeatureFlags;
-      var _ref2 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
-        _ref2$tableSortColumn = _ref2.tableSortColumnReorder,
-        tableSortColumnReorder = _ref2$tableSortColumn === void 0 ? false : _ref2$tableSortColumn;
       var sortColumnItems = _this.createSortColumnItems();
       var backgroundColorItem = _this.createBackgroundColorItem();
       var distributeColumnsItem = _this.createDistributeColumnsItem();
-      tableSortColumnReorder && sortColumnItems && items.push.apply(items, _toConsumableArray(sortColumnItems));
+      sortColumnItems && items.push.apply(items, _toConsumableArray(sortColumnItems));
       backgroundColorItem && items.push(backgroundColorItem);
       items.push(_this.createInsertColumnItem());
       items.push(_this.createInsertRowItem());
@@ -431,7 +427,6 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
       items.push(_this.createDeleteRowItem());
       items.push.apply(items, _toConsumableArray(_this.createMergeSplitCellItems()));
       distributeColumnsItem && items.push(distributeColumnsItem);
-      !tableSortColumnReorder && sortColumnItems && items.push.apply(items, _toConsumableArray(sortColumnItems));
       items.push(_this.createClearCellsItem());
       return [{
         items: items
@@ -462,8 +457,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
       items[1].items.push(deleteRowItem);
       return items;
     });
-    _defineProperty(_assertThisInitialized(_this), "onMenuItemActivated", function (_ref3) {
-      var item = _ref3.item;
+    _defineProperty(_assertThisInitialized(_this), "onMenuItemActivated", function (_ref2) {
+      var item = _ref2.item;
       var _this$props10 = _this.props,
         editorView = _this$props10.editorView,
         selectionRect = _this$props10.selectionRect,
@@ -479,11 +474,11 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         targetCellPosition = _getPluginState11.targetCellPosition,
         _getPluginState11$isT = _getPluginState11.isTableScalingEnabled,
         isTableScalingEnabled = _getPluginState11$isT === void 0 ? false : _getPluginState11$isT;
-      var _ref4 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
-        _ref4$tableDuplicateC = _ref4.tableDuplicateCellColouring,
-        tableDuplicateCellColouring = _ref4$tableDuplicateC === void 0 ? false : _ref4$tableDuplicateC,
-        _ref4$tableWithFixedC = _ref4.tableWithFixedColumnWidthsOption,
-        tableWithFixedColumnWidthsOption = _ref4$tableWithFixedC === void 0 ? false : _ref4$tableWithFixedC;
+      var _ref3 = getEditorFeatureFlags ? getEditorFeatureFlags() : {},
+        _ref3$tableDuplicateC = _ref3.tableDuplicateCellColouring,
+        tableDuplicateCellColouring = _ref3$tableDuplicateC === void 0 ? false : _ref3$tableDuplicateC,
+        _ref3$tableWithFixedC = _ref3.tableWithFixedColumnWidthsOption,
+        tableWithFixedColumnWidthsOption = _ref3$tableWithFixedC === void 0 ? false : _ref3$tableWithFixedC;
       // context menu opened by keyboard and any item except 'background' activated
       // or color has been chosen from color palette
       if (isCellMenuOpenByKeyboard && (item.value.name !== 'background' || item.value.name === 'background' && _this.state.isSubmenuOpen)) {
@@ -612,8 +607,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         }
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "handleItemMouseEnter", function (_ref5) {
-      var item = _ref5.item;
+    _defineProperty(_assertThisInitialized(_this), "handleItemMouseEnter", function (_ref4) {
+      var item = _ref4.item;
       var _this$props13 = _this.props,
         _this$props13$editorV = _this$props13.editorView,
         state = _this$props13$editorV.state,
@@ -636,8 +631,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         hoverMergedCells()(state, dispatch);
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "handleItemMouseLeave", function (_ref6) {
-      var item = _ref6.item;
+    _defineProperty(_assertThisInitialized(_this), "handleItemMouseLeave", function (_ref5) {
+      var item = _ref5.item;
       var _this$props$editorVie = _this.props.editorView,
         state = _this$props$editorVie.state,
         dispatch = _this$props$editorVie.dispatch;

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

@@ -94,20 +94,18 @@ var MapDragMenuOptionIdToMessage = {
     plural: null
   }
 };
-var getGroupedDragMenuConfig = function getGroupedDragMenuConfig(tableSortColumnReorder) {
+var getGroupedDragMenuConfig = function getGroupedDragMenuConfig() {
   var groupedDragMenuConfig = [['add_row_above', 'add_row_below', 'add_column_left', 'add_column_right', 'distribute_columns', 'clear_cells', 'delete_row', 'delete_column'], ['move_column_left', 'move_column_right', 'move_row_up', 'move_row_down']];
   var sortColumnItems = ['sort_column_asc', 'sort_column_desc'];
-  tableSortColumnReorder ? groupedDragMenuConfig.unshift(sortColumnItems) : groupedDragMenuConfig.push(sortColumnItems);
+  groupedDragMenuConfig.unshift(sortColumnItems);
   return groupedDragMenuConfig;
 };
 var elementBeforeIconStyles = xcss({
   marginRight: 'space.negative.075',
   display: 'flex'
 });
-var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, formatMessage) {
-  var tableSortColumnReorder = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var selectionRect = arguments.length > 3 ? arguments[3] : undefined;
-  var groupedDragMenuConfig = getGroupedDragMenuConfig(tableSortColumnReorder);
+var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect) {
+  var groupedDragMenuConfig = getGroupedDragMenuConfig();
   var menuItemsArr = _toConsumableArray(Array(groupedDragMenuConfig.length)).map(function () {
     return [];
   });
@@ -205,7 +203,6 @@ var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
     tableDuplicateCellColouring = _ref.tableDuplicateCellColouring,
     shouldUseIncreasedScalingPercent = _ref.shouldUseIncreasedScalingPercent,
     isTableFixedColumnWidthsOptionEnabled = _ref.isTableFixedColumnWidthsOptionEnabled,
-    tableSortColumnReorder = _ref.tableSortColumnReorder,
     ariaNotifyPlugin = _ref.ariaNotifyPlugin,
     isCommentEditor = _ref.isCommentEditor;
   var state = editorView.state,
@@ -221,8 +218,8 @@ var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
   var selectionRect = isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
   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, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder, ariaNotifyPlugin, isCommentEditor);
-  var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, tableSortColumnReorder, selectionRect),
+  var dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, ariaNotifyPlugin, isCommentEditor);
+  var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect),
     menuItems = _convertToDropdownIte.menuItems,
     menuCallback = _convertToDropdownIte.menuCallback;
   var handleSubMenuRef = function handleSubMenuRef(ref) {
@@ -271,7 +268,7 @@ var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
         className: DropdownMenuSharedCssClassName.SUBMENU
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         ,
-        css: dragMenuBackgroundColorStyles(tableSortColumnReorder)
+        css: dragMenuBackgroundColorStyles()
       }, jsx("div", {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         css: cellColourPreviewStyles(background)
@@ -469,7 +466,7 @@ var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
     return null;
   }
   if (allowBackgroundColor) {
-    tableSortColumnReorder ? menuItems[1].items.unshift(createBackgroundColorMenuItem()) : menuItems[0].items.unshift(createBackgroundColorMenuItem());
+    menuItems[1].items.unshift(createBackgroundColorMenuItem());
   }
 
   // If first row, add toggle for Header row, default is true

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

@@ -36,9 +36,7 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     _ref2$tableDuplicateC = _ref2.tableDuplicateCellColouring,
     tableDuplicateCellColouring = _ref2$tableDuplicateC === void 0 ? false : _ref2$tableDuplicateC,
     _ref2$tableWithFixedC = _ref2.tableWithFixedColumnWidthsOption,
-    tableWithFixedColumnWidthsOption = _ref2$tableWithFixedC === void 0 ? false : _ref2$tableWithFixedC,
-    _ref2$tableSortColumn = _ref2.tableSortColumnReorder,
-    tableSortColumnReorder = _ref2$tableSortColumn === void 0 ? false : _ref2$tableSortColumn;
+    tableWithFixedColumnWidthsOption = _ref2$tableWithFixedC === void 0 ? false : _ref2$tableWithFixedC;
   var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (tableWithFixedColumnWidthsOption || isCommentEditor);
   return /*#__PURE__*/React.createElement(Popup, {
     alignX: direction === 'row' ? 'right' : undefined,
@@ -77,7 +75,6 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     tableDuplicateCellColouring: tableDuplicateCellColouring,
     shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
     isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption,
-    tableSortColumnReorder: tableSortColumnReorder,
     ariaNotifyPlugin: ariaNotifyPlugin,
     api: api,
     isCommentEditor: isCommentEditor || false

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

@@ -17,8 +17,7 @@ export var cellColourPreviewStyles = function cellColourPreviewStyles(selectedCo
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
 export var dragMenuBackgroundColorStyles = function dragMenuBackgroundColorStyles() {
-  var tableSortColumnReorder = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-  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, ")"));
+  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), ")"), TABLE_DRAG_MENU_PADDING_TOP + TABLE_DRAG_MENU_SORT_GROUP_HEIGHT + TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT, 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 -- Ignored via go/DSP-18766

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

@@ -81,9 +81,8 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
   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 ariaNotifyPlugin = arguments.length > 16 ? arguments[16] : undefined;
-  var isCommentEditor = arguments.length > 17 && arguments[17] !== undefined ? arguments[17] : false;
+  var ariaNotifyPlugin = arguments.length > 15 ? arguments[15] : undefined;
+  var isCommentEditor = arguments.length > 16 && arguments[16] !== undefined ? arguments[16] : false;
   var selection = editorView.state.selection;
   var _getTablePluginState = getTablePluginState(editorView.state),
     getIntl = _getTablePluginState.getIntl;
@@ -274,6 +273,6 @@ export var getDragMenuConfig = function getDragMenuConfig(direction, getEditorCo
     };
   })));
   var allConfigs = _toConsumableArray(restConfigs);
-  tableSortColumnReorder ? allConfigs.unshift.apply(allConfigs, _toConsumableArray(sortConfigs)) : allConfigs.push.apply(allConfigs, _toConsumableArray(sortConfigs));
+  allConfigs.unshift.apply(allConfigs, _toConsumableArray(sortConfigs));
   return allConfigs.filter(Boolean);
 };

package/dist/types/ui/FloatingDragMenu/DragMenu.d.ts

@@ -32,7 +32,6 @@ type DragMenuProps = {
     tableDuplicateCellColouring?: boolean;
     shouldUseIncreasedScalingPercent?: boolean;
     isTableFixedColumnWidthsOptionEnabled?: boolean;
-    tableSortColumnReorder?: boolean;
     ariaNotifyPlugin?: (message: string, ariaLiveElementAttributes?: AriaLiveElementAttributes) => void;
     isCommentEditor?: boolean;
 };

package/dist/types/ui/FloatingDragMenu/styles.d.ts

@@ -1,3 +1,3 @@
 export declare const cellColourPreviewStyles: (selectedColor: string) => import("@emotion/react").SerializedStyles;
-export declare const dragMenuBackgroundColorStyles: (tableSortColumnReorder?: boolean) => import("@emotion/react").SerializedStyles;
+export declare const dragMenuBackgroundColorStyles: () => import("@emotion/react").SerializedStyles;
 export declare const toggleStyles: import("@emotion/react").SerializedStyles;

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

@@ -16,4 +16,4 @@ export interface DragMenuConfig extends Omit<DropdownOptionT<Command>, 'icon'> {
     iconFallback?: React.ComponentType<React.PropsWithChildren<UNSAFE_NewIconProps>>;
     keymap?: string;
 }
-export declare const getDragMenuConfig: (direction: TableDirection, getEditorContainerWidth: GetEditorContainerWidth, hasMergedCellsInTable: boolean, editorView: EditorView, api: PluginInjectionAPI | undefined | null, tableMap?: TableMap, index?: number, targetCellPosition?: number, selectionRect?: Rect, editorAnalyticsAPI?: EditorAnalyticsAPI, isHeaderRowRequired?: boolean, isTableScalingEnabled?: boolean, tableDuplicateCellColouring?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, tableSortColumnReorder?: boolean, ariaNotifyPlugin?: ((message: string, ariaLiveElementAttributes?: AriaLiveElementAttributes) => void) | undefined, isCommentEditor?: boolean) => DragMenuConfig[];
+export declare const getDragMenuConfig: (direction: TableDirection, getEditorContainerWidth: GetEditorContainerWidth, hasMergedCellsInTable: boolean, editorView: EditorView, api: PluginInjectionAPI | undefined | null, tableMap?: TableMap, index?: number, targetCellPosition?: number, selectionRect?: Rect, editorAnalyticsAPI?: EditorAnalyticsAPI, isHeaderRowRequired?: boolean, isTableScalingEnabled?: boolean, tableDuplicateCellColouring?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, ariaNotifyPlugin?: ((message: string, ariaLiveElementAttributes?: AriaLiveElementAttributes) => void) | undefined, isCommentEditor?: boolean) => DragMenuConfig[];

package/dist/types-ts4.5/ui/FloatingDragMenu/DragMenu.d.ts

@@ -32,7 +32,6 @@ type DragMenuProps = {
     tableDuplicateCellColouring?: boolean;
     shouldUseIncreasedScalingPercent?: boolean;
     isTableFixedColumnWidthsOptionEnabled?: boolean;
-    tableSortColumnReorder?: boolean;
     ariaNotifyPlugin?: (message: string, ariaLiveElementAttributes?: AriaLiveElementAttributes) => void;
     isCommentEditor?: boolean;
 };

package/dist/types-ts4.5/ui/FloatingDragMenu/styles.d.ts

@@ -1,3 +1,3 @@
 export declare const cellColourPreviewStyles: (selectedColor: string) => import("@emotion/react").SerializedStyles;
-export declare const dragMenuBackgroundColorStyles: (tableSortColumnReorder?: boolean) => import("@emotion/react").SerializedStyles;
+export declare const dragMenuBackgroundColorStyles: () => import("@emotion/react").SerializedStyles;
 export declare const toggleStyles: import("@emotion/react").SerializedStyles;

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

@@ -16,4 +16,4 @@ export interface DragMenuConfig extends Omit<DropdownOptionT<Command>, 'icon'> {
     iconFallback?: React.ComponentType<React.PropsWithChildren<UNSAFE_NewIconProps>>;
     keymap?: string;
 }
-export declare const getDragMenuConfig: (direction: TableDirection, getEditorContainerWidth: GetEditorContainerWidth, hasMergedCellsInTable: boolean, editorView: EditorView, api: PluginInjectionAPI | undefined | null, tableMap?: TableMap, index?: number, targetCellPosition?: number, selectionRect?: Rect, editorAnalyticsAPI?: EditorAnalyticsAPI, isHeaderRowRequired?: boolean, isTableScalingEnabled?: boolean, tableDuplicateCellColouring?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, tableSortColumnReorder?: boolean, ariaNotifyPlugin?: ((message: string, ariaLiveElementAttributes?: AriaLiveElementAttributes) => void) | undefined, isCommentEditor?: boolean) => DragMenuConfig[];
+export declare const getDragMenuConfig: (direction: TableDirection, getEditorContainerWidth: GetEditorContainerWidth, hasMergedCellsInTable: boolean, editorView: EditorView, api: PluginInjectionAPI | undefined | null, tableMap?: TableMap, index?: number, targetCellPosition?: number, selectionRect?: Rect, editorAnalyticsAPI?: EditorAnalyticsAPI, isHeaderRowRequired?: boolean, isTableScalingEnabled?: boolean, tableDuplicateCellColouring?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, ariaNotifyPlugin?: ((message: string, ariaLiveElementAttributes?: AriaLiveElementAttributes) => void) | undefined, isCommentEditor?: boolean) => DragMenuConfig[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "7.31.1",
+	"version": "7.31.2",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"

package/src/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -584,13 +584,11 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 
 	private createOriginalContextMenuItems = () => {
 		let items: MenuItem[] = [];
-		const { getEditorFeatureFlags } = this.props;
-		const { tableSortColumnReorder = false } = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
 		const sortColumnItems = this.createSortColumnItems();
 		const backgroundColorItem = this.createBackgroundColorItem();
 		const distributeColumnsItem = this.createDistributeColumnsItem();
 
-		tableSortColumnReorder && sortColumnItems && items.push(...sortColumnItems);
+		sortColumnItems && items.push(...sortColumnItems);
 
 		backgroundColorItem && items.push(backgroundColorItem);
 
@@ -606,8 +604,6 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 
 		distributeColumnsItem && items.push(distributeColumnsItem);
 
-		!tableSortColumnReorder && sortColumnItems && items.push(...sortColumnItems);
-
 		items.push(this.createClearCellsItem());
 
 		return [{ items }];

package/src/ui/FloatingDragMenu/DragMenu.tsx

@@ -93,7 +93,6 @@ type DragMenuProps = {
 	tableDuplicateCellColouring?: boolean;
 	shouldUseIncreasedScalingPercent?: boolean;
 	isTableFixedColumnWidthsOptionEnabled?: boolean;
-	tableSortColumnReorder?: boolean;
 	ariaNotifyPlugin?: (
 		message: string,
 		ariaLiveElementAttributes?: AriaLiveElementAttributes,
@@ -166,7 +165,7 @@ const MapDragMenuOptionIdToMessage: Record<DragMenuOptionIdType, MessageType> =
 	},
 };
 
-const getGroupedDragMenuConfig = (tableSortColumnReorder: boolean) => {
+const getGroupedDragMenuConfig = () => {
 	let groupedDragMenuConfig: DragMenuOptionIdType[][] = [
 		[
 			'add_row_above',
@@ -181,9 +180,7 @@ const getGroupedDragMenuConfig = (tableSortColumnReorder: boolean) => {
 		['move_column_left', 'move_column_right', 'move_row_up', 'move_row_down'],
 	];
 	const sortColumnItems: DragMenuOptionIdType[] = ['sort_column_asc', 'sort_column_desc'];
-	tableSortColumnReorder
-		? groupedDragMenuConfig.unshift(sortColumnItems)
-		: groupedDragMenuConfig.push(sortColumnItems);
+	groupedDragMenuConfig.unshift(sortColumnItems);
 
 	return groupedDragMenuConfig;
 };
@@ -196,10 +193,9 @@ const elementBeforeIconStyles = xcss({
 const convertToDropdownItems = (
 	dragMenuConfig: DragMenuConfig[],
 	formatMessage: IntlShape['formatMessage'],
-	tableSortColumnReorder: boolean = false,
 	selectionRect?: Rect,
 ) => {
-	const groupedDragMenuConfig = getGroupedDragMenuConfig(tableSortColumnReorder);
+	const groupedDragMenuConfig = getGroupedDragMenuConfig();
 	let menuItemsArr: MenuItem[][] = [...Array(groupedDragMenuConfig.length)].map(() => []);
 	let menuCallback: { [key: string]: Command } = {};
 	dragMenuConfig.forEach((item) => {
@@ -286,7 +282,6 @@ const DragMenu = React.memo(
 		tableDuplicateCellColouring,
 		shouldUseIncreasedScalingPercent,
 		isTableFixedColumnWidthsOptionEnabled,
-		tableSortColumnReorder,
 		ariaNotifyPlugin,
 		isCommentEditor,
 	}: DragMenuProps & WrappedComponentProps) => {
@@ -319,7 +314,6 @@ const DragMenu = React.memo(
 			tableDuplicateCellColouring,
 			isTableFixedColumnWidthsOptionEnabled,
 			shouldUseIncreasedScalingPercent,
-			tableSortColumnReorder,
 			ariaNotifyPlugin,
 			isCommentEditor,
 		);
@@ -327,7 +321,6 @@ const DragMenu = React.memo(
 		const { menuItems, menuCallback } = convertToDropdownItems(
 			dragMenuConfig,
 			formatMessage,
-			tableSortColumnReorder,
 			selectionRect,
 		);
 
@@ -383,7 +376,7 @@ const DragMenu = React.memo(
 						// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
 						className={DropdownMenuSharedCssClassName.SUBMENU}
 						// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-						css={dragMenuBackgroundColorStyles(tableSortColumnReorder)}
+						css={dragMenuBackgroundColorStyles()}
 					>
 						<div
 							// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
@@ -610,9 +603,7 @@ const DragMenu = React.memo(
 		}
 
 		if (allowBackgroundColor) {
-			tableSortColumnReorder
-				? menuItems[1].items.unshift(createBackgroundColorMenuItem())
-				: menuItems[0].items.unshift(createBackgroundColorMenuItem());
+			menuItems[1].items.unshift(createBackgroundColorMenuItem());
 		}
 
 		// If first row, add toggle for Header row, default is true

package/src/ui/FloatingDragMenu/index.tsx

@@ -79,11 +79,8 @@ const FloatingDragMenu = ({
 		return null;
 	}
 
-	const {
-		tableDuplicateCellColouring = false,
-		tableWithFixedColumnWidthsOption = false,
-		tableSortColumnReorder = false,
-	} = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
+	const { tableDuplicateCellColouring = false, tableWithFixedColumnWidthsOption = false } =
+		getEditorFeatureFlags ? getEditorFeatureFlags() : {};
 
 	const shouldUseIncreasedScalingPercent =
 		isTableScalingEnabled && (tableWithFixedColumnWidthsOption || isCommentEditor);
@@ -126,7 +123,6 @@ const FloatingDragMenu = ({
 				tableDuplicateCellColouring={tableDuplicateCellColouring}
 				shouldUseIncreasedScalingPercent={shouldUseIncreasedScalingPercent}
 				isTableFixedColumnWidthsOptionEnabled={tableWithFixedColumnWidthsOption}
-				tableSortColumnReorder={tableSortColumnReorder}
 				ariaNotifyPlugin={ariaNotifyPlugin}
 				api={api}
 				isCommentEditor={isCommentEditor || false}

package/src/ui/FloatingDragMenu/styles.ts

@@ -22,18 +22,16 @@ export const cellColourPreviewStyles = (selectedColor: string) =>
 	});
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
-export const dragMenuBackgroundColorStyles = (tableSortColumnReorder: boolean = false) => css`
+export const dragMenuBackgroundColorStyles = () => css`
 	.${ClassName.DRAG_SUBMENU} {
 		border-radius: ${token('border.radius', '3px')};
 		background: ${token('elevation.surface.overlay', 'white')};
 		box-shadow: ${token('elevation.shadow.overlay', `0 4px 8px -2px ${N60A}, 0 0 1px ${N60A}`)};
 		display: block;
 		position: absolute;
-		top: ${tableSortColumnReorder
-			? TABLE_DRAG_MENU_PADDING_TOP +
-				TABLE_DRAG_MENU_SORT_GROUP_HEIGHT +
-				TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT
-			: 0}px; // move the submenu down when 'sort increasing/decreasing' appear before background color picker
+		top: ${TABLE_DRAG_MENU_PADDING_TOP +
+		TABLE_DRAG_MENU_SORT_GROUP_HEIGHT +
+		TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT}px; // move the submenu down when 'sort increasing/decreasing' appear before background color picker
 		left: ${dragMenuDropdownWidth}px;
 		padding: ${token('space.100', '8px')};
 

package/src/utils/drag-menu.ts

@@ -165,7 +165,6 @@ export const getDragMenuConfig = (
 	tableDuplicateCellColouring = false,
 	isTableFixedColumnWidthsOptionEnabled = false,
 	shouldUseIncreasedScalingPercent = false,
-	tableSortColumnReorder = false,
 	ariaNotifyPlugin?: (
 		message: string,
 		ariaLiveElementAttributes?: AriaLiveElementAttributes,
@@ -417,7 +416,7 @@ export const getDragMenuConfig = (
 	];
 
 	let allConfigs = [...restConfigs];
-	tableSortColumnReorder ? allConfigs.unshift(...sortConfigs) : allConfigs.push(...sortConfigs);
+	allConfigs.unshift(...sortConfigs);
 
 	return allConfigs.filter(Boolean) as DragMenuConfig[];
 };