@atlaskit/editor-plugin-table 7.17.0 → 7.17.2

package/package.json

@@ -1,148 +1,137 @@
 {
-  "name": "@atlaskit/editor-plugin-table",
-  "version": "7.17.0",
-  "description": "Table plugin for the @atlaskit/editor",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
-  "author": "Atlassian Pty Ltd",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "module:es2019": "dist/es2019/index.js",
-  "types": "dist/types/index.d.ts",
-  "typesVersions": {
-    ">=4.5 <4.9": {
-      "*": [
-        "dist/types-ts4.5/*",
-        "dist/types-ts4.5/index.d.ts"
-      ]
-    }
-  },
-  "sideEffects": false,
-  "atlaskit:src": "src/index.ts",
-  "atlassian": {
-    "team": "Editor: Jenga",
-    "singleton": true,
-    "releaseModel": "continuous",
-    "runReact18": false
-  },
-  "dependencies": {
-    "@atlaskit/adf-schema": "^36.10.7",
-    "@atlaskit/button": "^17.17.0",
-    "@atlaskit/custom-steps": "^0.2.0",
-    "@atlaskit/editor-common": "^82.3.0",
-    "@atlaskit/editor-palette": "1.6.0",
-    "@atlaskit/editor-plugin-accessibility-utils": "^1.1.0",
-    "@atlaskit/editor-plugin-analytics": "^1.2.0",
-    "@atlaskit/editor-plugin-content-insertion": "^1.2.0",
-    "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
-    "@atlaskit/editor-plugin-guideline": "^1.1.0",
-    "@atlaskit/editor-plugin-selection": "^1.2.0",
-    "@atlaskit/editor-plugin-width": "^1.1.0",
-    "@atlaskit/editor-prosemirror": "4.0.1",
-    "@atlaskit/editor-shared-styles": "^2.12.0",
-    "@atlaskit/editor-tables": "^2.7.0",
-    "@atlaskit/icon": "^22.3.0",
-    "@atlaskit/menu": "^2.4.0",
-    "@atlaskit/platform-feature-flags": "^0.2.1",
-    "@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
-    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.3.0",
-    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
-    "@atlaskit/primitives": "^7.0.0",
-    "@atlaskit/theme": "^12.9.0",
-    "@atlaskit/toggle": "^13.1.0",
-    "@atlaskit/tokens": "^1.50.0",
-    "@atlaskit/tooltip": "^18.4.0",
-    "@babel/runtime": "^7.0.0",
-    "@emotion/react": "^11.7.1",
-    "classnames": "^2.2.5",
-    "lodash": "^4.17.21",
-    "memoize-one": "^6.0.0",
-    "raf-schd": "^4.0.3"
-  },
-  "peerDependencies": {
-    "react": "^16.8.0",
-    "react-dom": "^16.8.0",
-    "react-intl-next": "npm:react-intl@^5.18.1"
-  },
-  "devDependencies": {
-    "typescript": "~5.4.2"
-  },
-  "af:exports": {
-    "./types": "./src/types.ts",
-    ".": "./src/index.ts",
-    "./ui/common-styles": "./src/ui/common-styles.ts",
-    "./ui/consts": "./src/ui/consts.ts",
-    "./plugin-key": "./src/pm-plugins/plugin-key.ts",
-    "./commands": "./src/commands/index.ts"
-  },
-  "techstack": {
-    "@atlassian/frontend": {
-      "import-structure": [
-        "atlassian-conventions"
-      ],
-      "circular-dependencies": [
-        "file-and-folder-level"
-      ]
-    },
-    "@repo/internal": {
-      "design-tokens": [
-        "color"
-      ],
-      "deprecation": "no-deprecated-imports",
-      "styling": [
-        "emotion"
-      ]
-    }
-  },
-  "stricter": {
-    "no-unused-dependencies": {
-      "checkDevDependencies": true
-    }
-  },
-  "platform-feature-flags": {
-    "platform.editor.table.insert-last-column-btn-stays-in-place": {
-      "type": "boolean"
-    },
-    "platform.editor.table.drag-move-options-logic-update_fp7xw": {
-      "type": "boolean"
-    },
-    "platform.editor.a11y-table-resizing_uapcv": {
-      "type": "boolean"
-    },
-    "platform.editor.a11y-column-resizing_emcvz": {
-      "type": "boolean"
-    },
-    "platform.editor.a11y-help-dialog-shortcut-keys-position_aghfg": {
-      "type": "boolean"
-    },
-    "platform.editor.transform-slice-for-nested-expand": {
-      "type": "boolean"
-    },
-    "platform.editor.table.cmd-a-select-table": {
-      "type": "boolean"
-    },
-    "platform.editor.table.use-shared-state-hook": {
-      "type": "boolean"
-    },
-    "platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33": {
-      "type": "boolean"
-    },
-    "platform.editor.table.colum-resizing-improvements": {
-      "type": "boolean"
-    },
-    "platform.editor.table.use-increased-scaling-percent": {
-      "type": "boolean"
-    },
-    "platform.editor.explicit-html-element-check": {
-      "type": "boolean"
-    },
-    "platform.editor.table.live-pages-sorting_4malx": {
-      "type": "boolean"
-    },
-    "platform.editor.table.editor-num-col-style-changes": {
-      "type": "boolean"
-    }
-  }
-}
+	"name": "@atlaskit/editor-plugin-table",
+	"version": "7.17.2",
+	"description": "Table plugin for the @atlaskit/editor",
+	"publishConfig": {
+		"registry": "https://registry.npmjs.org/"
+	},
+	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
+	"author": "Atlassian Pty Ltd",
+	"main": "dist/cjs/index.js",
+	"module": "dist/esm/index.js",
+	"module:es2019": "dist/es2019/index.js",
+	"types": "dist/types/index.d.ts",
+	"typesVersions": {
+		">=4.5 <4.9": {
+			"*": ["dist/types-ts4.5/*", "dist/types-ts4.5/index.d.ts"]
+		}
+	},
+	"sideEffects": false,
+	"atlaskit:src": "src/index.ts",
+	"atlassian": {
+		"team": "Editor: Jenga",
+		"singleton": true,
+		"releaseModel": "continuous",
+		"runReact18": false
+	},
+	"dependencies": {
+		"@atlaskit/adf-schema": "^36.10.7",
+		"@atlaskit/button": "^17.17.0",
+		"@atlaskit/custom-steps": "^0.2.0",
+		"@atlaskit/editor-common": "^82.6.0",
+		"@atlaskit/editor-palette": "1.6.0",
+		"@atlaskit/editor-plugin-accessibility-utils": "^1.1.0",
+		"@atlaskit/editor-plugin-analytics": "^1.2.0",
+		"@atlaskit/editor-plugin-content-insertion": "^1.2.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^1.2.0",
+		"@atlaskit/editor-plugin-guideline": "^1.1.0",
+		"@atlaskit/editor-plugin-selection": "^1.2.0",
+		"@atlaskit/editor-plugin-width": "^1.1.0",
+		"@atlaskit/editor-prosemirror": "4.0.1",
+		"@atlaskit/editor-shared-styles": "^2.12.0",
+		"@atlaskit/editor-tables": "^2.7.0",
+		"@atlaskit/icon": "^22.3.0",
+		"@atlaskit/menu": "^2.4.0",
+		"@atlaskit/platform-feature-flags": "^0.2.1",
+		"@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
+		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.3.0",
+		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
+		"@atlaskit/primitives": "^7.2.0",
+		"@atlaskit/theme": "^12.9.0",
+		"@atlaskit/toggle": "^13.1.0",
+		"@atlaskit/tokens": "^1.50.0",
+		"@atlaskit/tooltip": "^18.4.0",
+		"@babel/runtime": "^7.0.0",
+		"@emotion/react": "^11.7.1",
+		"classnames": "^2.2.5",
+		"lodash": "^4.17.21",
+		"memoize-one": "^6.0.0",
+		"raf-schd": "^4.0.3"
+	},
+	"peerDependencies": {
+		"react": "^16.8.0",
+		"react-dom": "^16.8.0",
+		"react-intl-next": "npm:react-intl@^5.18.1"
+	},
+	"devDependencies": {
+		"typescript": "~5.4.2"
+	},
+	"af:exports": {
+		"./types": "./src/types.ts",
+		".": "./src/index.ts",
+		"./ui/common-styles": "./src/ui/common-styles.ts",
+		"./ui/consts": "./src/ui/consts.ts",
+		"./plugin-key": "./src/pm-plugins/plugin-key.ts",
+		"./commands": "./src/commands/index.ts"
+	},
+	"techstack": {
+		"@atlassian/frontend": {
+			"import-structure": ["atlassian-conventions"],
+			"circular-dependencies": ["file-and-folder-level"]
+		},
+		"@repo/internal": {
+			"design-tokens": ["color"],
+			"deprecation": "no-deprecated-imports",
+			"styling": ["emotion"]
+		}
+	},
+	"stricter": {
+		"no-unused-dependencies": {
+			"checkDevDependencies": true
+		}
+	},
+	"platform-feature-flags": {
+		"platform.editor.table.insert-last-column-btn-stays-in-place": {
+			"type": "boolean"
+		},
+		"platform.editor.table.drag-move-options-logic-update_fp7xw": {
+			"type": "boolean"
+		},
+		"platform.editor.a11y-table-resizing_uapcv": {
+			"type": "boolean"
+		},
+		"platform.editor.a11y-column-resizing_emcvz": {
+			"type": "boolean"
+		},
+		"platform.editor.a11y-help-dialog-shortcut-keys-position_aghfg": {
+			"type": "boolean"
+		},
+		"platform.editor.transform-slice-for-nested-expand": {
+			"type": "boolean"
+		},
+		"platform.editor.table.cmd-a-select-table": {
+			"type": "boolean"
+		},
+		"platform.editor.table.use-shared-state-hook": {
+			"type": "boolean"
+		},
+		"platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33": {
+			"type": "boolean"
+		},
+		"platform.editor.table.colum-resizing-improvements": {
+			"type": "boolean"
+		},
+		"platform.editor.table.use-increased-scaling-percent": {
+			"type": "boolean"
+		},
+		"platform.editor.explicit-html-element-check": {
+			"type": "boolean"
+		},
+		"platform.editor.table.live-pages-sorting_4malx": {
+			"type": "boolean"
+		},
+		"platform.editor.table.editor-num-col-style-changes": {
+			"type": "boolean"
+		}
+	}
+}

package/src/nodeviews/ExternalDropTargets.tsx

@@ -53,10 +53,11 @@ export const ExternalDropTargets = ({
 				overflow: 'hidden',
 				// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
 				position: 'absolute',
-				// 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
 				top: `-${dropTargetExtendedWidth - tableMarginTop}px`,
 				// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
 				pointerEvents: 'auto',
+				// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
 				zIndex: `${dropTargetsZIndex}`,
 			}}
 			data-testid="table-floating-column-extended-drop-targets"

package/src/nodeviews/TableResizer.tsx

@@ -350,6 +350,8 @@ export const TableResizer = ({
 			tableLocalId: node.attrs.localId,
 			tableRef: tableRef,
 		});
+		tr.setMeta('is-resizer-resizing', true);
+
 		tr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {
 			name: TABLE_OVERFLOW_CHANGE_TRIGGER.RESIZED,
 		});
@@ -507,6 +509,7 @@ export const TableResizer = ({
 				tableLocalId: '',
 				tableRef: null,
 			});
+			tr.setMeta('is-resizer-resizing', false);
 			const frameRateSamples = endMeasure();
 
 			if (frameRateSamples.length > 0) {

package/src/plugin.tsx

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

package/src/pm-plugins/table-resizing/event-handlers.ts

@@ -17,7 +17,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';
 
@@ -192,7 +192,10 @@ export const handleMouseDown = (
 
 				const resizedDelta = clientX - startX;
 
-				if (getBooleanFF('platform.editor.table.colum-resizing-improvements')) {
+				if (
+					getBooleanFF('platform.editor.table.colum-resizing-improvements') &&
+					!isTableNested(state, tablePos)
+				) {
 					const newResizeState = resizeColumnAndTable(
 						resizeState,
 						colIndex,
@@ -297,7 +300,10 @@ export const handleMouseDown = (
 			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,

package/src/pm-plugins/table-resizing/utils/resize-column.ts

@@ -2,6 +2,7 @@
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 
 import { TableCssClassName as ClassName } from '../../../types';
+import { ALIGN_START } from '../../../utils/alignment';
 
 import { getTableContainerElementWidth, getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';
@@ -61,7 +62,7 @@ export const resizeColumnAndTable = (
 	const tableContainerWidth = tableRef.closest('.pm-table-container')?.clientWidth;
 
 	const isOverflowed = !!(tableWidth && tableContainerWidth && tableWidth > tableContainerWidth);
-	let resizeAmount = amount * 2;
+	let 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/src/toolbar.tsx

@@ -224,6 +224,7 @@ export const getToolbarCellOptionsConfig = (
 			},
 			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: <div css={shortcutStyle}>{tooltip(addColumnAfter)}</div>,
 		},
 		{
@@ -242,6 +243,7 @@ export const getToolbarCellOptionsConfig = (
 			},
 			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: <div css={shortcutStyle}>{tooltip(addRowAfter)}</div>,
 		},
 		{
@@ -414,6 +416,7 @@ export const getToolbarCellOptionsConfig = (
 		},
 		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: <div css={shortcutStyle}>{tooltip(backspace)}</div>,
 	});
 

package/src/ui/DragHandle/index.tsx

@@ -199,11 +199,13 @@ const DragHandleComponent = ({
 				data-testid="table-drag-handle-clickable-zone-button"
 				style={{
 					height: isRow
-						? `calc(100% - ${dragTableInsertColumnButtonSize}px)`
+						? // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+							`calc(100% - ${dragTableInsertColumnButtonSize}px)`
 						: `${token('space.200', '16px')}`, // 16px here because it's the size of drag handle button's large side
 					width: isRow
 						? `${token('space.200', '16px')}` // 16px here because it's the size of drag handle button's large side
-						: `calc(100% - ${dragTableInsertColumnButtonSize}px)`,
+						: // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+							`calc(100% - ${dragTableInsertColumnButtonSize}px)`,
 					left: isRow ? `${token('space.050', '4px')}` : undefined,
 					bottom: isColumn ? `${token('space.0', '0px')}` : undefined,
 					alignSelf: isColumn ? 'none' : 'center',

package/src/ui/FloatingContextualButton/FixedButton.tsx

@@ -160,7 +160,7 @@ export const FixedButton = ({
 					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/src/ui/FloatingContextualButton/index.tsx

@@ -77,7 +77,9 @@ const FloatingContextualButtonInner = React.memo((props: Props & WrappedComponen
 	const button = (
 		<div
 			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(),
 			]}
 		>

package/src/ui/FloatingContextualButton/styles.ts

@@ -7,14 +7,17 @@ import { contextualMenuTriggerSize } from '../consts';
 
 export const tableFloatingCellButtonStyles = () =>
 	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: token('elevation.surface', N20),
 			borderRadius: token('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: `${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: token('color.background.neutral', 'none'),
 			flexDirection: 'column',
@@ -25,15 +28,19 @@ export const tableFloatingCellButtonStyles = () =>
 			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: token('color.background.neutral.hovered', 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: token('color.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 ${token('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',
 		},
@@ -41,12 +48,15 @@ export const tableFloatingCellButtonStyles = () =>
 
 export const tableFloatingCellButtonSelectedStyles = () =>
 	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: token('color.background.selected', 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: token('color.background.selected.hovered', 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: token('color.background.selected.pressed', N700),
 		},

package/src/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -169,6 +169,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 					: formatMessage(messages.cellBackground),
 				value: { name: 'background' },
 				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
 					<span css={elementBeforeIconStyles}>
 						<EditorBackgroundColorIcon
 							label={formatMessage(messages.backgroundColor)}
@@ -180,6 +181,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 					// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
 					<div className={DropdownMenuSharedCssClassName.SUBMENU}>
 						<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
 							className={
@@ -228,6 +230,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 					value: { name: 'merge' },
 					isDisabled: !canMergeCells(state.tr),
 					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
 						<span css={elementBeforeIconStyles}>
 							<MergeCellsIcon />
 						</span>
@@ -238,6 +241,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 					value: { name: 'split' },
 					isDisabled: !splitCell(state),
 					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
 						<span css={elementBeforeIconStyles}>
 							<SplitCellIcon />
 						</span>
@@ -260,8 +264,10 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 				isDragAndDropEnabled ? messages.addColumnRight : messages.insertColumn,
 			),
 			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: <div css={shortcutStyle}>{tooltip(addColumnAfter)}</div>,
 			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
 				<span css={elementBeforeIconStyles}>
 					<AddColRightIcon />
 				</span>
@@ -279,8 +285,10 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 		return {
 			content: formatMessage(isDragAndDropEnabled ? messages.addRowBelow : messages.insertRow),
 			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: <div css={shortcutStyle}>{tooltip(addRowAfter)}</div>,
 			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
 				<span css={elementBeforeIconStyles}>
 					<AddRowBelowIcon />
 				</span>
@@ -304,8 +312,10 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 				0: Math.max(noOfColumns, noOfRows),
 			}),
 			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: <div css={shortcutStyle}>{tooltip(backspace)}</div>,
 			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
 				<span css={elementBeforeIconStyles}>
 					<CrossCircleIcon
 						label={formatMessage(messages.clearCells, {
@@ -334,6 +344,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 			}),
 			value: { name: 'delete_column' },
 			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
 				<span css={elementBeforeIconStyles}>
 					<RemoveIcon
 						label={formatMessage(messages.removeColumns, {
@@ -362,6 +373,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 			}),
 			value: { name: 'delete_row' },
 			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
 				<span css={elementBeforeIconStyles}>
 					<RemoveIcon
 						label={formatMessage(messages.removeRows, {
@@ -447,7 +459,16 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 
 	private createOriginalContextMenuItems = () => {
 		let items: MenuItem[] = [];
+		const { getEditorFeatureFlags } = this.props;
+		const { tableSortColumnDiscoverability = false } = getEditorFeatureFlags
+			? getEditorFeatureFlags()
+			: {};
+		const sortColumnItems = this.createSortColumnItems();
 		const backgroundColorItem = this.createBackgroundColorItem();
+		const distributeColumnsItem = this.createDistributeColumnsItem();
+
+		tableSortColumnDiscoverability && sortColumnItems && items.push(...sortColumnItems);
+
 		backgroundColorItem && items.push(backgroundColorItem);
 
 		items.push(this.createInsertColumnItem());
@@ -460,11 +481,9 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 
 		items.push(...this.createMergeSplitCellItems());
 
-		const distributeColumnsItem = this.createDistributeColumnsItem();
 		distributeColumnsItem && items.push(distributeColumnsItem);
 
-		const sortColumnItems = this.createSortColumnItems();
-		sortColumnItems && items.push(...sortColumnItems);
+		!tableSortColumnDiscoverability && sortColumnItems && items.push(...sortColumnItems);
 
 		items.push(this.createClearCellsItem());
 

package/src/ui/FloatingContextualMenu/index.tsx

@@ -92,6 +92,7 @@ const FloatingContextualMenu = ({
 			offset={[-7, 0]}
 			stick={true}
 		>
+			{/* eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */}
 			<div css={tablePopupStyles(isDragAndDropEnabled)}>
 				<ContextualMenu
 					editorView={editorView}

package/src/ui/FloatingContextualMenu/styles.ts

@@ -10,10 +10,12 @@ import { contextualMenuDropdownWidth, contextualMenuDropdownWidthDnD } from '../
 export const cellColourPreviewStyles = (selectedColor: string) =>
 	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 const elementBeforeIconStyles = css({
 	marginRight: token('space.negative.075', '-6px'),
 	display: 'flex',