@atlaskit/editor-core 98.4.1 → 98.4.2
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/nodeviews/TableComponent.js +4 -3
- package/dist/es2015/plugins/table/nodeviews/TableComponent.js.map +1 -1
- package/dist/es2015/plugins/table/utils/fix-tables.js +85 -17
- package/dist/es2015/plugins/table/utils/fix-tables.js.map +1 -1
- package/dist/es5/plugins/table/nodeviews/TableComponent.js +4 -3
- package/dist/es5/plugins/table/nodeviews/TableComponent.js.map +1 -1
- package/dist/es5/plugins/table/utils/fix-tables.js +85 -17
- 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.4.2
|
|
4
|
+
- [patch] [2487368a7e](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/2487368a7e):
|
|
5
|
+
|
|
6
|
+
- ED-6170: repair the table by removing invisible columns
|
|
7
|
+
|
|
3
8
|
## 98.4.1
|
|
4
9
|
- [patch] [47970c78b1](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/47970c78b1):
|
|
5
10
|
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as tslib_1 from "tslib";
|
|
2
2
|
import * as React from 'react';
|
|
3
3
|
import rafSchedule from 'raf-schd';
|
|
4
|
+
import { TableMap } from 'prosemirror-tables';
|
|
4
5
|
import { browser, calcTableWidth, akEditorMobileBreakoutPoint, } from '@atlaskit/editor-common';
|
|
5
6
|
import TableFloatingControls from '../ui/TableFloatingControls';
|
|
6
7
|
import ColumnControls from '../ui/TableFloatingControls/ColumnControls';
|
|
@@ -117,9 +118,9 @@ var TableComponent = /** @class */ (function (_super) {
|
|
|
117
118
|
var _a = this.props, view = _a.view, node = _a.node, getPos = _a.getPos, containerWidth = _a.containerWidth;
|
|
118
119
|
var prevAttrs = prevProps.node.attrs;
|
|
119
120
|
var currentAttrs = node.attrs;
|
|
120
|
-
var
|
|
121
|
-
var
|
|
122
|
-
if (
|
|
121
|
+
var prevMap = TableMap.get(prevProps.node);
|
|
122
|
+
var currentMap = TableMap.get(node);
|
|
123
|
+
if (prevMap.width !== currentMap.width ||
|
|
123
124
|
prevAttrs.layout !== currentAttrs.layout ||
|
|
124
125
|
prevAttrs.isNumberColumnEnabled !== currentAttrs.isNumberColumnEnabled ||
|
|
125
126
|
prevAttrs.__autoSize !== currentAttrs.__autoSize ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableComponent.js","sourceRoot":"","sources":["../../../../../src/plugins/table/nodeviews/TableComponent.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TableComponent.js","sourceRoot":"","sources":["../../../../../src/plugins/table/nodeviews/TableComponent.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,WAAW,MAAM,UAAU,CAAC;AAGnC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EACL,OAAO,EACP,cAAc,EACd,2BAA2B,GAC5B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,qBAAqB,MAAM,6BAA6B,CAAC;AAChE,OAAO,cAAc,MAAM,4CAA4C,CAAC;AAExE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAEL,UAAU,EACV,eAAe,GAChB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAoB,iBAAiB,IAAI,SAAS,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,IAAM,MAAM,GAAG,OAAO,CAAC,UAAU,KAAK,EAAE,CAAC;AAGzC,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAe3C;IAA6B,0CAA+B;IAc1D,wBAAY,KAAK;QAAjB,YACE,kBAAM,KAAK,CAAC,SAWb;QAzBD,WAAK,GAGD;YACF,MAAM,EAAE,CAAC;YACT,mBAAmB,EAAE,SAAS;SAC/B,CAAC;QA4KM,kBAAY,GAAG,UAAC,KAAY;YAClC,IAAI,CAAC,KAAI,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,KAAK,KAAI,CAAC,OAAO,EAAE;gBAClD,OAAO;aACR;YAED,KAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QACrD,CAAC,CAAC;QAEM,2BAAqB,GAAG,WAAW,CAAC,KAAI,CAAC,YAAY,CAAC,CAAC;QAwCvD,oBAAc,GAAG;YACvB,IAAI,KAAI,CAAC,KAAK,EAAE;gBACR,IAAA,gBAAmC,EAAjC,cAAI,EAAE,cAAI,EAAE,kBAAqB,CAAC;gBAClC,IAAA,kBAAK,EAAE,wBAAQ,CAAU;gBACjC,aAAa,CAAC,IAAI,EAAE,KAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;aAC5D;QACH,CAAC,CAAC;QAxNA,gEAAgE;QAChE,wDAAwD;QACxD,IAAI,aAAa,IAAI,QAAQ,EAAE;YAC7B,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG;gBAC9D,IAAI,QAAQ,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE;oBACvC,QAAQ,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;iBAC3C;YACH,CAAC,CAAC,CAAC;SACJ;;IACH,CAAC;IAED,0CAAiB,GAAjB;QACU,IAAA,oDAAmB,CAAgB;QAE3C,IAAI,mBAAmB,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;YAClD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACrE;QAED,IAAI,mBAAmB,EAAE;YACjB,IAAA,eAAqC,EAAnC,gBAAI,EAAE,oCAA6B,CAAC;YAE5C,eAAe,CACb,IAAI,CAAC,KAAK,EACV,MAAI,EACJ,gBAAc,CAAC,KAAK,EACpB,MAAI,CAAC,KAAK,CAAC,MAAM,CAClB,CAAC;YAEF,IAAI,CAAC,QAAQ,CAAC,cAAM,OAAA,CAAC;gBACnB,mBAAmB,EAAE,cAAc,CACjC,MAAI,CAAC,KAAK,CAAC,MAAM,EACjB,gBAAc,CAAC,KAAK,CACrB;aACF,CAAC,EALkB,CAKlB,CAAC,CAAC;SACL;IACH,CAAC;IAED,6CAAoB,GAApB;QACE,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE;YAC3B,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACxE;QAED,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC;IACtC,CAAC;IAED,2CAAkB,GAAlB,UAAmB,SAAS;QAC1B,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAE9D,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;YACpC,IAAI,CAAC,cAAc,EAAE,CAAC;SACvB;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,mBAAmB,IAAI,IAAI,CAAC,KAAK,EAAE;YACvD,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;SACrC;IACH,CAAC;IAED,+BAAM,GAAN;QAAA,iBAyGC;;QAxGO,IAAA,eAMQ,EALZ,cAAI,EACJ,cAAI,EACJ,4BAAW,EACX,sDAAwB,EACxB,gBACY,CAAC;QAGG,IAAA,2CAAoB,EAApB,yCAAoB,CACtB;QAEhB,yCAAyC;QACnC,IAAA,+BAMwB,EAL5B,0BAAU,EACV,kCAAc,EACd,4BAAW,EACX,oDAAuB,EACvB,8CAC4B,CAAC;QAE/B,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC;QACzC,IAAM,WAAW,GAAG,IAAI,CAAC,KAAK,KAAK,WAAW,CAAC,QAAQ,CAAC;QACxD,IAAM,UAAU,GACd,CAAC,CAAC,wBAAwB,IAAI,CAAC,CAAC,wBAAwB,CAAC,QAAQ,CAAC;QAC5D,IAAA,0BAAM,CAAgB;QAE9B,IAAM,WAAW,GAAG;YAClB,6BACE,GAAG,EAAE,CAAC,EACN,SAAS,EAAK,SAAS,CAAC,oBAAoB,UAC1C,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAC7C;gBAEF,oBAAC,qBAAqB,IACpB,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,qBAAqB,EAAE,IAAI,CAAC,KAAK,CAAC,qBAAqB,EACvD,qBAAqB,EAAE,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,EAC7D,kBAAkB,EAAE,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,EACvD,YAAY,EAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC;oBACjD,0DAA0D;oBAC1D,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,EACzD,uBAAuB,EAAE,uBAAuB,EAChD,oBAAoB,EAAE,oBAAoB,GAC1C,CACE;SACP,CAAC;QAEF,IAAM,cAAc,GAAG;YACrB,6BAAK,GAAG,EAAE,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,uBAAuB;gBACvD,oBAAC,cAAc,IACb,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,UAAA,IAAI,IAAI,OAAA,CAAC,KAAI,CAAC,cAAc,GAAG,IAAI,CAAC,EAA5B,CAA4B,EACzC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;oBACtB,8DAA8D;oBAC9D,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,EAC/B,eAAe,EAAE,IAAI,CAAC,UAAW,CAAC,UAAU,EAC5C,uBAAuB,EAAE,uBAAuB,GAChD,CACE;SACP,CAAC;QAEF,OAAO,CACL,6BACE,KAAK,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,mBAAmB;aACtC,EACD,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,eAAe;gBAC7C,GAAC,SAAS,CAAC,aAAa,IAAG,WAAW;gBACtC,kBAAc,GAAE,KAAK,GAAG,2BAA2B;oBACnD,wBACkB,IAAI,CAAC,KAAK,CAAC,qBAAqB,iBACvC,IAAI,CAAC,KAAK,CAAC,MAAM;YAE7B,aAAa,IAAI,WAAW;YAC7B,6BACE,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,EACnD,GAAG,EAAE,UAAA,IAAI;oBACP,KAAI,CAAC,OAAO,GAAG,IAAI,CAAC;oBACpB,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBAC/C,IAAI,IAAI,EAAE;wBACR,KAAI,CAAC,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;qBAC1C;gBACH,CAAC,IAEA,aAAa,IAAI,cAAc,CAC5B;YACN,6BACE,GAAG,EAAE,UAAA,IAAI;oBACP,KAAI,CAAC,WAAW,GAAG,IAAI,CAAC;gBAC1B,CAAC,EACD,SAAS,EAAE,SAAS,CAAC,kBAAkB,GACvC,CACE,CACP,CAAC;IACJ,CAAC;IAYO,4CAAmB,GAA3B,UAA4B,SAAS;QAC7B,IAAA,eAAmD,EAAjD,cAAI,EAAE,cAAI,EAAE,kBAAM,EAAE,kCAA6B,CAAC;QAE1D,IAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;QACvC,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC;QAEhC,IAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEtC,IACE,OAAO,CAAC,KAAK,KAAK,UAAU,CAAC,KAAK;YAClC,SAAS,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM;YACxC,SAAS,CAAC,qBAAqB,KAAK,YAAY,CAAC,qBAAqB;YACtE,SAAS,CAAC,UAAU,KAAK,YAAY,CAAC,UAAU;YAChD,SAAS,CAAC,cAAc,KAAK,cAAc,EAC3C;YACA,UAAU,CACR,IAAI,EACJ,IAAI,CAAC,KAAK,EACV,IAAI,EACJ,MAAM,EAAE,EACR,cAAc,CAAC,KAAK,EACpB,YAAY,CAAC,MAAM,CACpB,CAAC;YAEF,IAAI,IAAI,CAAC,cAAc,EAAE;gBACvB,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC;aACnC;YAED,IAAI,CAAC,QAAQ,CAAC,cAAM,OAAA,CAAC;gBACnB,mBAAmB,EAAE,cAAc,CACjC,YAAY,CAAC,MAAM,EACnB,cAAc,CAAC,KAAK,CACrB;aACF,CAAC,EALkB,CAKlB,CAAC,CAAC;SACL;IACH,CAAC;IASH,qBAAC;AAAD,CAAC,AA1OD,CAA6B,KAAK,CAAC,SAAS,GA0O3C;AAED,MAAM,CAAC,IAAM,iBAAiB,GAAG,UAC/B,OAA2B,EAC3B,KAAyB,EACzB,WAA+B;IAE/B,IAAI,KAAK,IAAI,OAAO,IAAI,WAAW,EAAE;QACnC,IAAM,IAAI,GAAG,KAAK,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACrD,WAAW,CAAC,KAAK,CAAC,OAAO;YACvB,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;KAC5D;IACD,OAAO;AACT,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -1,7 +1,24 @@
|
|
|
1
1
|
import * as tslib_1 from "tslib";
|
|
2
|
+
import { getCellsInColumn } from 'prosemirror-utils';
|
|
3
|
+
import { TableMap } from 'prosemirror-tables';
|
|
2
4
|
import { sendLogs } from '../../../utils/sendLogs';
|
|
3
5
|
import { parseDOMColumnWidths } from '../utils';
|
|
4
|
-
var
|
|
6
|
+
var fireAnalytics = function (properties) {
|
|
7
|
+
if (properties === void 0) { properties = {}; }
|
|
8
|
+
return sendLogs({
|
|
9
|
+
events: [
|
|
10
|
+
{
|
|
11
|
+
name: 'atlaskit.fabric.editor.fixtable',
|
|
12
|
+
product: 'atlaskit',
|
|
13
|
+
properties: properties,
|
|
14
|
+
serverTime: new Date().getTime(),
|
|
15
|
+
server: 'local',
|
|
16
|
+
user: '-',
|
|
17
|
+
},
|
|
18
|
+
],
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
var removeEmptyRows = function (table, tablePos, tr) {
|
|
5
22
|
var rows = [];
|
|
6
23
|
var hasProblems = false;
|
|
7
24
|
// detect if table has empty rows that we need to remove
|
|
@@ -43,25 +60,69 @@ var fixTable = function (table, tablePos, tr) {
|
|
|
43
60
|
// remove the table if it's not fixable
|
|
44
61
|
if (!rows.length) {
|
|
45
62
|
// ED-6141: send analytics event
|
|
46
|
-
|
|
47
|
-
events: [
|
|
48
|
-
{
|
|
49
|
-
name: 'atlaskit.fabric.editor.fixtable',
|
|
50
|
-
product: 'atlaskit',
|
|
51
|
-
properties: {
|
|
52
|
-
message: 'Delete table with empty rows',
|
|
53
|
-
},
|
|
54
|
-
serverTime: new Date().getTime(),
|
|
55
|
-
server: 'local',
|
|
56
|
-
user: '-',
|
|
57
|
-
},
|
|
58
|
-
],
|
|
59
|
-
});
|
|
63
|
+
fireAnalytics({ message: 'removeEmptyRows' });
|
|
60
64
|
return tr.delete(tablePos, tablePos + table.nodeSize);
|
|
61
65
|
}
|
|
62
66
|
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
63
67
|
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
64
68
|
};
|
|
69
|
+
var removeEmptyColumns = function (table, tablePos, tr) {
|
|
70
|
+
// detect if a table has columns with minimum colspan > 1
|
|
71
|
+
// so that we know there's invisible columns that we need to remove
|
|
72
|
+
var map = TableMap.get(table);
|
|
73
|
+
var colsMinColspan = [];
|
|
74
|
+
var _loop_1 = function (colIndex) {
|
|
75
|
+
var cells = getCellsInColumn(colIndex)(tr.selection);
|
|
76
|
+
if (cells) {
|
|
77
|
+
cells.forEach(function (cell) {
|
|
78
|
+
if (!colsMinColspan[colIndex] ||
|
|
79
|
+
colsMinColspan[colIndex] > cell.node.attrs.colspan) {
|
|
80
|
+
colsMinColspan[colIndex] = cell.node.attrs.colspan;
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
};
|
|
85
|
+
for (var colIndex = 0; colIndex < map.width; colIndex++) {
|
|
86
|
+
_loop_1(colIndex);
|
|
87
|
+
}
|
|
88
|
+
if (!colsMinColspan.some(function (colspan) { return colspan > 1; })) {
|
|
89
|
+
return tr;
|
|
90
|
+
}
|
|
91
|
+
var rows = [];
|
|
92
|
+
var _loop_2 = function (rowIndex) {
|
|
93
|
+
var rowCells = [];
|
|
94
|
+
Object.keys(colsMinColspan)
|
|
95
|
+
.map(Number)
|
|
96
|
+
.forEach(function (colIndex) {
|
|
97
|
+
var cellPos = map.map[colIndex + rowIndex * map.width] + tablePos + 1;
|
|
98
|
+
var columnCells = getCellsInColumn(colIndex)(tr.selection);
|
|
99
|
+
var cell = (columnCells || []).find(function (cell) { return cell.pos === cellPos; });
|
|
100
|
+
if (cell) {
|
|
101
|
+
if (colsMinColspan[colIndex] > 1) {
|
|
102
|
+
var colspan = cell.node.attrs.colspan - colsMinColspan[colIndex] + 1;
|
|
103
|
+
var colwidth = cell.node.attrs.colwidth;
|
|
104
|
+
var newCell = cell.node.type.createChecked(tslib_1.__assign({}, cell.node.attrs, { colspan: colspan, colwidth: colwidth ? colwidth.slice(0, colspan) : null }), cell.node.content, cell.node.marks);
|
|
105
|
+
rowCells.push(newCell);
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
rowCells.push(cell.node);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
var row = table.child(rowIndex);
|
|
113
|
+
if (row) {
|
|
114
|
+
rows.push(row.type.createChecked(row.attrs, rowCells, row.marks));
|
|
115
|
+
}
|
|
116
|
+
};
|
|
117
|
+
for (var rowIndex = 0; rowIndex < map.height; rowIndex++) {
|
|
118
|
+
_loop_2(rowIndex);
|
|
119
|
+
}
|
|
120
|
+
if (!rows.length) {
|
|
121
|
+
return tr;
|
|
122
|
+
}
|
|
123
|
+
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
124
|
+
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
125
|
+
};
|
|
65
126
|
// We attempt to patch the document when we have extra, unneeded, column widths
|
|
66
127
|
// Take this node for example:
|
|
67
128
|
//
|
|
@@ -70,18 +131,25 @@ var fixTable = function (table, tablePos, tr) {
|
|
|
70
131
|
// This row only spans two columns, yet it contains widths for 3.
|
|
71
132
|
// We remove the third width here, assumed duplicate content.
|
|
72
133
|
export var removeExtraneousColumnWidths = function (node, basePos, tr) {
|
|
73
|
-
|
|
134
|
+
var hasProblems = false;
|
|
135
|
+
tr = replaceCells(tr, node, basePos, function (cell) {
|
|
74
136
|
var _a = cell.attrs, colwidth = _a.colwidth, colspan = _a.colspan;
|
|
75
137
|
if (colwidth && colwidth.length > colspan) {
|
|
138
|
+
hasProblems = true;
|
|
76
139
|
return cell.type.createChecked(tslib_1.__assign({}, cell.attrs, { colwidth: colwidth.slice(0, colspan) }), cell.content, cell.marks);
|
|
77
140
|
}
|
|
78
141
|
return cell;
|
|
79
142
|
});
|
|
143
|
+
if (hasProblems) {
|
|
144
|
+
fireAnalytics({ message: 'removeExtraneousColumnWidths' });
|
|
145
|
+
}
|
|
146
|
+
return tr;
|
|
80
147
|
};
|
|
81
148
|
export var fixTables = function (tr) {
|
|
82
149
|
tr.doc.descendants(function (node, pos) {
|
|
83
150
|
if (node.type.name === 'table') {
|
|
84
|
-
tr =
|
|
151
|
+
tr = removeEmptyRows(node, pos, tr);
|
|
152
|
+
tr = removeEmptyColumns(node, pos, tr);
|
|
85
153
|
tr = removeExtraneousColumnWidths(node, pos, tr);
|
|
86
154
|
}
|
|
87
155
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
4
|
var React = require("react");
|
|
5
5
|
var raf_schd_1 = require("raf-schd");
|
|
6
|
+
var prosemirror_tables_1 = require("prosemirror-tables");
|
|
6
7
|
var editor_common_1 = require("@atlaskit/editor-common");
|
|
7
8
|
var TableFloatingControls_1 = require("../ui/TableFloatingControls");
|
|
8
9
|
var ColumnControls_1 = require("../ui/TableFloatingControls/ColumnControls");
|
|
@@ -119,9 +120,9 @@ var TableComponent = /** @class */ (function (_super) {
|
|
|
119
120
|
var _a = this.props, view = _a.view, node = _a.node, getPos = _a.getPos, containerWidth = _a.containerWidth;
|
|
120
121
|
var prevAttrs = prevProps.node.attrs;
|
|
121
122
|
var currentAttrs = node.attrs;
|
|
122
|
-
var
|
|
123
|
-
var
|
|
124
|
-
if (
|
|
123
|
+
var prevMap = prosemirror_tables_1.TableMap.get(prevProps.node);
|
|
124
|
+
var currentMap = prosemirror_tables_1.TableMap.get(node);
|
|
125
|
+
if (prevMap.width !== currentMap.width ||
|
|
125
126
|
prevAttrs.layout !== currentAttrs.layout ||
|
|
126
127
|
prevAttrs.isNumberColumnEnabled !== currentAttrs.isNumberColumnEnabled ||
|
|
127
128
|
prevAttrs.__autoSize !== currentAttrs.__autoSize ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableComponent.js","sourceRoot":"","sources":["../../../../../src/plugins/table/nodeviews/TableComponent.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TableComponent.js","sourceRoot":"","sources":["../../../../../src/plugins/table/nodeviews/TableComponent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
+
var prosemirror_utils_1 = require("prosemirror-utils");
|
|
5
|
+
var prosemirror_tables_1 = require("prosemirror-tables");
|
|
4
6
|
var sendLogs_1 = require("../../../utils/sendLogs");
|
|
5
7
|
var utils_1 = require("../utils");
|
|
6
|
-
var
|
|
8
|
+
var fireAnalytics = function (properties) {
|
|
9
|
+
if (properties === void 0) { properties = {}; }
|
|
10
|
+
return sendLogs_1.sendLogs({
|
|
11
|
+
events: [
|
|
12
|
+
{
|
|
13
|
+
name: 'atlaskit.fabric.editor.fixtable',
|
|
14
|
+
product: 'atlaskit',
|
|
15
|
+
properties: properties,
|
|
16
|
+
serverTime: new Date().getTime(),
|
|
17
|
+
server: 'local',
|
|
18
|
+
user: '-',
|
|
19
|
+
},
|
|
20
|
+
],
|
|
21
|
+
});
|
|
22
|
+
};
|
|
23
|
+
var removeEmptyRows = function (table, tablePos, tr) {
|
|
7
24
|
var rows = [];
|
|
8
25
|
var hasProblems = false;
|
|
9
26
|
// detect if table has empty rows that we need to remove
|
|
@@ -45,25 +62,69 @@ var fixTable = function (table, tablePos, tr) {
|
|
|
45
62
|
// remove the table if it's not fixable
|
|
46
63
|
if (!rows.length) {
|
|
47
64
|
// ED-6141: send analytics event
|
|
48
|
-
|
|
49
|
-
events: [
|
|
50
|
-
{
|
|
51
|
-
name: 'atlaskit.fabric.editor.fixtable',
|
|
52
|
-
product: 'atlaskit',
|
|
53
|
-
properties: {
|
|
54
|
-
message: 'Delete table with empty rows',
|
|
55
|
-
},
|
|
56
|
-
serverTime: new Date().getTime(),
|
|
57
|
-
server: 'local',
|
|
58
|
-
user: '-',
|
|
59
|
-
},
|
|
60
|
-
],
|
|
61
|
-
});
|
|
65
|
+
fireAnalytics({ message: 'removeEmptyRows' });
|
|
62
66
|
return tr.delete(tablePos, tablePos + table.nodeSize);
|
|
63
67
|
}
|
|
64
68
|
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
65
69
|
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
66
70
|
};
|
|
71
|
+
var removeEmptyColumns = function (table, tablePos, tr) {
|
|
72
|
+
// detect if a table has columns with minimum colspan > 1
|
|
73
|
+
// so that we know there's invisible columns that we need to remove
|
|
74
|
+
var map = prosemirror_tables_1.TableMap.get(table);
|
|
75
|
+
var colsMinColspan = [];
|
|
76
|
+
var _loop_1 = function (colIndex) {
|
|
77
|
+
var cells = prosemirror_utils_1.getCellsInColumn(colIndex)(tr.selection);
|
|
78
|
+
if (cells) {
|
|
79
|
+
cells.forEach(function (cell) {
|
|
80
|
+
if (!colsMinColspan[colIndex] ||
|
|
81
|
+
colsMinColspan[colIndex] > cell.node.attrs.colspan) {
|
|
82
|
+
colsMinColspan[colIndex] = cell.node.attrs.colspan;
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
for (var colIndex = 0; colIndex < map.width; colIndex++) {
|
|
88
|
+
_loop_1(colIndex);
|
|
89
|
+
}
|
|
90
|
+
if (!colsMinColspan.some(function (colspan) { return colspan > 1; })) {
|
|
91
|
+
return tr;
|
|
92
|
+
}
|
|
93
|
+
var rows = [];
|
|
94
|
+
var _loop_2 = function (rowIndex) {
|
|
95
|
+
var rowCells = [];
|
|
96
|
+
Object.keys(colsMinColspan)
|
|
97
|
+
.map(Number)
|
|
98
|
+
.forEach(function (colIndex) {
|
|
99
|
+
var cellPos = map.map[colIndex + rowIndex * map.width] + tablePos + 1;
|
|
100
|
+
var columnCells = prosemirror_utils_1.getCellsInColumn(colIndex)(tr.selection);
|
|
101
|
+
var cell = (columnCells || []).find(function (cell) { return cell.pos === cellPos; });
|
|
102
|
+
if (cell) {
|
|
103
|
+
if (colsMinColspan[colIndex] > 1) {
|
|
104
|
+
var colspan = cell.node.attrs.colspan - colsMinColspan[colIndex] + 1;
|
|
105
|
+
var colwidth = cell.node.attrs.colwidth;
|
|
106
|
+
var newCell = cell.node.type.createChecked(tslib_1.__assign({}, cell.node.attrs, { colspan: colspan, colwidth: colwidth ? colwidth.slice(0, colspan) : null }), cell.node.content, cell.node.marks);
|
|
107
|
+
rowCells.push(newCell);
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
rowCells.push(cell.node);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
});
|
|
114
|
+
var row = table.child(rowIndex);
|
|
115
|
+
if (row) {
|
|
116
|
+
rows.push(row.type.createChecked(row.attrs, rowCells, row.marks));
|
|
117
|
+
}
|
|
118
|
+
};
|
|
119
|
+
for (var rowIndex = 0; rowIndex < map.height; rowIndex++) {
|
|
120
|
+
_loop_2(rowIndex);
|
|
121
|
+
}
|
|
122
|
+
if (!rows.length) {
|
|
123
|
+
return tr;
|
|
124
|
+
}
|
|
125
|
+
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
126
|
+
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
127
|
+
};
|
|
67
128
|
// We attempt to patch the document when we have extra, unneeded, column widths
|
|
68
129
|
// Take this node for example:
|
|
69
130
|
//
|
|
@@ -72,18 +133,25 @@ var fixTable = function (table, tablePos, tr) {
|
|
|
72
133
|
// This row only spans two columns, yet it contains widths for 3.
|
|
73
134
|
// We remove the third width here, assumed duplicate content.
|
|
74
135
|
exports.removeExtraneousColumnWidths = function (node, basePos, tr) {
|
|
75
|
-
|
|
136
|
+
var hasProblems = false;
|
|
137
|
+
tr = replaceCells(tr, node, basePos, function (cell) {
|
|
76
138
|
var _a = cell.attrs, colwidth = _a.colwidth, colspan = _a.colspan;
|
|
77
139
|
if (colwidth && colwidth.length > colspan) {
|
|
140
|
+
hasProblems = true;
|
|
78
141
|
return cell.type.createChecked(tslib_1.__assign({}, cell.attrs, { colwidth: colwidth.slice(0, colspan) }), cell.content, cell.marks);
|
|
79
142
|
}
|
|
80
143
|
return cell;
|
|
81
144
|
});
|
|
145
|
+
if (hasProblems) {
|
|
146
|
+
fireAnalytics({ message: 'removeExtraneousColumnWidths' });
|
|
147
|
+
}
|
|
148
|
+
return tr;
|
|
82
149
|
};
|
|
83
150
|
exports.fixTables = function (tr) {
|
|
84
151
|
tr.doc.descendants(function (node, pos) {
|
|
85
152
|
if (node.type.name === 'table') {
|
|
86
|
-
tr =
|
|
153
|
+
tr = removeEmptyRows(node, pos, tr);
|
|
154
|
+
tr = removeEmptyColumns(node, pos, tr);
|
|
87
155
|
tr = exports.removeExtraneousColumnWidths(node, pos, tr);
|
|
88
156
|
}
|
|
89
157
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":";;;
|
|
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