@contrail/documents 1.3.25 → 1.3.26
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/lib/document-element-factory.js +16 -13
- package/package.json +2 -2
|
@@ -37,7 +37,7 @@ class DocumentElementFactory {
|
|
|
37
37
|
let element = this.initNewElement(type);
|
|
38
38
|
element = Object.assign(element, options);
|
|
39
39
|
if (((_a = element === null || element === void 0 ? void 0 : element.elements) === null || _a === void 0 ? void 0 : _a.length) > 0) {
|
|
40
|
-
element.elements = element.elements.map(
|
|
40
|
+
element.elements = element.elements.map(e => {
|
|
41
41
|
e.id = (0, nanoid_1.nanoid)(16);
|
|
42
42
|
return e;
|
|
43
43
|
});
|
|
@@ -81,7 +81,7 @@ class DocumentElementFactory {
|
|
|
81
81
|
element.elements = elements;
|
|
82
82
|
element.modelBindings = modelBindings;
|
|
83
83
|
if (((_a = element === null || element === void 0 ? void 0 : element.elements) === null || _a === void 0 ? void 0 : _a.length) > 0) {
|
|
84
|
-
element.elements = element.elements.map(
|
|
84
|
+
element.elements = element.elements.map(e => {
|
|
85
85
|
e.id = (0, nanoid_1.nanoid)(16);
|
|
86
86
|
return e;
|
|
87
87
|
});
|
|
@@ -114,18 +114,18 @@ class DocumentElementFactory {
|
|
|
114
114
|
}
|
|
115
115
|
const newInnerElements = [];
|
|
116
116
|
if (newElement.type === 'table') {
|
|
117
|
-
const oldChildElements = elements.filter(
|
|
117
|
+
const oldChildElements = elements.filter(e => e.tableId === element.id && ['cell', 'column', 'row'].indexOf(e.type) !== -1);
|
|
118
118
|
let newTableElement, newChildElements = [];
|
|
119
119
|
try {
|
|
120
120
|
[newTableElement, ...newChildElements] = document_table_1.TableCopyService.copy(newElement, oldChildElements);
|
|
121
121
|
}
|
|
122
122
|
catch (e) { }
|
|
123
|
-
if (oldChildElements.length
|
|
123
|
+
if (oldChildElements.length > newChildElements.length || oldChildElements.length === 0) {
|
|
124
124
|
console.log(`Invalid table element to copy`, newElement, oldChildElements, newChildElements);
|
|
125
125
|
continue;
|
|
126
126
|
}
|
|
127
127
|
newElement = newTableElement;
|
|
128
|
-
newChildElements.forEach(
|
|
128
|
+
newChildElements.forEach(newChildElement => {
|
|
129
129
|
var _a;
|
|
130
130
|
let oldChildId;
|
|
131
131
|
if (newChildElement.type === 'row') {
|
|
@@ -137,7 +137,7 @@ class DocumentElementFactory {
|
|
|
137
137
|
else if (newChildElement.type === 'cell') {
|
|
138
138
|
const oldRowId = element.rowIds[newTableElement.rowIds.indexOf(newChildElement.rowId)];
|
|
139
139
|
const oldColumnId = element.columnIds[newTableElement.columnIds.indexOf(newChildElement.columnId)];
|
|
140
|
-
oldChildId = (_a = elements.find(
|
|
140
|
+
oldChildId = (_a = elements.find(e => e.type === 'cell' && e.rowId === oldRowId && e.columnId === oldColumnId)) === null || _a === void 0 ? void 0 : _a.id;
|
|
141
141
|
}
|
|
142
142
|
if (oldChildId) {
|
|
143
143
|
newChildElement.documentId = documentId;
|
|
@@ -145,6 +145,9 @@ class DocumentElementFactory {
|
|
|
145
145
|
oldIdToNewId.set(oldChildId, newChildElement.id);
|
|
146
146
|
newInnerElements.push(newChildElement);
|
|
147
147
|
}
|
|
148
|
+
else {
|
|
149
|
+
newInnerElements.push(newChildElement);
|
|
150
|
+
}
|
|
148
151
|
});
|
|
149
152
|
}
|
|
150
153
|
if (positionOffset) {
|
|
@@ -175,18 +178,18 @@ class DocumentElementFactory {
|
|
|
175
178
|
if (DocumentElementFactory.isMask(newElement))
|
|
176
179
|
maskElements.push(newElement);
|
|
177
180
|
}
|
|
178
|
-
groupElements.forEach(
|
|
181
|
+
groupElements.forEach(groupElement => {
|
|
179
182
|
groupElement.elementIds = groupElement.elementIds
|
|
180
|
-
.map(
|
|
181
|
-
.filter(
|
|
183
|
+
.map(oldElementId => oldIdToNewId.get(oldElementId))
|
|
184
|
+
.filter(id => !!id);
|
|
182
185
|
});
|
|
183
|
-
maskElements.forEach(
|
|
186
|
+
maskElements.forEach(maskElement => {
|
|
184
187
|
const newElementIds = maskElement.elementIds
|
|
185
|
-
.map(
|
|
186
|
-
.filter(
|
|
188
|
+
.map(oldElementId => oldIdToNewId.get(oldElementId))
|
|
189
|
+
.filter(id => !!id);
|
|
187
190
|
maskElement.elementIds = (newElementIds === null || newElementIds === void 0 ? void 0 : newElementIds.length) > 0 ? newElementIds : null;
|
|
188
191
|
});
|
|
189
|
-
calloutElements.forEach(
|
|
192
|
+
calloutElements.forEach(calloutElement => {
|
|
190
193
|
if (calloutElement.start.id) {
|
|
191
194
|
const startId = oldIdToNewId.get(calloutElement.start.id);
|
|
192
195
|
if (startId) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@contrail/documents",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.26",
|
|
4
4
|
"description": "Documents library for contrail platform",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"@contrail/actions": "^1.0.17",
|
|
42
|
-
"@contrail/document-table": "^1.0.
|
|
42
|
+
"@contrail/document-table": "^1.0.19",
|
|
43
43
|
"@contrail/types": "^3.1.4",
|
|
44
44
|
"@contrail/document-util": "^1.0.15",
|
|
45
45
|
"reflect-metadata": "^0.1.13"
|