@atlaskit/editor-core 98.4.1 → 98.4.4
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 -0
- package/dist/es2015/plugins/media/nodeviews/media.d.ts +2 -0
- package/dist/es2015/plugins/media/nodeviews/media.js +2 -33
- package/dist/es2015/plugins/media/nodeviews/media.js.map +1 -1
- package/dist/es2015/plugins/media/nodeviews/mediaSingle.d.ts +9 -0
- package/dist/es2015/plugins/media/nodeviews/mediaSingle.js +68 -2
- package/dist/es2015/plugins/media/nodeviews/mediaSingle.js.map +1 -1
- package/dist/es2015/plugins/media/pm-plugins/main.d.ts +1 -1
- package/dist/es2015/plugins/media/pm-plugins/main.js +1 -1
- package/dist/es2015/plugins/media/pm-plugins/main.js.map +1 -1
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.d.ts +2 -0
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.js +16 -9
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.js.map +1 -1
- package/dist/es2015/plugins/media/ui/ResizableMediaSingle/types.d.ts +2 -2
- 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/pm-plugins/table-resizing/plugin.js +11 -1
- package/dist/es2015/plugins/table/pm-plugins/table-resizing/plugin.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/media/nodeviews/media.d.ts +2 -0
- package/dist/es5/plugins/media/nodeviews/media.js +2 -33
- package/dist/es5/plugins/media/nodeviews/media.js.map +1 -1
- package/dist/es5/plugins/media/nodeviews/mediaSingle.d.ts +9 -0
- package/dist/es5/plugins/media/nodeviews/mediaSingle.js +68 -2
- package/dist/es5/plugins/media/nodeviews/mediaSingle.js.map +1 -1
- package/dist/es5/plugins/media/pm-plugins/main.d.ts +1 -1
- package/dist/es5/plugins/media/pm-plugins/main.js +1 -1
- package/dist/es5/plugins/media/pm-plugins/main.js.map +1 -1
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.d.ts +2 -0
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.js +16 -9
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.js.map +1 -1
- package/dist/es5/plugins/media/ui/ResizableMediaSingle/types.d.ts +2 -2
- 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/pm-plugins/table-resizing/plugin.js +11 -1
- package/dist/es5/plugins/table/pm-plugins/table-resizing/plugin.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
|
@@ -92,23 +92,30 @@ var ResizableMediaSingle = /** @class */ (function (_super) {
|
|
|
92
92
|
});
|
|
93
93
|
ResizableMediaSingle.prototype.componentDidMount = function () {
|
|
94
94
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
95
|
-
|
|
95
|
+
return tslib_1.__generator(this, function (_a) {
|
|
96
|
+
this.checkVideoFile(this.props.viewContext);
|
|
97
|
+
return [2 /*return*/];
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
};
|
|
101
|
+
ResizableMediaSingle.prototype.componentWillReceiveProps = function (nextProps) {
|
|
102
|
+
if (this.props.viewContext !== nextProps.viewContext) {
|
|
103
|
+
this.checkVideoFile(nextProps.viewContext);
|
|
104
|
+
}
|
|
105
|
+
};
|
|
106
|
+
ResizableMediaSingle.prototype.checkVideoFile = function (viewContext) {
|
|
107
|
+
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
108
|
+
var $pos, getMediaNode, state;
|
|
96
109
|
return tslib_1.__generator(this, function (_a) {
|
|
97
110
|
switch (_a.label) {
|
|
98
111
|
case 0:
|
|
99
112
|
$pos = this.$pos;
|
|
100
|
-
if (!$pos || !
|
|
113
|
+
if (!$pos || !viewContext) {
|
|
101
114
|
return [2 /*return*/];
|
|
102
115
|
}
|
|
103
|
-
return [4 /*yield*/, this.props.mediaProvider];
|
|
104
|
-
case 1:
|
|
105
|
-
mediaProvider = _a.sent();
|
|
106
116
|
getMediaNode = this.props.state.doc.nodeAt($pos.pos + 1);
|
|
107
|
-
return [4 /*yield*/, mediaProvider.viewContext];
|
|
108
|
-
case 2:
|
|
109
|
-
viewContext = _a.sent();
|
|
110
117
|
return [4 /*yield*/, viewContext.file.getCurrentState(getMediaNode.attrs.id)];
|
|
111
|
-
case
|
|
118
|
+
case 1:
|
|
112
119
|
state = _a.sent();
|
|
113
120
|
if (state && state.status !== 'error' && state.mediaType === 'image') {
|
|
114
121
|
this.setState({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/media/ui/ResizableMediaSingle/index.tsx"],"names":[],"mappings":";;;AAAA,6BAA+B;AAC/B,uDAAqE;AAErE,yDAQiC;AAEjC,mCAAmC;AAEnC,qCAAgC;AAChC,iCAKiB;AAOjB;IAAkD,gDAGjD;IAHD;QAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/media/ui/ResizableMediaSingle/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@ import { MediaSingleLayout } from '@atlaskit/adf-schema';
|
|
|
2
2
|
import { MediaSingleProps } from '@atlaskit/editor-common';
|
|
3
3
|
import { EditorAppearance } from '../../../../types';
|
|
4
4
|
import { GridType } from '../../../grid/types';
|
|
5
|
-
import { MediaProvider } from '../../types';
|
|
6
5
|
import { EditorView } from 'prosemirror-view';
|
|
7
6
|
import { EditorState } from 'prosemirror-state';
|
|
7
|
+
import { Context } from '@atlaskit/media-core';
|
|
8
8
|
export declare type EnabledHandles = {
|
|
9
9
|
left?: boolean;
|
|
10
10
|
right?: boolean;
|
|
@@ -20,5 +20,5 @@ export declare type Props = MediaSingleProps & {
|
|
|
20
20
|
containerWidth: number;
|
|
21
21
|
appearance: EditorAppearance;
|
|
22
22
|
selected: boolean;
|
|
23
|
-
|
|
23
|
+
viewContext?: Context;
|
|
24
24
|
};
|
|
@@ -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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"}
|
|
@@ -170,6 +170,7 @@ function handleMouseDown(view, event, cellMinWidth) {
|
|
|
170
170
|
}
|
|
171
171
|
var cell = view.state.doc.nodeAt(activeHandle);
|
|
172
172
|
var $cell = view.state.doc.resolve(activeHandle);
|
|
173
|
+
var $originalTable = $cell.node(-1);
|
|
173
174
|
var dom = view.domAtPos($cell.start(-1)).node;
|
|
174
175
|
while (dom.nodeName !== 'TABLE') {
|
|
175
176
|
dom = dom.parentNode;
|
|
@@ -190,9 +191,18 @@ function handleMouseDown(view, event, cellMinWidth) {
|
|
|
190
191
|
window.removeEventListener('mouseup', finish);
|
|
191
192
|
window.removeEventListener('mousemove', move);
|
|
192
193
|
var _a = exports.pluginKey.getState(view.state), activeHandle = _a.activeHandle, dragging = _a.dragging;
|
|
194
|
+
// activeHandle could be remapped via a collab change.
|
|
195
|
+
// Fetch a fresh reference of the table.
|
|
196
|
+
var $cell = view.state.doc.resolve(activeHandle);
|
|
197
|
+
var $table = $cell.node(-1);
|
|
193
198
|
if (dragging) {
|
|
194
199
|
var startX = dragging.startX;
|
|
195
|
-
|
|
200
|
+
// If the table has changed (via collab for example) don't apply column widths
|
|
201
|
+
// For example, if a table col is deleted we won't be able to reliably remap the new widths
|
|
202
|
+
// There may be a more elegant solution to this, to avoid a jarring experience.
|
|
203
|
+
if ($table.eq($originalTable)) {
|
|
204
|
+
actions_1.updateColumnWidth(view, activeHandle, clientX - startX, resizer);
|
|
205
|
+
}
|
|
196
206
|
view.dispatch(view.state.tr.setMeta(exports.pluginKey, { setDragging: null }));
|
|
197
207
|
}
|
|
198
208
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../src/plugins/table/pm-plugins/table-resizing/plugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../../src/plugins/table/pm-plugins/table-resizing/plugin.ts"],"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