@ckeditor/ckeditor5-table 45.2.1 → 46.0.0-alpha.0

package/src/tableproperties/tablepropertiesediting.js

@@ -6,16 +6,16 @@
  * @module table/tableproperties/tablepropertiesediting
  */
 import { Plugin } from 'ckeditor5/src/core.js';
-import { addBackgroundRules, addBorderRules } from 'ckeditor5/src/engine.js';
-import TableEditing from '../tableediting.js';
+import { addBackgroundStylesRules, addBorderStylesRules } from 'ckeditor5/src/engine.js';
+import { TableEditing } from '../tableediting.js';
 import { downcastAttributeToStyle, downcastTableAttribute, getDefaultValueAdjusted, upcastBorderStyles, upcastStyleToAttribute } from '../converters/tableproperties.js';
-import TableBackgroundColorCommand from './commands/tablebackgroundcolorcommand.js';
-import TableBorderColorCommand from './commands/tablebordercolorcommand.js';
-import TableBorderStyleCommand from './commands/tableborderstylecommand.js';
-import TableBorderWidthCommand from './commands/tableborderwidthcommand.js';
-import TableWidthCommand from './commands/tablewidthcommand.js';
-import TableHeightCommand from './commands/tableheightcommand.js';
-import TableAlignmentCommand from './commands/tablealignmentcommand.js';
+import { TableBackgroundColorCommand } from './commands/tablebackgroundcolorcommand.js';
+import { TableBorderColorCommand } from './commands/tablebordercolorcommand.js';
+import { TableBorderStyleCommand } from './commands/tableborderstylecommand.js';
+import { TableBorderWidthCommand } from './commands/tableborderwidthcommand.js';
+import { TableWidthCommand } from './commands/tablewidthcommand.js';
+import { TableHeightCommand } from './commands/tableheightcommand.js';
+import { TableAlignmentCommand } from './commands/tablealignmentcommand.js';
 import { getNormalizedDefaultTableProperties } from '../utils/table-properties.js';
 const ALIGN_VALUES_REG_EXP = /^(left|center|right)$/;
 const FLOAT_VALUES_REG_EXP = /^(left|none|right)$/;
@@ -36,7 +36,7 @@ const FLOAT_VALUES_REG_EXP = /^(left|none|right)$/;
  * - horizontal alignment: `'tableAlignment'`
  * - width & height: `'tableWidth'` & `'tableHeight'`
  */
-export default class TablePropertiesEditing extends Plugin {
+export class TablePropertiesEditing extends Plugin {
     /**
      * @inheritDoc
      */
@@ -66,7 +66,7 @@ export default class TablePropertiesEditing extends Plugin {
         const defaultTableProperties = getNormalizedDefaultTableProperties(editor.config.get('table.tableProperties.defaultProperties'), {
             includeAlignmentProperty: true
         });
-        editor.data.addStyleProcessorRules(addBorderRules);
+        editor.data.addStyleProcessorRules(addBorderStylesRules);
         enableBorderProperties(schema, conversion, {
             color: defaultTableProperties.borderColor,
             style: defaultTableProperties.borderStyle,
@@ -80,19 +80,25 @@ export default class TablePropertiesEditing extends Plugin {
         enableTableToFigureProperty(schema, conversion, {
             modelAttribute: 'tableWidth',
             styleName: 'width',
+            attributeName: 'width',
+            attributeType: 'length',
             defaultValue: defaultTableProperties.width
         });
         editor.commands.add('tableWidth', new TableWidthCommand(editor, defaultTableProperties.width));
         enableTableToFigureProperty(schema, conversion, {
             modelAttribute: 'tableHeight',
             styleName: 'height',
+            attributeName: 'height',
+            attributeType: 'length',
             defaultValue: defaultTableProperties.height
         });
         editor.commands.add('tableHeight', new TableHeightCommand(editor, defaultTableProperties.height));
-        editor.data.addStyleProcessorRules(addBackgroundRules);
+        editor.data.addStyleProcessorRules(addBackgroundStylesRules);
         enableProperty(schema, conversion, {
             modelAttribute: 'tableBackgroundColor',
             styleName: 'background-color',
+            attributeName: 'bgcolor',
+            attributeType: 'color',
             defaultValue: defaultTableProperties.backgroundColor
         });
         editor.commands.add('tableBackgroundColor', new TableBackgroundColorCommand(editor, defaultTableProperties.backgroundColor));
@@ -115,6 +121,9 @@ function enableBorderProperties(schema, conversion, defaultBorder) {
     schema.extend('table', {
         allowAttributes: Object.values(modelAttributes)
     });
+    for (const modelAttribute of Object.values(modelAttributes)) {
+        schema.setAttributeProperties(modelAttribute, { isFormatting: true });
+    }
     upcastBorderStyles(conversion, 'table', modelAttributes, defaultBorder);
     downcastTableAttribute(conversion, { modelAttribute: modelAttributes.color, styleName: 'border-color' });
     downcastTableAttribute(conversion, { modelAttribute: modelAttributes.style, styleName: 'border-style' });
@@ -129,6 +138,7 @@ function enableAlignmentProperty(schema, conversion, defaultValue) {
     schema.extend('table', {
         allowAttributes: ['tableAlignment']
     });
+    schema.setAttributeProperties('tableAlignment', { isFormatting: true });
     conversion.for('downcast')
         .attributeToAttribute({
         model: {
@@ -177,13 +187,21 @@ function enableAlignmentProperty(schema, conversion, defaultValue) {
         model: {
             key: 'tableAlignment',
             value: (viewElement, conversionApi, data) => {
+                // Ignore other figure elements.
+                if (viewElement.name == 'figure' && !viewElement.hasClass('table')) {
+                    return;
+                }
                 const localDefaultValue = getDefaultValueAdjusted(defaultValue, '', data);
                 let align = viewElement.getStyle('float');
                 // CSS: `float:none` => Model: `alignment:center`.
                 if (align === 'none') {
                     align = 'center';
                 }
-                return align === localDefaultValue ? null : align;
+                if (align !== localDefaultValue) {
+                    return align;
+                }
+                // Consume the style even if not applied to the element so it won't be processed by other converters.
+                conversionApi.consumable.consume(viewElement, { styles: 'float' });
             }
         }
     })
@@ -199,26 +217,38 @@ function enableAlignmentProperty(schema, conversion, defaultValue) {
         model: {
             key: 'tableAlignment',
             value: (viewElement, conversionApi, data) => {
+                // Ignore other figure elements.
+                if (viewElement.name == 'figure' && !viewElement.hasClass('table')) {
+                    return;
+                }
                 const localDefaultValue = getDefaultValueAdjusted(defaultValue, '', data);
                 const align = 'center';
-                return align === localDefaultValue ? null : align;
+                if (align !== localDefaultValue) {
+                    return align;
+                }
+                // Consume the styles even if not applied to the element so it won't be processed by other converters.
+                conversionApi.consumable.consume(viewElement, { styles: ['margin-left', 'margin-right'] });
             }
         }
     })
         // Support for the `align` attribute as the backward compatibility while pasting from other sources.
         .attributeToAttribute({
         view: {
+            name: 'table',
             attributes: {
                 align: ALIGN_VALUES_REG_EXP
             }
         },
         model: {
-            name: 'table',
             key: 'tableAlignment',
             value: (viewElement, conversionApi, data) => {
                 const localDefaultValue = getDefaultValueAdjusted(defaultValue, '', data);
                 const align = viewElement.getAttribute('align');
-                return align === localDefaultValue ? null : align;
+                if (align !== localDefaultValue) {
+                    return align;
+                }
+                // Consume the attribute even if not applied to the element so it won't be processed by other converters.
+                conversionApi.consumable.consume(viewElement, { attributes: 'align' });
             }
         }
     });
@@ -233,6 +263,7 @@ function enableProperty(schema, conversion, options) {
     schema.extend('table', {
         allowAttributes: [modelAttribute]
     });
+    schema.setAttributeProperties(modelAttribute, { isFormatting: true });
     upcastStyleToAttribute(conversion, { viewElement: 'table', ...options });
     downcastTableAttribute(conversion, options);
 }
@@ -244,10 +275,7 @@ function enableTableToFigureProperty(schema, conversion, options) {
     schema.extend('table', {
         allowAttributes: [modelAttribute]
     });
-    upcastStyleToAttribute(conversion, {
-        viewElement: /^(table|figure)$/,
-        shouldUpcast: (element) => !(element.name == 'table' && element.parent.name == 'figure'),
-        ...options
-    });
+    schema.setAttributeProperties(modelAttribute, { isFormatting: true });
+    upcastStyleToAttribute(conversion, { viewElement: /^(table|figure)$/, ...options });
     downcastAttributeToStyle(conversion, { modelElement: 'table', ...options });
 }

package/src/tableproperties/tablepropertiesui.d.ts

@@ -7,14 +7,14 @@
  */
 import { Plugin, type Editor } from 'ckeditor5/src/core.js';
 import { ButtonView, ContextualBalloon } from 'ckeditor5/src/ui.js';
-import TablePropertiesView from './ui/tablepropertiesview.js';
+import { TablePropertiesView } from './ui/tablepropertiesview.js';
 /**
  * The table properties UI plugin. It introduces the `'tableProperties'` button
  * that opens a form allowing to specify visual styling of an entire table.
  *
  * It uses the {@link module:ui/panel/balloon/contextualballoon~ContextualBalloon contextual balloon plugin}.
  */
-export default class TablePropertiesUI extends Plugin {
+export declare class TablePropertiesUI extends Plugin {
     /**
      * The default table properties.
      */

package/src/tableproperties/tablepropertiesui.js

@@ -9,7 +9,7 @@ import { Plugin } from 'ckeditor5/src/core.js';
 import { IconTableProperties } from 'ckeditor5/src/icons.js';
 import { ButtonView, ContextualBalloon, clickOutsideHandler, getLocalizedColorOptions, normalizeColorOptions } from 'ckeditor5/src/ui.js';
 import { debounce } from 'es-toolkit/compat';
-import TablePropertiesView from './ui/tablepropertiesview.js';
+import { TablePropertiesView } from './ui/tablepropertiesview.js';
 import { colorFieldValidator, getLocalizedColorErrorText, getLocalizedLengthErrorText, lengthFieldValidator, lineWidthFieldValidator, defaultColors } from '../utils/ui/table-properties.js';
 import { getSelectionAffectedTableWidget } from '../utils/ui/widget.js';
 import { getBalloonTablePositionData, repositionContextualBalloon } from '../utils/ui/contextualballoon.js';
@@ -31,7 +31,7 @@ const propertyToCommandMap = {
  *
  * It uses the {@link module:ui/panel/balloon/contextualballoon~ContextualBalloon contextual balloon plugin}.
  */
-export default class TablePropertiesUI extends Plugin {
+export class TablePropertiesUI extends Plugin {
     /**
      * The default table properties.
      */

package/src/tableproperties/ui/tablepropertiesview.d.ts

@@ -7,7 +7,7 @@
  */
 import { ButtonView, FocusCycler, LabeledFieldView, ToolbarView, View, ViewCollection, type DropdownView, type InputTextView, type NormalizedColorOption, type ColorPickerConfig, type FocusableView } from 'ckeditor5/src/ui.js';
 import { FocusTracker, KeystrokeHandler, type Locale } from 'ckeditor5/src/utils.js';
-import type ColorInputView from '../../ui/colorinputview.js';
+import { type ColorInputView } from '../../ui/colorinputview.js';
 import type { TablePropertiesOptions } from '../../tableconfig.js';
 import '@ckeditor/ckeditor5-ui/theme/components/form/form.css';
 import '../../../theme/formrow.css';
@@ -40,7 +40,7 @@ export interface TablePropertiesViewOptions {
  * The class representing a table properties form, allowing users to customize
  * certain style aspects of a table, for instance, border, background color, alignment, etc..
  */
-export default class TablePropertiesView extends View {
+export declare class TablePropertiesView extends View {
     /**
      * The value of the border style.
      *

package/src/tableproperties/ui/tablepropertiesview.js

@@ -18,7 +18,7 @@ import '../../../theme/tableproperties.css';
  * The class representing a table properties form, allowing users to customize
  * certain style aspects of a table, for instance, border, background color, alignment, etc..
  */
-export default class TablePropertiesView extends View {
+export class TablePropertiesView extends View {
     /**
      * Options passed to the view. See {@link #constructor} to learn more.
      */

package/src/tableproperties.d.ts

@@ -6,8 +6,8 @@
  * @module table/tableproperties
  */
 import { Plugin } from 'ckeditor5/src/core.js';
-import TablePropertiesEditing from './tableproperties/tablepropertiesediting.js';
-import TablePropertiesUI from './tableproperties/tablepropertiesui.js';
+import { TablePropertiesEditing } from './tableproperties/tablepropertiesediting.js';
+import { TablePropertiesUI } from './tableproperties/tablepropertiesui.js';
 /**
  * The table properties feature. Enables support for setting properties of tables (size, border, background, etc.).
  *
@@ -18,7 +18,7 @@ import TablePropertiesUI from './tableproperties/tablepropertiesui.js';
  * {@link module:table/tableproperties/tablepropertiesediting~TablePropertiesEditing table properties editing feature} and
  * the {@link module:table/tableproperties/tablepropertiesui~TablePropertiesUI table properties UI feature}.
  */
-export default class TableProperties extends Plugin {
+export declare class TableProperties extends Plugin {
     /**
      * @inheritDoc
      */

package/src/tableproperties.js

@@ -6,8 +6,8 @@
  * @module table/tableproperties
  */
 import { Plugin } from 'ckeditor5/src/core.js';
-import TablePropertiesEditing from './tableproperties/tablepropertiesediting.js';
-import TablePropertiesUI from './tableproperties/tablepropertiesui.js';
+import { TablePropertiesEditing } from './tableproperties/tablepropertiesediting.js';
+import { TablePropertiesUI } from './tableproperties/tablepropertiesui.js';
 /**
  * The table properties feature. Enables support for setting properties of tables (size, border, background, etc.).
  *
@@ -18,7 +18,7 @@ import TablePropertiesUI from './tableproperties/tablepropertiesui.js';
  * {@link module:table/tableproperties/tablepropertiesediting~TablePropertiesEditing table properties editing feature} and
  * the {@link module:table/tableproperties/tablepropertiesui~TablePropertiesUI table properties UI feature}.
  */
-export default class TableProperties extends Plugin {
+export class TableProperties extends Plugin {
     /**
      * @inheritDoc
      */

package/src/tableselection.d.ts

@@ -6,14 +6,14 @@
  * @module table/tableselection
  */
 import { Plugin } from 'ckeditor5/src/core.js';
-import type { Element, DocumentFragment } from 'ckeditor5/src/engine.js';
-import TableUtils from './tableutils.js';
+import type { ModelElement, ModelDocumentFragment } from 'ckeditor5/src/engine.js';
+import { TableUtils } from './tableutils.js';
 import '../theme/tableselection.css';
 /**
  * This plugin enables the advanced table cells, rows and columns selection.
  * It is loaded automatically by the {@link module:table/table~Table} plugin.
  */
-export default class TableSelection extends Plugin {
+export declare class TableSelection extends Plugin {
     /**
      * @inheritDoc
      */
@@ -33,11 +33,11 @@ export default class TableSelection extends Plugin {
     /**
      * Returns the currently selected table cells or `null` if it is not a table cells selection.
      */
-    getSelectedTableCells(): Array<Element> | null;
+    getSelectedTableCells(): Array<ModelElement> | null;
     /**
      * Returns the selected table fragment as a document fragment.
      */
-    getSelectionAsFragment(): DocumentFragment | null;
+    getSelectionAsFragment(): ModelDocumentFragment | null;
     /**
      * Sets the model selection based on given anchor and target cells (can be the same cell).
      * Takes care of setting the backward flag.
@@ -51,15 +51,15 @@ export default class TableSelection extends Plugin {
      * tableSelection.setCellSelection( firstCell, lastCell );
      * ```
      */
-    setCellSelection(anchorCell: Element, targetCell: Element): void;
+    setCellSelection(anchorCell: ModelElement, targetCell: ModelElement): void;
     /**
      * Returns the focus cell from the current selection.
      */
-    getFocusCell(): Element | null;
+    getFocusCell(): ModelElement | null;
     /**
      * Returns the anchor cell from the current selection.
      */
-    getAnchorCell(): Element | null;
+    getAnchorCell(): ModelElement | null;
     /**
      * Defines a selection converter which marks the selected cells with a specific class.
      *
@@ -91,7 +91,7 @@ export default class TableSelection extends Plugin {
      * yes, it's a hack).
      *
      * When multiple cells are selected in the model and the user starts to type, the
-     * {@link module:engine/view/document~Document#event:insertText} event carries information provided by the
+     * {@link module:engine/view/document~ViewDocument#event:insertText} event carries information provided by the
      * beforeinput DOM  event, that in turn only knows about this collapsed DOM selection in the last cell.
      *
      * As a result, the selected cells have no chance to be cleaned up. To fix this, this listener intercepts

package/src/tableselection.js

@@ -7,15 +7,15 @@
  */
 import { Plugin } from 'ckeditor5/src/core.js';
 import { first } from 'ckeditor5/src/utils.js';
-import TableWalker from './tablewalker.js';
-import TableUtils from './tableutils.js';
+import { TableWalker } from './tablewalker.js';
+import { TableUtils } from './tableutils.js';
 import { cropTableToDimensions, adjustLastRowIndex, adjustLastColumnIndex } from './utils/structure.js';
 import '../theme/tableselection.css';
 /**
  * This plugin enables the advanced table cells, rows and columns selection.
  * It is loaded automatically by the {@link module:table/table~Table} plugin.
  */
-export default class TableSelection extends Plugin {
+export class TableSelection extends Plugin {
     /**
      * @inheritDoc
      */
@@ -242,7 +242,7 @@ export default class TableSelection extends Plugin {
      * yes, it's a hack).
      *
      * When multiple cells are selected in the model and the user starts to type, the
-     * {@link module:engine/view/document~Document#event:insertText} event carries information provided by the
+     * {@link module:engine/view/document~ViewDocument#event:insertText} event carries information provided by the
      * beforeinput DOM  event, that in turn only knows about this collapsed DOM selection in the last cell.
      *
      * As a result, the selected cells have no chance to be cleaned up. To fix this, this listener intercepts

package/src/tabletoolbar.d.ts

@@ -16,7 +16,7 @@ import { WidgetToolbarRepository } from 'ckeditor5/src/widget.js';
  * Table content toolbar shows up when the selection is inside the content of a table. It creates its component based on the
  * {@link module:table/tableconfig~TableConfig#contentToolbar `table.contentToolbar` configuration option}.
  */
-export default class TableToolbar extends Plugin {
+export declare class TableToolbar extends Plugin {
     /**
      * @inheritDoc
      */

package/src/tabletoolbar.js

@@ -17,7 +17,7 @@ import { getSelectedTableWidget, getTableWidgetAncestor } from './utils/ui/widge
  * Table content toolbar shows up when the selection is inside the content of a table. It creates its component based on the
  * {@link module:table/tableconfig~TableConfig#contentToolbar `table.contentToolbar` configuration option}.
  */
-export default class TableToolbar extends Plugin {
+export class TableToolbar extends Plugin {
     /**
      * @inheritDoc
      */

package/src/tableui.d.ts

@@ -17,7 +17,7 @@ import { Plugin } from 'ckeditor5/src/core.js';
  *
  * The `'tableColumn'`, `'tableRow'` and `'mergeTableCells'` dropdowns work best with {@link module:table/tabletoolbar~TableToolbar}.
  */
-export default class TableUI extends Plugin {
+export declare class TableUI extends Plugin {
     /**
      * @inheritDoc
      */

package/src/tableui.js

@@ -7,9 +7,9 @@
  */
 import { Plugin } from 'ckeditor5/src/core.js';
 import { IconTable, IconTableColumn, IconTableRow, IconTableMergeCell } from 'ckeditor5/src/icons.js';
-import { addListToDropdown, createDropdown, ViewModel, SplitButtonView, SwitchButtonView, MenuBarMenuView } from 'ckeditor5/src/ui.js';
+import { addListToDropdown, createDropdown, UIModel, SplitButtonView, SwitchButtonView, MenuBarMenuView } from 'ckeditor5/src/ui.js';
 import { Collection } from 'ckeditor5/src/utils.js';
-import InsertTableView from './ui/inserttableview.js';
+import { InsertTableView } from './ui/inserttableview.js';
 /**
  * The table UI plugin. It introduces:
  *
@@ -21,7 +21,7 @@ import InsertTableView from './ui/inserttableview.js';
  *
  * The `'tableColumn'`, `'tableRow'` and `'mergeTableCells'` dropdowns work best with {@link module:table/tabletoolbar~TableToolbar}.
  */
-export default class TableUI extends Plugin {
+export class TableUI extends Plugin {
     /**
      * @inheritDoc
      */
@@ -318,7 +318,7 @@ export default class TableUI extends Plugin {
  */
 function addListOption(option, editor, commands, itemDefinitions) {
     if (option.type === 'button' || option.type === 'switchbutton') {
-        const model = option.model = new ViewModel(option.model);
+        const model = option.model = new UIModel(option.model);
         const { commandName, bindIsOn } = option.model;
         const command = editor.commands.get(commandName);
         commands.push(command);

package/src/tableutils.d.ts

@@ -3,16 +3,16 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
  */
 import { Plugin } from 'ckeditor5/src/core.js';
-import type { DocumentSelection, Element, Range, Selection, Writer } from 'ckeditor5/src/engine.js';
-import TableWalker, { type TableWalkerOptions } from './tablewalker.js';
-type IndexesObject = {
+import type { ModelDocumentSelection, ModelElement, ModelRange, ModelSelection, ModelWriter } from 'ckeditor5/src/engine.js';
+import { TableWalker, type TableWalkerOptions } from './tablewalker.js';
+export type TableIndexesObject = {
     first: number;
     last: number;
 };
 /**
  * The table utilities plugin.
  */
-export default class TableUtils extends Plugin {
+export declare class TableUtils extends Plugin {
     /**
      * @inheritDoc
      */
@@ -53,7 +53,7 @@ export default class TableUtils extends Plugin {
      *
      * @returns Returns a `{row, column}` object.
      */
-    getCellLocation(tableCell: Element): {
+    getCellLocation(tableCell: ModelElement): {
         row: number;
         column: number;
     };
@@ -78,12 +78,12 @@ export default class TableUtils extends Plugin {
      * @param options.headingColumns The number of heading columns. Default value is 0.
      * @returns The created table element.
      */
-    createTable(writer: Writer, options: {
+    createTable(writer: ModelWriter, options: {
         rows?: number;
         columns?: number;
         headingRows?: number;
         headingColumns?: number;
-    }): Element;
+    }): ModelElement;
     /**
      * Inserts rows into a table.
      *
@@ -112,7 +112,7 @@ export default class TableUtils extends Plugin {
      * @param options.copyStructureFromAbove The flag for copying row structure. Note that
      * the row structure will not be copied if this option is not provided.
      */
-    insertRows(table: Element, options?: {
+    insertRows(table: ModelElement, options?: {
         at?: number;
         rows?: number;
         copyStructureFromAbove?: boolean;
@@ -144,7 +144,7 @@ export default class TableUtils extends Plugin {
      * @param options.at The column index at which the columns will be inserted. Default value is 0.
      * @param options.columns The number of columns to insert. Default value is 1.
      */
-    insertColumns(table: Element, options?: {
+    insertColumns(table: ModelElement, options?: {
         at?: number;
         columns?: number;
     }): void;
@@ -176,7 +176,7 @@ export default class TableUtils extends Plugin {
      * @param options.at The row index at which the removing rows will start.
      * @param options.rows The number of rows to remove. Default value is 1.
      */
-    removeRows(table: Element, options: {
+    removeRows(table: ModelElement, options: {
         at: number;
         rows?: number;
     }): void;
@@ -209,7 +209,7 @@ export default class TableUtils extends Plugin {
      * @param options.at The row index at which the removing columns will start.
      * @param options.columns The number of columns to remove.
      */
-    removeColumns(table: Element, options: {
+    removeColumns(table: ModelElement, options: {
         at: number;
         columns?: number;
     }): void;
@@ -254,7 +254,7 @@ export default class TableUtils extends Plugin {
      *  | b | c | d |
      *  +---+---+---+
      */
-    splitCellVertically(tableCell: Element, numberOfCells?: number): void;
+    splitCellVertically(tableCell: ModelElement, numberOfCells?: number): void;
     /**
      * Divides a table cell horizontally into several ones.
      *
@@ -308,7 +308,7 @@ export default class TableUtils extends Plugin {
      *  |   | h | i |
      *  +---+---+---+
      */
-    splitCellHorizontally(tableCell: Element, numberOfCells?: number): void;
+    splitCellHorizontally(tableCell: ModelElement, numberOfCells?: number): void;
     /**
      * Returns the number of columns for a given table.
      *
@@ -318,7 +318,7 @@ export default class TableUtils extends Plugin {
      *
      * @param table The table to analyze.
      */
-    getColumns(table: Element): number;
+    getColumns(table: ModelElement): number;
     /**
      * Returns the number of rows for a given table. Any other element present in the table model is omitted.
      *
@@ -328,7 +328,7 @@ export default class TableUtils extends Plugin {
      *
      * @param table The table to analyze.
      */
-    getRows(table: Element): number;
+    getRows(table: ModelElement): number;
     /**
      * Creates an instance of the table walker.
      *
@@ -341,7 +341,7 @@ export default class TableUtils extends Plugin {
      * @param table A table over which the walker iterates.
      * @param options An object with configuration.
      */
-    createTableWalker(table: Element, options?: TableWalkerOptions): TableWalker;
+    createTableWalker(table: ModelElement, options?: TableWalkerOptions): TableWalker;
     /**
      * Returns all model table cells that are fully selected (from the outside)
      * within the provided model selection's ranges.
@@ -349,24 +349,24 @@ export default class TableUtils extends Plugin {
      * To obtain the cells selected from the inside, use
      * {@link #getTableCellsContainingSelection}.
      */
-    getSelectedTableCells(selection: Selection | DocumentSelection): Array<Element>;
+    getSelectedTableCells(selection: ModelSelection | ModelDocumentSelection): Array<ModelElement>;
     /**
      * Returns all model table cells that the provided model selection's ranges
-     * {@link module:engine/model/range~Range#start} inside.
+     * {@link module:engine/model/range~ModelRange#start} inside.
      *
      * To obtain the cells selected from the outside, use
      * {@link #getSelectedTableCells}.
      */
-    getTableCellsContainingSelection(selection: Selection | DocumentSelection): Array<Element>;
+    getTableCellsContainingSelection(selection: ModelSelection | ModelDocumentSelection): Array<ModelElement>;
     /**
      * Returns all model table cells that are either completely selected
      * by selection ranges or host selection range
-     * {@link module:engine/model/range~Range#start start positions} inside them.
+     * {@link module:engine/model/range~ModelRange#start start positions} inside them.
      *
      * Combines {@link #getTableCellsContainingSelection} and
      * {@link #getSelectedTableCells}.
      */
-    getSelectionAffectedTableCells(selection: Selection | DocumentSelection): Array<Element>;
+    getSelectionAffectedTableCells(selection: ModelSelection | ModelDocumentSelection): Array<ModelElement>;
     /**
      * Returns an object with the `first` and `last` row index contained in the given `tableCells`.
      *
@@ -380,7 +380,7 @@ export default class TableUtils extends Plugin {
      *
      * @returns Returns an object with the `first` and `last` table row indexes.
      */
-    getRowIndexes(tableCells: Array<Element>): IndexesObject;
+    getRowIndexes(tableCells: Array<ModelElement>): TableIndexesObject;
     /**
      * Returns an object with the `first` and `last` column index contained in the given `tableCells`.
      *
@@ -394,7 +394,7 @@ export default class TableUtils extends Plugin {
      *
      * @returns Returns an object with the `first` and `last` table column indexes.
      */
-    getColumnIndexes(tableCells: Array<Element>): IndexesObject;
+    getColumnIndexes(tableCells: Array<ModelElement>): TableIndexesObject;
     /**
      * Checks if the selection contains cells that do not exceed rectangular selection.
      *
@@ -418,11 +418,11 @@ export default class TableUtils extends Plugin {
      *   - a, c (the unselected cell "b" creates a gap)
      *   - f, g, h (cell "d" spans over a cell from the row of "f" cell - thus creates a gap)
      */
-    isSelectionRectangular(selectedTableCells: Array<Element>): boolean;
+    isSelectionRectangular(selectedTableCells: Array<ModelElement>): boolean;
     /**
      * Returns array of sorted ranges.
      */
-    sortRanges(ranges: Iterable<Range>): Array<Range>;
+    sortRanges(ranges: Iterable<ModelRange>): Array<ModelRange>;
     /**
      * Helper method to get an object with `first` and `last` indexes from an unsorted array of indexes.
      */
@@ -449,4 +449,3 @@ export default class TableUtils extends Plugin {
      */
     private _areIndexesInSameSection;
 }
-export {};

package/src/tableutils.js

@@ -7,14 +7,14 @@
  */
 import { CKEditorError } from 'ckeditor5/src/utils.js';
 import { Plugin } from 'ckeditor5/src/core.js';
-import TableWalker from './tablewalker.js';
+import { TableWalker } from './tablewalker.js';
 import { createEmptyTableCell, updateNumericAttribute } from './utils/common.js';
 import { removeEmptyColumns, removeEmptyRows } from './utils/structure.js';
 import { getTableColumnElements } from './tablecolumnresize/utils.js';
 /**
  * The table utilities plugin.
  */
-export default class TableUtils extends Plugin {
+export class TableUtils extends Plugin {
     /**
      * @inheritDoc
      */
@@ -730,7 +730,7 @@ export default class TableUtils extends Plugin {
     }
     /**
      * Returns all model table cells that the provided model selection's ranges
-     * {@link module:engine/model/range~Range#start} inside.
+     * {@link module:engine/model/range~ModelRange#start} inside.
      *
      * To obtain the cells selected from the outside, use
      * {@link #getSelectedTableCells}.
@@ -748,7 +748,7 @@ export default class TableUtils extends Plugin {
     /**
      * Returns all model table cells that are either completely selected
      * by selection ranges or host selection range
-     * {@link module:engine/model/range~Range#start start positions} inside them.
+     * {@link module:engine/model/range~ModelRange#start start positions} inside them.
      *
      * Combines {@link #getTableCellsContainingSelection} and
      * {@link #getSelectedTableCells}.