@atlaskit/editor-core 98.2.0 → 98.2.1
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/fix-tables.js +21 -2
- package/dist/es2015/plugins/table/utils/fix-tables.js.map +1 -1
- package/dist/es5/plugins/table/utils/fix-tables.js +21 -2
- 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.1
|
|
4
|
+
- [patch] [17107bdfb0](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/17107bdfb0):
|
|
5
|
+
|
|
6
|
+
- ED-6141: remove broken tables if its not fixable
|
|
7
|
+
|
|
3
8
|
## 98.2.0
|
|
4
9
|
- [minor] [3fecea2975](https://bitbucket.org/atlassian/atlaskit-mk-2/commits/3fecea2975):
|
|
5
10
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as tslib_1 from "tslib";
|
|
2
|
+
import { sendLogs } from '../../../utils/sendLogs';
|
|
2
3
|
import { parseDOMColumnWidths } from '../utils';
|
|
3
4
|
var fixTable = function (table, tablePos, tr) {
|
|
4
5
|
var rows = [];
|
|
@@ -33,12 +34,30 @@ var fixTable = function (table, tablePos, tr) {
|
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
// re-create the row with decremented rowspans @see ED-5802
|
|
36
|
-
|
|
37
|
+
if (cells.length) {
|
|
38
|
+
rows[j] = row.type.createChecked(row.attrs, cells, row.marks);
|
|
39
|
+
}
|
|
37
40
|
}
|
|
38
41
|
}
|
|
39
42
|
}
|
|
43
|
+
// remove the table if it's not fixable
|
|
40
44
|
if (!rows.length) {
|
|
41
|
-
|
|
45
|
+
// ED-6141: send analytics event
|
|
46
|
+
sendLogs({
|
|
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
|
+
});
|
|
60
|
+
return tr.delete(tablePos, tablePos + table.nodeSize);
|
|
42
61
|
}
|
|
43
62
|
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
44
63
|
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
@@ -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":";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;SAC9B;IACH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,4DAA4D;AAC5D,oCAAoC;AACpC,+BAA+B;AAC/B,2EAA2E;AAC3E,2DAA2D;AAC3D,EAAE;AACF,4EAA4E;AAC5E,gCAAgC;AAChC,EAAE;AACF,yEAAyE;AACzE,0GAA0G;AAC1G,MAAM,CAAC,IAAM,iBAAiB,GAAG,UAC/B,EAAe,EACf,IAAY,EACZ,KAAuB,EACvB,OAAe;IAEf,IAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAE9C,IAAI,CAAC,OAAO,CAAC,UAAC,OAAO,EAAE,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,OAAO,CAAC,UAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YACpC,IAAM,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,CAAC,CAAC;YAEhD,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,uBAC1B,OAAO,CAAC,KAAK,IAChB,QAAQ,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IACnE,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,qCAAqC;IACrC,OAAO,EAAE;SACN,aAAa,CAAC,OAAO,EAAE,SAAS,uBAC5B,IAAI,CAAC,KAAK,IACb,UAAU,EAAE,KAAK,IACjB;SACD,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
+
var sendLogs_1 = require("../../../utils/sendLogs");
|
|
4
5
|
var utils_1 = require("../utils");
|
|
5
6
|
var fixTable = function (table, tablePos, tr) {
|
|
6
7
|
var rows = [];
|
|
@@ -35,12 +36,30 @@ var fixTable = function (table, tablePos, tr) {
|
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
// re-create the row with decremented rowspans @see ED-5802
|
|
38
|
-
|
|
39
|
+
if (cells.length) {
|
|
40
|
+
rows[j] = row.type.createChecked(row.attrs, cells, row.marks);
|
|
41
|
+
}
|
|
39
42
|
}
|
|
40
43
|
}
|
|
41
44
|
}
|
|
45
|
+
// remove the table if it's not fixable
|
|
42
46
|
if (!rows.length) {
|
|
43
|
-
|
|
47
|
+
// ED-6141: send analytics event
|
|
48
|
+
sendLogs_1.sendLogs({
|
|
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
|
+
});
|
|
62
|
+
return tr.delete(tablePos, tablePos + table.nodeSize);
|
|
44
63
|
}
|
|
45
64
|
var newTable = table.type.createChecked(table.attrs, rows, table.marks);
|
|
46
65
|
return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
|
|
@@ -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