@atlaskit/editor-plugin-table 7.25.9 → 7.25.11

package/src/utils/index.ts

@@ -1,23 +1,14 @@
-export {
-	getSelectedColumnIndexes,
-	getSelectedRowIndexes,
-	normalizeSelection,
-	isSelectionUpdated,
-} from './selection';
+export { getSelectedColumnIndexes, getSelectedRowIndexes } from './selection';
 export {
 	findControlsHoverDecoration,
 	createControlsHoverDecoration,
-	createColumnControlsDecoration,
-	createColumnSelectedDecoration,
 	createCellHoverDecoration,
 	updateDecorations,
-	createResizeHandleDecoration,
 	createColumnInsertLine,
 	createColumnLineResize,
 	createRowInsertLine,
 } from './decoration';
 export {
-	isIsolating,
 	containsHeaderColumn,
 	containsHeaderRow,
 	checkIfHeaderColumnEnabled,
@@ -28,13 +19,8 @@ export {
 	tablesHaveDifferentNoOfColumns,
 	tablesHaveDifferentNoOfRows,
 	isTableNested,
-	anyChildCellMergedAcrossRow,
-	supportedHeaderRow,
 } from './nodes';
 export {
-	unwrapContentFromTable,
-	removeTableFromFirstChild,
-	removeTableFromLastChild,
 	transformSliceToRemoveOpenTable,
 	transformSliceToCorrectEmptyTableCells,
 	transformSliceToFixHardBreakProblemOnCopyFromCell,
@@ -47,7 +33,6 @@ export {
 	isTableControlsButton,
 	isTableContainerOrWrapper,
 	isRowControlsButton,
-	isDragRowControlsButton,
 	isDragColumnFloatingInsertDot,
 	isDragRowFloatingInsertDot,
 	isDragCornerButton,
@@ -61,14 +46,11 @@ export {
 export {
 	convertHTMLCellIndexToColumnIndex,
 	getColumnsWidths,
-	isColumnDeleteButtonVisible,
 	getColumnDeleteButtonParams,
-	getColumnClassNames,
 	getColumnIndexMappedToColumnIndexInFirstRow,
 } from './column-controls';
 export {
 	getRowHeights,
-	isRowDeleteButtonVisible,
 	getRowDeleteButtonParams,
 	getRowsParams,
 	getRowClassNames,
@@ -79,11 +61,8 @@ export { getSelectedTableInfo, getSelectedCellInfo } from './analytics';
 export { getMergedCellsPositions, getAssistiveMessage } from './table';
 export { updatePluginStateDecorations } from './update-plugin-state-decorations';
 export {
-	hasMergedCellsInColumn,
-	hasMergedCellsInRow,
 	hasMergedCellsInBetween,
 	hasMergedCellsInSelection,
 	findDuplicatePosition,
-	checkEdgeHasMergedCells,
 } from './merged-cells';
 export { createTableWithWidth } from './create';

package/src/utils/merged-cells.ts

@@ -1,70 +1,8 @@
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
-import type { Rect } from '@atlaskit/editor-tables';
 import { findTable, TableMap } from '@atlaskit/editor-tables';
 
 type MergeType = 'row' | 'column';
 
-const hasMergedCells =
-	(indexes: number | number[], normalizeRect: (index: number, map: TableMap) => Rect) =>
-	(selection: Selection): boolean => {
-		const table = findTable(selection);
-		if (!table) {
-			return false;
-		}
-
-		const map = TableMap.get(table.node);
-		const cellPositions = new Set<number>();
-		const mergedCells = new Set<number>();
-
-		map.map.forEach((value) => {
-			if (cellPositions.has(value)) {
-				mergedCells.add(value);
-			} else {
-				cellPositions.add(value);
-			}
-		});
-
-		if (!mergedCells.size) {
-			return false;
-		}
-
-		return (Array.isArray(indexes) ? indexes : [indexes])
-			.map((index) => normalizeRect(index, map))
-			.filter((rect) => rect.left < rect.right && rect.top < rect.bottom)
-			.some((rect) => {
-				const n = (rect.right - rect.left) * (rect.bottom - rect.top);
-				const cells = map.cellsInRect(rect);
-				if (cells.length !== n) {
-					// We can quickly assume that if the amount of cells from the map is different to what the rect says
-					// then there is most likely merged cells across this area which is removing cells
-					return true;
-				}
-				return cells.some((nodePos) => mergedCells.has(nodePos));
-			});
-	};
-
-export const hasMergedCellsInColumn = (columnIndexes: number | number[]) =>
-	hasMergedCells(columnIndexes, (index: number, map: TableMap) => {
-		const x = Math.max(Math.min(index, map.width - 1), 0); // clamped index
-		return {
-			left: x,
-			right: x === index ? x + 1 : x,
-			top: 0,
-			bottom: map.height,
-		};
-	});
-
-export const hasMergedCellsInRow = (rowIndexes: number | number[]) =>
-	hasMergedCells(rowIndexes, (index: number, map: TableMap) => {
-		const y = Math.max(Math.min(index, map.height - 1), 0); // clamped index
-		return {
-			left: 0,
-			right: map.width,
-			top: y,
-			bottom: y === index ? y + 1 : y,
-		};
-	});
-
 const getRect = (index: number, type: MergeType, map: TableMap) => {
 	if (type === 'column') {
 		const x = Math.max(Math.min(index, map.width - 1), 0); // clamped index

package/src/utils/nodes.ts

@@ -136,7 +136,7 @@ export const isTableNested = (state: EditorState, tablePos = 0): boolean => {
 	);
 };
 
-export const anyChildCellMergedAcrossRow = (node: PmNode): boolean =>
+const anyChildCellMergedAcrossRow = (node: PmNode): boolean =>
 	mapChildren(node, (child) => child.attrs.rowspan || 0).some((rowspan) => rowspan > 1);
 
 /**

package/src/utils/row-controls.ts

@@ -2,14 +2,8 @@ import { parsePx } from '@atlaskit/editor-common/utils';
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import {
-	findTable,
-	getSelectionRect,
-	isRowSelected,
-	isTableSelected,
-} from '@atlaskit/editor-tables/utils';
+import { findTable, getSelectionRect, isRowSelected } from '@atlaskit/editor-tables/utils';
 
 import { TableCssClassName as ClassName } from '../types';
 import { tableDeleteButtonSize } from '../ui/consts';
@@ -41,18 +35,6 @@ export const getRowHeights = (tableRef: HTMLTableElement): number[] => {
 	return heights;
 };
 
-export const isRowDeleteButtonVisible = (selection: Selection): boolean => {
-	if (
-		!isTableSelected(selection) &&
-		selection instanceof CellSelection &&
-		selection.isRowSelection()
-	) {
-		return true;
-	}
-
-	return false;
-};
-
 export const getRowDeleteButtonParams = (
 	rowsHeights: Array<number | undefined>,
 	selection: Selection,

package/src/utils/selection.ts

@@ -1,88 +1,4 @@
-import type { Selection, Transaction } from '@atlaskit/editor-prosemirror/state';
-import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import type { Rect } from '@atlaskit/editor-tables/table-map';
-import { TableMap } from '@atlaskit/editor-tables/table-map';
-import {
-	findTable,
-	getSelectionRangeInColumn,
-	getSelectionRangeInRow,
-	getSelectionRect,
-	isSelectionType,
-} from '@atlaskit/editor-tables/utils';
-
-export const isSelectionUpdated = (oldSelection: Selection, newSelection?: Selection) =>
-	!!(!newSelection && oldSelection) ||
-	isSelectionType(oldSelection, 'cell') !== isSelectionType(newSelection!, 'cell') ||
-	(isSelectionType(oldSelection, 'cell') &&
-		isSelectionType(newSelection!, 'cell') &&
-		oldSelection.ranges !== newSelection!.ranges);
-
-const isRectangularCellSelection = (selection: Selection, rect: Rect): boolean => {
-	const table = findTable(selection);
-	if (!table) {
-		return true;
-	}
-	const { width, height, map } = TableMap.get(table.node);
-
-	let indexTop = rect.top * width + rect.left;
-	let indexLeft = indexTop;
-	let indexBottom = (rect.bottom - 1) * width + rect.left;
-	let indexRight = indexTop + (rect.right - rect.left - 1);
-
-	for (let i = rect.top; i < rect.bottom; i++) {
-		if (
-			(rect.left > 0 && map[indexLeft] === map[indexLeft - 1]) ||
-			(rect.right < width && map[indexRight] === map[indexRight + 1])
-		) {
-			return false;
-		}
-		indexLeft += width;
-		indexRight += width;
-	}
-	for (let i = rect.left; i < rect.right; i++) {
-		if (
-			(rect.top > 0 && map[indexTop] === map[indexTop - width]) ||
-			(rect.bottom < height && map[indexBottom] === map[indexBottom + width])
-		) {
-			return false;
-		}
-		indexTop++;
-		indexBottom++;
-	}
-
-	return true;
-};
-
-export const normalizeSelection = (tr: Transaction): Transaction => {
-	const { selection } = tr;
-	const rect = getSelectionRect(selection);
-
-	if (
-		!rect ||
-		!(selection instanceof CellSelection) ||
-		isRectangularCellSelection(selection, rect)
-	) {
-		return tr;
-	}
-
-	if (selection.isColSelection()) {
-		const $anchor = getSelectionRangeInColumn(rect.left)(tr)?.$anchor;
-		const $head = getSelectionRangeInColumn(rect.right - 1)(tr)?.$head;
-		if ($anchor && $head) {
-			return tr.setSelection(new CellSelection($anchor, $head) as any);
-		}
-	}
-
-	if (selection.isRowSelection()) {
-		const $anchor = getSelectionRangeInRow(rect.top)(tr)?.$anchor;
-		const $head = getSelectionRangeInRow(rect.bottom - 1)(tr)?.$head;
-		if ($anchor && $head) {
-			return tr.setSelection(new CellSelection($anchor, $head) as any);
-		}
-	}
-
-	return tr;
-};
 
 export const getSelectedColumnIndexes = (selectionRect: Rect): number[] => {
 	const columnIndexes: number[] = [];

package/src/utils/table.ts

@@ -3,7 +3,6 @@ import type { IntlShape } from 'react-intl-next';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-import type { Rect } from '@atlaskit/editor-tables/table-map';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 
@@ -28,13 +27,6 @@ export const getMergedCellsPositions = (tr: Transaction): number[] => {
 	return mergedCells;
 };
 
-export const colsToRect = (cols: Array<number>, noOfRows: number): Rect => ({
-	left: Math.min(...cols),
-	right: Math.max(...cols) + 1,
-	top: 0,
-	bottom: noOfRows,
-});
-
 export const getAssistiveMessage = (
 	prevTableNode: PmNode,
 	currentTableNode: PmNode,

package/dist/cjs/utils/transforms.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.combineTransforms = void 0;
-var combineTransforms = exports.combineTransforms = function combineTransforms(transforms, tr) {
-  return transforms.reduce(function (prev, curr) {
-    return curr(prev);
-  }, tr);
-};

package/dist/es2019/utils/transforms.js

@@ -1,5 +0,0 @@
-export const combineTransforms = (transforms, tr) => {
-  return transforms.reduce((prev, curr) => {
-    return curr(prev);
-  }, tr);
-};

package/dist/esm/utils/transforms.js

@@ -1,5 +0,0 @@
-export var combineTransforms = function combineTransforms(transforms, tr) {
-  return transforms.reduce(function (prev, curr) {
-    return curr(prev);
-  }, tr);
-};

package/dist/types/utils/transforms.d.ts

@@ -1,2 +0,0 @@
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const combineTransforms: (transforms: ((tr: Transaction) => Transaction)[], tr: Transaction) => Transaction;

package/dist/types-ts4.5/utils/transforms.d.ts

@@ -1,2 +0,0 @@
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const combineTransforms: (transforms: ((tr: Transaction) => Transaction)[], tr: Transaction) => Transaction;

package/src/utils/transforms.ts

@@ -1,10 +0,0 @@
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-
-export const combineTransforms = (
-	transforms: Array<(tr: Transaction) => Transaction>,
-	tr: Transaction,
-) => {
-	return transforms.reduce((prev, curr) => {
-		return curr(prev);
-	}, tr);
-};