@ckeditor/ckeditor5-table 44.3.0 → 45.0.0-alpha.1

package/lang/translations/zh.po

@@ -266,3 +266,31 @@ msgstr "在表格中移動"
 msgctxt "The accessible label of the menu bar button that displays a user interface to insert a table into editor content."
 msgid "Table"
 msgstr "表格"
+
+msgctxt "Label for the insert table layout toolbar button."
+msgid "Insert table layout"
+msgstr ""
+
+msgctxt "The accessible label used in the table layout insert UI element."
+msgid "Table layout"
+msgstr ""
+
+msgctxt "The accessible label of the layout table type dropdown button."
+msgid "Layout table"
+msgstr ""
+
+msgctxt "The accessible label of the content table type dropdown button."
+msgid "Content table"
+msgstr ""
+
+msgctxt "The accessible label of the table balloon button that displays a user interface to choose table type."
+msgid "Choose table type"
+msgstr ""
+
+msgctxt "The accessible label of the table type toolbar button."
+msgid "Table type"
+msgstr ""
+
+msgctxt "The accessible label of dropdown list that displays a user interface to choose table type."
+msgid "Table type options"
+msgstr ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-table",
-  "version": "44.3.0",
+  "version": "45.0.0-alpha.1",
   "description": "Table feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,14 +13,15 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "44.3.0",
-    "@ckeditor/ckeditor5-clipboard": "44.3.0",
-    "@ckeditor/ckeditor5-core": "44.3.0",
-    "@ckeditor/ckeditor5-engine": "44.3.0",
-    "@ckeditor/ckeditor5-ui": "44.3.0",
-    "@ckeditor/ckeditor5-utils": "44.3.0",
-    "@ckeditor/ckeditor5-widget": "44.3.0",
-    "lodash-es": "4.17.21"
+    "ckeditor5": "45.0.0-alpha.1",
+    "@ckeditor/ckeditor5-clipboard": "45.0.0-alpha.1",
+    "@ckeditor/ckeditor5-core": "45.0.0-alpha.1",
+    "@ckeditor/ckeditor5-engine": "45.0.0-alpha.1",
+    "@ckeditor/ckeditor5-icons": "45.0.0-alpha.1",
+    "@ckeditor/ckeditor5-ui": "45.0.0-alpha.1",
+    "@ckeditor/ckeditor5-utils": "45.0.0-alpha.1",
+    "@ckeditor/ckeditor5-widget": "45.0.0-alpha.1",
+    "es-toolkit": "1.32.0"
   },
   "author": "CKSource (http://cksource.com/)",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/augmentation.d.ts

@@ -2,7 +2,7 @@
  * @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
  */
-import type { TableConfig, Table, TableCaption, TableCaptionEditing, TableCaptionUI, TableCellProperties, TableCellPropertiesEditing, TableCellPropertiesUI, TableCellWidthEditing, TableClipboard, TableColumnResize, TableColumnResizeEditing, TableEditing, TableKeyboard, TableMouse, TableProperties, TablePropertiesEditing, TablePropertiesUI, TableSelection, TableToolbar, TableUI, TableUtils, PlainTableOutput, InsertColumnCommand, InsertRowCommand, InsertTableCommand, MergeCellCommand, MergeCellsCommand, RemoveColumnCommand, RemoveRowCommand, SelectColumnCommand, SelectRowCommand, SetHeaderColumnCommand, SetHeaderRowCommand, SplitCellCommand, ToggleTableCaptionCommand, TableCellBackgroundColorCommand, TableCellBorderColorCommand, TableCellBorderStyleCommand, TableCellBorderWidthCommand, TableCellHeightCommand, TableCellHorizontalAlignmentCommand, TableCellPaddingCommand, TableCellVerticalAlignmentCommand, TableCellWidthCommand, TableAlignmentCommand, TableBackgroundColorCommand, TableBorderColorCommand, TableBorderStyleCommand, TableBorderWidthCommand, TableHeightCommand, TableWidthCommand } from './index.js';
+import type { TableConfig, Table, TableCaption, TableCaptionEditing, TableCaptionUI, TableCellProperties, TableCellPropertiesEditing, TableCellPropertiesUI, TableCellWidthEditing, TableClipboard, TableColumnResize, TableColumnResizeEditing, TableEditing, TableKeyboard, TableLayout, TableLayoutEditing, TableMouse, TableProperties, TablePropertiesEditing, TablePropertiesUI, TableSelection, TableToolbar, TableUI, TableUtils, PlainTableOutput, InsertColumnCommand, InsertRowCommand, InsertTableCommand, InsertTableLayoutCommand, MergeCellCommand, MergeCellsCommand, RemoveColumnCommand, RemoveRowCommand, SelectColumnCommand, SelectRowCommand, SetHeaderColumnCommand, SetHeaderRowCommand, TableTypeCommand, SplitCellCommand, ToggleTableCaptionCommand, TableCellBackgroundColorCommand, TableCellBorderColorCommand, TableCellBorderStyleCommand, TableCellBorderWidthCommand, TableCellHeightCommand, TableCellHorizontalAlignmentCommand, TableCellPaddingCommand, TableCellVerticalAlignmentCommand, TableCellWidthCommand, TableAlignmentCommand, TableBackgroundColorCommand, TableBorderColorCommand, TableBorderStyleCommand, TableBorderWidthCommand, TableHeightCommand, TableWidthCommand } from './index.js';
 declare module '@ckeditor/ckeditor5-core' {
     interface EditorConfig {
         /**
@@ -26,6 +26,8 @@ declare module '@ckeditor/ckeditor5-core' {
         [TableColumnResizeEditing.pluginName]: TableColumnResizeEditing;
         [TableEditing.pluginName]: TableEditing;
         [TableKeyboard.pluginName]: TableKeyboard;
+        [TableLayout.pluginName]: TableLayout;
+        [TableLayoutEditing.pluginName]: TableLayoutEditing;
         [TableMouse.pluginName]: TableMouse;
         [TableProperties.pluginName]: TableProperties;
         [TablePropertiesEditing.pluginName]: TablePropertiesEditing;
@@ -42,6 +44,7 @@ declare module '@ckeditor/ckeditor5-core' {
         insertTableRowAbove: InsertRowCommand;
         insertTableRowBelow: InsertRowCommand;
         insertTable: InsertTableCommand;
+        insertTableLayout: InsertTableLayoutCommand;
         mergeTableCellRight: MergeCellCommand;
         mergeTableCellLeft: MergeCellCommand;
         mergeTableCellDown: MergeCellCommand;
@@ -72,5 +75,6 @@ declare module '@ckeditor/ckeditor5-core' {
         tableBorderWidth: TableBorderWidthCommand;
         tableHeight: TableHeightCommand;
         tableWidth: TableWidthCommand;
+        tableType: TableTypeCommand;
     }
 }

package/src/commands/insertcolumncommand.js

@@ -25,6 +25,10 @@ import { Command } from 'ckeditor5/src/core.js';
  * ```
  */
 export default class InsertColumnCommand extends Command {
+    /**
+     * The order of insertion relative to the column in which the caret is located.
+     */
+    order;
     /**
      * Creates a new `InsertColumnCommand` instance.
      *

package/src/commands/insertrowcommand.js

@@ -25,6 +25,10 @@ import { Command } from 'ckeditor5/src/core.js';
  * ```
  */
 export default class InsertRowCommand extends Command {
+    /**
+     * The order of insertion relative to the row in which the caret is located.
+     */
+    order;
     /**
      * Creates a new `InsertRowCommand` instance.
      *

package/src/commands/inserttablelayoutcommand.d.ts

@@ -0,0 +1,39 @@
+/**
+ * @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
+ */
+/**
+ * @module table/commands/inserttablelayoutcommand
+ */
+import { Command } from 'ckeditor5/src/core.js';
+/**
+ * The insert table layout command.
+ *
+ * The command is registered by {@link module:table/tablelayout/tablelayoutediting~TableLayoutEditing}
+ * as the `'insertTableLayout'` editor command.
+ *
+ * To insert a layout table at the current selection, execute the command and specify the dimensions:
+ *
+ * ```ts
+ * editor.execute( 'insertTableLayout', { rows: 20, columns: 5 } );
+ * ```
+ */
+export default class InsertTableLayoutCommand extends Command {
+    /**
+     * @inheritDoc
+     */
+    refresh(): void;
+    /**
+     * Executes the command.
+     *
+     * Inserts a layout table with the given number of rows and columns into the editor.
+     *
+     * @param options.rows The number of rows to create in the inserted table. Default value is 2.
+     * @param options.columns The number of columns to create in the inserted table. Default value is 2.
+     * @fires execute
+     */
+    execute(options?: {
+        rows?: number;
+        columns?: number;
+    }): void;
+}

package/src/commands/inserttablelayoutcommand.js

@@ -0,0 +1,65 @@
+/**
+ * @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
+ */
+/**
+ * @module table/commands/inserttablelayoutcommand
+ */
+import { Command } from 'ckeditor5/src/core.js';
+/**
+ * The insert table layout command.
+ *
+ * The command is registered by {@link module:table/tablelayout/tablelayoutediting~TableLayoutEditing}
+ * as the `'insertTableLayout'` editor command.
+ *
+ * To insert a layout table at the current selection, execute the command and specify the dimensions:
+ *
+ * ```ts
+ * editor.execute( 'insertTableLayout', { rows: 20, columns: 5 } );
+ * ```
+ */
+export default class InsertTableLayoutCommand extends Command {
+    /**
+     * @inheritDoc
+     */
+    refresh() {
+        const model = this.editor.model;
+        const selection = model.document.selection;
+        const schema = model.schema;
+        this.isEnabled = isAllowedInParent(selection, schema);
+    }
+    /**
+     * Executes the command.
+     *
+     * Inserts a layout table with the given number of rows and columns into the editor.
+     *
+     * @param options.rows The number of rows to create in the inserted table. Default value is 2.
+     * @param options.columns The number of columns to create in the inserted table. Default value is 2.
+     * @fires execute
+     */
+    execute(options = {}) {
+        const editor = this.editor;
+        const model = editor.model;
+        const tableUtils = editor.plugins.get('TableUtils');
+        model.change(writer => {
+            const normalizedOptions = { rows: options.rows || 2, columns: options.columns || 2 };
+            const table = tableUtils.createTable(writer, normalizedOptions);
+            writer.setAttribute('tableType', 'layout', table);
+            model.insertObject(table, null, null, { findOptimalPosition: 'auto' });
+            const singleColumnWidth = `${100 / normalizedOptions.columns}%`;
+            const columnWidths = Array(normalizedOptions.columns).fill(singleColumnWidth);
+            const tableWidthsCommand = editor.commands.get('resizeColumnWidths');
+            // Make the table full-width with equal columns width.
+            tableWidthsCommand.execute({ tableWidth: '100%', columnWidths, table });
+            writer.setSelection(writer.createPositionAt(table.getNodeByPath([0, 0, 0]), 0));
+        });
+    }
+}
+/**
+ * Checks if the table is allowed in the parent.
+ */
+function isAllowedInParent(selection, schema) {
+    const positionParent = selection.getFirstPosition().parent;
+    const validParent = positionParent === positionParent.root ? positionParent : positionParent.parent;
+    return schema.checkChild(validParent, 'table');
+}

package/src/commands/mergecellcommand.js

@@ -25,6 +25,14 @@ import { removeEmptyRowsColumns } from '../utils/structure.js';
  * (for `'mergeTableCellUp'` and `'mergeTableCellDown'`), the command will be disabled.
  */
 export default class MergeCellCommand extends Command {
+    /**
+     * The direction that indicates which cell will be merged with the currently selected one.
+     */
+    direction;
+    /**
+     * Whether the merge is horizontal (left/right) or vertical (up/down).
+     */
+    isHorizontal;
     /**
      * Creates a new `MergeCellCommand` instance.
      *

package/src/commands/setheadercolumncommand.js

@@ -28,12 +28,17 @@ export default class SetHeaderColumnCommand extends Command {
      * @inheritDoc
      */
     refresh() {
-        const model = this.editor.model;
         const tableUtils = this.editor.plugins.get('TableUtils');
+        const model = this.editor.model;
         const selectedCells = tableUtils.getSelectionAffectedTableCells(model.document.selection);
-        const isInTable = selectedCells.length > 0;
-        this.isEnabled = isInTable;
-        this.value = isInTable && selectedCells.every(cell => isHeadingColumnCell(tableUtils, cell));
+        if (selectedCells.length === 0) {
+            this.isEnabled = false;
+            this.value = false;
+            return;
+        }
+        const table = selectedCells[0].findAncestor('table');
+        this.isEnabled = model.schema.checkAttribute(table, 'headingColumns');
+        this.value = selectedCells.every(cell => isHeadingColumnCell(tableUtils, cell));
     }
     /**
      * Executes the command.

package/src/commands/setheaderrowcommand.js

@@ -30,9 +30,14 @@ export default class SetHeaderRowCommand extends Command {
         const tableUtils = this.editor.plugins.get('TableUtils');
         const model = this.editor.model;
         const selectedCells = tableUtils.getSelectionAffectedTableCells(model.document.selection);
-        const isInTable = selectedCells.length > 0;
-        this.isEnabled = isInTable;
-        this.value = isInTable && selectedCells.every(cell => this._isInHeading(cell, cell.parent.parent));
+        if (selectedCells.length === 0) {
+            this.isEnabled = false;
+            this.value = false;
+            return;
+        }
+        const table = selectedCells[0].findAncestor('table');
+        this.isEnabled = model.schema.checkAttribute(table, 'headingRows');
+        this.value = selectedCells.every(cell => this._isInHeading(cell, cell.parent.parent));
     }
     /**
      * Executes the command.

package/src/commands/splitcellcommand.js

@@ -19,6 +19,10 @@ import { Command } from 'ckeditor5/src/core.js';
  * ```
  */
 export default class SplitCellCommand extends Command {
+    /**
+     * The direction that indicates which cell will be split.
+     */
+    direction;
     /**
      * Creates a new `SplitCellCommand` instance.
      *

package/src/converters/downcast.js

@@ -73,7 +73,7 @@ export function downcastCell(options = {}) {
                 const isHeading = tableSlot.row < headingRows || tableSlot.column < headingColumns;
                 const cellElementName = isHeading ? 'th' : 'td';
                 result = options.asWidget ?
-                    toWidgetEditable(writer.createEditableElement(cellElementName), writer) :
+                    toWidgetEditable(writer.createEditableElement(cellElementName), writer, { withAriaRole: false }) :
                     writer.createContainerElement(cellElementName);
                 break;
             }

package/src/converters/tableproperties.js

@@ -2,6 +2,7 @@
  * @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
  */
+import { first } from 'ckeditor5/src/utils.js';
 /**
  * Conversion helper for upcasting attributes using normalized styles.
  *
@@ -22,13 +23,23 @@ export function upcastStyleToAttribute(conversion, options) {
         },
         model: {
             key: modelAttribute,
-            value: (viewElement) => {
+            value: (viewElement, conversionApi, data) => {
                 if (!shouldUpcast(viewElement)) {
                     return;
                 }
+                let localDefaultValue = defaultValue;
+                // Adjust default for layout tables.
+                if (data.modelRange) {
+                    const modelElement = first(data.modelRange.getItems({ shallow: true }));
+                    const tableElement = modelElement && modelElement.is('element') &&
+                        modelElement.findAncestor('table', { includeSelf: true });
+                    if (tableElement && tableElement.getAttribute('tableType') == 'layout') {
+                        localDefaultValue = '';
+                    }
+                }
                 const normalized = viewElement.getNormalizedStyle(styleName);
                 const value = reduceBoxSides ? reduceBoxSidesValue(normalized) : normalized;
-                if (defaultValue !== value) {
+                if (localDefaultValue !== value) {
                     return value;
                 }
             }
@@ -77,6 +88,15 @@ export function upcastBorderStyles(conversion, viewElementName, modelAttributes,
             return;
         }
         const modelElement = [...data.modelRange.getItems({ shallow: true })].pop();
+        const tableElement = modelElement.findAncestor('table', { includeSelf: true });
+        let localDefaultBorder = defaultBorder;
+        if (tableElement && tableElement.getAttribute('tableType') == 'layout') {
+            localDefaultBorder = {
+                style: 'none',
+                color: '',
+                width: ''
+            };
+        }
         conversionApi.consumable.consume(data.viewItem, matcherPattern);
         const normalizedBorder = {
             style: data.viewItem.getNormalizedStyle('border-style'),
@@ -88,13 +108,13 @@ export function upcastBorderStyles(conversion, viewElementName, modelAttributes,
             color: reduceBoxSidesValue(normalizedBorder.color),
             width: reduceBoxSidesValue(normalizedBorder.width)
         };
-        if (reducedBorder.style !== defaultBorder.style) {
+        if (reducedBorder.style !== localDefaultBorder.style) {
             conversionApi.writer.setAttribute(modelAttributes.style, reducedBorder.style, modelElement);
         }
-        if (reducedBorder.color !== defaultBorder.color) {
+        if (reducedBorder.color !== localDefaultBorder.color) {
             conversionApi.writer.setAttribute(modelAttributes.color, reducedBorder.color, modelElement);
         }
-        if (reducedBorder.width !== defaultBorder.width) {
+        if (reducedBorder.width !== localDefaultBorder.width) {
             conversionApi.writer.setAttribute(modelAttributes.width, reducedBorder.width, modelElement);
         }
     }));

package/src/index.d.ts

@@ -14,6 +14,8 @@ export { default as TableCellProperties } from './tablecellproperties.js';
 export { default as TableCellPropertiesEditing } from './tablecellproperties/tablecellpropertiesediting.js';
 export { default as TableCellPropertiesUI } from './tablecellproperties/tablecellpropertiesui.js';
 export { default as TableCellWidthEditing } from './tablecellwidth/tablecellwidthediting.js';
+export { default as TableLayout } from './tablelayout.js';
+export { default as TableLayoutEditing } from './tablelayout/tablelayoutediting.js';
 export { default as TableProperties } from './tableproperties.js';
 export { default as TablePropertiesEditing } from './tableproperties/tablepropertiesediting.js';
 export { default as TablePropertiesUI } from './tableproperties/tablepropertiesui.js';
@@ -31,6 +33,8 @@ export type { TableConfig } from './tableconfig.js';
 export type { default as InsertColumnCommand } from './commands/insertcolumncommand.js';
 export type { default as InsertRowCommand } from './commands/insertrowcommand.js';
 export type { default as InsertTableCommand } from './commands/inserttablecommand.js';
+export type { default as InsertTableLayoutCommand } from './commands/inserttablelayoutcommand.js';
+export type { default as TableTypeCommand } from './tablelayout/commands/tabletypecommand.js';
 export type { default as MergeCellCommand } from './commands/mergecellcommand.js';
 export type { default as MergeCellsCommand } from './commands/mergecellscommand.js';
 export type { default as RemoveColumnCommand } from './commands/removecolumncommand.js';

package/src/index.js

@@ -14,6 +14,8 @@ export { default as TableCellProperties } from './tablecellproperties.js';
 export { default as TableCellPropertiesEditing } from './tablecellproperties/tablecellpropertiesediting.js';
 export { default as TableCellPropertiesUI } from './tablecellproperties/tablecellpropertiesui.js';
 export { default as TableCellWidthEditing } from './tablecellwidth/tablecellwidthediting.js';
+export { default as TableLayout } from './tablelayout.js';
+export { default as TableLayoutEditing } from './tablelayout/tablelayoutediting.js';
 export { default as TableProperties } from './tableproperties.js';
 export { default as TablePropertiesEditing } from './tableproperties/tablepropertiesediting.js';
 export { default as TablePropertiesUI } from './tableproperties/tablepropertiesui.js';

package/src/plaintableoutput.d.ts

@@ -9,6 +9,9 @@ import { Plugin } from 'ckeditor5/src/core.js';
 import Table from './table.js';
 /**
  * The plain table output feature.
+ *
+ * This feature strips the `<figure>` tag from the table data. This is because this tag is not supported
+ * by most popular email clients and removing it ensures compatibility.
  */
 export default class PlainTableOutput extends Plugin {
     /**

package/src/plaintableoutput.js

@@ -9,6 +9,9 @@ import { Plugin } from 'ckeditor5/src/core.js';
 import Table from './table.js';
 /**
  * The plain table output feature.
+ *
+ * This feature strips the `<figure>` tag from the table data. This is because this tag is not supported
+ * by most popular email clients and removing it ensures compatibility.
  */
 export default class PlainTableOutput extends Plugin {
     /**
@@ -56,6 +59,14 @@ export default class PlainTableOutput extends Plugin {
         if (editor.plugins.has('TableProperties')) {
             downcastTableBorderAndBackgroundAttributes(editor);
         }
+        editor.conversion.for('upcast').add(dispatcher => {
+            dispatcher.on('element:table', (evt, data, conversionApi) => {
+                // It's not necessary to upcast the `table` class. This class was only added in data downcast
+                // to center a plain table in the editor output.
+                // See: https://github.com/ckeditor/ckeditor5/issues/17888.
+                conversionApi.consumable.consume(data.viewItem, { classes: 'table' });
+            });
+        });
     }
 }
 /**
@@ -96,7 +107,7 @@ function downcastTableElement(table, { writer }) {
     //        {table-body-rows-slot}
     //    </tbody>
     // </table>
-    return writer.createContainerElement('table', null, [childrenSlot, ...tableContentElements]);
+    return writer.createContainerElement('table', { class: 'table' }, [childrenSlot, ...tableContentElements]);
 }
 /**
  * Register table border and background attributes converters.

package/src/tablecaption/tablecaptionediting.js

@@ -15,6 +15,13 @@ import { isTable, matchTableCaptionViewElement } from './utils.js';
  * The table caption editing plugin.
  */
 export default class TableCaptionEditing extends Plugin {
+    /**
+     * A map that keeps saved JSONified table captions and table model elements they are
+     * associated with.
+     *
+     * To learn more about this system, see {@link #_saveCaption}.
+     */
+    _savedCaptionsMap;
     /**
      * @inheritDoc
      */

package/src/tablecaption/tablecaptionui.js

@@ -5,8 +5,9 @@
 /**
 * @module table/tablecaption/tablecaptionui
 */
-import { Plugin, icons } from 'ckeditor5/src/core.js';
+import { Plugin } from 'ckeditor5/src/core.js';
 import { ButtonView } from 'ckeditor5/src/ui.js';
+import { IconCaption } from 'ckeditor5/src/icons.js';
 import { getCaptionFromModelSelection } from './utils.js';
 /**
   * The table caption UI plugin. It introduces the `'toggleTableCaption'` UI button.
@@ -35,7 +36,7 @@ export default class TableCaptionUI extends Plugin {
             const command = editor.commands.get('toggleTableCaption');
             const view = new ButtonView(locale);
             view.set({
-                icon: icons.caption,
+                icon: IconCaption,
                 tooltip: true,
                 isToggleable: true
             });

package/src/tablecaption/toggletablecaptioncommand.js

@@ -38,7 +38,7 @@ export default class ToggleTableCaptionCommand extends Command {
     refresh() {
         const editor = this.editor;
         const tableElement = getSelectionAffectedTable(editor.model.document.selection);
-        this.isEnabled = !!tableElement;
+        this.isEnabled = !!tableElement && editor.model.schema.checkChild(tableElement, 'caption');
         if (!this.isEnabled) {
             this.value = false;
         }

package/src/tablecellproperties/commands/tablecellpropertycommand.d.ts

@@ -19,8 +19,18 @@ export default class TableCellPropertyCommand extends Command {
     readonly attributeName: string;
     /**
      * The default value for the attribute.
+     *
+     * @readonly
+     */
+    protected _defaultValue: string | undefined;
+    /**
+     * The default value for the attribute for the content table.
+     */
+    private readonly _defaultContentTableValue;
+    /**
+     * The default value for the attribute for the layout table.
      */
-    protected readonly _defaultValue: string;
+    private readonly _defaultLayoutTableValue;
     /**
      * Creates a new `TableCellPropertyCommand` instance.
      *

package/src/tablecellproperties/commands/tablecellpropertycommand.js

@@ -6,12 +6,31 @@
  * @module table/tablecellproperties/commands/tablecellpropertycommand
  */
 import { Command } from 'ckeditor5/src/core.js';
+import { getSelectionAffectedTable } from '../../utils/common.js';
 /**
  * The table cell attribute command.
  *
  * The command is a base command for other table cell property commands.
  */
 export default class TableCellPropertyCommand extends Command {
+    /**
+     * The attribute that will be set by the command.
+     */
+    attributeName;
+    /**
+     * The default value for the attribute.
+     *
+     * @readonly
+     */
+    _defaultValue;
+    /**
+     * The default value for the attribute for the content table.
+     */
+    _defaultContentTableValue;
+    /**
+     * The default value for the attribute for the layout table.
+     */
+    _defaultLayoutTableValue;
     /**
      * Creates a new `TableCellPropertyCommand` instance.
      *
@@ -22,15 +41,34 @@ export default class TableCellPropertyCommand extends Command {
     constructor(editor, attributeName, defaultValue) {
         super(editor);
         this.attributeName = attributeName;
-        this._defaultValue = defaultValue;
+        this._defaultContentTableValue = defaultValue;
+        // Hardcoded defaults for layout table.
+        switch (attributeName) {
+            case 'tableCellBorderStyle':
+                this._defaultLayoutTableValue = 'none';
+                break;
+            case 'tableCellHorizontalAlignment':
+                this._defaultLayoutTableValue = 'left';
+                break;
+            case 'tableCellVerticalAlignment':
+                this._defaultLayoutTableValue = 'middle';
+                break;
+            default:
+                this._defaultLayoutTableValue = undefined;
+        }
     }
     /**
      * @inheritDoc
      */
     refresh() {
         const editor = this.editor;
+        const selection = editor.model.document.selection;
         const tableUtils = this.editor.plugins.get('TableUtils');
-        const selectedTableCells = tableUtils.getSelectionAffectedTableCells(editor.model.document.selection);
+        const selectedTableCells = tableUtils.getSelectionAffectedTableCells(selection);
+        const table = getSelectionAffectedTable(selection);
+        this._defaultValue = !table || table.getAttribute('tableType') !== 'layout' ?
+            this._defaultContentTableValue :
+            this._defaultLayoutTableValue;
         this.isEnabled = !!selectedTableCells.length;
         this.value = this._getSingleValue(selectedTableCells);
     }