@atlaskit/editor-plugin-table 7.17.3 → 7.17.5

package/src/ui/FloatingContextualButton/index.tsx

@@ -1,6 +1,7 @@
 /** @jsx jsx */
 import React from 'react';
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import { injectIntl } from 'react-intl-next';

package/src/ui/FloatingContextualButton/styles.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 
 import { N0, N20, N30A, N700 } from '@atlaskit/theme/colors';

package/src/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -2,6 +2,7 @@
 /** @jsx jsx */
 import { Component } from 'react';
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import { injectIntl } from 'react-intl-next';
@@ -460,14 +461,12 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 	private createOriginalContextMenuItems = () => {
 		let items: MenuItem[] = [];
 		const { getEditorFeatureFlags } = this.props;
-		const { tableSortColumnDiscoverability = false } = getEditorFeatureFlags
-			? getEditorFeatureFlags()
-			: {};
+		const { tableSortColumnReorder = false } = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
 		const sortColumnItems = this.createSortColumnItems();
 		const backgroundColorItem = this.createBackgroundColorItem();
 		const distributeColumnsItem = this.createDistributeColumnsItem();
 
-		tableSortColumnDiscoverability && sortColumnItems && items.push(...sortColumnItems);
+		tableSortColumnReorder && sortColumnItems && items.push(...sortColumnItems);
 
 		backgroundColorItem && items.push(backgroundColorItem);
 
@@ -483,7 +482,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 
 		distributeColumnsItem && items.push(distributeColumnsItem);
 
-		!tableSortColumnDiscoverability && sortColumnItems && items.push(...sortColumnItems);
+		!tableSortColumnReorder && sortColumnItems && items.push(...sortColumnItems);
 
 		items.push(this.createClearCellsItem());
 

package/src/ui/FloatingContextualMenu/index.tsx

@@ -1,4 +1,5 @@
 /** @jsx jsx */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';

package/src/ui/FloatingContextualMenu/styles.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 
 import { tableBackgroundBorderColor } from '@atlaskit/adf-schema';

package/src/ui/FloatingDragMenu/DragMenu.tsx

@@ -3,6 +3,7 @@
 /** @jsxFrag */
 import React, { useEffect, useState } from 'react';
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import type { IntlShape, MessageDescriptor, WrappedComponentProps } from 'react-intl-next';
 import { injectIntl } from 'react-intl-next';
@@ -95,7 +96,7 @@ type DragMenuProps = {
 	tableDuplicateCellColouring?: boolean;
 	shouldUseIncreasedScalingPercent?: boolean;
 	isTableFixedColumnWidthsOptionEnabled?: boolean;
-	tableSortColumnDiscoverability?: boolean;
+	tableSortColumnReorder?: boolean;
 };
 
 type PluralOptionType = 'noOfCols' | 'noOfRows' | 'noOfCells' | null;
@@ -163,7 +164,7 @@ const MapDragMenuOptionIdToMessage: Record<DragMenuOptionIdType, MessageType> =
 	},
 };
 
-const getGroupedDragMenuConfig = (tableSortColumnDiscoverability: boolean) => {
+const getGroupedDragMenuConfig = (tableSortColumnReorder: boolean) => {
 	let groupedDragMenuConfig: DragMenuOptionIdType[][] = [
 		[
 			'add_row_above',
@@ -178,7 +179,7 @@ const getGroupedDragMenuConfig = (tableSortColumnDiscoverability: boolean) => {
 		['move_column_left', 'move_column_right', 'move_row_up', 'move_row_down'],
 	];
 	const sortColumnItems: DragMenuOptionIdType[] = ['sort_column_asc', 'sort_column_desc'];
-	tableSortColumnDiscoverability
+	tableSortColumnReorder
 		? groupedDragMenuConfig.unshift(sortColumnItems)
 		: groupedDragMenuConfig.push(sortColumnItems);
 
@@ -188,10 +189,10 @@ const getGroupedDragMenuConfig = (tableSortColumnDiscoverability: boolean) => {
 const convertToDropdownItems = (
 	dragMenuConfig: DragMenuConfig[],
 	formatMessage: IntlShape['formatMessage'],
-	tableSortColumnDiscoverability: boolean = false,
+	tableSortColumnReorder: boolean = false,
 	selectionRect?: Rect,
 ) => {
-	const groupedDragMenuConfig = getGroupedDragMenuConfig(tableSortColumnDiscoverability);
+	const groupedDragMenuConfig = getGroupedDragMenuConfig(tableSortColumnReorder);
 	let menuItemsArr: MenuItem[][] = [...Array(groupedDragMenuConfig.length)].map(() => []);
 	let menuCallback: { [key: string]: Command } = {};
 	dragMenuConfig.forEach((item) => {
@@ -277,7 +278,7 @@ export const DragMenu = React.memo(
 		tableDuplicateCellColouring,
 		shouldUseIncreasedScalingPercent,
 		isTableFixedColumnWidthsOptionEnabled,
-		tableSortColumnDiscoverability,
+		tableSortColumnReorder,
 	}: DragMenuProps & WrappedComponentProps) => {
 		const { state, dispatch } = editorView;
 		const { selection } = state;
@@ -320,13 +321,13 @@ export const DragMenu = React.memo(
 			tableDuplicateCellColouring,
 			isTableFixedColumnWidthsOptionEnabled,
 			shouldUseIncreasedScalingPercent,
-			tableSortColumnDiscoverability,
+			tableSortColumnReorder,
 		);
 
 		const { menuItems, menuCallback } = convertToDropdownItems(
 			dragMenuConfig,
 			formatMessage,
-			tableSortColumnDiscoverability,
+			tableSortColumnReorder,
 			selectionRect,
 		);
 
@@ -386,7 +387,7 @@ export 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(tableSortColumnDiscoverability)}
+						css={dragMenuBackgroundColorStyles(tableSortColumnReorder)}
 					>
 						<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
@@ -613,7 +614,7 @@ export const DragMenu = React.memo(
 		}
 
 		if (allowBackgroundColor) {
-			tableSortColumnDiscoverability
+			tableSortColumnReorder
 				? menuItems[1].items.unshift(createBackgroundColorMenuItem())
 				: menuItems[0].items.unshift(createBackgroundColorMenuItem());
 		}

package/src/ui/FloatingDragMenu/index.tsx

@@ -73,7 +73,7 @@ const FloatingDragMenu = ({
 	const {
 		tableDuplicateCellColouring = false,
 		tableWithFixedColumnWidthsOption = false,
-		tableSortColumnDiscoverability = false,
+		tableSortColumnReorder = false,
 	} = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
 
 	const shouldUseIncreasedScalingPercent =
@@ -119,7 +119,7 @@ const FloatingDragMenu = ({
 				tableDuplicateCellColouring={tableDuplicateCellColouring}
 				shouldUseIncreasedScalingPercent={shouldUseIncreasedScalingPercent}
 				isTableFixedColumnWidthsOptionEnabled={tableWithFixedColumnWidthsOption}
-				tableSortColumnDiscoverability={tableSortColumnDiscoverability}
+				tableSortColumnReorder={tableSortColumnReorder}
 			/>
 		</Popup>
 	);

package/src/ui/FloatingDragMenu/styles.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 
 import { tableBackgroundBorderColor } from '@atlaskit/adf-schema';
@@ -27,16 +28,14 @@ export const elementBeforeIconStyles = css({
 });
 
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
-export const dragMenuBackgroundColorStyles = (
-	tableSortColumnDiscoverability: boolean = false,
-) => css`
+export const dragMenuBackgroundColorStyles = (tableSortColumnReorder: boolean = false) => 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: ${tableSortColumnDiscoverability
+		top: ${tableSortColumnReorder
 			? TABLE_DRAG_MENU_PADDING_TOP +
 				TABLE_DRAG_MENU_SORT_GROUP_HEIGHT +
 				TABLE_DRAG_MENU_MENU_GROUP_BEFORE_HEIGHT

package/src/ui/TableFloatingControls/RowControls/DragControls.tsx

@@ -10,7 +10,6 @@ import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { token } from '@atlaskit/tokens';
 
@@ -128,30 +127,16 @@ const DragControlsComponent = ({
 
 	const handleMouseMove = useCallback(
 		(e: MouseEvent) => {
-			if (getBooleanFF('platform.editor.explicit-html-element-check')) {
-				const target = e.nativeEvent.target instanceof Element ? e.nativeEvent.target : null;
-				const isParentDragControls = target?.closest(`.${ClassName.DRAG_ROW_CONTROLS}`);
-				const rowIndex = target?.getAttribute('data-start-index');
+			const target = e.nativeEvent.target instanceof Element ? e.nativeEvent.target : null;
+			const isParentDragControls = target?.closest(`.${ClassName.DRAG_ROW_CONTROLS}`);
+			const rowIndex = target?.getAttribute('data-start-index');
 
-				// avoid updating if event target is not related
-				if (!isParentDragControls || !rowIndex) {
-					return;
-				}
-
-				updateCellHoverLocation(Number(rowIndex));
-			} else {
-				const isParentDragControls = (e.nativeEvent.target as Element).closest(
-					`.${ClassName.DRAG_ROW_CONTROLS}`,
-				);
-				const rowIndex = (e.nativeEvent.target as Element).getAttribute('data-start-index');
-
-				// avoid updating if event target is not related
-				if (!isParentDragControls || !rowIndex) {
-					return;
-				}
-
-				updateCellHoverLocation(Number(rowIndex));
+			// avoid updating if event target is not related
+			if (!isParentDragControls || !rowIndex) {
+				return;
 			}
+
+			updateCellHoverLocation(Number(rowIndex));
 		},
 		[updateCellHoverLocation],
 	);

package/src/ui/common-styles.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression */
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 
 import { tableMarginTop, tableSharedStyle } from '@atlaskit/editor-common/styles';

package/src/ui/ui-styles.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- needs mahual remediation */
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
 
 import {

package/src/utils/drag-menu.ts

@@ -162,7 +162,7 @@ export const getDragMenuConfig = (
 	tableDuplicateCellColouring = false,
 	isTableFixedColumnWidthsOptionEnabled = false,
 	shouldUseIncreasedScalingPercent = false,
-	tableSortColumnDiscoverability = false,
+	tableSortColumnReorder = false,
 ): DragMenuConfig[] => {
 	const { selection } = editorView.state;
 	const addOptions =
@@ -394,9 +394,7 @@ export const getDragMenuConfig = (
 	];
 
 	let allConfigs = [...restConfigs];
-	tableSortColumnDiscoverability
-		? allConfigs.unshift(...sortConfigs)
-		: allConfigs.push(...sortConfigs);
+	tableSortColumnReorder ? allConfigs.unshift(...sortConfigs) : allConfigs.push(...sortConfigs);
 
 	return allConfigs.filter(Boolean) as DragMenuConfig[];
 };