@ckeditor/ckeditor5-table 47.5.0-alpha.8 → 47.6.0-alpha.0

package/build/translations/de.js

@@ -1 +1 @@
-!function(e){const t=e.de=e.de||{};t.dictionary=Object.assign(t.dictionary||{},{"Align cell text to the bottom":"Zellentext unten ausrichten","Align cell text to the center":"Zellentext zentriert ausrichten","Align cell text to the left":"Zellentext linksbündig ausrichten","Align cell text to the middle":"Zellentext mittig ausrichten","Align cell text to the right":"Zellentext rechtsbündig ausrichten","Align cell text to the top":"Zellentext oben ausrichten","Align table to the left":"Tabelle links ausrichten","Align table to the left with no text wrapping":"Tabelle ohne Textumbruch linksbündig ausrichten","Align table to the left with text wrapping":"Tabelle mit Textumbruch linksbündig ausrichten","Align table to the right":"Tabelle rechts ausrichten","Align table to the right with no text wrapping":"Tabelle ohne Textumbruch rechtsbündig ausrichten","Align table to the right with text wrapping":"Tabelle mit Textumbruch rechtsbündig ausrichten",Alignment:"Ausrichtung",Background:"Hintergrund",Border:"Rahmen","Cell properties":"Zelleneigenschaften","Cell type":"Zelltyp","Center table":"Tabelle zentrieren","Center table with no text wrapping":"Tabelle ohne Textumbruch zentrieren","Choose table type":"Tabellentyp auswählen",Color:"Farbe",Column:"Spalte","Content table":"Inhaltstabelle",Dashed:"Gestrichelt","Data cell":"Datenzelle","Delete column":"Spalte löschen","Delete row":"Zeile löschen",Dimensions:"Größe",Dotted:"Gepunktet",Double:"Doppelt","Enter table caption":"Tabellenüberschrift eingeben",Groove:"Eingeritzt","Header cell":"Kopfzelle","Header column":"Kopfspalte","Header row":"Kopfzeile",Height:"Höhe","Horizontal text alignment toolbar":"Werkzeugleiste für die horizontale Zellentext-Ausrichtung","Insert a new table row (when in the last cell of a table)":"Eine neue Tabellenspalte einfügen (wenn in der letzten Tabellenzelle)","Insert column left":"Spalte links einfügen","Insert column right":"Spalte rechts einfügen","Insert row above":"Zeile oben einfügen","Insert row below":"Zeile unten einfügen","Insert table":"Tabelle einfügen","Insert table layout":"Tabellenlayout einfügen",Inset:"Eingelassen","Justify cell text":"Zellentext als Blocksatz ausrichten","Keystrokes that can be used in a table cell":"Tastatureingaben, die in einer Tabelle benutz werden können.","Layout table":"Layouttabelle","Merge cell down":"Zelle unten verbinden","Merge cell left":"Zelle links verbinden","Merge cell right":"Zelle rechts verbinden","Merge cell up":"Zelle verbinden","Merge cells":"Zellen verbinden","Move the selection to the next cell":"Auswahl in die nächste Zelle verschieben","Move the selection to the previous cell":"Auswahl in die vorherige Zelle verschieben","Navigate through the table":"Tabellennavigation",None:"Kein Rahmen",Outset:"Geprägt",Padding:"Innenabstand",Ridge:"Hervorgehoben",Row:"Zeile","Select column":"Spalte auswählen","Select row":"Zeile auswählen",Solid:"Durchgezogen","Split cell horizontally":"Zelle horizontal teilen","Split cell vertically":"Zelle vertikal teilen",Style:"Rahmenart",Table:"Tabelle","Table Alignment":"Tabellenausrichtung","Table alignment toolbar":"Werkzeugleiste für die Tabellen-Ausrichtung","Table cell text alignment":"Ausrichtung des Zellentextes","Table layout":"Tabellenlayout","Table properties":"Tabelleneigenschaften","Table toolbar":"Tabelle Werkzeugleiste","Table type":"Tabellentyp","Table type options":"Tabellentyp-Optionen",'The color is invalid. Try "#FF0000" or "rgb(255,0,0)" or "red".':"Die Farbe ist ungültig. Probieren Sie „#FF0000“ oder „rgb(255,0,0)“ oder „red“.",'The value is invalid. Try "10px" or "2em" or simply "2".':"Der Wert ist ungültig. Probieren Sie „10px“ oder „2em“ oder „2“.","Vertical text alignment toolbar":"Werkzeugleiste für die vertikale Zellentext-Ausrichtung",Width:"Breite"})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));
+!function(e){const t=e.de=e.de||{};t.dictionary=Object.assign(t.dictionary||{},{"Align cell text to the bottom":"Zellentext unten ausrichten","Align cell text to the center":"Zellentext zentriert ausrichten","Align cell text to the left":"Zellentext linksbündig ausrichten","Align cell text to the middle":"Zellentext mittig ausrichten","Align cell text to the right":"Zellentext rechtsbündig ausrichten","Align cell text to the top":"Zellentext oben ausrichten","Align table to the left":"Tabelle links ausrichten","Align table to the left with no text wrapping":"Tabelle ohne Textumbruch linksbündig ausrichten","Align table to the left with text wrapping":"Tabelle mit Textumbruch linksbündig ausrichten","Align table to the right":"Tabelle rechts ausrichten","Align table to the right with no text wrapping":"Tabelle ohne Textumbruch rechtsbündig ausrichten","Align table to the right with text wrapping":"Tabelle mit Textumbruch rechtsbündig ausrichten",Alignment:"Ausrichtung",Background:"Hintergrund",Border:"Rahmen","Cell properties":"Zelleneigenschaften","Cell type":"Zelltyp","Center table":"Tabelle zentrieren","Center table with no text wrapping":"Tabelle ohne Textumbruch zentrieren","Choose table type":"Tabellentyp auswählen",Color:"Farbe",Column:"Spalte","Content table":"Inhaltstabelle",Dashed:"Gestrichelt","Data cell":"Datenzelle","Delete column":"Spalte löschen","Delete row":"Zeile löschen",Dimensions:"Größe",Dotted:"Gepunktet",Double:"Doppelt","Enter table caption":"Tabellenüberschrift eingeben",Groove:"Eingeritzt","Header cell":"Kopfzelle","Header column":"Kopfspalte","Header row":"Kopfzeile",Height:"Höhe","Horizontal text alignment toolbar":"Werkzeugleiste für die horizontale Zellentext-Ausrichtung","Insert a new table row (when in the last cell of a table)":"Eine neue Tabellenspalte einfügen (wenn in der letzten Tabellenzelle)","Insert column left":"Spalte links einfügen","Insert column right":"Spalte rechts einfügen","Insert row above":"Zeile oben einfügen","Insert row below":"Zeile unten einfügen","Insert table":"Tabelle einfügen","Insert table layout":"Tabellenlayout einfügen",Inset:"Eingelassen","Justify cell text":"Zellentext als Blocksatz ausrichten","Keystrokes that can be used in a table cell":"Tastatureingaben, die in einer Tabelle benutz werden können.","Layout table":"Layouttabelle","Merge cell down":"Zelle unten verbinden","Merge cell left":"Zelle links verbinden","Merge cell right":"Zelle rechts verbinden","Merge cell up":"Zelle oben verbinden","Merge cells":"Zellen verbinden","Move the selection to the next cell":"Auswahl in die nächste Zelle verschieben","Move the selection to the previous cell":"Auswahl in die vorherige Zelle verschieben","Navigate through the table":"Tabellennavigation",None:"Kein Rahmen",Outset:"Geprägt",Padding:"Innenabstand",Ridge:"Hervorgehoben",Row:"Zeile","Select column":"Spalte auswählen","Select row":"Zeile auswählen",Solid:"Durchgezogen","Split cell horizontally":"Zelle horizontal teilen","Split cell vertically":"Zelle vertikal teilen",Style:"Rahmenart",Table:"Tabelle","Table Alignment":"Tabellenausrichtung","Table alignment toolbar":"Werkzeugleiste für die Tabellen-Ausrichtung","Table cell text alignment":"Ausrichtung des Zellentextes","Table layout":"Tabellenlayout","Table properties":"Tabelleneigenschaften","Table toolbar":"Tabelle Werkzeugleiste","Table type":"Tabellentyp","Table type options":"Tabellentyp-Optionen",'The color is invalid. Try "#FF0000" or "rgb(255,0,0)" or "red".':"Die Farbe ist ungültig. Probieren Sie „#FF0000“ oder „rgb(255,0,0)“ oder „red“.",'The value is invalid. Try "10px" or "2em" or simply "2".':"Der Wert ist ungültig. Probieren Sie „10px“ oder „2em“ oder „2“.","Vertical text alignment toolbar":"Werkzeugleiste für die vertikale Zellentext-Ausrichtung",Width:"Breite"})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={}));

package/dist/index.js

@@ -4,7 +4,7 @@
  */
 import { Command, Plugin } from '@ckeditor/ckeditor5-core/dist/index.js';
 import { toWidgetEditable, toWidget, Widget, isWidget, WidgetToolbarRepository } from '@ckeditor/ckeditor5-widget/dist/index.js';
-import { first, global, CKEditorError, KeystrokeHandler, FocusTracker, Collection, getLocalizedArrowKeyCodeDirection, Rect, priorities, DomEmitterMixin, toUnit } from '@ckeditor/ckeditor5-utils/dist/index.js';
+import { first, global, CKEditorError, KeystrokeHandler, FocusTracker, Collection, getLocalizedArrowKeyCodeDirection, Rect, priorities, DomEmitterMixin, toUnit, uid } from '@ckeditor/ckeditor5-utils/dist/index.js';
 import { isObject, debounce, isEqual, throttle } from 'es-toolkit/compat';
 import { IconTable, IconTableColumn, IconTableRow, IconTableMergeCell, IconCheck, IconCancel, IconAlignBottom, IconAlignMiddle, IconAlignTop, IconAlignJustify, IconAlignRight, IconAlignCenter, IconAlignLeft, IconTableCellProperties, IconTableLayout, IconTableProperties, IconObjectInlineRight, IconObjectCenter, IconObjectInlineLeft, IconCaption, IconPreviousArrow, IconObjectRight, IconObjectLeft } from '@ckeditor/ckeditor5-icons/dist/index.js';
 import { View, addKeyboardHandlingForGrid, ButtonView, createDropdown, MenuBarMenuView, SwitchButtonView, SplitButtonView, addListToDropdown, UIModel, ViewCollection, FocusCycler, InputTextView, ColorSelectorView, FormHeaderView, FormRowView, submitHandler, LabelView, LabeledFieldView, createLabeledDropdown, createLabeledInputText, ToolbarView, BalloonPanelView, ContextualBalloon, normalizeColorOptions, getLocalizedColorOptions, clickOutsideHandler, DropdownButtonView } from '@ckeditor/ckeditor5-ui/dist/index.js';
@@ -2183,10 +2183,11 @@ const downcastTableAlignmentConfig = {
         const hasPlainTableOutput = editor.plugins.has('PlainTableOutput');
         const isClipboardPipeline = conversionApi.options.isClipboardPipeline;
         const useExtendedAlignment = editor.config.get('experimentalFlags.useExtendedTableBlockAlignment');
-        if (!hasPlainTableOutput && !(useExtendedAlignment && isClipboardPipeline)) {
-            return null;
+        const stripFigureTagWithLayoutTable = shouldStripFigureTagWithLayoutTable(editor, table);
+        if (hasPlainTableOutput || stripFigureTagWithLayoutTable || useExtendedAlignment && isClipboardPipeline) {
+            return downcastPlainTable(table, conversionApi, editor);
         }
-        return downcastPlainTable(table, conversionApi, editor);
+        return null;
     };
 }
 /**
@@ -2196,7 +2197,8 @@ const downcastTableAlignmentConfig = {
         const hasPlainTableOutput = editor.plugins.has('PlainTableOutput');
         const isClipboardPipeline = options.isClipboardPipeline;
         const useExtendedAlignment = editor.config.get('experimentalFlags.useExtendedTableBlockAlignment');
-        if (!hasPlainTableOutput && !(useExtendedAlignment && isClipboardPipeline)) {
+        const stripFigureTagWithLayoutTable = shouldStripFigureTagWithLayoutTable(editor, modelElement);
+        if (!(hasPlainTableOutput || stripFigureTagWithLayoutTable || useExtendedAlignment && isClipboardPipeline)) {
             return null;
         }
         if (modelElement.parent.name === 'table') {
@@ -2287,7 +2289,8 @@ const downcastTableAlignmentConfig = {
                 const hasPlainTableOutput = editor.plugins.has('PlainTableOutput');
                 const isClipboardPipeline = conversionApi.options.isClipboardPipeline;
                 const useExtendedAlignment = editor.config.get('experimentalFlags.useExtendedTableBlockAlignment');
-                if (!hasPlainTableOutput && !(useExtendedAlignment && isClipboardPipeline)) {
+                const stripFigureTagWithLayoutTable = shouldStripFigureTagWithLayoutTable(editor, item);
+                if (!(hasPlainTableOutput || stripFigureTagWithLayoutTable || useExtendedAlignment && isClipboardPipeline)) {
                     return;
                 }
                 if (!conversionApi.consumable.consume(item, evt.name)) {
@@ -2305,6 +2308,22 @@ const downcastTableAlignmentConfig = {
         });
     }
 }
+/**
+ * Returns `true` if the figure tag should be stripped when using layout tables and when `tableType` is `layout`
+ * or `stripFigureFromContentTable` option is set to `true`, `false` otherwise.
+ *
+ * @param editor The editor instance.
+ * @param modelElement The model element to check.
+ * @returns `true` if the figure tag should be stripped, `false` otherwise.
+ */ function shouldStripFigureTagWithLayoutTable(editor, modelElement) {
+    const hasTableLayout = editor.plugins.has('TableLayoutEditing');
+    const stripFigureFromContentTable = editor.config.get('table.tableLayout.stripFigureFromContentTable') ?? true;
+    const tableModelElement = modelElement.findAncestor('table', {
+        includeSelf: true
+    });
+    const tableType = tableModelElement?.getAttribute('tableType');
+    return hasTableLayout && (stripFigureFromContentTable || tableType === 'layout');
+}
 
 /**
  * The insert table command.
@@ -11859,7 +11878,6 @@ const TABLE_TYPES = [
 	 * @inheritDoc
 	 */ static get requires() {
         return [
-            PlainTableOutput,
             TableColumnResize,
             TableLayoutEditing,
             TableLayoutUI
@@ -13844,6 +13862,9 @@ const propertyToCommandMap$2 = {
 	 *
 	 * To learn more about this system, see {@link #_saveCaption}.
 	 */ _savedCaptionsMap = new WeakMap();
+    /**
+	 * A map that keeps generated ids for table captions to reuse them if the same caption is rendered again.
+	 */ _captionIdsMapping = new WeakMap();
     /**
 	 * @inheritDoc
 	 */ static get pluginName() {
@@ -13914,6 +13935,42 @@ const propertyToCommandMap$2 = {
                 return toWidgetEditable(captionElement, writer);
             }
         });
+        editor.conversion.for('editingDowncast').add((dispatcher)=>{
+            dispatcher.on('insert:table', (evt, data, { writer, mapper })=>{
+                const modelTable = data.item;
+                const viewFigure = mapper.toViewElement(modelTable);
+                if (!viewFigure) {
+                    return;
+                }
+                const viewTable = Array.from(viewFigure.getChildren()).find((child)=>child.is('element', 'table'));
+                if (!viewTable) {
+                    return;
+                }
+                const modelCaption = getCaptionFromTableModelElement(modelTable);
+                // Remove `aria-labelledby` from the table if there is no caption.
+                if (!modelCaption) {
+                    writer.removeAttribute('aria-labelledby', viewTable);
+                    return;
+                }
+                const viewCaption = mapper.toViewElement(modelCaption);
+                if (!viewCaption) {
+                    return;
+                }
+                // Try reusing the same id for the caption if it was already created for the given model caption.
+                // If it was not created before, generate a new one and save it in the mapping to reuse it in the future if needed.
+                let captionId;
+                if (viewCaption.hasAttribute('id')) {
+                    captionId = viewCaption.getAttribute('id');
+                } else {
+                    captionId = this._captionIdsMapping.get(modelCaption) ?? `ck-editor__caption_${uid()}`;
+                }
+                this._captionIdsMapping.set(modelCaption, captionId);
+                writer.setAttribute('id', captionId, viewCaption);
+                writer.setAttribute('aria-labelledby', captionId, viewTable);
+            }, {
+                priority: 'low'
+            });
+        });
         injectTableCaptionPostFixer(editor.model);
     }
     /**