@atlaskit/editor-plugin-table 7.16.13 → 7.16.15

package/src/transforms/delete-columns.ts

@@ -240,7 +240,13 @@ function fixRowSpans(table: PMNode): PMNode | null {
 }
 
 export const deleteColumns =
-	(rect: Rect, allowCustomStep: boolean, view?: EditorView, isTableScalingEnabled = false) =>
+	(
+		rect: Rect,
+		allowCustomStep: boolean,
+		view?: EditorView,
+		isTableScalingEnabled = false,
+		shouldUseIncreasedScalingPercent = false,
+	) =>
 	(tr: Transaction) => {
 		let updatedTr = tr;
 		updatedTr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {
@@ -255,7 +261,10 @@ export const deleteColumns =
 		const table = findTable(updatedTr.selection);
 
 		if (table) {
-			updatedTr = rescaleColumns(isTableScalingEnabled)(table, view)(updatedTr);
+			updatedTr = rescaleColumns(isTableScalingEnabled, shouldUseIncreasedScalingPercent)(
+				table,
+				view,
+			)(updatedTr);
 		}
 		return updatedTr;
 	};

package/src/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -35,6 +35,7 @@ import { splitCell } from '@atlaskit/editor-tables/utils';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import EditorBackgroundColorIcon from '@atlaskit/icon/glyph/editor/background-color';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 import {
 	clearHoverSelection,
@@ -510,6 +511,11 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 			? getEditorFeatureFlags()
 			: {};
 
+		const shouldUseIncreasedScalingPercent =
+			isTableScalingEnabled &&
+			getBooleanFF('platform.editor.table.preserve-widths-with-lock-button') &&
+			getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+
 		switch (item.value.name) {
 			case 'sort_column_desc':
 				sortColumnWithAnalytics(editorAnalyticsAPI)(
@@ -564,6 +570,7 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 					editorAnalyticsAPI,
 					isTableScalingEnabled,
 					tableDuplicateCellColouring,
+					shouldUseIncreasedScalingPercent,
 				)(INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
 				this.toggleOpen();
 				break;
@@ -578,11 +585,11 @@ export class ContextualMenu extends Component<Props & WrappedComponentProps, Sta
 				this.toggleOpen();
 				break;
 			case 'delete_column':
-				deleteColumnsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.CONTEXT_MENU, selectionRect)(
-					state,
-					dispatch,
-					editorView,
-				);
+				deleteColumnsWithAnalytics(
+					editorAnalyticsAPI,
+					isTableScalingEnabled,
+					shouldUseIncreasedScalingPercent,
+				)(INPUT_METHOD.CONTEXT_MENU, selectionRect)(state, dispatch, editorView);
 				this.toggleOpen();
 				break;
 			case 'delete_row':

package/src/ui/FloatingDragMenu/DragMenu.tsx

@@ -93,6 +93,7 @@ type DragMenuProps = {
 	scrollableElement?: HTMLElement;
 	isTableScalingEnabled?: boolean;
 	tableDuplicateCellColouring?: boolean;
+	shouldUseIncreasedScalingPercent?: boolean;
 };
 
 type PluralOptionType = 'noOfCols' | 'noOfRows' | 'noOfCells' | null;
@@ -261,6 +262,7 @@ export const DragMenu = React.memo(
 		boundariesElement,
 		isTableScalingEnabled,
 		tableDuplicateCellColouring,
+		shouldUseIncreasedScalingPercent,
 	}: DragMenuProps & WrappedComponentProps) => {
 		const { state, dispatch } = editorView;
 		const { selection } = state;
@@ -301,6 +303,7 @@ export const DragMenu = React.memo(
 			pluginConfig?.isHeaderRowRequired,
 			isTableScalingEnabled,
 			tableDuplicateCellColouring,
+			shouldUseIncreasedScalingPercent,
 		);
 
 		const { menuItems, menuCallback } = convertToDropdownItems(

package/src/ui/FloatingDragMenu/index.tsx

@@ -10,6 +10,7 @@ import {
 	akEditorFloatingOverlapPanelZIndex,
 } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
 import type { PluginConfig, TableDirection } from '../../types';
@@ -73,6 +74,11 @@ const FloatingDragMenu = ({
 		? getEditorFeatureFlags()
 		: {};
 
+	const shouldUseIncreasedScalingPercent =
+		isTableScalingEnabled &&
+		getBooleanFF('platform.editor.table.preserve-widths-with-lock-button') &&
+		getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+
 	return (
 		<Popup
 			alignX={direction === 'row' ? 'right' : undefined}
@@ -109,6 +115,7 @@ const FloatingDragMenu = ({
 				scrollableElement={scrollableElement}
 				isTableScalingEnabled={isTableScalingEnabled}
 				tableDuplicateCellColouring={tableDuplicateCellColouring}
+				shouldUseIncreasedScalingPercent={shouldUseIncreasedScalingPercent}
 			/>
 		</Popup>
 	);

package/src/ui/FloatingInsertButton/index.tsx

@@ -25,6 +25,7 @@ import { akEditorTableCellOnStickyHeaderZIndex } from '@atlaskit/editor-shared-s
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../commands-with-analytics';
 import { getPluginState } from '../../pm-plugins/plugin-factory';
@@ -263,6 +264,11 @@ export class FloatingInsertButton extends React.Component<Props & WrappedCompone
 
 			const { isTableScalingEnabled = false } = getPluginState(editorView.state);
 
+			const shouldUseIncreasedScalingPercent =
+				isTableScalingEnabled &&
+				getBooleanFF('platform.editor.table.preserve-widths-with-lock-button') &&
+				getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+
 			const { tableDuplicateCellColouring = false } = getEditorFeatureFlags
 				? getEditorFeatureFlags()
 				: {};
@@ -272,6 +278,7 @@ export class FloatingInsertButton extends React.Component<Props & WrappedCompone
 				editorAnalyticsAPI,
 				isTableScalingEnabled,
 				tableDuplicateCellColouring,
+				shouldUseIncreasedScalingPercent,
 			)(INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
 		}
 	}

package/src/utils/drag-menu.ts

@@ -160,6 +160,7 @@ export const getDragMenuConfig = (
 	isHeaderRowRequired?: boolean,
 	isTableScalingEnabled = false,
 	tableDuplicateCellColouring = false,
+	shouldUseIncreasedScalingPercent = false,
 ): DragMenuConfig[] => {
 	const addOptions =
 		direction === 'row'
@@ -271,6 +272,7 @@ export const getDragMenuConfig = (
 						editorAnalyticsAPI,
 						isTableScalingEnabled,
 						tableDuplicateCellColouring,
+						shouldUseIncreasedScalingPercent,
 					)(INPUT_METHOD.TABLE_CONTEXT_MENU, (index ?? 0) + offset)(state, dispatch, editorView);
 				}
 				return true;