@shapediver/viewer.data-engine.html-element-anchor-engine 1.8.13 → 1.10.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.
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { TreeNode } from '@shapediver/viewer.shared.node-tree';
|
|
2
|
-
import {
|
|
2
|
+
import { ShapeDiverResponseOutputContent } from '@shapediver/sdk.geometry-api-sdk-v2';
|
|
3
3
|
export declare class HTMLElementAnchorEngine {
|
|
4
|
-
private readonly _logger;
|
|
5
4
|
private readonly _converter;
|
|
6
|
-
|
|
5
|
+
private readonly _inputValidator;
|
|
6
|
+
private readonly _logger;
|
|
7
|
+
loadContent(content: ShapeDiverResponseOutputContent): Promise<TreeNode>;
|
|
7
8
|
}
|
|
8
9
|
//# sourceMappingURL=HTMLElementAnchorEngine.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HTMLElementAnchorEngine.d.ts","sourceRoot":"","sources":["../src/HTMLElementAnchorEngine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAI9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"HTMLElementAnchorEngine.d.ts","sourceRoot":"","sources":["../src/HTMLElementAnchorEngine.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAI9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AA4DrF,qBACa,uBAAuB;IAGhC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsD;IACjF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqE;IACrG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IAYxD,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,QAAQ,CAAC;CA6FxF"}
|
|
@@ -23,8 +23,9 @@ const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
|
|
|
23
23
|
const viewer_shared_math_1 = require("@shapediver/viewer.shared.math");
|
|
24
24
|
let HTMLElementAnchorEngine = class HTMLElementAnchorEngine {
|
|
25
25
|
constructor() {
|
|
26
|
-
this._logger = tsyringe_1.container.resolve(viewer_shared_services_1.Logger);
|
|
27
26
|
this._converter = tsyringe_1.container.resolve(viewer_shared_services_1.Converter);
|
|
27
|
+
this._inputValidator = tsyringe_1.container.resolve(viewer_shared_services_1.InputValidator);
|
|
28
|
+
this._logger = tsyringe_1.container.resolve(viewer_shared_services_1.Logger);
|
|
28
29
|
}
|
|
29
30
|
loadContent(content) {
|
|
30
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -37,7 +38,8 @@ let HTMLElementAnchorEngine = class HTMLElementAnchorEngine {
|
|
|
37
38
|
this._logger.warn(viewer_shared_services_1.LOGGINGTOPIC.DATAPROCESSING, 'HTMLElementAnchorEngine.load: One of the specified Tag2D elements did not have all necessary properties.');
|
|
38
39
|
return;
|
|
39
40
|
}
|
|
40
|
-
|
|
41
|
+
const cleanedText = this._inputValidator.sanitize(element.text);
|
|
42
|
+
node.data.push(new viewer_shared_types_1.HTMLElementAnchorData(this._converter.toVec3(element.location), { color: this._converter.toColor(element.color, '#000000'), text: cleanedText }, 'text'));
|
|
41
43
|
});
|
|
42
44
|
}
|
|
43
45
|
else if (content.format === 'anchor') {
|
|
@@ -67,9 +69,10 @@ let HTMLElementAnchorEngine = class HTMLElementAnchorEngine {
|
|
|
67
69
|
return;
|
|
68
70
|
}
|
|
69
71
|
const textData = element.data;
|
|
72
|
+
const cleanedText = this._inputValidator.sanitize(textData.text);
|
|
70
73
|
node.data.push(new viewer_shared_types_1.HTMLElementAnchorData(this._converter.toVec3(element.location), {
|
|
71
74
|
color: this._converter.toColor(textData.color, '#000000'),
|
|
72
|
-
text:
|
|
75
|
+
text: cleanedText,
|
|
73
76
|
hidden: textData.hidden,
|
|
74
77
|
textAlign: textData.textAlign,
|
|
75
78
|
position
|
|
@@ -96,8 +99,8 @@ let HTMLElementAnchorEngine = class HTMLElementAnchorEngine {
|
|
|
96
99
|
return node;
|
|
97
100
|
}
|
|
98
101
|
catch (e) {
|
|
99
|
-
|
|
100
|
-
|
|
102
|
+
const error = new viewer_shared_services_1.ShapeDiverViewerDataProcessingError('HTMLElementAnchorEngine.load: Loading of anchors failed.');
|
|
103
|
+
throw this._logger.handleError(viewer_shared_services_1.LOGGINGTOPIC.DATAPROCESSING, `HTMLElementAnchorEngine.load`, error);
|
|
101
104
|
}
|
|
102
105
|
});
|
|
103
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HTMLElementAnchorEngine.js","sourceRoot":"","sources":["../src/HTMLElementAnchorEngine.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,uCAA+C;AAC/C,yEAAuE;AACvE,iFAA8D;AAC9D,+
|
|
1
|
+
{"version":3,"file":"HTMLElementAnchorEngine.js","sourceRoot":"","sources":["../src/HTMLElementAnchorEngine.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.data-engine.html-element-anchor-engine",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.10.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -36,13 +36,13 @@
|
|
|
36
36
|
"testEnvironment": "node"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@shapediver/
|
|
40
|
-
"@shapediver/viewer.shared.math": "^1.
|
|
41
|
-
"@shapediver/viewer.shared.node-tree": "^1.
|
|
42
|
-
"@shapediver/viewer.shared.services": "^1.
|
|
43
|
-
"@shapediver/viewer.shared.types": "^1.
|
|
39
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.11",
|
|
40
|
+
"@shapediver/viewer.shared.math": "^1.10.4",
|
|
41
|
+
"@shapediver/viewer.shared.node-tree": "^1.10.4",
|
|
42
|
+
"@shapediver/viewer.shared.services": "^1.10.4",
|
|
43
|
+
"@shapediver/viewer.shared.types": "^1.10.4",
|
|
44
44
|
"gl-matrix": "3.3.0",
|
|
45
45
|
"tsyringe": "^4.5.0"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "e469ee08831fb0c77e45d9a8e3600150300e7134"
|
|
48
48
|
}
|