@atlaskit/editor-core 98.2.5 → 98.2.6
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 +5 -0
- package/dist/es2015/plugins/table/utils/colgroup.js +9 -2
- package/dist/es2015/plugins/table/utils/colgroup.js.map +1 -1
- package/dist/es2015/plugins/table/utils/fix-tables.d.ts +1 -0
- package/dist/es2015/plugins/table/utils/fix-tables.js +47 -0
- package/dist/es2015/plugins/table/utils/fix-tables.js.map +1 -1
- package/dist/es5/plugins/table/utils/colgroup.js +9 -2
- package/dist/es5/plugins/table/utils/colgroup.js.map +1 -1
- package/dist/es5/plugins/table/utils/fix-tables.d.ts +1 -0
- package/dist/es5/plugins/table/utils/fix-tables.js +47 -0
- package/dist/es5/plugins/table/utils/fix-tables.js.map +1 -1
- package/dist/package.json +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 98.2.6
|
|
4
|
+
- [patch] [3305886b5a](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/3305886b5a):
|
|
5
|
+
|
|
6
|
+
- ED-6167: Handle extraneous column widths
|
|
7
|
+
|
|
3
8
|
## 98.2.5
|
|
4
9
|
- [patch] [b11848ebf8](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/b11848ebf8):
|
|
5
10
|
|
|
@@ -1,15 +1,22 @@
|
|
|
1
|
+
import * as tslib_1 from "tslib";
|
|
1
2
|
import { DOMSerializer } from 'prosemirror-model';
|
|
2
3
|
import { getFragmentBackingArray } from '../../../utils/slice';
|
|
3
4
|
export var generateColgroup = function (node) {
|
|
4
5
|
var cols = [];
|
|
5
6
|
node.content.firstChild.content.forEach(function (cell) {
|
|
7
|
+
var colspan = cell.attrs.colspan || 1;
|
|
6
8
|
if (Array.isArray(cell.attrs.colwidth)) {
|
|
7
|
-
|
|
9
|
+
// We slice here to guard against our colwidth array having more entries
|
|
10
|
+
// Than the we actually span. We'll patch the document at a later point.
|
|
11
|
+
cell.attrs.colwidth.slice(0, colspan).forEach(function (width) {
|
|
8
12
|
cols.push(['col', { style: "width: " + width + "px;" }]);
|
|
9
13
|
});
|
|
10
14
|
}
|
|
11
15
|
else {
|
|
12
|
-
|
|
16
|
+
// When we have merged cells on the first row (firstChild),
|
|
17
|
+
// We want to ensure we're creating the appropriate amount of
|
|
18
|
+
// cols the table still has.
|
|
19
|
+
cols.push.apply(cols, tslib_1.__spread(Array.from({ length: colspan }, function (_) { return ['col', {}]; })));
|
|
13
20
|
}
|
|
14
21
|
});
|
|
15
22
|
return cols;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"colgroup.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/colgroup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAAC,IAAY;IAC3C,IAAM,IAAI,GAAoD,EAAE,CAAC;IAEjE,IAAI,CAAC,OAAO,CAAC,UAAW,CAAC,OAAO,CAAC,OAAO,CAAC,UAAA,IAAI;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACtC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAA,KAAK;
|
|
1
|
+
{"version":3,"file":"colgroup.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/colgroup.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/D,MAAM,CAAC,IAAM,gBAAgB,GAAG,UAAC,IAAY;IAC3C,IAAM,IAAI,GAAoD,EAAE,CAAC;IAEjE,IAAI,CAAC,OAAO,CAAC,UAAW,CAAC,OAAO,CAAC,OAAO,CAAC,UAAA,IAAI;QAC3C,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACtC,wEAAwE;YACxE,wEAAwE;YACxE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,UAAA,KAAK;gBACjD,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,YAAU,KAAK,QAAK,EAAE,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,2DAA2D;YAC3D,6DAA6D;YAC7D,4BAA4B;YAC5B,IAAI,CAAC,IAAI,OAAT,IAAI,mBAAS,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,EAAE,EAAE,CAAC,EAAX,CAAW,CAAC,GAAE;SACjE;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,sBAAsB,GAAG,UAAC,IAAY;IACjD,IAAM,QAAQ,GAAG,aAAa,CAAC,UAAU,CACvC,QAAQ;IACR,aAAa;IACb,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAChD,CAAC;IAEF,IAAI,QAAQ,CAAC,GAAG,EAAE;QAChB,OAAO,QAAQ,CAAC,GAAG,CAAC;KACrB;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,sBAAsB,GAAG,UACpC,SAA2B,EAC3B,IAAY;IAEZ,IAAI,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAC,UAAU,CAAgB,CAAC;IAClE,IAAI,QAAQ,EAAE;QACZ,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;KACjC;IAED,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAgB,CAAC;IACvD,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IAEvD,OAAO,QAAQ,CAAC,QAAQ,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,mBAAmB,GAAG,UAAC,IAAY;IAC9C,OAAO,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAW,CAAC,OAAO,CAAC,CAAC,IAAI,CACrE,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAnB,CAAmB,CAC5B,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Transaction } from 'prosemirror-state';
|
|
2
2
|
import { Node as PMNode } from 'prosemirror-model';
|
|
3
|
+
export declare const removeExtraneousColumnWidths: (node: any, basePos: any, tr: any) => any;
|
|
3
4
|
export declare const fixTables: (tr: Transaction<any>) => Transaction<any>;
|
|
4
5
|
export declare const fixAutoSizedTable: (tr: Transaction<any>, node: PMNode<any>, table: HTMLTableElement, basePos: number) => Transaction<any>;
|
|
@@ -62,10 +62,27 @@ var fixTable = function (table, tablePos, tr) {
|
|
|
62
62
|
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
63
63
|
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
64
64
|
};
|
|
65
|
+
// We attempt to patch the document when we have extra, unneeded, column widths
|
|
66
|
+
// Take this node for example:
|
|
67
|
+
//
|
|
68
|
+
// ['td', { colwidth: [100, 100, 100], colspan: 2 }]
|
|
69
|
+
//
|
|
70
|
+
// This row only spans two columns, yet it contains widths for 3.
|
|
71
|
+
// We remove the third width here, assumed duplicate content.
|
|
72
|
+
export var removeExtraneousColumnWidths = function (node, basePos, tr) {
|
|
73
|
+
return replaceCells(tr, node, basePos, function (cell) {
|
|
74
|
+
var _a = cell.attrs, colwidth = _a.colwidth, colspan = _a.colspan;
|
|
75
|
+
if (colwidth && colwidth.length > colspan) {
|
|
76
|
+
return cell.type.createChecked(tslib_1.__assign({}, cell.attrs, { colwidth: colwidth.slice(0, colspan) }), cell.content, cell.marks);
|
|
77
|
+
}
|
|
78
|
+
return cell;
|
|
79
|
+
});
|
|
80
|
+
};
|
|
65
81
|
export var fixTables = function (tr) {
|
|
66
82
|
tr.doc.descendants(function (node, pos) {
|
|
67
83
|
if (node.type.name === 'table') {
|
|
68
84
|
tr = fixTable(node, pos, tr);
|
|
85
|
+
tr = removeExtraneousColumnWidths(node, pos, tr);
|
|
69
86
|
}
|
|
70
87
|
});
|
|
71
88
|
return tr;
|
|
@@ -94,4 +111,34 @@ export var fixAutoSizedTable = function (tr, node, table, basePos) {
|
|
|
94
111
|
.setNodeMarkup(basePos, undefined, tslib_1.__assign({}, node.attrs, { __autoSize: false }))
|
|
95
112
|
.setMeta('addToHistory', false);
|
|
96
113
|
};
|
|
114
|
+
// TODO: move to prosemirror-utils
|
|
115
|
+
var replaceCells = function (tr, table, tablePos, modifyCell) {
|
|
116
|
+
var rows = [];
|
|
117
|
+
var modifiedCells = 0;
|
|
118
|
+
for (var rowIndex = 0; rowIndex < table.childCount; rowIndex++) {
|
|
119
|
+
var row = table.child(rowIndex);
|
|
120
|
+
var cells = [];
|
|
121
|
+
for (var colIndex = 0; colIndex < row.childCount; colIndex++) {
|
|
122
|
+
var cell = row.child(colIndex);
|
|
123
|
+
// FIXME
|
|
124
|
+
// The rowIndex and colIndex are not accurate in a merged cell scenario
|
|
125
|
+
// e.g. table with 5 columns might have only one cell in a row, colIndex will be 1, where it should be 4
|
|
126
|
+
var node = modifyCell(cell, rowIndex, colIndex);
|
|
127
|
+
if (node.sameMarkup(cell) === false) {
|
|
128
|
+
modifiedCells++;
|
|
129
|
+
}
|
|
130
|
+
cells.push(node);
|
|
131
|
+
}
|
|
132
|
+
if (cells.length) {
|
|
133
|
+
rows.push(row.type.createChecked(row.attrs, cells, row.marks));
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
// Check if the table has changed before replacing.
|
|
137
|
+
// If no cells are modified our counter will be zero.
|
|
138
|
+
if (rows.length && modifiedCells !== 0) {
|
|
139
|
+
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
140
|
+
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
141
|
+
}
|
|
142
|
+
return tr;
|
|
143
|
+
};
|
|
97
144
|
//# sourceMappingURL=fix-tables.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,IAAM,QAAQ,GAAG,UACf,KAAa,EACb,QAAgB,EAChB,EAAe;IAEf,IAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,wDAAwD;IACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE;QACzC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE;YAC9B,WAAW,GAAG,IAAI,CAAC;YACnB,MAAM;SACP;KACF;IAED,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QAC9D,IAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,GAAG,CAAC,UAAU,EAAE;YAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChB;aAAM;YACL,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzC,IAAM,KAAK,GAAa,EAAE,CAAC;gBAC3B,IAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEzB,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;oBACjE,IAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;oBAC9B,IAAA,4BAAO,CAAgB;oBAC/B,IAAI,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;wBAClC,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,IAAI,CAAC,aAAa,sBAEhB,IAAI,CAAC,KAAK,IACb,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,KAEjC,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CACF,CAAC;qBACH;yBAAM;wBACL,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAClB;iBACF;gBACD,2DAA2D;gBAC3D,IAAI,KAAK,CAAC,MAAM,EAAE;oBAChB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC/D;aACF;SACF;KACF;IAED,uCAAuC;IACvC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,gCAAgC;QAChC,QAAQ,CAAC;YACP,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,iCAAiC;oBACvC,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE;wBACV,OAAO,EAAE,8BAA8B;qBACxC;oBACD,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;oBAChC,MAAM,EAAE,OAAO;oBACf,IAAI,EAAE,GAAG;iBACV;aACF;SACF,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;KACvD;IAED,IAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1E,OAAO,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,SAAS,GAAG,UAAC,EAAe;IACvC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,UAAC,IAAI,EAAE,GAAG;QAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;YAC9B,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var tslib_1 = require("tslib");
|
|
3
4
|
var prosemirror_model_1 = require("prosemirror-model");
|
|
4
5
|
var slice_1 = require("../../../utils/slice");
|
|
5
6
|
exports.generateColgroup = function (node) {
|
|
6
7
|
var cols = [];
|
|
7
8
|
node.content.firstChild.content.forEach(function (cell) {
|
|
9
|
+
var colspan = cell.attrs.colspan || 1;
|
|
8
10
|
if (Array.isArray(cell.attrs.colwidth)) {
|
|
9
|
-
|
|
11
|
+
// We slice here to guard against our colwidth array having more entries
|
|
12
|
+
// Than the we actually span. We'll patch the document at a later point.
|
|
13
|
+
cell.attrs.colwidth.slice(0, colspan).forEach(function (width) {
|
|
10
14
|
cols.push(['col', { style: "width: " + width + "px;" }]);
|
|
11
15
|
});
|
|
12
16
|
}
|
|
13
17
|
else {
|
|
14
|
-
|
|
18
|
+
// When we have merged cells on the first row (firstChild),
|
|
19
|
+
// We want to ensure we're creating the appropriate amount of
|
|
20
|
+
// cols the table still has.
|
|
21
|
+
cols.push.apply(cols, tslib_1.__spread(Array.from({ length: colspan }, function (_) { return ['col', {}]; })));
|
|
15
22
|
}
|
|
16
23
|
});
|
|
17
24
|
return cols;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"colgroup.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/colgroup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"colgroup.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/colgroup.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAClE,8CAA+D;AAElD,QAAA,gBAAgB,GAAG,UAAC,IAAY;IAC3C,IAAM,IAAI,GAAoD,EAAE,CAAC;IAEjE,IAAI,CAAC,OAAO,CAAC,UAAW,CAAC,OAAO,CAAC,OAAO,CAAC,UAAA,IAAI;QAC3C,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACtC,wEAAwE;YACxE,wEAAwE;YACxE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,UAAA,KAAK;gBACjD,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,YAAU,KAAK,QAAK,EAAE,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,2DAA2D;YAC3D,6DAA6D;YAC7D,4BAA4B;YAC5B,IAAI,CAAC,IAAI,OAAT,IAAI,mBAAS,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,EAAE,EAAE,CAAC,EAAX,CAAW,CAAC,GAAE;SACjE;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEW,QAAA,sBAAsB,GAAG,UAAC,IAAY;IACjD,IAAM,QAAQ,GAAG,iCAAa,CAAC,UAAU,CACvC,QAAQ;IACR,aAAa;IACb,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,wBAAgB,CAAC,IAAI,CAAC,CAAC,CAChD,CAAC;IAEF,IAAI,QAAQ,CAAC,GAAG,EAAE;QAChB,OAAO,QAAQ,CAAC,GAAG,CAAC;KACrB;AACH,CAAC,CAAC;AAEW,QAAA,sBAAsB,GAAG,UACpC,SAA2B,EAC3B,IAAY;IAEZ,IAAI,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAC,UAAU,CAAgB,CAAC;IAClE,IAAI,QAAQ,EAAE;QACZ,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;KACjC;IAED,QAAQ,GAAG,8BAAsB,CAAC,IAAI,CAAgB,CAAC;IACvD,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;IAEvD,OAAO,QAAQ,CAAC,QAAQ,CAAC;AAC3B,CAAC,CAAC;AAEW,QAAA,mBAAmB,GAAG,UAAC,IAAY;IAC9C,OAAO,CAAC,CAAC,+BAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAW,CAAC,OAAO,CAAC,CAAC,IAAI,CACrE,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAnB,CAAmB,CAC5B,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Transaction } from 'prosemirror-state';
|
|
2
2
|
import { Node as PMNode } from 'prosemirror-model';
|
|
3
|
+
export declare const removeExtraneousColumnWidths: (node: any, basePos: any, tr: any) => any;
|
|
3
4
|
export declare const fixTables: (tr: Transaction<any>) => Transaction<any>;
|
|
4
5
|
export declare const fixAutoSizedTable: (tr: Transaction<any>, node: PMNode<any>, table: HTMLTableElement, basePos: number) => Transaction<any>;
|
|
@@ -64,10 +64,27 @@ var fixTable = function (table, tablePos, tr) {
|
|
|
64
64
|
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
65
65
|
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
66
66
|
};
|
|
67
|
+
// We attempt to patch the document when we have extra, unneeded, column widths
|
|
68
|
+
// Take this node for example:
|
|
69
|
+
//
|
|
70
|
+
// ['td', { colwidth: [100, 100, 100], colspan: 2 }]
|
|
71
|
+
//
|
|
72
|
+
// This row only spans two columns, yet it contains widths for 3.
|
|
73
|
+
// We remove the third width here, assumed duplicate content.
|
|
74
|
+
exports.removeExtraneousColumnWidths = function (node, basePos, tr) {
|
|
75
|
+
return replaceCells(tr, node, basePos, function (cell) {
|
|
76
|
+
var _a = cell.attrs, colwidth = _a.colwidth, colspan = _a.colspan;
|
|
77
|
+
if (colwidth && colwidth.length > colspan) {
|
|
78
|
+
return cell.type.createChecked(tslib_1.__assign({}, cell.attrs, { colwidth: colwidth.slice(0, colspan) }), cell.content, cell.marks);
|
|
79
|
+
}
|
|
80
|
+
return cell;
|
|
81
|
+
});
|
|
82
|
+
};
|
|
67
83
|
exports.fixTables = function (tr) {
|
|
68
84
|
tr.doc.descendants(function (node, pos) {
|
|
69
85
|
if (node.type.name === 'table') {
|
|
70
86
|
tr = fixTable(node, pos, tr);
|
|
87
|
+
tr = exports.removeExtraneousColumnWidths(node, pos, tr);
|
|
71
88
|
}
|
|
72
89
|
});
|
|
73
90
|
return tr;
|
|
@@ -96,4 +113,34 @@ exports.fixAutoSizedTable = function (tr, node, table, basePos) {
|
|
|
96
113
|
.setNodeMarkup(basePos, undefined, tslib_1.__assign({}, node.attrs, { __autoSize: false }))
|
|
97
114
|
.setMeta('addToHistory', false);
|
|
98
115
|
};
|
|
116
|
+
// TODO: move to prosemirror-utils
|
|
117
|
+
var replaceCells = function (tr, table, tablePos, modifyCell) {
|
|
118
|
+
var rows = [];
|
|
119
|
+
var modifiedCells = 0;
|
|
120
|
+
for (var rowIndex = 0; rowIndex < table.childCount; rowIndex++) {
|
|
121
|
+
var row = table.child(rowIndex);
|
|
122
|
+
var cells = [];
|
|
123
|
+
for (var colIndex = 0; colIndex < row.childCount; colIndex++) {
|
|
124
|
+
var cell = row.child(colIndex);
|
|
125
|
+
// FIXME
|
|
126
|
+
// The rowIndex and colIndex are not accurate in a merged cell scenario
|
|
127
|
+
// e.g. table with 5 columns might have only one cell in a row, colIndex will be 1, where it should be 4
|
|
128
|
+
var node = modifyCell(cell, rowIndex, colIndex);
|
|
129
|
+
if (node.sameMarkup(cell) === false) {
|
|
130
|
+
modifiedCells++;
|
|
131
|
+
}
|
|
132
|
+
cells.push(node);
|
|
133
|
+
}
|
|
134
|
+
if (cells.length) {
|
|
135
|
+
rows.push(row.type.createChecked(row.attrs, cells, row.marks));
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
// Check if the table has changed before replacing.
|
|
139
|
+
// If no cells are modified our counter will be zero.
|
|
140
|
+
if (rows.length && modifiedCells !== 0) {
|
|
141
|
+
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
142
|
+
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
143
|
+
}
|
|
144
|
+
return tr;
|
|
145
|
+
};
|
|
99
146
|
//# sourceMappingURL=fix-tables.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED