@ckeditor/ckeditor5-table 40.0.0 → 40.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -15
- package/LICENSE.md +3 -3
- package/build/table.js +1 -1
- package/build/translations/fi.js +1 -1
- package/lang/translations/fi.po +3 -3
- package/package.json +2 -2
- package/src/augmentation.d.ts +76 -76
- package/src/augmentation.js +5 -5
- package/src/commands/insertcolumncommand.d.ts +55 -55
- package/src/commands/insertcolumncommand.js +67 -67
- package/src/commands/insertrowcommand.d.ts +54 -54
- package/src/commands/insertrowcommand.js +66 -66
- package/src/commands/inserttablecommand.d.ts +44 -44
- package/src/commands/inserttablecommand.js +69 -69
- package/src/commands/mergecellcommand.d.ts +68 -68
- package/src/commands/mergecellcommand.js +198 -198
- package/src/commands/mergecellscommand.d.ts +28 -28
- package/src/commands/mergecellscommand.js +94 -94
- package/src/commands/removecolumncommand.d.ts +29 -29
- package/src/commands/removecolumncommand.js +109 -109
- package/src/commands/removerowcommand.d.ts +29 -29
- package/src/commands/removerowcommand.js +82 -82
- package/src/commands/selectcolumncommand.d.ts +33 -33
- package/src/commands/selectcolumncommand.js +60 -60
- package/src/commands/selectrowcommand.d.ts +33 -33
- package/src/commands/selectrowcommand.js +56 -56
- package/src/commands/setheadercolumncommand.d.ts +50 -50
- package/src/commands/setheadercolumncommand.js +71 -71
- package/src/commands/setheaderrowcommand.d.ts +53 -53
- package/src/commands/setheaderrowcommand.js +79 -79
- package/src/commands/splitcellcommand.d.ts +43 -43
- package/src/commands/splitcellcommand.js +54 -54
- package/src/converters/downcast.d.ts +63 -63
- package/src/converters/downcast.js +146 -146
- package/src/converters/table-caption-post-fixer.d.ts +20 -20
- package/src/converters/table-caption-post-fixer.js +53 -53
- package/src/converters/table-cell-paragraph-post-fixer.d.ts +32 -32
- package/src/converters/table-cell-paragraph-post-fixer.js +107 -107
- package/src/converters/table-cell-refresh-handler.d.ts +18 -18
- package/src/converters/table-cell-refresh-handler.js +45 -45
- package/src/converters/table-headings-refresh-handler.d.ts +17 -17
- package/src/converters/table-headings-refresh-handler.js +49 -49
- package/src/converters/table-layout-post-fixer.d.ts +226 -226
- package/src/converters/table-layout-post-fixer.js +367 -367
- package/src/converters/tableproperties.d.ts +54 -54
- package/src/converters/tableproperties.js +159 -159
- package/src/converters/upcasttable.d.ts +49 -49
- package/src/converters/upcasttable.js +243 -243
- package/src/index.d.ts +60 -60
- package/src/index.js +30 -30
- package/src/plaintableoutput.d.ts +26 -26
- package/src/plaintableoutput.js +123 -123
- package/src/table.d.ts +40 -40
- package/src/table.js +44 -44
- package/src/tablecaption/tablecaptionediting.d.ts +63 -63
- package/src/tablecaption/tablecaptionediting.js +122 -122
- package/src/tablecaption/tablecaptionui.d.ts +21 -21
- package/src/tablecaption/tablecaptionui.js +57 -57
- package/src/tablecaption/toggletablecaptioncommand.d.ts +68 -68
- package/src/tablecaption/toggletablecaptioncommand.js +105 -104
- package/src/tablecaption/utils.d.ts +38 -42
- package/src/tablecaption/utils.js +57 -67
- package/src/tablecaption.d.ts +24 -24
- package/src/tablecaption.js +28 -28
- package/src/tablecellproperties/commands/tablecellbackgroundcolorcommand.d.ts +32 -32
- package/src/tablecellproperties/commands/tablecellbackgroundcolorcommand.js +30 -30
- package/src/tablecellproperties/commands/tablecellbordercolorcommand.d.ts +37 -37
- package/src/tablecellproperties/commands/tablecellbordercolorcommand.js +44 -44
- package/src/tablecellproperties/commands/tablecellborderstylecommand.d.ts +37 -37
- package/src/tablecellproperties/commands/tablecellborderstylecommand.js +44 -44
- package/src/tablecellproperties/commands/tablecellborderwidthcommand.d.ts +51 -51
- package/src/tablecellproperties/commands/tablecellborderwidthcommand.js +64 -64
- package/src/tablecellproperties/commands/tablecellheightcommand.d.ts +46 -46
- package/src/tablecellproperties/commands/tablecellheightcommand.js +51 -51
- package/src/tablecellproperties/commands/tablecellhorizontalalignmentcommand.d.ts +32 -32
- package/src/tablecellproperties/commands/tablecellhorizontalalignmentcommand.js +30 -30
- package/src/tablecellproperties/commands/tablecellpaddingcommand.d.ts +51 -51
- package/src/tablecellproperties/commands/tablecellpaddingcommand.js +64 -64
- package/src/tablecellproperties/commands/tablecellpropertycommand.d.ts +62 -62
- package/src/tablecellproperties/commands/tablecellpropertycommand.js +92 -92
- package/src/tablecellproperties/commands/tablecellverticalalignmentcommand.d.ts +40 -40
- package/src/tablecellproperties/commands/tablecellverticalalignmentcommand.js +38 -38
- package/src/tablecellproperties/tablecellpropertiesediting.d.ts +43 -43
- package/src/tablecellproperties/tablecellpropertiesediting.js +241 -241
- package/src/tablecellproperties/tablecellpropertiesui.d.ts +112 -112
- package/src/tablecellproperties/tablecellpropertiesui.js +330 -330
- package/src/tablecellproperties/ui/tablecellpropertiesview.d.ts +228 -228
- package/src/tablecellproperties/ui/tablecellpropertiesview.js +548 -548
- package/src/tablecellproperties.d.ts +30 -30
- package/src/tablecellproperties.js +34 -34
- package/src/tablecellwidth/commands/tablecellwidthcommand.d.ts +46 -46
- package/src/tablecellwidth/commands/tablecellwidthcommand.js +51 -51
- package/src/tablecellwidth/tablecellwidthediting.d.ts +29 -29
- package/src/tablecellwidth/tablecellwidthediting.js +45 -45
- package/src/tableclipboard.d.ts +65 -65
- package/src/tableclipboard.js +450 -450
- package/src/tablecolumnresize/constants.d.ts +20 -20
- package/src/tablecolumnresize/constants.js +20 -20
- package/src/tablecolumnresize/converters.d.ts +18 -18
- package/src/tablecolumnresize/converters.js +46 -46
- package/src/tablecolumnresize/tablecolumnresizeediting.d.ts +139 -139
- package/src/tablecolumnresize/tablecolumnresizeediting.js +583 -583
- package/src/tablecolumnresize/tablewidthscommand.d.ts +38 -38
- package/src/tablecolumnresize/tablewidthscommand.js +61 -61
- package/src/tablecolumnresize/utils.d.ts +148 -148
- package/src/tablecolumnresize/utils.js +358 -358
- package/src/tablecolumnresize.d.ts +26 -26
- package/src/tablecolumnresize.js +30 -30
- package/src/tableconfig.d.ts +343 -343
- package/src/tableconfig.js +5 -5
- package/src/tableediting.d.ts +98 -98
- package/src/tableediting.js +191 -191
- package/src/tablekeyboard.d.ts +68 -68
- package/src/tablekeyboard.js +279 -279
- package/src/tablemouse/mouseeventsobserver.d.ts +62 -62
- package/src/tablemouse/mouseeventsobserver.js +35 -35
- package/src/tablemouse.d.ts +48 -48
- package/src/tablemouse.js +172 -172
- package/src/tableproperties/commands/tablealignmentcommand.d.ts +32 -32
- package/src/tableproperties/commands/tablealignmentcommand.js +30 -30
- package/src/tableproperties/commands/tablebackgroundcolorcommand.d.ts +32 -32
- package/src/tableproperties/commands/tablebackgroundcolorcommand.js +30 -30
- package/src/tableproperties/commands/tablebordercolorcommand.d.ts +37 -37
- package/src/tableproperties/commands/tablebordercolorcommand.js +44 -44
- package/src/tableproperties/commands/tableborderstylecommand.d.ts +37 -37
- package/src/tableproperties/commands/tableborderstylecommand.js +44 -44
- package/src/tableproperties/commands/tableborderwidthcommand.d.ts +51 -51
- package/src/tableproperties/commands/tableborderwidthcommand.js +64 -64
- package/src/tableproperties/commands/tableheightcommand.d.ts +46 -46
- package/src/tableproperties/commands/tableheightcommand.js +54 -54
- package/src/tableproperties/commands/tablepropertycommand.d.ts +61 -61
- package/src/tableproperties/commands/tablepropertycommand.js +81 -80
- package/src/tableproperties/commands/tablewidthcommand.d.ts +46 -46
- package/src/tableproperties/commands/tablewidthcommand.js +54 -54
- package/src/tableproperties/tablepropertiesediting.d.ts +40 -40
- package/src/tableproperties/tablepropertiesediting.js +206 -206
- package/src/tableproperties/tablepropertiesui.d.ts +114 -114
- package/src/tableproperties/tablepropertiesui.js +321 -321
- package/src/tableproperties/ui/tablepropertiesview.d.ts +207 -207
- package/src/tableproperties/ui/tablepropertiesview.js +466 -466
- package/src/tableproperties.d.ts +30 -30
- package/src/tableproperties.js +34 -34
- package/src/tableselection.d.ts +107 -107
- package/src/tableselection.js +297 -297
- package/src/tabletoolbar.d.ts +32 -32
- package/src/tabletoolbar.js +57 -57
- package/src/tableui.d.ts +53 -53
- package/src/tableui.js +309 -309
- package/src/tableutils.d.ts +448 -448
- package/src/tableutils.js +1055 -1055
- package/src/tablewalker.d.ts +362 -362
- package/src/tablewalker.js +393 -393
- package/src/ui/colorinputview.d.ts +140 -140
- package/src/ui/colorinputview.js +271 -271
- package/src/ui/formrowview.d.ts +61 -61
- package/src/ui/formrowview.js +57 -57
- package/src/ui/inserttableview.d.ts +77 -77
- package/src/ui/inserttableview.js +169 -169
- package/src/utils/common.d.ts +46 -42
- package/src/utils/common.js +68 -57
- package/src/utils/structure.d.ts +245 -245
- package/src/utils/structure.js +426 -426
- package/src/utils/table-properties.d.ts +67 -67
- package/src/utils/table-properties.js +86 -86
- package/src/utils/ui/contextualballoon.d.ts +34 -34
- package/src/utils/ui/contextualballoon.js +110 -106
- package/src/utils/ui/table-properties.d.ts +195 -195
- package/src/utils/ui/table-properties.js +362 -362
- package/src/utils/ui/widget.d.ts +20 -16
- package/src/utils/ui/widget.js +48 -38
- package/build/table.js.map +0 -1
|
@@ -1,146 +1,146 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
-
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
-
*/
|
|
5
|
-
/**
|
|
6
|
-
* @module table/converters/downcast
|
|
7
|
-
*/
|
|
8
|
-
import { toWidget, toWidgetEditable } from 'ckeditor5/src/widget';
|
|
9
|
-
import TableWalker from './../tablewalker';
|
|
10
|
-
/**
|
|
11
|
-
* Model table element to view table element conversion helper.
|
|
12
|
-
*/
|
|
13
|
-
export function downcastTable(tableUtils, options) {
|
|
14
|
-
return (table, { writer }) => {
|
|
15
|
-
const headingRows = table.getAttribute('headingRows') || 0;
|
|
16
|
-
const tableElement = writer.createContainerElement('table', null, []);
|
|
17
|
-
const figureElement = writer.createContainerElement('figure', { class: 'table' }, tableElement);
|
|
18
|
-
// Table head slot.
|
|
19
|
-
if (headingRows > 0) {
|
|
20
|
-
writer.insert(writer.createPositionAt(tableElement, 'end'), writer.createContainerElement('thead', null, writer.createSlot(element => element.is('element', 'tableRow') && element.index < headingRows)));
|
|
21
|
-
}
|
|
22
|
-
// Table body slot.
|
|
23
|
-
if (headingRows < tableUtils.getRows(table)) {
|
|
24
|
-
writer.insert(writer.createPositionAt(tableElement, 'end'), writer.createContainerElement('tbody', null, writer.createSlot(element => element.is('element', 'tableRow') && element.index >= headingRows)));
|
|
25
|
-
}
|
|
26
|
-
// Dynamic slots.
|
|
27
|
-
for (const { positionOffset, filter } of options.additionalSlots) {
|
|
28
|
-
writer.insert(writer.createPositionAt(tableElement, positionOffset), writer.createSlot(filter));
|
|
29
|
-
}
|
|
30
|
-
// Create a slot with items that don't fit into the table.
|
|
31
|
-
writer.insert(writer.createPositionAt(tableElement, 'after'), writer.createSlot(element => {
|
|
32
|
-
if (element.is('element', 'tableRow')) {
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
return !options.additionalSlots.some(({ filter }) => filter(element));
|
|
36
|
-
}));
|
|
37
|
-
return options.asWidget ? toTableWidget(figureElement, writer) : figureElement;
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
/**
|
|
41
|
-
* Model table row element to view `<tr>` element conversion helper.
|
|
42
|
-
*
|
|
43
|
-
* @returns Element creator.
|
|
44
|
-
*/
|
|
45
|
-
export function downcastRow() {
|
|
46
|
-
return (tableRow, { writer }) => {
|
|
47
|
-
return tableRow.isEmpty ?
|
|
48
|
-
writer.createEmptyElement('tr') :
|
|
49
|
-
writer.createContainerElement('tr');
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
/**
|
|
53
|
-
* Model table cell element to view `<td>` or `<th>` element conversion helper.
|
|
54
|
-
*
|
|
55
|
-
* This conversion helper will create proper `<th>` elements for table cells that are in the heading section (heading row or column)
|
|
56
|
-
* and `<td>` otherwise.
|
|
57
|
-
*
|
|
58
|
-
* @param options.asWidget If set to `true`, the downcast conversion will produce a widget.
|
|
59
|
-
* @returns Element creator.
|
|
60
|
-
*/
|
|
61
|
-
export function downcastCell(options = {}) {
|
|
62
|
-
return (tableCell, { writer }) => {
|
|
63
|
-
const tableRow = tableCell.parent;
|
|
64
|
-
const table = tableRow.parent;
|
|
65
|
-
const rowIndex = table.getChildIndex(tableRow);
|
|
66
|
-
const tableWalker = new TableWalker(table, { row: rowIndex });
|
|
67
|
-
const headingRows = table.getAttribute('headingRows') || 0;
|
|
68
|
-
const headingColumns = table.getAttribute('headingColumns') || 0;
|
|
69
|
-
let result = null;
|
|
70
|
-
// We need to iterate over a table in order to get proper row & column values from a walker.
|
|
71
|
-
for (const tableSlot of tableWalker) {
|
|
72
|
-
if (tableSlot.cell == tableCell) {
|
|
73
|
-
const isHeading = tableSlot.row < headingRows || tableSlot.column < headingColumns;
|
|
74
|
-
const cellElementName = isHeading ? 'th' : 'td';
|
|
75
|
-
result = options.asWidget ?
|
|
76
|
-
toWidgetEditable(writer.createEditableElement(cellElementName), writer) :
|
|
77
|
-
writer.createContainerElement(cellElementName);
|
|
78
|
-
break;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
return result;
|
|
82
|
-
};
|
|
83
|
-
}
|
|
84
|
-
/**
|
|
85
|
-
* Overrides paragraph inside table cell conversion.
|
|
86
|
-
*
|
|
87
|
-
* This converter:
|
|
88
|
-
* * should be used to override default paragraph conversion.
|
|
89
|
-
* * It will only convert `<paragraph>` placed directly inside `<tableCell>`.
|
|
90
|
-
* * For a single paragraph without attributes it returns `<span>` to simulate data table.
|
|
91
|
-
* * For all other cases it returns `<p>` element.
|
|
92
|
-
*
|
|
93
|
-
* @param options.asWidget If set to `true`, the downcast conversion will produce a widget.
|
|
94
|
-
* @returns Element creator.
|
|
95
|
-
*/
|
|
96
|
-
export function convertParagraphInTableCell(options = {}) {
|
|
97
|
-
return (modelElement, { writer }) => {
|
|
98
|
-
if (!modelElement.parent.is('element', 'tableCell')) {
|
|
99
|
-
return null;
|
|
100
|
-
}
|
|
101
|
-
if (!isSingleParagraphWithoutAttributes(modelElement)) {
|
|
102
|
-
return null;
|
|
103
|
-
}
|
|
104
|
-
if (options.asWidget) {
|
|
105
|
-
return writer.createContainerElement('span', { class: 'ck-table-bogus-paragraph' });
|
|
106
|
-
}
|
|
107
|
-
else {
|
|
108
|
-
// Using `<p>` in case there are some markers on it and transparentRendering will render it anyway.
|
|
109
|
-
const viewElement = writer.createContainerElement('p');
|
|
110
|
-
writer.setCustomProperty('dataPipeline:transparentRendering', true, viewElement);
|
|
111
|
-
return viewElement;
|
|
112
|
-
}
|
|
113
|
-
};
|
|
114
|
-
}
|
|
115
|
-
/**
|
|
116
|
-
* Checks if given model `<paragraph>` is an only child of a parent (`<tableCell>`) and if it has any attribute set.
|
|
117
|
-
*
|
|
118
|
-
* The paragraph should be converted in the editing view to:
|
|
119
|
-
*
|
|
120
|
-
* * If returned `true` - to a `<span class="ck-table-bogus-paragraph">`
|
|
121
|
-
* * If returned `false` - to a `<p>`
|
|
122
|
-
*/
|
|
123
|
-
export function isSingleParagraphWithoutAttributes(modelElement) {
|
|
124
|
-
const tableCell = modelElement.parent;
|
|
125
|
-
const isSingleParagraph = tableCell.childCount == 1;
|
|
126
|
-
return isSingleParagraph && !hasAnyAttribute(modelElement);
|
|
127
|
-
}
|
|
128
|
-
/**
|
|
129
|
-
* Converts a given {@link module:engine/view/element~Element} to a table widget:
|
|
130
|
-
* * Adds a {@link module:engine/view/element~Element#_setCustomProperty custom property} allowing to recognize the table widget element.
|
|
131
|
-
* * Calls the {@link module:widget/utils~toWidget} function with the proper element's label creator.
|
|
132
|
-
*
|
|
133
|
-
* @param writer An instance of the view writer.
|
|
134
|
-
* @param label The element's label. It will be concatenated with the table `alt` attribute if one is present.
|
|
135
|
-
*/
|
|
136
|
-
function toTableWidget(viewElement, writer) {
|
|
137
|
-
writer.setCustomProperty('table', true, viewElement);
|
|
138
|
-
return toWidget(viewElement, writer, { hasSelectionHandle: true });
|
|
139
|
-
}
|
|
140
|
-
/**
|
|
141
|
-
* Checks if an element has any attributes set.
|
|
142
|
-
*/
|
|
143
|
-
function hasAnyAttribute(element) {
|
|
144
|
-
const iteratorItem = element.getAttributeKeys().next();
|
|
145
|
-
return !iteratorItem.done;
|
|
146
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
+
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* @module table/converters/downcast
|
|
7
|
+
*/
|
|
8
|
+
import { toWidget, toWidgetEditable } from 'ckeditor5/src/widget';
|
|
9
|
+
import TableWalker from './../tablewalker';
|
|
10
|
+
/**
|
|
11
|
+
* Model table element to view table element conversion helper.
|
|
12
|
+
*/
|
|
13
|
+
export function downcastTable(tableUtils, options) {
|
|
14
|
+
return (table, { writer }) => {
|
|
15
|
+
const headingRows = table.getAttribute('headingRows') || 0;
|
|
16
|
+
const tableElement = writer.createContainerElement('table', null, []);
|
|
17
|
+
const figureElement = writer.createContainerElement('figure', { class: 'table' }, tableElement);
|
|
18
|
+
// Table head slot.
|
|
19
|
+
if (headingRows > 0) {
|
|
20
|
+
writer.insert(writer.createPositionAt(tableElement, 'end'), writer.createContainerElement('thead', null, writer.createSlot(element => element.is('element', 'tableRow') && element.index < headingRows)));
|
|
21
|
+
}
|
|
22
|
+
// Table body slot.
|
|
23
|
+
if (headingRows < tableUtils.getRows(table)) {
|
|
24
|
+
writer.insert(writer.createPositionAt(tableElement, 'end'), writer.createContainerElement('tbody', null, writer.createSlot(element => element.is('element', 'tableRow') && element.index >= headingRows)));
|
|
25
|
+
}
|
|
26
|
+
// Dynamic slots.
|
|
27
|
+
for (const { positionOffset, filter } of options.additionalSlots) {
|
|
28
|
+
writer.insert(writer.createPositionAt(tableElement, positionOffset), writer.createSlot(filter));
|
|
29
|
+
}
|
|
30
|
+
// Create a slot with items that don't fit into the table.
|
|
31
|
+
writer.insert(writer.createPositionAt(tableElement, 'after'), writer.createSlot(element => {
|
|
32
|
+
if (element.is('element', 'tableRow')) {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
return !options.additionalSlots.some(({ filter }) => filter(element));
|
|
36
|
+
}));
|
|
37
|
+
return options.asWidget ? toTableWidget(figureElement, writer) : figureElement;
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Model table row element to view `<tr>` element conversion helper.
|
|
42
|
+
*
|
|
43
|
+
* @returns Element creator.
|
|
44
|
+
*/
|
|
45
|
+
export function downcastRow() {
|
|
46
|
+
return (tableRow, { writer }) => {
|
|
47
|
+
return tableRow.isEmpty ?
|
|
48
|
+
writer.createEmptyElement('tr') :
|
|
49
|
+
writer.createContainerElement('tr');
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Model table cell element to view `<td>` or `<th>` element conversion helper.
|
|
54
|
+
*
|
|
55
|
+
* This conversion helper will create proper `<th>` elements for table cells that are in the heading section (heading row or column)
|
|
56
|
+
* and `<td>` otherwise.
|
|
57
|
+
*
|
|
58
|
+
* @param options.asWidget If set to `true`, the downcast conversion will produce a widget.
|
|
59
|
+
* @returns Element creator.
|
|
60
|
+
*/
|
|
61
|
+
export function downcastCell(options = {}) {
|
|
62
|
+
return (tableCell, { writer }) => {
|
|
63
|
+
const tableRow = tableCell.parent;
|
|
64
|
+
const table = tableRow.parent;
|
|
65
|
+
const rowIndex = table.getChildIndex(tableRow);
|
|
66
|
+
const tableWalker = new TableWalker(table, { row: rowIndex });
|
|
67
|
+
const headingRows = table.getAttribute('headingRows') || 0;
|
|
68
|
+
const headingColumns = table.getAttribute('headingColumns') || 0;
|
|
69
|
+
let result = null;
|
|
70
|
+
// We need to iterate over a table in order to get proper row & column values from a walker.
|
|
71
|
+
for (const tableSlot of tableWalker) {
|
|
72
|
+
if (tableSlot.cell == tableCell) {
|
|
73
|
+
const isHeading = tableSlot.row < headingRows || tableSlot.column < headingColumns;
|
|
74
|
+
const cellElementName = isHeading ? 'th' : 'td';
|
|
75
|
+
result = options.asWidget ?
|
|
76
|
+
toWidgetEditable(writer.createEditableElement(cellElementName), writer) :
|
|
77
|
+
writer.createContainerElement(cellElementName);
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return result;
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Overrides paragraph inside table cell conversion.
|
|
86
|
+
*
|
|
87
|
+
* This converter:
|
|
88
|
+
* * should be used to override default paragraph conversion.
|
|
89
|
+
* * It will only convert `<paragraph>` placed directly inside `<tableCell>`.
|
|
90
|
+
* * For a single paragraph without attributes it returns `<span>` to simulate data table.
|
|
91
|
+
* * For all other cases it returns `<p>` element.
|
|
92
|
+
*
|
|
93
|
+
* @param options.asWidget If set to `true`, the downcast conversion will produce a widget.
|
|
94
|
+
* @returns Element creator.
|
|
95
|
+
*/
|
|
96
|
+
export function convertParagraphInTableCell(options = {}) {
|
|
97
|
+
return (modelElement, { writer }) => {
|
|
98
|
+
if (!modelElement.parent.is('element', 'tableCell')) {
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
if (!isSingleParagraphWithoutAttributes(modelElement)) {
|
|
102
|
+
return null;
|
|
103
|
+
}
|
|
104
|
+
if (options.asWidget) {
|
|
105
|
+
return writer.createContainerElement('span', { class: 'ck-table-bogus-paragraph' });
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
// Using `<p>` in case there are some markers on it and transparentRendering will render it anyway.
|
|
109
|
+
const viewElement = writer.createContainerElement('p');
|
|
110
|
+
writer.setCustomProperty('dataPipeline:transparentRendering', true, viewElement);
|
|
111
|
+
return viewElement;
|
|
112
|
+
}
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
/**
|
|
116
|
+
* Checks if given model `<paragraph>` is an only child of a parent (`<tableCell>`) and if it has any attribute set.
|
|
117
|
+
*
|
|
118
|
+
* The paragraph should be converted in the editing view to:
|
|
119
|
+
*
|
|
120
|
+
* * If returned `true` - to a `<span class="ck-table-bogus-paragraph">`
|
|
121
|
+
* * If returned `false` - to a `<p>`
|
|
122
|
+
*/
|
|
123
|
+
export function isSingleParagraphWithoutAttributes(modelElement) {
|
|
124
|
+
const tableCell = modelElement.parent;
|
|
125
|
+
const isSingleParagraph = tableCell.childCount == 1;
|
|
126
|
+
return isSingleParagraph && !hasAnyAttribute(modelElement);
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Converts a given {@link module:engine/view/element~Element} to a table widget:
|
|
130
|
+
* * Adds a {@link module:engine/view/element~Element#_setCustomProperty custom property} allowing to recognize the table widget element.
|
|
131
|
+
* * Calls the {@link module:widget/utils~toWidget} function with the proper element's label creator.
|
|
132
|
+
*
|
|
133
|
+
* @param writer An instance of the view writer.
|
|
134
|
+
* @param label The element's label. It will be concatenated with the table `alt` attribute if one is present.
|
|
135
|
+
*/
|
|
136
|
+
function toTableWidget(viewElement, writer) {
|
|
137
|
+
writer.setCustomProperty('table', true, viewElement);
|
|
138
|
+
return toWidget(viewElement, writer, { hasSelectionHandle: true });
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* Checks if an element has any attributes set.
|
|
142
|
+
*/
|
|
143
|
+
function hasAnyAttribute(element) {
|
|
144
|
+
const iteratorItem = element.getAttributeKeys().next();
|
|
145
|
+
return !iteratorItem.done;
|
|
146
|
+
}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
-
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
-
*/
|
|
5
|
-
/**
|
|
6
|
-
* @module table/converters/table-caption-post-fixer
|
|
7
|
-
*/
|
|
8
|
-
import type { Model } from 'ckeditor5/src/engine';
|
|
9
|
-
/**
|
|
10
|
-
* Injects a table caption post-fixer into the model.
|
|
11
|
-
*
|
|
12
|
-
* The role of the table caption post-fixer is to ensure that the table with caption have the correct structure
|
|
13
|
-
* after a {@link module:engine/model/model~Model#change `change()`} block was executed.
|
|
14
|
-
*
|
|
15
|
-
* The correct structure means that:
|
|
16
|
-
*
|
|
17
|
-
* * If there are many caption model element, they are merged into one model.
|
|
18
|
-
* * A final, merged caption model is placed at the end of the table.
|
|
19
|
-
*/
|
|
20
|
-
export default function injectTableCaptionPostFixer(model: Model): void;
|
|
1
|
+
/**
|
|
2
|
+
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
+
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* @module table/converters/table-caption-post-fixer
|
|
7
|
+
*/
|
|
8
|
+
import type { Model } from 'ckeditor5/src/engine';
|
|
9
|
+
/**
|
|
10
|
+
* Injects a table caption post-fixer into the model.
|
|
11
|
+
*
|
|
12
|
+
* The role of the table caption post-fixer is to ensure that the table with caption have the correct structure
|
|
13
|
+
* after a {@link module:engine/model/model~Model#change `change()`} block was executed.
|
|
14
|
+
*
|
|
15
|
+
* The correct structure means that:
|
|
16
|
+
*
|
|
17
|
+
* * If there are many caption model element, they are merged into one model.
|
|
18
|
+
* * A final, merged caption model is placed at the end of the table.
|
|
19
|
+
*/
|
|
20
|
+
export default function injectTableCaptionPostFixer(model: Model): void;
|
|
@@ -1,53 +1,53 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
-
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
-
*/
|
|
5
|
-
/**
|
|
6
|
-
* Injects a table caption post-fixer into the model.
|
|
7
|
-
*
|
|
8
|
-
* The role of the table caption post-fixer is to ensure that the table with caption have the correct structure
|
|
9
|
-
* after a {@link module:engine/model/model~Model#change `change()`} block was executed.
|
|
10
|
-
*
|
|
11
|
-
* The correct structure means that:
|
|
12
|
-
*
|
|
13
|
-
* * If there are many caption model element, they are merged into one model.
|
|
14
|
-
* * A final, merged caption model is placed at the end of the table.
|
|
15
|
-
*/
|
|
16
|
-
export default function injectTableCaptionPostFixer(model) {
|
|
17
|
-
model.document.registerPostFixer(writer => tableCaptionPostFixer(writer, model));
|
|
18
|
-
}
|
|
19
|
-
/**
|
|
20
|
-
* The table caption post-fixer.
|
|
21
|
-
*/
|
|
22
|
-
function tableCaptionPostFixer(writer, model) {
|
|
23
|
-
const changes = model.document.differ.getChanges();
|
|
24
|
-
let wasFixed = false;
|
|
25
|
-
for (const entry of changes) {
|
|
26
|
-
if (entry.type != 'insert') {
|
|
27
|
-
continue;
|
|
28
|
-
}
|
|
29
|
-
const positionParent = entry.position.parent;
|
|
30
|
-
if (positionParent.is('element', 'table') || entry.name == 'table') {
|
|
31
|
-
const table = (entry.name == 'table' ? entry.position.nodeAfter : positionParent);
|
|
32
|
-
const captionsToMerge = Array.from(table.getChildren())
|
|
33
|
-
.filter((child) => child.is('element', 'caption'));
|
|
34
|
-
const firstCaption = captionsToMerge.shift();
|
|
35
|
-
if (!firstCaption) {
|
|
36
|
-
continue;
|
|
37
|
-
}
|
|
38
|
-
// Move all the contents of the captions to the first one.
|
|
39
|
-
for (const caption of captionsToMerge) {
|
|
40
|
-
writer.move(writer.createRangeIn(caption), firstCaption, 'end');
|
|
41
|
-
writer.remove(caption);
|
|
42
|
-
}
|
|
43
|
-
// Make sure the final caption is at the end of the table.
|
|
44
|
-
if (firstCaption.nextSibling) {
|
|
45
|
-
writer.move(writer.createRangeOn(firstCaption), table, 'end');
|
|
46
|
-
wasFixed = true;
|
|
47
|
-
}
|
|
48
|
-
// Do we merged captions and/or moved the single caption to the end of the table?
|
|
49
|
-
wasFixed = !!captionsToMerge.length || wasFixed;
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
return wasFixed;
|
|
53
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
+
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* Injects a table caption post-fixer into the model.
|
|
7
|
+
*
|
|
8
|
+
* The role of the table caption post-fixer is to ensure that the table with caption have the correct structure
|
|
9
|
+
* after a {@link module:engine/model/model~Model#change `change()`} block was executed.
|
|
10
|
+
*
|
|
11
|
+
* The correct structure means that:
|
|
12
|
+
*
|
|
13
|
+
* * If there are many caption model element, they are merged into one model.
|
|
14
|
+
* * A final, merged caption model is placed at the end of the table.
|
|
15
|
+
*/
|
|
16
|
+
export default function injectTableCaptionPostFixer(model) {
|
|
17
|
+
model.document.registerPostFixer(writer => tableCaptionPostFixer(writer, model));
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* The table caption post-fixer.
|
|
21
|
+
*/
|
|
22
|
+
function tableCaptionPostFixer(writer, model) {
|
|
23
|
+
const changes = model.document.differ.getChanges();
|
|
24
|
+
let wasFixed = false;
|
|
25
|
+
for (const entry of changes) {
|
|
26
|
+
if (entry.type != 'insert') {
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
const positionParent = entry.position.parent;
|
|
30
|
+
if (positionParent.is('element', 'table') || entry.name == 'table') {
|
|
31
|
+
const table = (entry.name == 'table' ? entry.position.nodeAfter : positionParent);
|
|
32
|
+
const captionsToMerge = Array.from(table.getChildren())
|
|
33
|
+
.filter((child) => child.is('element', 'caption'));
|
|
34
|
+
const firstCaption = captionsToMerge.shift();
|
|
35
|
+
if (!firstCaption) {
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
// Move all the contents of the captions to the first one.
|
|
39
|
+
for (const caption of captionsToMerge) {
|
|
40
|
+
writer.move(writer.createRangeIn(caption), firstCaption, 'end');
|
|
41
|
+
writer.remove(caption);
|
|
42
|
+
}
|
|
43
|
+
// Make sure the final caption is at the end of the table.
|
|
44
|
+
if (firstCaption.nextSibling) {
|
|
45
|
+
writer.move(writer.createRangeOn(firstCaption), table, 'end');
|
|
46
|
+
wasFixed = true;
|
|
47
|
+
}
|
|
48
|
+
// Do we merged captions and/or moved the single caption to the end of the table?
|
|
49
|
+
wasFixed = !!captionsToMerge.length || wasFixed;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return wasFixed;
|
|
53
|
+
}
|
|
@@ -1,32 +1,32 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
-
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
-
*/
|
|
5
|
-
/**
|
|
6
|
-
* @module table/converters/table-cell-paragraph-post-fixer
|
|
7
|
-
*/
|
|
8
|
-
import type { Model } from 'ckeditor5/src/engine';
|
|
9
|
-
/**
|
|
10
|
-
* Injects a table cell post-fixer into the model which inserts a `paragraph` element into empty table cells.
|
|
11
|
-
*
|
|
12
|
-
* A table cell must contain at least one block element as a child. An empty table cell will have an empty `paragraph` as a child.
|
|
13
|
-
*
|
|
14
|
-
* ```xml
|
|
15
|
-
* <table>
|
|
16
|
-
* <tableRow>
|
|
17
|
-
* <tableCell></tableCell>
|
|
18
|
-
* </tableRow>
|
|
19
|
-
* </table>
|
|
20
|
-
* ```
|
|
21
|
-
*
|
|
22
|
-
* Will be fixed to:
|
|
23
|
-
*
|
|
24
|
-
* ```xml
|
|
25
|
-
* <table>
|
|
26
|
-
* <tableRow>
|
|
27
|
-
* <tableCell><paragraph></paragraph></tableCell>
|
|
28
|
-
* </tableRow>
|
|
29
|
-
* </table>
|
|
30
|
-
* ```
|
|
31
|
-
*/
|
|
32
|
-
export default function injectTableCellParagraphPostFixer(model: Model): void;
|
|
1
|
+
/**
|
|
2
|
+
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
|
|
3
|
+
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* @module table/converters/table-cell-paragraph-post-fixer
|
|
7
|
+
*/
|
|
8
|
+
import type { Model } from 'ckeditor5/src/engine';
|
|
9
|
+
/**
|
|
10
|
+
* Injects a table cell post-fixer into the model which inserts a `paragraph` element into empty table cells.
|
|
11
|
+
*
|
|
12
|
+
* A table cell must contain at least one block element as a child. An empty table cell will have an empty `paragraph` as a child.
|
|
13
|
+
*
|
|
14
|
+
* ```xml
|
|
15
|
+
* <table>
|
|
16
|
+
* <tableRow>
|
|
17
|
+
* <tableCell></tableCell>
|
|
18
|
+
* </tableRow>
|
|
19
|
+
* </table>
|
|
20
|
+
* ```
|
|
21
|
+
*
|
|
22
|
+
* Will be fixed to:
|
|
23
|
+
*
|
|
24
|
+
* ```xml
|
|
25
|
+
* <table>
|
|
26
|
+
* <tableRow>
|
|
27
|
+
* <tableCell><paragraph></paragraph></tableCell>
|
|
28
|
+
* </tableRow>
|
|
29
|
+
* </table>
|
|
30
|
+
* ```
|
|
31
|
+
*/
|
|
32
|
+
export default function injectTableCellParagraphPostFixer(model: Model): void;
|