@atlaskit/editor-plugin-table 7.17.0 → 7.17.2

package/dist/esm/plugin.js

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

package/dist/esm/pm-plugins/table-resizing/event-handlers.js

@@ -6,7 +6,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { stopKeyboardColumnResizing } from '../../commands/column-resize';
 import { updateResizeHandleDecorations } from '../../commands/misc';
 import { updateColumnWidths } from '../../transforms';
-import { getSelectedColumnIndexes } from '../../utils';
+import { getSelectedColumnIndexes, isTableNested } from '../../utils';
 import { getPluginState as getTablePluginState } from '../plugin-factory';
 import { META_KEYS } from '../table-analytics';
 import { evenColumns, setDragging, stopResizing } from './commands';
@@ -141,7 +141,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
           _shouldScale = _shouldScale && originalTable.attrs.displayMode !== 'fixed';
         }
         var resizedDelta = clientX - startX;
-        if (getBooleanFF('platform.editor.table.colum-resizing-improvements')) {
+        if (getBooleanFF('platform.editor.table.colum-resizing-improvements') && !isTableNested(state, tablePos)) {
           var newResizeState = resizeColumnAndTable(resizeState, colIndex, clientX - startX, dom, originalTable, resizingSelectedColumns ? selectedColumns : undefined, _shouldScale);
           tr = updateColumnWidths(newResizeState, table, start)(tr);
           tr.setNodeAttribute(start - 1, 'width', newResizeState.tableWidth);
@@ -218,7 +218,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
     if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
       shouldScale = shouldScale && originalTable.attrs.displayMode !== 'fixed';
     }
-    if (getBooleanFF('platform.editor.table.colum-resizing-improvements')) {
+    if (getBooleanFF('platform.editor.table.colum-resizing-improvements') && !isTableNested(state, tablePos)) {
       resizeColumnAndTable(resizeState, colIndex, clientX - dragging.startX, dom, table, undefined, shouldScale, undefined, shouldUseIncreasedScalingPercent);
     } else {
       resizeColumn(resizeState, colIndex, clientX - dragging.startX, dom, table, undefined, shouldScale, shouldUseIncreasedScalingPercent);

package/dist/esm/pm-plugins/table-resizing/utils/resize-column.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 // Resize a given column by an amount from the current state
 
 import { TableCssClassName as ClassName } from '../../../types';
+import { ALIGN_START } from '../../../utils/alignment';
 import { getTableContainerElementWidth, getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
@@ -31,7 +32,7 @@ export var resizeColumnAndTable = function resizeColumnAndTable(resizeState, col
   var tableWidth = tableRef.clientWidth;
   var tableContainerWidth = (_tableRef$closest = tableRef.closest('.pm-table-container')) === null || _tableRef$closest === void 0 ? void 0 : _tableRef$closest.clientWidth;
   var isOverflowed = !!(tableWidth && tableContainerWidth && tableWidth > tableContainerWidth);
-  var resizeAmount = amount * 2;
+  var resizeAmount = tableNode.attrs.layout === ALIGN_START && !isOverflowed ? amount : amount * 2;
 
   // todo: reimplement - use getTableScalingPercentFrozen to get scaled percent before table width changes dynamically
   // let scalePercent = 1;

package/dist/esm/toolbar.js

@@ -146,6 +146,7 @@ export var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(ed
     },
     selected: false,
     disabled: false,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     elemAfter: jsx("div", {
       css: shortcutStyle
     }, tooltip(addColumnAfter))
@@ -165,6 +166,7 @@ export var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(ed
     },
     selected: false,
     disabled: false,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     elemAfter: jsx("div", {
       css: shortcutStyle
     }, tooltip(addRowAfter))
@@ -297,6 +299,7 @@ export var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(ed
     },
     selected: false,
     disabled: false,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     elemAfter: jsx("div", {
       css: shortcutStyle
     }, tooltip(backspace))

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

@@ -152,10 +152,12 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
     className: ClassName.DRAG_HANDLE_BUTTON_CLICKABLE_ZONE,
     "data-testid": "table-drag-handle-clickable-zone-button",
     style: {
-      height: isRow ? "calc(100% - ".concat(dragTableInsertColumnButtonSize, "px)") : "var(--ds-space-200, 16px)",
+      height: isRow ? // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      "calc(100% - ".concat(dragTableInsertColumnButtonSize, "px)") : "var(--ds-space-200, 16px)",
       // 16px here because it's the size of drag handle button's large side
       width: isRow ? "var(--ds-space-200, 16px)" // 16px here because it's the size of drag handle button's large side
-      : "calc(100% - ".concat(dragTableInsertColumnButtonSize, "px)"),
+      : // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      "calc(100% - ".concat(dragTableInsertColumnButtonSize, "px)"),
       left: isRow ? "var(--ds-space-050, 4px)" : undefined,
       bottom: isColumn ? "var(--ds-space-0, 0px)" : undefined,
       alignSelf: isColumn ? 'none' : 'center',

package/dist/esm/ui/FloatingContextualButton/FixedButton.js

@@ -110,7 +110,7 @@ export var FixedButton = function FixedButton(_ref2) {
       position: 'fixed',
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       top: stickyHeader.top + stickyHeader.padding + offset * 2,
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       zIndex: akEditorTableCellOnStickyHeaderZIndex,
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       left: calcLeftPos({

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

@@ -45,7 +45,11 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
   }
   var labelCellOptions = formatMessage(messages.cellOptions);
   var button = jsx("div", {
-    css: [tableFloatingCellButtonStyles(), isContextualMenuOpen && tableFloatingCellButtonSelectedStyles()]
+    css: [
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+    tableFloatingCellButtonStyles(),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+    isContextualMenuOpen && tableFloatingCellButtonSelectedStyles()]
   }, jsx(ToolbarButton
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
   , {

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

@@ -3,14 +3,17 @@ import { N0, N20, N30A, N700 } from '@atlaskit/theme/colors';
 import { contextualMenuTriggerSize } from '../consts';
 export var tableFloatingCellButtonStyles = function tableFloatingCellButtonStyles() {
   return css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '> div': {
       // Sits behind button to provide surface-color background
       background: "var(--ds-surface, ".concat(N20, ")"),
       borderRadius: "var(--ds-border-radius, 3px)",
       display: 'flex',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
       height: "".concat(contextualMenuTriggerSize + 2, "px"),
       flexDirection: 'column'
     },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '&& button': {
       background: "var(--ds-background-neutral, none)",
       flexDirection: 'column',
@@ -21,15 +24,19 @@ export var tableFloatingCellButtonStyles = function tableFloatingCellButtonStyle
       height: 'calc(100% - 4px)',
       display: 'flex'
     },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '&& button:hover': {
       background: "var(--ds-background-neutral-hovered, ".concat(N30A, ")")
     },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '&& button:active': {
       background: "var(--ds-background-neutral-pressed, rgba(179, 212, 255, 0.6))"
     },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '&& button > span': {
       margin: "0px ".concat("var(--ds-space-negative-050, -4px)")
     },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '&& span': {
       pointerEvents: 'none'
     }
@@ -37,12 +44,15 @@ export var tableFloatingCellButtonStyles = function tableFloatingCellButtonStyle
 };
 export var tableFloatingCellButtonSelectedStyles = function tableFloatingCellButtonSelectedStyles() {
   return css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '&& button': {
       background: "var(--ds-background-selected, ".concat(N700, ")")
     },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '&& button:hover': {
       background: "var(--ds-background-selected-hovered, ".concat(N700, ")")
     },
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '&& button:active': {
       background: "var(--ds-background-selected-pressed, ".concat(N700, ")")
     }

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

@@ -84,7 +84,9 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
           value: {
             name: 'background'
           },
-          elemBefore: isDragAndDropEnabled ? jsx("span", {
+          elemBefore: isDragAndDropEnabled ?
+          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+          jsx("span", {
             css: elementBeforeIconStyles
           }, jsx(EditorBackgroundColorIcon, {
             label: formatMessage(messages.backgroundColor),
@@ -95,6 +97,7 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
           jsx("div", {
             className: DropdownMenuSharedCssClassName.SUBMENU
           }, 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)
             // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
             ,
@@ -131,7 +134,9 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
             name: 'merge'
           },
           isDisabled: !canMergeCells(state.tr),
-          elemBefore: isDragAndDropEnabled ? jsx("span", {
+          elemBefore: isDragAndDropEnabled ?
+          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+          jsx("span", {
             css: elementBeforeIconStyles
           }, jsx(MergeCellsIcon, null)) : undefined
         }, {
@@ -140,7 +145,9 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
             name: 'split'
           },
           isDisabled: !splitCell(state),
-          elemBefore: isDragAndDropEnabled ? jsx("span", {
+          elemBefore: isDragAndDropEnabled ?
+          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+          jsx("span", {
             css: elementBeforeIconStyles
           }, jsx(SplitCellIcon, null)) : undefined
         }];
@@ -158,10 +165,13 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         value: {
           name: 'insert_column'
         },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         elemAfter: jsx("div", {
           css: shortcutStyle
         }, tooltip(addColumnAfter)),
-        elemBefore: isDragAndDropEnabled ? jsx("span", {
+        elemBefore: isDragAndDropEnabled ?
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+        jsx("span", {
           css: elementBeforeIconStyles
         }, jsx(AddColRightIcon, null)) : undefined
       };
@@ -177,10 +187,13 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         value: {
           name: 'insert_row'
         },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         elemAfter: jsx("div", {
           css: shortcutStyle
         }, tooltip(addRowAfter)),
-        elemBefore: isDragAndDropEnabled ? jsx("span", {
+        elemBefore: isDragAndDropEnabled ?
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+        jsx("span", {
           css: elementBeforeIconStyles
         }, jsx(AddRowBelowIcon, null)) : undefined
       };
@@ -205,10 +218,13 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         value: {
           name: 'clear'
         },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         elemAfter: jsx("div", {
           css: shortcutStyle
         }, tooltip(backspace)),
-        elemBefore: isDragAndDropEnabled ? jsx("span", {
+        elemBefore: isDragAndDropEnabled ?
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+        jsx("span", {
           css: elementBeforeIconStyles
         }, jsx(CrossCircleIcon, {
           label: formatMessage(messages.clearCells, {
@@ -234,7 +250,9 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         value: {
           name: 'delete_column'
         },
-        elemBefore: isDragAndDropEnabled ? jsx("span", {
+        elemBefore: isDragAndDropEnabled ?
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+        jsx("span", {
           css: elementBeforeIconStyles
         }, jsx(RemoveIcon, {
           label: formatMessage(messages.removeColumns, {
@@ -260,7 +278,9 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         value: {
           name: 'delete_row'
         },
-        elemBefore: isDragAndDropEnabled ? jsx("span", {
+        elemBefore: isDragAndDropEnabled ?
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+        jsx("span", {
           css: elementBeforeIconStyles
         }, jsx(RemoveIcon, {
           label: formatMessage(messages.removeRows, {
@@ -328,17 +348,22 @@ 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.tableSortColumnDiscoverability,
+        tableSortColumnDiscoverability = _ref2$tableSortColumn === void 0 ? false : _ref2$tableSortColumn;
+      var sortColumnItems = _this.createSortColumnItems();
       var backgroundColorItem = _this.createBackgroundColorItem();
+      var distributeColumnsItem = _this.createDistributeColumnsItem();
+      tableSortColumnDiscoverability && sortColumnItems && items.push.apply(items, _toConsumableArray(sortColumnItems));
       backgroundColorItem && items.push(backgroundColorItem);
       items.push(_this.createInsertColumnItem());
       items.push(_this.createInsertRowItem());
       items.push(_this.createDeleteColumnItem());
       items.push(_this.createDeleteRowItem());
       items.push.apply(items, _toConsumableArray(_this.createMergeSplitCellItems()));
-      var distributeColumnsItem = _this.createDistributeColumnsItem();
       distributeColumnsItem && items.push(distributeColumnsItem);
-      var sortColumnItems = _this.createSortColumnItems();
-      sortColumnItems && items.push.apply(items, _toConsumableArray(sortColumnItems));
+      !tableSortColumnDiscoverability && sortColumnItems && items.push.apply(items, _toConsumableArray(sortColumnItems));
       items.push(_this.createClearCellsItem());
       return [{
         items: items
@@ -369,8 +394,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
       items[1].items.push(deleteRowItem);
       return items;
     });
-    _defineProperty(_assertThisInitialized(_this), "onMenuItemActivated", function (_ref2) {
-      var item = _ref2.item;
+    _defineProperty(_assertThisInitialized(_this), "onMenuItemActivated", function (_ref3) {
+      var item = _ref3.item;
       var _this$props10 = _this.props,
         editorView = _this$props10.editorView,
         selectionRect = _this$props10.selectionRect,
@@ -384,11 +409,11 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         targetCellPosition = _getPluginState11.targetCellPosition,
         _getPluginState11$isT = _getPluginState11.isTableScalingEnabled,
         isTableScalingEnabled = _getPluginState11$isT === void 0 ? false : _getPluginState11$isT;
-      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;
+      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 shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
       switch (item.value.name) {
         case 'sort_column_desc':
@@ -463,8 +488,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         isSubmenuOpen: false
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "handleItemMouseEnter", function (_ref4) {
-      var item = _ref4.item;
+    _defineProperty(_assertThisInitialized(_this), "handleItemMouseEnter", function (_ref5) {
+      var item = _ref5.item;
       var _this$props12 = _this.props,
         _this$props12$editorV = _this$props12.editorView,
         state = _this$props12$editorV.state,
@@ -487,8 +512,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         hoverMergedCells()(state, dispatch);
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "handleItemMouseLeave", function (_ref5) {
-      var item = _ref5.item;
+    _defineProperty(_assertThisInitialized(_this), "handleItemMouseLeave", function (_ref6) {
+      var item = _ref6.item;
       var _this$props$editorVie2 = _this.props.editorView,
         state = _this$props$editorVie2.state,
         dispatch = _this$props$editorVie2.dispatch;

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

@@ -8,10 +8,13 @@ import { contextualMenuDropdownWidth, contextualMenuDropdownWidthDnD } from '../
 export var cellColourPreviewStyles = function cellColourPreviewStyles(selectedColor) {
   return css({
     '&::before': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
       background: selectedColor
     }
   });
 };
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
 export var elementBeforeIconStyles = css({
   marginRight: "var(--ds-space-negative-075, -6px)",
   display: 'flex'

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

@@ -202,10 +202,12 @@ var FloatingDeleteButton = /*#__PURE__*/function (_Component) {
               position: 'fixed',
               // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
               top: pos.top,
-              // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+              // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
               zIndex: stickyRowZIndex,
               // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
-              left: rect.left + (pos.left || 0) - (this.state.selectionType === 'column' ? this.state.scrollLeft : 0) - (this.props.isNumberColumnEnabled ? akEditorTableNumberColumnWidth : 0)
+              left: rect.left + (pos.left || 0) - (this.state.selectionType === 'column' ? this.state.scrollLeft : 0) - (
+              // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+              this.props.isNumberColumnEnabled ? akEditorTableNumberColumnWidth : 0)
             }
           }, button), mountTo);
         }

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

@@ -89,8 +89,16 @@ var MapDragMenuOptionIdToMessage = {
     plural: null
   }
 };
-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'], ['sort_column_asc', 'sort_column_desc']];
-var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect) {
+var getGroupedDragMenuConfig = function getGroupedDragMenuConfig(tableSortColumnDiscoverability) {
+  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'];
+  tableSortColumnDiscoverability ? groupedDragMenuConfig.unshift(sortColumnItems) : groupedDragMenuConfig.push(sortColumnItems);
+  return groupedDragMenuConfig;
+};
+var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, formatMessage) {
+  var tableSortColumnDiscoverability = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var selectionRect = arguments.length > 3 ? arguments[3] : undefined;
+  var groupedDragMenuConfig = getGroupedDragMenuConfig(tableSortColumnDiscoverability);
   var menuItemsArr = _toConsumableArray(Array(groupedDragMenuConfig.length)).map(function () {
     return [];
   });
@@ -138,11 +146,14 @@ var convertToDropdownItems = function convertToDropdownItems(dragMenuConfig, for
         name: item.id
       },
       isDisabled: item.disabled,
-      elemBefore: item.icon ? jsx("span", {
+      elemBefore: item.icon ?
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+      jsx("span", {
         css: elementBeforeIconStyles
       }, jsx(item.icon, {
         label: formatMessage(MapDragMenuOptionIdToMessage[item.id].message, options)
       })) : undefined,
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
       elemAfter: item.keymap ? jsx("div", {
         css: shortcutStyle
       }, item.keymap) : undefined
@@ -183,7 +194,8 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
     isTableScalingEnabled = _ref.isTableScalingEnabled,
     tableDuplicateCellColouring = _ref.tableDuplicateCellColouring,
     shouldUseIncreasedScalingPercent = _ref.shouldUseIncreasedScalingPercent,
-    isTableFixedColumnWidthsOptionEnabled = _ref.isTableFixedColumnWidthsOptionEnabled;
+    isTableFixedColumnWidthsOptionEnabled = _ref.isTableFixedColumnWidthsOptionEnabled,
+    tableSortColumnDiscoverability = _ref.tableSortColumnDiscoverability;
   var state = editorView.state,
     dispatch = editorView.dispatch;
   var selection = state.selection;
@@ -207,8 +219,8 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
     hasMergedCellsInTable = getMergedCellsPositions(state.tr).length > 0;
   }
   var allowBackgroundColor = (_pluginConfig$allowBa = pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.allowBackgroundColor) !== null && _pluginConfig$allowBa !== void 0 ? _pluginConfig$allowBa : false;
-  var dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, !shouldMoveDisabled, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent);
-  var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, selectionRect),
+  var dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, !shouldMoveDisabled, hasMergedCellsInTable, editorView, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnDiscoverability);
+  var _convertToDropdownIte = convertToDropdownItems(dragMenuConfig, formatMessage, tableSortColumnDiscoverability, selectionRect),
     menuItems = _convertToDropdownIte.menuItems,
     menuCallback = _convertToDropdownIte.menuCallback;
   var handleSubMenuRef = function handleSubMenuRef(ref) {
@@ -246,7 +258,9 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
       value: {
         name: 'background'
       },
-      elemBefore: jsx("span", {
+      elemBefore:
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+      jsx("span", {
         css: elementBeforeIconStyles
       }, jsx(EditorBackgroundColorIcon, {
         label: formatMessage(messages.backgroundColor),
@@ -254,9 +268,12 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
       })),
       elemAfter: jsx("div", {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-        className: DropdownMenuSharedCssClassName.SUBMENU,
-        css: dragMenuBackgroundColorStyles
+        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(tableSortColumnDiscoverability)
       }, 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)
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
@@ -311,7 +328,9 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
       value: {
         name: 'header_column'
       },
-      elemAfter: jsx("div", {
+      elemAfter:
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+      jsx("div", {
         css: toggleStyles
       }, jsx(Toggle, {
         id: "toggle-header-column",
@@ -324,7 +343,9 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
       value: {
         name: 'header_row'
       },
-      elemAfter: jsx("div", {
+      elemAfter:
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+      jsx("div", {
         css: toggleStyles
       }, jsx(Toggle, {
         id: "toggle-header-row",
@@ -340,7 +361,9 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
       value: {
         name: 'row_numbers'
       },
-      elemAfter: jsx("div", {
+      elemAfter:
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
+      jsx("div", {
         css: toggleStyles
       }, jsx(Toggle, {
         id: "toggle-row-numbers",
@@ -446,7 +469,7 @@ export var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
     return null;
   }
   if (allowBackgroundColor) {
-    menuItems[0].items.unshift(createBackgroundColorMenuItem());
+    tableSortColumnDiscoverability ? menuItems[1].items.unshift(createBackgroundColorMenuItem()) : menuItems[0].items.unshift(createBackgroundColorMenuItem());
   }
 
   // If first row, add toggle for Header row, default is true

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

@@ -34,7 +34,9 @@ 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;
+    tableWithFixedColumnWidthsOption = _ref2$tableWithFixedC === void 0 ? false : _ref2$tableWithFixedC,
+    _ref2$tableSortColumn = _ref2.tableSortColumnDiscoverability,
+    tableSortColumnDiscoverability = _ref2$tableSortColumn === void 0 ? false : _ref2$tableSortColumn;
   var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
   return /*#__PURE__*/React.createElement(Popup, {
     alignX: direction === 'row' ? 'right' : undefined,
@@ -72,7 +74,8 @@ var FloatingDragMenu = function FloatingDragMenu(_ref) {
     isTableScalingEnabled: isTableScalingEnabled,
     tableDuplicateCellColouring: tableDuplicateCellColouring,
     shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
-    isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption
+    isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption,
+    tableSortColumnDiscoverability: tableSortColumnDiscoverability
   }));
 };
 FloatingDragMenu.displayName = 'FloatingDragMenu';

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

@@ -4,32 +4,43 @@ import { css } from '@emotion/react';
 import { tableBackgroundBorderColor } from '@atlaskit/adf-schema';
 import { N60A, N90 } from '@atlaskit/theme/colors';
 import { TableCssClassName as ClassName } from '../../types';
-import { dragMenuDropdownWidth } from '../consts';
+import { dragMenuDropdownWidth, TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT, TABLE_DRAG_MENU_PADDING_TOP, TABLE_DRAG_MENU_SORT_GROUP_HEIGHT } from '../consts';
 export var cellColourPreviewStyles = function cellColourPreviewStyles(selectedColor) {
   return css({
     '&::before': {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
       background: selectedColor
     }
   });
 };
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
 export var elementBeforeIconStyles = css({
   marginRight: "var(--ds-space-negative-075, -6px)",
   display: 'flex'
 });
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
-export var dragMenuBackgroundColorStyles = 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: 0;\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), ")"), 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, ")"));
+export var dragMenuBackgroundColorStyles = function dragMenuBackgroundColorStyles() {
+  var tableSortColumnDiscoverability = 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), ")"), tableSortColumnDiscoverability ? TABLE_DRAG_MENU_PADDING_TOP + TABLE_DRAG_MENU_SORT_GROUP_HEIGHT + TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT : 0, dragMenuDropdownWidth, "var(--ds-space-100, 8px)", ClassName.DRAG_SUBMENU_ICON, tableBackgroundBorderColor, "var(--ds-border-radius, 3px)", "var(--ds-space-050, 4px)", "var(--ds-icon, ".concat(N90, ")"));
+};
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/design-system/no-exported-css -- Ignored via go/DSP-18766
 export var toggleStyles = css({
   display: 'flex',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   "input[type='checkbox']": {
     width: '30px',
     height: '14px',
     pointerEvents: 'initial',
     cursor: 'pointer'
   },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '> label': {
     margin: '0px',
     pointerEvents: 'none',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '> span': {
       pointerEvents: 'none'
     }

package/dist/esm/ui/TableFloatingControls/NumberColumn/index.js

@@ -105,7 +105,9 @@ var NumberColumn = /*#__PURE__*/function (_Component) {
         style: {
           // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
           marginTop: hasHeaderRow && this.props.stickyTop !== undefined ? rowHeights[0] : undefined,
-          borderLeft: isDragAndDropEnabled && tableActive ? "1px solid ".concat(tableBorderColor) : undefined
+          borderLeft:
+          // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+          isDragAndDropEnabled && tableActive ? "1px solid ".concat(tableBorderColor) : undefined
         },
         contentEditable: false
       }, rowHeights.map(function (rowHeight, index) {

package/dist/esm/ui/TableFloatingControls/RowControls/ClassicControls.js

@@ -80,7 +80,7 @@ var RowControlsComponent = /*#__PURE__*/function (_Component) {
               marginTop: "".concat(marginTop, "px"),
               // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
               top: thisRowSticky ? "".concat(_this2.props.stickyTop + 3, "px") : undefined,
-              // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
+              // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
               paddingTop: thisRowSticky ? "".concat(tableControlsSpacing, "px") : undefined
             }
           }, /*#__PURE__*/React.createElement("button", {