@ckeditor/ckeditor5-table 31.1.0 → 34.0.0

package/src/commands/inserttablecommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -8,7 +8,6 @@
  */
 
 import { Command } from 'ckeditor5/src/core';
-import { findOptimalInsertionRange } from 'ckeditor5/src/widget';
 
 /**
  * The insert table command.
@@ -51,12 +50,9 @@ export default class InsertTableCommand extends Command {
 	 */
 	execute( options = {} ) {
 		const model = this.editor.model;
-		const selection = model.document.selection;
 		const tableUtils = this.editor.plugins.get( 'TableUtils' );
 		const config = this.editor.config.get( 'table' );
 
-		const insertionRange = findOptimalInsertionRange( selection, model );
-
 		const defaultRows = config.defaultHeadings.rows;
 		const defaultColumns = config.defaultHeadings.columns;
 
@@ -71,7 +67,7 @@ export default class InsertTableCommand extends Command {
 		model.change( writer => {
 			const table = tableUtils.createTable( writer, options );
 
-			model.insertContent( table, insertionRange );
+			model.insertObject( table, null, null, { findOptimalPosition: 'auto' } );
 
 			writer.setSelection( writer.createPositionAt( table.getNodeByPath( [ 0, 0, 0 ] ), 0 ) );
 		} );

package/src/commands/mergecellcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -9,7 +9,6 @@
 
 import { Command } from 'ckeditor5/src/core';
 import TableWalker from '../tablewalker';
-import { getTableCellsContainingSelection } from '../utils/selection';
 import { isHeadingColumnCell } from '../utils/common';
 import { removeEmptyRowsColumns } from '../utils/structure';
 
@@ -80,7 +79,8 @@ export default class MergeCellCommand extends Command {
 	execute() {
 		const model = this.editor.model;
 		const doc = model.document;
-		const tableCell = getTableCellsContainingSelection( doc.selection )[ 0 ];
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const tableCell = tableUtils.getTableCellsContainingSelection( doc.selection )[ 0 ];
 
 		const cellToMerge = this.value;
 		const direction = this.direction;
@@ -122,14 +122,13 @@ export default class MergeCellCommand extends Command {
 	_getMergeableCell() {
 		const model = this.editor.model;
 		const doc = model.document;
-		const tableCell = getTableCellsContainingSelection( doc.selection )[ 0 ];
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const tableCell = tableUtils.getTableCellsContainingSelection( doc.selection )[ 0 ];
 
 		if ( !tableCell ) {
 			return;
 		}
 
-		const tableUtils = this.editor.plugins.get( 'TableUtils' );
-
 		// First get the cell on proper direction.
 		const cellToMerge = this.isHorizontal ?
 			getHorizontalCell( tableCell, this.direction, tableUtils ) :

package/src/commands/mergecellscommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -9,7 +9,6 @@
 
 import { Command } from 'ckeditor5/src/core';
 import TableUtils from '../tableutils';
-import { getSelectedTableCells, isSelectionRectangular } from '../utils/selection';
 import { updateNumericAttribute } from '../utils/common';
 import { removeEmptyRowsColumns } from '../utils/structure';
 
@@ -29,8 +28,10 @@ export default class MergeCellsCommand extends Command {
 	 * @inheritDoc
 	 */
 	refresh() {
-		const selectedTableCells = getSelectedTableCells( this.editor.model.document.selection );
-		this.isEnabled = isSelectionRectangular( selectedTableCells, this.editor.plugins.get( TableUtils ) );
+		const tableUtils = this.editor.plugins.get( TableUtils );
+
+		const selectedTableCells = tableUtils.getSelectedTableCells( this.editor.model.document.selection );
+		this.isEnabled = tableUtils.isSelectionRectangular( selectedTableCells, this.editor.plugins.get( TableUtils ) );
 	}
 
 	/**
@@ -43,7 +44,7 @@ export default class MergeCellsCommand extends Command {
 		const tableUtils = this.editor.plugins.get( TableUtils );
 
 		model.change( writer => {
-			const selectedTableCells = getSelectedTableCells( model.document.selection );
+			const selectedTableCells = tableUtils.getSelectedTableCells( model.document.selection );
 
 			// All cells will be merged into the first one.
 			const firstTableCell = selectedTableCells.shift();

package/src/commands/removecolumncommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -10,7 +10,6 @@
 import { Command } from 'ckeditor5/src/core';
 
 import TableWalker from '../tablewalker';
-import { getColumnIndexes, getSelectionAffectedTableCells } from '../utils/selection';
 
 /**
  * The remove column command.
@@ -28,14 +27,15 @@ export default class RemoveColumnCommand extends Command {
 	 * @inheritDoc
 	 */
 	refresh() {
-		const selectedCells = getSelectionAffectedTableCells( this.editor.model.document.selection );
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( this.editor.model.document.selection );
 		const firstCell = selectedCells[ 0 ];
 
 		if ( firstCell ) {
 			const table = firstCell.findAncestor( 'table' );
-			const tableColumnCount = this.editor.plugins.get( 'TableUtils' ).getColumns( table );
+			const tableColumnCount = tableUtils.getColumns( table );
 
-			const { first, last } = getColumnIndexes( selectedCells );
+			const { first, last } = tableUtils.getColumnIndexes( selectedCells );
 
 			this.isEnabled = last - first < ( tableColumnCount - 1 );
 		} else {
@@ -47,7 +47,8 @@ export default class RemoveColumnCommand extends Command {
 	 * @inheritDoc
 	 */
 	execute() {
-		const [ firstCell, lastCell ] = getBoundaryCells( this.editor.model.document.selection );
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const [ firstCell, lastCell ] = getBoundaryCells( this.editor.model.document.selection, tableUtils );
 		const table = firstCell.parent.parent;
 
 		// Cache the table before removing or updating colspans.
@@ -111,8 +112,8 @@ function getCellToFocus( tableMap, firstCell, lastCell, removedColumnIndexes ) {
 }
 
 // Returns helper object returning the first and the last cell contained in given selection, based on DOM order.
-function getBoundaryCells( selection ) {
-	const referenceCells = getSelectionAffectedTableCells( selection );
+function getBoundaryCells( selection, tableUtils ) {
+	const referenceCells = tableUtils.getSelectionAffectedTableCells( selection );
 	const firstCell = referenceCells[ 0 ];
 	const lastCell = referenceCells.pop();
 

package/src/commands/removerowcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -9,8 +9,6 @@
 
 import { Command } from 'ckeditor5/src/core';
 
-import { getRowIndexes, getSelectionAffectedTableCells } from '../utils/selection';
-
 /**
  * The remove row command.
  *
@@ -27,7 +25,8 @@ export default class RemoveRowCommand extends Command {
 	 * @inheritDoc
 	 */
 	refresh() {
-		const selectedCells = getSelectionAffectedTableCells( this.editor.model.document.selection );
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( this.editor.model.document.selection );
 		const firstCell = selectedCells[ 0 ];
 
 		if ( firstCell ) {
@@ -35,7 +34,7 @@ export default class RemoveRowCommand extends Command {
 			const tableRowCount = this.editor.plugins.get( 'TableUtils' ).getRows( table );
 			const lastRowIndex = tableRowCount - 1;
 
-			const selectedRowIndexes = getRowIndexes( selectedCells );
+			const selectedRowIndexes = tableUtils.getRowIndexes( selectedCells );
 
 			const areAllRowsSelected = selectedRowIndexes.first === 0 && selectedRowIndexes.last === lastRowIndex;
 
@@ -53,8 +52,8 @@ export default class RemoveRowCommand extends Command {
 		const model = this.editor.model;
 		const tableUtils = this.editor.plugins.get( 'TableUtils' );
 
-		const referenceCells = getSelectionAffectedTableCells( model.document.selection );
-		const removedRowIndexes = getRowIndexes( referenceCells );
+		const referenceCells = tableUtils.getSelectionAffectedTableCells( model.document.selection );
+		const removedRowIndexes = tableUtils.getRowIndexes( referenceCells );
 
 		const firstCell = referenceCells[ 0 ];
 		const table = firstCell.findAncestor( 'table' );

package/src/commands/selectcolumncommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -10,7 +10,6 @@
 import { Command } from 'ckeditor5/src/core';
 
 import TableWalker from '../tablewalker';
-import { getSelectionAffectedTableCells } from '../utils/selection';
 
 /**
  * The select column command.
@@ -38,7 +37,8 @@ export default class SelectColumnCommand extends Command {
 	 * @inheritDoc
 	 */
 	refresh() {
-		const selectedCells = getSelectionAffectedTableCells( this.editor.model.document.selection );
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( this.editor.model.document.selection );
 
 		this.isEnabled = selectedCells.length > 0;
 	}
@@ -47,13 +47,13 @@ export default class SelectColumnCommand extends Command {
 	 * @inheritDoc
 	 */
 	execute() {
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
 		const model = this.editor.model;
-		const referenceCells = getSelectionAffectedTableCells( model.document.selection );
+		const referenceCells = tableUtils.getSelectionAffectedTableCells( model.document.selection );
 		const firstCell = referenceCells[ 0 ];
 		const lastCell = referenceCells.pop();
 		const table = firstCell.findAncestor( 'table' );
 
-		const tableUtils = this.editor.plugins.get( 'TableUtils' );
 		const startLocation = tableUtils.getCellLocation( firstCell );
 		const endLocation = tableUtils.getCellLocation( lastCell );
 

package/src/commands/selectrowcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -9,8 +9,6 @@
 
 import { Command } from 'ckeditor5/src/core';
 
-import { getRowIndexes, getSelectionAffectedTableCells } from '../utils/selection';
-
 /**
  * The select row command.
  *
@@ -37,7 +35,8 @@ export default class SelectRowCommand extends Command {
 	 * @inheritDoc
 	 */
 	refresh() {
-		const selectedCells = getSelectionAffectedTableCells( this.editor.model.document.selection );
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( this.editor.model.document.selection );
 
 		this.isEnabled = selectedCells.length > 0;
 	}
@@ -47,8 +46,9 @@ export default class SelectRowCommand extends Command {
 	 */
 	execute() {
 		const model = this.editor.model;
-		const referenceCells = getSelectionAffectedTableCells( model.document.selection );
-		const rowIndexes = getRowIndexes( referenceCells );
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const referenceCells = tableUtils.getSelectionAffectedTableCells( model.document.selection );
+		const rowIndexes = tableUtils.getRowIndexes( referenceCells );
 
 		const table = referenceCells[ 0 ].findAncestor( 'table' );
 		const rangesToSelect = [];

package/src/commands/setheadercolumncommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -13,7 +13,6 @@ import {
 	isHeadingColumnCell,
 	updateNumericAttribute
 } from '../utils/common';
-import { getColumnIndexes, getSelectionAffectedTableCells } from '../utils/selection';
 import { getHorizontallyOverlappingCells, splitVertically } from '../utils/structure';
 
 /**
@@ -37,8 +36,9 @@ export default class SetHeaderColumnCommand extends Command {
 	 */
 	refresh() {
 		const model = this.editor.model;
-		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
 		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( model.document.selection );
 		const isInTable = selectedCells.length > 0;
 
 		this.isEnabled = isInTable;
@@ -71,11 +71,12 @@ export default class SetHeaderColumnCommand extends Command {
 			return;
 		}
 
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
 		const model = this.editor.model;
-		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( model.document.selection );
 		const table = selectedCells[ 0 ].findAncestor( 'table' );
 
-		const { first, last } = getColumnIndexes( selectedCells );
+		const { first, last } = tableUtils.getColumnIndexes( selectedCells );
 		const headingColumnsToSet = this.value ? first : last + 1;
 
 		model.change( writer => {

package/src/commands/setheaderrowcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -10,7 +10,6 @@
 import { Command } from 'ckeditor5/src/core';
 
 import { updateNumericAttribute } from '../utils/common';
-import { getRowIndexes, getSelectionAffectedTableCells } from '../utils/selection';
 import { getVerticallyOverlappingCells, splitHorizontally } from '../utils/structure';
 
 /**
@@ -32,8 +31,9 @@ export default class SetHeaderRowCommand extends Command {
 	 * @inheritDoc
 	 */
 	refresh() {
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
 		const model = this.editor.model;
-		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( model.document.selection );
 		const isInTable = selectedCells.length > 0;
 
 		this.isEnabled = isInTable;
@@ -65,11 +65,14 @@ export default class SetHeaderRowCommand extends Command {
 		if ( options.forceValue === this.value ) {
 			return;
 		}
+
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
 		const model = this.editor.model;
-		const selectedCells = getSelectionAffectedTableCells( model.document.selection );
+
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( model.document.selection );
 		const table = selectedCells[ 0 ].findAncestor( 'table' );
 
-		const { first, last } = getRowIndexes( selectedCells );
+		const { first, last } = tableUtils.getRowIndexes( selectedCells );
 		const headingRowsToSet = this.value ? first : last + 1;
 		const currentHeadingRows = table.getAttribute( 'headingRows' ) || 0;
 

package/src/commands/splitcellcommand.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
@@ -8,7 +8,6 @@
  */
 
 import { Command } from 'ckeditor5/src/core';
-import { getSelectionAffectedTableCells } from '../utils/selection';
 
 /**
  * The split cell command.
@@ -46,7 +45,8 @@ export default class SplitCellCommand extends Command {
 	 * @inheritDoc
 	 */
 	refresh() {
-		const selectedCells = getSelectionAffectedTableCells( this.editor.model.document.selection );
+		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const selectedCells = tableUtils.getSelectionAffectedTableCells( this.editor.model.document.selection );
 
 		this.isEnabled = selectedCells.length === 1;
 	}
@@ -55,9 +55,9 @@ export default class SplitCellCommand extends Command {
 	 * @inheritDoc
 	 */
 	execute() {
-		const tableCell = getSelectionAffectedTableCells( this.editor.model.document.selection )[ 0 ];
-		const isHorizontal = this.direction === 'horizontally';
 		const tableUtils = this.editor.plugins.get( 'TableUtils' );
+		const tableCell = tableUtils.getSelectionAffectedTableCells( this.editor.model.document.selection )[ 0 ];
+		const isHorizontal = this.direction === 'horizontally';
 
 		if ( isHorizontal ) {
 			tableUtils.splitCellHorizontally( tableCell, 2 );