@ckeditor/ckeditor5-table 31.0.0 → 33.0.0

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 );