@ckeditor/ckeditor5-table 41.1.0 → 41.2.0

package/lang/translations/tk.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr "Reňk saýlaýjy"
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
+msgctxt "The placeholder text for the table caption displayed when the caption is empty."
+msgid "Enter table caption"
 msgstr ""
 
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
 msgstr ""
 
-msgctxt "The placeholder text for the table caption displayed when the caption is empty."
-msgid "Enter table caption"
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
 msgstr ""

package/lang/translations/tr.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr "Renk seçici"
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
-msgstr "Açıklamayı kapat"
-
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
-msgstr "Açıklamayı aç"
-
 msgctxt "The placeholder text for the table caption displayed when the caption is empty."
 msgid "Enter table caption"
 msgstr "Tablo açıklaması gir"
+
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
+msgstr "Tablo hücresinde kullanılabilecek tuş vuruşları"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr "Seçimi sonraki hücreye taşı"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr "Seçimi önceki hücreye taşı"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr "Yeni bir tablo satırı ekle (tablonun son hücresindeyken)"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
+msgstr "Tabloda gezin"

package/lang/translations/tt.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr ""
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
+msgctxt "The placeholder text for the table caption displayed when the caption is empty."
+msgid "Enter table caption"
 msgstr ""
 
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
 msgstr ""
 
-msgctxt "The placeholder text for the table caption displayed when the caption is empty."
-msgid "Enter table caption"
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
 msgstr ""

package/lang/translations/ug.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr ""
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
+msgctxt "The placeholder text for the table caption displayed when the caption is empty."
+msgid "Enter table caption"
 msgstr ""
 
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
 msgstr ""
 
-msgctxt "The placeholder text for the table caption displayed when the caption is empty."
-msgid "Enter table caption"
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
 msgstr ""

package/lang/translations/uk.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr "Вибір кольору"
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
-msgstr "Вимкнути підпис"
-
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
-msgstr "Увімкнути підпис"
-
 msgctxt "The placeholder text for the table caption displayed when the caption is empty."
 msgid "Enter table caption"
 msgstr "Введіть підпис таблиці"
+
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
+msgstr "Натискання клавіш, які можна використовувати в комірці таблиці"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr "Move the selection to the next cell"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr "Перемістити виділення в попередню клітинку"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr "Вставити новий рядок таблиці (якщо в останній клітинці таблиці)"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
+msgstr "Навігація по таблиці"

package/lang/translations/ur.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr ""
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
+msgctxt "The placeholder text for the table caption displayed when the caption is empty."
+msgid "Enter table caption"
 msgstr ""
 
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
 msgstr ""
 
-msgctxt "The placeholder text for the table caption displayed when the caption is empty."
-msgid "Enter table caption"
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
 msgstr ""

package/lang/translations/uz.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr "Rang tanlash"
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
+msgctxt "The placeholder text for the table caption displayed when the caption is empty."
+msgid "Enter table caption"
 msgstr ""
 
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
 msgstr ""
 
-msgctxt "The placeholder text for the table caption displayed when the caption is empty."
-msgid "Enter table caption"
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr ""
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
 msgstr ""

package/lang/translations/vi.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr "Bộ chọn màu"
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
-msgstr "Ẩn chú thích"
-
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
-msgstr "Hiện chú thích"
-
 msgctxt "The placeholder text for the table caption displayed when the caption is empty."
 msgid "Enter table caption"
 msgstr "Nhập chú thích cho bảng"
+
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
+msgstr "Tổ hợp phím mà bạn có thể dùng trong một ô bảng"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr "Di chuyển vùng chọn đến ô tiếp theo"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr "Di chuyển vùng chọn đến ô trước đó"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr "Chèn một hàng mới trong bảng (khi ở ô cuối cùng của bảng)"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
+msgstr "Điều hướng qua bảng"

package/lang/translations/zh-cn.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr "颜色选择器"
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
-msgstr "关闭表标题"
-
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
-msgstr "打开表标题"
-
 msgctxt "The placeholder text for the table caption displayed when the caption is empty."
 msgid "Enter table caption"
 msgstr "输入表标题"
+
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
+msgstr "可在表格单元格中使用的按键"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr "将所选内容移动到下一个单元格"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr "将所选内容移至上一个单元格"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr "插入新的表格行（当位于表格的最后一个单元格时）"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
+msgstr "在表格中进行导览"

package/lang/translations/zh.po

@@ -249,14 +249,26 @@ msgctxt "The label used by assistive technologies describing a button that opens
 msgid "Color picker"
 msgstr "顏色選擇"
 
-msgctxt "The button label for the table toolbar hiding caption attached to the table."
-msgid "Toggle caption off"
-msgstr "關閉表標題"
-
-msgctxt "The button label for the table toolbar showing caption attached to the table."
-msgid "Toggle caption on"
-msgstr "開啟表標題"
-
 msgctxt "The placeholder text for the table caption displayed when the caption is empty."
 msgid "Enter table caption"
 msgstr "輸入表標題"
+
+msgctxt "Accessibility help dialog header text displayed before the list of keystrokes that can be used in a table cell."
+msgid "Keystrokes that can be used in a table cell"
+msgstr "可在表格單元格中使用的按鍵"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the next cell."
+msgid "Move the selection to the next cell"
+msgstr "將選取範圍移動到下一個單元格"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for moving the selection to the previous cell."
+msgid "Move the selection to the previous cell"
+msgstr "將選取範圍移動到上一個單元格"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for inserting a new table row."
+msgid "Insert a new table row (when in the last cell of a table)"
+msgstr "插入新的表格橫排（當位於表格的最後一個單元格時）"
+
+msgctxt "Keystroke description for assistive technologies: keystroke for navigating through the table."
+msgid "Navigate through the table"
+msgstr "在表格中移動"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-table",
-  "version": "41.1.0",
+  "version": "41.2.0",
   "description": "Table feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,7 +13,7 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "41.1.0",
+    "ckeditor5": "41.2.0",
     "lodash-es": "4.17.21"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/tableclipboard.d.ts

@@ -2,6 +2,7 @@
  * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
+import { ClipboardPipeline, ClipboardMarkersUtils } from 'ckeditor5/src/clipboard.js';
 import { Plugin } from 'ckeditor5/src/core.js';
 import type { DocumentFragment, Element, Item, Model, Position, Writer } from 'ckeditor5/src/engine.js';
 import TableSelection from './tableselection.js';
@@ -19,7 +20,7 @@ export default class TableClipboard extends Plugin {
     /**
      * @inheritDoc
      */
-    static get requires(): readonly [typeof TableSelection, typeof TableUtils];
+    static get requires(): readonly [typeof ClipboardMarkersUtils, typeof ClipboardPipeline, typeof TableSelection, typeof TableUtils];
     /**
      * @inheritDoc
      */
@@ -44,6 +45,10 @@ export default class TableClipboard extends Plugin {
      * If not provided the current model document selection will be used.
      */
     private _onInsertContent;
+    /**
+     * Inserts provided `selectedTableCells` into `pastedTable`.
+     */
+    private _replaceSelectedCells;
     /**
      * Replaces the part of selectedTable with pastedTable.
      */

package/src/tableclipboard.js

@@ -2,6 +2,7 @@
  * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
+import { ClipboardPipeline, ClipboardMarkersUtils } from 'ckeditor5/src/clipboard.js';
 import { Plugin } from 'ckeditor5/src/core.js';
 import TableSelection from './tableselection.js';
 import TableWalker from './tablewalker.js';
@@ -22,7 +23,7 @@ export default class TableClipboard extends Plugin {
      * @inheritDoc
      */
     static get requires() {
-        return [TableSelection, TableUtils];
+        return [ClipboardMarkersUtils, ClipboardPipeline, TableSelection, TableUtils];
     }
     /**
      * @inheritDoc
@@ -42,7 +43,9 @@ export default class TableClipboard extends Plugin {
      * @param data Clipboard event data.
      */
     _onCopyCut(evt, data) {
+        const view = this.editor.editing.view;
         const tableSelection = this.editor.plugins.get(TableSelection);
+        const clipboardMarkersUtils = this.editor.plugins.get(ClipboardMarkersUtils);
         if (!tableSelection.getSelectedTableCells()) {
             return;
         }
@@ -51,12 +54,10 @@ export default class TableClipboard extends Plugin {
         }
         data.preventDefault();
         evt.stop();
-        const dataController = this.editor.data;
-        const viewDocument = this.editor.editing.view.document;
-        const content = dataController.toView(tableSelection.getSelectionAsFragment());
-        viewDocument.fire('clipboardOutput', {
+        const fragment = clipboardMarkersUtils._copySelectedFragmentWithMarkers(evt.name, this.editor.model.document.selection, () => tableSelection.getSelectionAsFragment());
+        view.document.fire('clipboardOutput', {
             dataTransfer: data.dataTransfer,
-            content,
+            content: this.editor.data.toView(fragment),
             method: evt.name
         });
     }
@@ -78,8 +79,9 @@ export default class TableClipboard extends Plugin {
         }
         const model = this.editor.model;
         const tableUtils = this.editor.plugins.get(TableUtils);
+        const clipboardMarkersUtils = this.editor.plugins.get(ClipboardMarkersUtils);
         // We might need to crop table before inserting so reference might change.
-        let pastedTable = this.getTableIfOnlyTableInContent(content, model);
+        const pastedTable = this.getTableIfOnlyTableInContent(content, model);
         if (!pastedTable) {
             return;
         }
@@ -90,44 +92,57 @@ export default class TableClipboard extends Plugin {
         }
         // Override default model.insertContent() handling at this point.
         evt.stop();
-        model.change(writer => {
-            const pastedDimensions = {
-                width: tableUtils.getColumns(pastedTable),
-                height: tableUtils.getRows(pastedTable)
-            };
-            // Prepare the table for pasting.
-            const selection = prepareTableForPasting(selectedTableCells, pastedDimensions, writer, tableUtils);
-            // Beyond this point we operate on a fixed content table with rectangular selection and proper last row/column values.
-            const selectionHeight = selection.lastRow - selection.firstRow + 1;
-            const selectionWidth = selection.lastColumn - selection.firstColumn + 1;
-            // Crop pasted table if:
-            // - Pasted table dimensions exceeds selection area.
-            // - Pasted table has broken layout (ie some cells sticks out by the table dimensions established by the first and last row).
-            //
-            // Note: The table dimensions are established by the width of the first row and the total number of rows.
-            // It is possible to programmatically create a table that has rows which would have cells anchored beyond first row width but
-            // such table will not be created by other editing solutions.
-            const cropDimensions = {
-                startRow: 0,
-                startColumn: 0,
-                endRow: Math.min(selectionHeight, pastedDimensions.height) - 1,
-                endColumn: Math.min(selectionWidth, pastedDimensions.width) - 1
-            };
-            pastedTable = cropTableToDimensions(pastedTable, cropDimensions, writer);
-            // Content table to which we insert a pasted table.
-            const selectedTable = selectedTableCells[0].findAncestor('table');
-            const cellsToSelect = this._replaceSelectedCellsWithPasted(pastedTable, pastedDimensions, selectedTable, selection, writer);
-            if (this.editor.plugins.get('TableSelection').isEnabled) {
-                // Selection ranges must be sorted because the first and last selection ranges are considered
-                // as anchor/focus cell ranges for multi-cell selection.
-                const selectionRanges = tableUtils.sortRanges(cellsToSelect.map(cell => writer.createRangeOn(cell)));
-                writer.setSelection(selectionRanges);
-            }
-            else {
-                // Set selection inside first cell if multi-cell selection is disabled.
-                writer.setSelection(cellsToSelect[0], 0);
-            }
-        });
+        if (content.is('documentFragment')) {
+            clipboardMarkersUtils._pasteMarkersIntoTransformedElement(content.markers, writer => this._replaceSelectedCells(pastedTable, selectedTableCells, writer));
+        }
+        else {
+            this.editor.model.change(writer => {
+                this._replaceSelectedCells(pastedTable, selectedTableCells, writer);
+            });
+        }
+    }
+    /**
+     * Inserts provided `selectedTableCells` into `pastedTable`.
+     */
+    _replaceSelectedCells(pastedTable, selectedTableCells, writer) {
+        const tableUtils = this.editor.plugins.get(TableUtils);
+        const pastedDimensions = {
+            width: tableUtils.getColumns(pastedTable),
+            height: tableUtils.getRows(pastedTable)
+        };
+        // Prepare the table for pasting.
+        const selection = prepareTableForPasting(selectedTableCells, pastedDimensions, writer, tableUtils);
+        // Beyond this point we operate on a fixed content table with rectangular selection and proper last row/column values.
+        const selectionHeight = selection.lastRow - selection.firstRow + 1;
+        const selectionWidth = selection.lastColumn - selection.firstColumn + 1;
+        // Crop pasted table if:
+        // - Pasted table dimensions exceeds selection area.
+        // - Pasted table has broken layout (ie some cells sticks out by the table dimensions established by the first and last row).
+        //
+        // Note: The table dimensions are established by the width of the first row and the total number of rows.
+        // It is possible to programmatically create a table that has rows which would have cells anchored beyond first row width but
+        // such table will not be created by other editing solutions.
+        const cropDimensions = {
+            startRow: 0,
+            startColumn: 0,
+            endRow: Math.min(selectionHeight, pastedDimensions.height) - 1,
+            endColumn: Math.min(selectionWidth, pastedDimensions.width) - 1
+        };
+        pastedTable = cropTableToDimensions(pastedTable, cropDimensions, writer);
+        // Content table to which we insert a pasted table.
+        const selectedTable = selectedTableCells[0].findAncestor('table');
+        const cellsToSelect = this._replaceSelectedCellsWithPasted(pastedTable, pastedDimensions, selectedTable, selection, writer);
+        if (this.editor.plugins.get('TableSelection').isEnabled) {
+            // Selection ranges must be sorted because the first and last selection ranges are considered
+            // as anchor/focus cell ranges for multi-cell selection.
+            const selectionRanges = tableUtils.sortRanges(cellsToSelect.map(cell => writer.createRangeOn(cell)));
+            writer.setSelection(selectionRanges);
+        }
+        else {
+            // Set selection inside first cell if multi-cell selection is disabled.
+            writer.setSelection(cellsToSelect[0], 0);
+        }
+        return selectedTable;
     }
     /**
      * Replaces the part of selectedTable with pastedTable.

package/src/tablekeyboard.js

@@ -31,11 +31,36 @@ export default class TableKeyboard extends Plugin {
      * @inheritDoc
      */
     init() {
-        const view = this.editor.editing.view;
+        const editor = this.editor;
+        const view = editor.editing.view;
         const viewDocument = view.document;
+        const t = editor.t;
         this.listenTo(viewDocument, 'arrowKey', (...args) => this._onArrowKey(...args), { context: 'table' });
         this.listenTo(viewDocument, 'tab', (...args) => this._handleTabOnSelectedTable(...args), { context: 'figure' });
         this.listenTo(viewDocument, 'tab', (...args) => this._handleTab(...args), { context: ['th', 'td'] });
+        // Add the information about the keystrokes to the accessibility database.
+        editor.accessibility.addKeystrokeInfoGroup({
+            id: 'table',
+            label: t('Keystrokes that can be used in a table cell'),
+            keystrokes: [
+                {
+                    label: t('Move the selection to the next cell'),
+                    keystroke: 'Tab'
+                },
+                {
+                    label: t('Move the selection to the previous cell'),
+                    keystroke: 'Shift+Tab'
+                },
+                {
+                    label: t('Insert a new table row (when in the last cell of a table)'),
+                    keystroke: 'Tab'
+                },
+                {
+                    label: t('Navigate through the table'),
+                    keystroke: [['arrowup'], ['arrowright'], ['arrowdown'], ['arrowleft']]
+                }
+            ]
+        });
     }
     /**
      * Handles {@link module:engine/view/document~Document#event:tab tab} events for the <kbd>Tab</kbd> key executed

package/src/tableutils.js

@@ -656,7 +656,10 @@ export default class TableUtils extends Plugin {
         // Using the first row without checking if it's a tableRow because we expect
         // that table will have only tableRow model elements at the beginning.
         const row = table.getChild(0);
-        return [...row.getChildren()].reduce((columns, row) => {
+        return [...row.getChildren()]
+            // $marker elements can also be children of a row too (when TrackChanges is on). Don't include them in the count.
+            .filter(node => node.is('element', 'tableCell'))
+            .reduce((columns, row) => {
             const columnWidth = parseInt(row.getAttribute('colspan') || '1');
             return columns + columnWidth;
         }, 0);