@node-projects/web-component-designer 0.2.18 → 0.2.20
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/dist/elements/documentContainer.d.ts +4 -1
- package/dist/elements/documentContainer.js +23 -7
- package/dist/elements/documentContainer.js.map +1 -1
- package/dist/elements/helper/getBoxQuads.js +60 -43
- package/dist/elements/helper/getBoxQuads.js.map +1 -1
- package/dist/elements/item/DesignItem.d.ts +1 -1
- package/dist/elements/services/DefaultServiceBootstrap.js +2 -0
- package/dist/elements/services/DefaultServiceBootstrap.js.map +1 -1
- package/dist/elements/services/ServiceContainer.d.ts +2 -0
- package/dist/elements/services/ServiceContainer.js +1 -0
- package/dist/elements/services/ServiceContainer.js.map +1 -1
- package/dist/elements/services/designItemDocumentPositionService/DesignItemDocumentPositionService.d.ts +10 -0
- package/dist/elements/services/designItemDocumentPositionService/DesignItemDocumentPositionService.js +47 -0
- package/dist/elements/services/designItemDocumentPositionService/DesignItemDocumentPositionService.js.map +1 -1
- package/dist/elements/services/designItemDocumentPositionService/IDesignItemDocumentPositionService.d.ts +7 -0
- package/dist/elements/services/htmlParserService/DefaultHtmlParserService.js +6 -1
- package/dist/elements/services/htmlParserService/DefaultHtmlParserService.js.map +1 -1
- package/dist/elements/services/htmlWriterService/AbstractHtmlWriterService.d.ts +3 -1
- package/dist/elements/services/htmlWriterService/AbstractHtmlWriterService.js +40 -5
- package/dist/elements/services/htmlWriterService/AbstractHtmlWriterService.js.map +1 -1
- package/dist/elements/services/htmlWriterService/HtmlWriterService.js +3 -1
- package/dist/elements/services/htmlWriterService/HtmlWriterService.js.map +1 -1
- package/dist/elements/services/propertiesService/services/AttributesPropertiesService.d.ts +2 -0
- package/dist/elements/services/propertiesService/services/AttributesPropertiesService.js +24 -0
- package/dist/elements/services/propertiesService/services/AttributesPropertiesService.js.map +1 -1
- package/dist/elements/services/selectionService/ISelectionChangedEvent.d.ts +3 -0
- package/dist/elements/services/selectionService/ISelectionRefreshEvent.d.ts +2 -0
- package/dist/elements/services/selectionService/ISelectionService.d.ts +4 -1
- package/dist/elements/services/selectionService/SelectionService.d.ts +7 -2
- package/dist/elements/services/selectionService/SelectionService.js +28 -6
- package/dist/elements/services/selectionService/SelectionService.js.map +1 -1
- package/dist/elements/services/sourceMapService/ISourceMapProvider.d.ts +15 -0
- package/dist/elements/services/sourceMapService/ISourceMapProvider.js +2 -0
- package/dist/elements/services/sourceMapService/ISourceMapProvider.js.map +1 -0
- package/dist/elements/services/sourceMapService/ISourcePart.d.ts +16 -0
- package/dist/elements/services/sourceMapService/ISourcePart.js +2 -0
- package/dist/elements/services/sourceMapService/ISourcePart.js.map +1 -0
- package/dist/elements/services/sourceMapService/SvgPathDataSourceMap.d.ts +8 -0
- package/dist/elements/services/sourceMapService/SvgPathDataSourceMap.js +120 -0
- package/dist/elements/services/sourceMapService/SvgPathDataSourceMap.js.map +1 -0
- package/dist/elements/services/sourceMapService/SvgPathSourceMapProvider.d.ts +7 -0
- package/dist/elements/services/sourceMapService/SvgPathSourceMapProvider.js +29 -0
- package/dist/elements/services/sourceMapService/SvgPathSourceMapProvider.js.map +1 -0
- package/dist/elements/widgets/designerView/extensions/svg/UnifiedGeometryExtension.d.ts +4 -0
- package/dist/elements/widgets/designerView/extensions/svg/UnifiedGeometryExtension.js +44 -3
- package/dist/elements/widgets/designerView/extensions/svg/UnifiedGeometryExtension.js.map +1 -1
- package/dist/elements/widgets/designerView/extensions/svg/UnifiedGeometryExtensionProvider.js +5 -0
- package/dist/elements/widgets/designerView/extensions/svg/UnifiedGeometryExtensionProvider.js.map +1 -1
- package/dist/index-min.js +13 -13
- package/dist/index-min.js.map +4 -4
- package/dist/index.d.ts +4 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { DesignItem } from '../../item/DesignItem.js';
|
|
2
2
|
import { isFirefox } from '../../helper/Browser.js';
|
|
3
|
+
import { IndentedTextWriter } from '../../helper/IndentedTextWriter.js';
|
|
3
4
|
export class DefaultHtmlParserService {
|
|
4
5
|
async parse(html, serviceContainer, instanceServiceContainer, parseSnippet) {
|
|
5
6
|
let doc;
|
|
@@ -14,7 +15,11 @@ export class DefaultHtmlParserService {
|
|
|
14
15
|
}
|
|
15
16
|
const headNodes = this.createDesignItems(doc.head.childNodes, serviceContainer, instanceServiceContainer);
|
|
16
17
|
const bodyNodes = this.createDesignItems(doc.body.childNodes, serviceContainer, instanceServiceContainer);
|
|
17
|
-
|
|
18
|
+
const designItems = [...headNodes, ...bodyNodes];
|
|
19
|
+
if (!parseSnippet && instanceServiceContainer.designItemDocumentPositionService && designItems.length) {
|
|
20
|
+
serviceContainer.htmlWriterService.write(new IndentedTextWriter(), designItems, true, true);
|
|
21
|
+
}
|
|
22
|
+
return designItems;
|
|
18
23
|
}
|
|
19
24
|
createDesignItems(elements, serviceContainer, instanceServiceContainer) {
|
|
20
25
|
let res = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultHtmlParserService.js","sourceRoot":"","sources":["../../../../src/elements/services/htmlParserService/DefaultHtmlParserService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"DefaultHtmlParserService.js","sourceRoot":"","sources":["../../../../src/elements/services/htmlParserService/DefaultHtmlParserService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,MAAM,OAAO,wBAAwB;IACnC,KAAK,CAAC,KAAK,CAAC,IAAY,EAAE,gBAAkC,EAAE,wBAAkD,EAAE,YAAqB;QACrI,IAAI,GAAa,CAAC;QAClB,YAAY;QACZ,IAAI,QAAQ,CAAC,eAAe,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3C,YAAY;YACZ,GAAG,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,YAAY;YACZ,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;QAC1G,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;QAC1G,MAAM,WAAW,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;QAEjD,IAAI,CAAC,YAAY,IAAI,wBAAwB,CAAC,iCAAiC,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACtG,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,kBAAkB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC9F,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,iBAAiB,CAAC,QAAyE,EAAE,gBAAkC,EAAE,wBAAkD;QACxL,IAAI,GAAG,GAAkB,EAAE,CAAC;QAC5B,KAAK,IAAI,EAAE,IAAI,QAAQ,EAAE,CAAC;YACxB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,2BAA2B,CAAC,IAAU,EAAE,gBAAkC,EAAE,wBAAkD;QACpI,OAAO,UAAU,CAAC,4BAA4B,CAAC,IAAI,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IACnG,CAAC;CACF"}
|
|
@@ -6,6 +6,8 @@ export declare abstract class AbstractHtmlWriterService implements IHtmlWriterSe
|
|
|
6
6
|
options: IHtmlWriterOptions;
|
|
7
7
|
constructor(options?: IHtmlWriterOptions);
|
|
8
8
|
abstract write(indentedTextWriter: ITextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, updatePositions?: boolean): any;
|
|
9
|
-
writeAttributes(indentedTextWriter: ITextWriter, designItem: IDesignItem): void;
|
|
9
|
+
writeAttributes(indentedTextWriter: ITextWriter, designItem: IDesignItem, updatePositions?: boolean): void;
|
|
10
|
+
private _writeAttributeWithValue;
|
|
11
|
+
private _addAttributeSourcePart;
|
|
10
12
|
writeStyles(indentedTextWriter: ITextWriter, designItem: IDesignItem): void;
|
|
11
13
|
}
|
|
@@ -11,9 +11,10 @@ export class AbstractHtmlWriterService {
|
|
|
11
11
|
this.options.parseJsonInAttributes ??= true;
|
|
12
12
|
this.options.jsonWriteMode ??= 'min';
|
|
13
13
|
}
|
|
14
|
-
writeAttributes(indentedTextWriter, designItem) {
|
|
14
|
+
writeAttributes(indentedTextWriter, designItem, updatePositions = false) {
|
|
15
15
|
if (designItem.hasAttributes) {
|
|
16
16
|
for (const a of designItem.attributes()) {
|
|
17
|
+
const attributeStart = indentedTextWriter.position;
|
|
17
18
|
indentedTextWriter.write(' ');
|
|
18
19
|
if (typeof a[1] === 'string') {
|
|
19
20
|
if (a[1] === "")
|
|
@@ -29,7 +30,8 @@ export class AbstractHtmlWriterService {
|
|
|
29
30
|
txt = JSON.stringify(j, null, 2);
|
|
30
31
|
else
|
|
31
32
|
txt = JSON.stringify(j);
|
|
32
|
-
|
|
33
|
+
const writtenValue = DomConverter.normalizeAttributeValue(txt, true);
|
|
34
|
+
this._writeAttributeWithValue(indentedTextWriter, designItem, a[0], writtenValue, '\'', updatePositions);
|
|
33
35
|
continue;
|
|
34
36
|
}
|
|
35
37
|
catch { }
|
|
@@ -38,12 +40,12 @@ export class AbstractHtmlWriterService {
|
|
|
38
40
|
if (content.indexOf('"')) {
|
|
39
41
|
const contentSingle = DomConverter.normalizeAttributeValue(a[1], true);
|
|
40
42
|
if (contentSingle.length < content.length)
|
|
41
|
-
|
|
43
|
+
this._writeAttributeWithValue(indentedTextWriter, designItem, a[0], contentSingle, '\'', updatePositions);
|
|
42
44
|
else
|
|
43
|
-
|
|
45
|
+
this._writeAttributeWithValue(indentedTextWriter, designItem, a[0], content, '"', updatePositions);
|
|
44
46
|
}
|
|
45
47
|
else
|
|
46
|
-
|
|
48
|
+
this._writeAttributeWithValue(indentedTextWriter, designItem, a[0], content, '"', updatePositions);
|
|
47
49
|
}
|
|
48
50
|
}
|
|
49
51
|
else if (!a[1])
|
|
@@ -51,9 +53,42 @@ export class AbstractHtmlWriterService {
|
|
|
51
53
|
else {
|
|
52
54
|
//TODO: writing of bindings, really ???
|
|
53
55
|
}
|
|
56
|
+
if (updatePositions)
|
|
57
|
+
this._addAttributeSourcePart(designItem, a[0], { start: attributeStart + 1, length: indentedTextWriter.position - attributeStart - 1 });
|
|
54
58
|
}
|
|
55
59
|
}
|
|
56
60
|
}
|
|
61
|
+
_writeAttributeWithValue(indentedTextWriter, designItem, attributeName, writtenValue, quote, updatePositions) {
|
|
62
|
+
indentedTextWriter.write(attributeName + '=' + quote);
|
|
63
|
+
const valueStart = indentedTextWriter.position;
|
|
64
|
+
indentedTextWriter.write(writtenValue);
|
|
65
|
+
const valueRange = { start: valueStart, length: indentedTextWriter.position - valueStart };
|
|
66
|
+
indentedTextWriter.write(quote);
|
|
67
|
+
if (!updatePositions)
|
|
68
|
+
return;
|
|
69
|
+
const positionService = designItem.instanceServiceContainer.designItemDocumentPositionService;
|
|
70
|
+
positionService.addSourcePart({
|
|
71
|
+
designItem,
|
|
72
|
+
kind: 'attribute-value',
|
|
73
|
+
key: `attribute:${attributeName}/value`,
|
|
74
|
+
name: attributeName,
|
|
75
|
+
textRange: valueRange
|
|
76
|
+
});
|
|
77
|
+
const context = { designItem, sourceKind: 'attribute', name: attributeName, value: writtenValue, valueTextRange: valueRange };
|
|
78
|
+
for (const provider of designItem.serviceContainer.sourceMapProviders) {
|
|
79
|
+
if (provider.canMap(context))
|
|
80
|
+
positionService.addSourceParts(provider.map(context));
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
_addAttributeSourcePart(designItem, attributeName, textRange) {
|
|
84
|
+
designItem.instanceServiceContainer.designItemDocumentPositionService.addSourcePart({
|
|
85
|
+
designItem,
|
|
86
|
+
kind: 'attribute',
|
|
87
|
+
key: `attribute:${attributeName}`,
|
|
88
|
+
name: attributeName,
|
|
89
|
+
textRange
|
|
90
|
+
});
|
|
91
|
+
}
|
|
57
92
|
writeStyles(indentedTextWriter, designItem) {
|
|
58
93
|
if (designItem.hasStyles) {
|
|
59
94
|
indentedTextWriter.write(' style="');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractHtmlWriterService.js","sourceRoot":"","sources":["../../../../src/elements/services/htmlWriterService/AbstractHtmlWriterService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractHtmlWriterService.js","sourceRoot":"","sources":["../../../../src/elements/services/htmlWriterService/AbstractHtmlWriterService.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,8 @@ export class HtmlWriterService extends AbstractHtmlWriterService {
|
|
|
32
32
|
indentedTextWriter.writeNewline();
|
|
33
33
|
}
|
|
34
34
|
write(indentedTextWriter, designItems, rootContainerKeepInline, updatePositions = false) {
|
|
35
|
+
if (updatePositions)
|
|
36
|
+
designItems[0]?.instanceServiceContainer.designItemDocumentPositionService?.clearSourceParts();
|
|
35
37
|
for (const d of designItems) {
|
|
36
38
|
this.internalWrite(indentedTextWriter, d, updatePositions, false);
|
|
37
39
|
}
|
|
@@ -61,7 +63,7 @@ export class HtmlWriterService extends AbstractHtmlWriterService {
|
|
|
61
63
|
this._conditionalyWriteIndentBefore(indentedTextWriter, designItem, currentPreserveInlineWhitespace);
|
|
62
64
|
start = indentedTextWriter.position;
|
|
63
65
|
indentedTextWriter.write('<' + designItem.name);
|
|
64
|
-
this.writeAttributes(indentedTextWriter, designItem);
|
|
66
|
+
this.writeAttributes(indentedTextWriter, designItem, updatePositions);
|
|
65
67
|
this.writeStyles(indentedTextWriter, designItem);
|
|
66
68
|
indentedTextWriter.write('>');
|
|
67
69
|
let contentSingleTextNode = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlWriterService.js","sourceRoot":"","sources":["../../../../src/elements/services/htmlWriterService/HtmlWriterService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HtmlWriterService.js","sourceRoot":"","sources":["../../../../src/elements/services/htmlWriterService/HtmlWriterService.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,4 +19,6 @@ export declare class AttributesPropertiesService extends AbstractPropertiesServi
|
|
|
19
19
|
getValue(designItems: IDesignItem[], property: IProperty): string;
|
|
20
20
|
getBinding(designItems: IDesignItem[], property: IProperty): IBinding;
|
|
21
21
|
getUnsetValue(designItems: IDesignItem[], property: IProperty): any;
|
|
22
|
+
getContextMenu(designItems: IDesignItem[], property: IProperty): import("../../../../index.js").IContextMenuItem[];
|
|
23
|
+
private _getAttributeSourcePart;
|
|
22
24
|
}
|
|
@@ -91,5 +91,29 @@ export class AttributesPropertiesService extends AbstractPropertiesService {
|
|
|
91
91
|
getUnsetValue(designItems, property) {
|
|
92
92
|
return property.defaultValue;
|
|
93
93
|
}
|
|
94
|
+
getContextMenu(designItems, property) {
|
|
95
|
+
const ctxMenuItems = super.getContextMenu(designItems, property);
|
|
96
|
+
const sourcePart = this._getAttributeSourcePart(designItems, property);
|
|
97
|
+
if (sourcePart) {
|
|
98
|
+
ctxMenuItems.splice(1, 0, {
|
|
99
|
+
title: 'jump to definition',
|
|
100
|
+
action: () => {
|
|
101
|
+
const selectionService = designItems[0].instanceServiceContainer.selectionService;
|
|
102
|
+
if (selectionService.primarySelection !== designItems[0])
|
|
103
|
+
selectionService.setSelectedElements([designItems[0]], null, sourcePart);
|
|
104
|
+
else
|
|
105
|
+
selectionService.setSelectedPart(sourcePart);
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
return ctxMenuItems;
|
|
110
|
+
}
|
|
111
|
+
_getAttributeSourcePart(designItems, property) {
|
|
112
|
+
if (designItems?.length !== 1 || !property?.name)
|
|
113
|
+
return null;
|
|
114
|
+
return designItems[0].instanceServiceContainer.designItemDocumentPositionService
|
|
115
|
+
?.getSourceParts(designItems[0])
|
|
116
|
+
.find(x => x.kind === 'attribute' && x.key === `attribute:${property.name}`);
|
|
117
|
+
}
|
|
94
118
|
}
|
|
95
119
|
//# sourceMappingURL=AttributesPropertiesService.js.map
|
package/dist/elements/services/propertiesService/services/AttributesPropertiesService.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributesPropertiesService.js","sourceRoot":"","sources":["../../../../../src/elements/services/propertiesService/services/AttributesPropertiesService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,OAAO,2BAA4B,SAAQ,yBAAyB;IAEjE,IAAI,GAAG,YAAY,CAAA;IAEnB,cAAc,CAAC,UAAuB;QAC3C,OAAO,WAAW,CAAC,iBAAiB,CAAC;IACvC,CAAC;IAED,gBAAgB,CAAC,UAAuB;QACtC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC;IAChC,CAAC;IAEQ,KAAK,CAAC,WAAW,CAAC,UAAuB,EAAE,IAAY;QAC9D,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,SAAS,EAAE,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAuB;QACzC,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,GAAgB,EAAE,CAAC;YACxB,KAAK,IAAI,CAAC,IAAI,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC;gBACtC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,SAAS,EAAE,CAAC,CAAA;YAC9G,CAAC;YACD,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;YACxF,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,KAAK,CAAC,QAAQ,CAAC,WAA0B,EAAE,QAAmB,EAAE,KAAU;QACjF,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC1D,KAAK,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC;YAC1B,CAAC,CAAC,YAAY,CAAS,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC;QACD,EAAE,CAAC,MAAM,EAAE,CAAC;IACd,CAAC;IAEQ,iBAAiB,CAAC,UAAuB,EAAE,QAAmB;QACrE,OAAO,aAAa,CAAC,SAAS,CAAC;IACjC,CAAC;IAEQ,UAAU,CAAC,WAA0B,EAAE,QAAmB;QACjE,KAAK,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC;YAC1B,CAAC,CAAC,eAAe,CAAS,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,EAAE;gBACnE,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC/E,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEQ,KAAK,CAAC,WAA0B,EAAE,QAAmB;QAC5D,IAAI,GAAG,GAAG,IAAI,CAAC;QACf,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpD,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,IAAI,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ;gBAC1F,OAAO,SAAS,CAAC,KAAK,CAAC;YACzB,IAAI,QAAQ,GAAG,gBAAgB,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/D,IAAI,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC;YAClC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACxB,IAAI,GAAG,GAAG,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;gBACxC,GAAG,GAAG,GAAG,IAAI,GAAG,CAAC;gBACjB,IAAI,GAAG,IAAI,IAAI,GAAG,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,yBAAyB,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YACpF,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC,SAAS,IAAI,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC;gBACjG,OAAO,SAAS,CAAC,KAAK,CAAC;QAC3B,CAAC;;YAEC,OAAO,SAAS,CAAC,IAAI,CAAA;QAEvB,OAAO,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;IACtE,CAAC;IAEQ,QAAQ,CAAC,WAA0B,EAAE,QAAmB;QAC/D,IAAI,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpD,IAAI,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC;YAClC,IAAI,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAC3D,IAAI,OAAO,SAAS,KAAK,QAAQ;gBAC/B,OAAkB,SAAU,CAAC,QAAQ,CAAC;YACxC;;;;;;;;cAQE;YACF,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,UAAU,CAAC,WAA0B,EAAE,QAAmB;QACjE,MAAM,QAAQ,GAAG,yBAAyB,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC,QAAQ,IAAI,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC,gBAAgB,IAAI,CAAC,CAAC,MAAM,IAAI,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxL,CAAC;IAEQ,aAAa,CAAC,WAA0B,EAAE,QAAmB;QACpE,OAAO,QAAQ,CAAC,YAAY,CAAC;IAC/B,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"AttributesPropertiesService.js","sourceRoot":"","sources":["../../../../../src/elements/services/propertiesService/services/AttributesPropertiesService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { IDesignItem } from '../../item/IDesignItem.js';
|
|
2
|
+
import { ISourcePart } from '../sourceMapService/ISourcePart.js';
|
|
2
3
|
export interface ISelectionChangedEvent {
|
|
3
4
|
oldSelectedElements: IDesignItem[];
|
|
4
5
|
selectedElements: IDesignItem[];
|
|
6
|
+
selectedPart?: ISourcePart;
|
|
7
|
+
oldSelectedPart?: ISourcePart;
|
|
5
8
|
event?: Event;
|
|
6
9
|
}
|
|
@@ -2,10 +2,13 @@ import { TypedEvent } from '@node-projects/base-custom-webcomponent';
|
|
|
2
2
|
import { IDesignItem } from '../../item/IDesignItem.js';
|
|
3
3
|
import { ISelectionChangedEvent } from './ISelectionChangedEvent.js';
|
|
4
4
|
import { ISelectionRefreshEvent } from './ISelectionRefreshEvent.js';
|
|
5
|
+
import { ISourcePart } from '../sourceMapService/ISourcePart.js';
|
|
5
6
|
export interface ISelectionService {
|
|
6
7
|
primarySelection: IDesignItem;
|
|
7
8
|
selectedElements: IDesignItem[];
|
|
8
|
-
|
|
9
|
+
selectedPart: ISourcePart;
|
|
10
|
+
setSelectedElements(designItems: IDesignItem[], even?: Event, selectedPart?: ISourcePart): void;
|
|
11
|
+
setSelectedPart(sourcePart: ISourcePart, event?: Event): void;
|
|
9
12
|
setSelectionByTextRange(positionStart: number, positionEnd: number): any;
|
|
10
13
|
clearSelectedElements(): void;
|
|
11
14
|
isSelected(designItem: IDesignItem): boolean;
|
|
@@ -4,15 +4,20 @@ import { ISelectionChangedEvent } from './ISelectionChangedEvent.js';
|
|
|
4
4
|
import { TypedEvent } from '@node-projects/base-custom-webcomponent';
|
|
5
5
|
import { IDesignerCanvas } from '../../widgets/designerView/IDesignerCanvas.js';
|
|
6
6
|
import { ISelectionRefreshEvent } from './ISelectionRefreshEvent.js';
|
|
7
|
+
import { ISourcePart } from '../sourceMapService/ISourcePart.js';
|
|
7
8
|
export declare class SelectionService implements ISelectionService {
|
|
8
9
|
primarySelection: IDesignItem;
|
|
9
10
|
selectedElements: IDesignItem[];
|
|
11
|
+
selectedPart: ISourcePart;
|
|
10
12
|
_designerCanvas: IDesignerCanvas;
|
|
11
13
|
_undoSelectionChanges: boolean;
|
|
12
14
|
constructor(designerCanvas: IDesignerCanvas, undoSelectionChanges: boolean);
|
|
13
|
-
setSelectedElements(designItems: IDesignItem[], event?: Event): void;
|
|
15
|
+
setSelectedElements(designItems: IDesignItem[], event?: Event, selectedPart?: ISourcePart): void;
|
|
16
|
+
private _setSelectedElements;
|
|
17
|
+
setSelectedPart(sourcePart: ISourcePart, event?: Event): void;
|
|
18
|
+
private _setSelectedPart;
|
|
14
19
|
setSelectionByTextRange(positionStart: number, positionEnd: number): void;
|
|
15
|
-
_withoutUndoSetSelectedElements(designItems: IDesignItem[], event?: Event): void;
|
|
20
|
+
_withoutUndoSetSelectedElements(designItems: IDesignItem[], event?: Event, selectedPart?: ISourcePart): void;
|
|
16
21
|
clearSelectedElements(): void;
|
|
17
22
|
isSelected(designItem: IDesignItem): boolean;
|
|
18
23
|
readonly onSelectionChanged: TypedEvent<ISelectionChangedEvent>;
|
|
@@ -19,18 +19,23 @@ function findDesignItem(designItem, position) {
|
|
|
19
19
|
export class SelectionService {
|
|
20
20
|
primarySelection;
|
|
21
21
|
selectedElements = [];
|
|
22
|
+
selectedPart;
|
|
22
23
|
_designerCanvas;
|
|
23
24
|
_undoSelectionChanges;
|
|
24
25
|
constructor(designerCanvas, undoSelectionChanges) {
|
|
25
26
|
this._designerCanvas = designerCanvas;
|
|
26
27
|
this._undoSelectionChanges = undoSelectionChanges;
|
|
27
28
|
}
|
|
28
|
-
setSelectedElements(designItems, event) {
|
|
29
|
+
setSelectedElements(designItems, event, selectedPart) {
|
|
30
|
+
this._setSelectedElements(designItems, event, selectedPart);
|
|
31
|
+
}
|
|
32
|
+
_setSelectedElements(designItems, event, selectedPart) {
|
|
29
33
|
if (designItems === null || designItems.length === 0)
|
|
30
34
|
designItems = [this._designerCanvas.rootDesignItem];
|
|
31
35
|
if (this.selectedElements != designItems && !(this.selectedElements.length === 0 && (designItems == null || designItems.length === 0))) {
|
|
32
36
|
if (this.selectedElements?.length === 1 && designItems?.length === 1 && designItems[0] === this.selectedElements[0]) {
|
|
33
|
-
this.
|
|
37
|
+
this._setSelectedPart(selectedPart);
|
|
38
|
+
this.onSelectionRefresh.emit({ selectedElements: this.selectedElements, selectedPart: this.selectedPart, event });
|
|
34
39
|
return;
|
|
35
40
|
}
|
|
36
41
|
if (this._undoSelectionChanges) {
|
|
@@ -38,22 +43,38 @@ export class SelectionService {
|
|
|
38
43
|
this._designerCanvas.instanceServiceContainer.undoService.execute(action);
|
|
39
44
|
}
|
|
40
45
|
else {
|
|
41
|
-
this._withoutUndoSetSelectedElements(designItems, event);
|
|
46
|
+
this._withoutUndoSetSelectedElements(designItems, event, selectedPart);
|
|
42
47
|
}
|
|
43
48
|
}
|
|
44
49
|
}
|
|
50
|
+
setSelectedPart(sourcePart, event) {
|
|
51
|
+
if (this._setSelectedPart(sourcePart))
|
|
52
|
+
this.onSelectionRefresh.emit({ selectedElements: this.selectedElements, selectedPart: this.selectedPart, event });
|
|
53
|
+
}
|
|
54
|
+
_setSelectedPart(sourcePart) {
|
|
55
|
+
const oldSelectedPart = this.selectedPart;
|
|
56
|
+
if (oldSelectedPart === sourcePart || (oldSelectedPart?.designItem === sourcePart?.designItem && oldSelectedPart?.key === sourcePart?.key))
|
|
57
|
+
return false;
|
|
58
|
+
this.selectedPart = sourcePart;
|
|
59
|
+
return true;
|
|
60
|
+
}
|
|
45
61
|
setSelectionByTextRange(positionStart, positionEnd) {
|
|
62
|
+
const sourcePart = this._designerCanvas.instanceServiceContainer.designItemDocumentPositionService?.getSourcePartAt(positionStart);
|
|
46
63
|
const item = findDesignItem(this._designerCanvas.rootDesignItem, positionStart);
|
|
47
64
|
if (item) {
|
|
48
65
|
if (this.selectedElements.length != 1 || this.primarySelection != item)
|
|
49
|
-
this.
|
|
66
|
+
this._setSelectedElements([item], undefined, sourcePart);
|
|
67
|
+
else
|
|
68
|
+
this.setSelectedPart(sourcePart);
|
|
50
69
|
}
|
|
51
70
|
}
|
|
52
|
-
_withoutUndoSetSelectedElements(designItems, event) {
|
|
71
|
+
_withoutUndoSetSelectedElements(designItems, event, selectedPart) {
|
|
53
72
|
let oldSelectedElements = this.selectedElements;
|
|
73
|
+
let oldSelectedPart = this.selectedPart;
|
|
54
74
|
if (!designItems) {
|
|
55
75
|
this.selectedElements = [];
|
|
56
76
|
this.primarySelection = null;
|
|
77
|
+
this.selectedPart = null;
|
|
57
78
|
}
|
|
58
79
|
else {
|
|
59
80
|
let newSelection = [];
|
|
@@ -66,8 +87,9 @@ export class SelectionService {
|
|
|
66
87
|
this.primarySelection = newSelection[0];
|
|
67
88
|
else
|
|
68
89
|
this.primarySelection = null;
|
|
90
|
+
this.selectedPart = selectedPart?.designItem === this.primarySelection ? selectedPart : null;
|
|
69
91
|
}
|
|
70
|
-
this.onSelectionChanged.emit({ selectedElements: this.selectedElements, oldSelectedElements: oldSelectedElements, event });
|
|
92
|
+
this.onSelectionChanged.emit({ selectedElements: this.selectedElements, oldSelectedElements: oldSelectedElements, selectedPart: this.selectedPart, oldSelectedPart, event });
|
|
71
93
|
}
|
|
72
94
|
clearSelectedElements() {
|
|
73
95
|
this.setSelectedElements([]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectionService.js","sourceRoot":"","sources":["../../../../src/elements/services/selectionService/SelectionService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;
|
|
1
|
+
{"version":3,"file":"SelectionService.js","sourceRoot":"","sources":["../../../../src/elements/services/selectionService/SelectionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { IDesignItem } from '../../item/IDesignItem.js';
|
|
2
|
+
import { IStringPosition } from '../htmlWriterService/IStringPosition.js';
|
|
3
|
+
import { ISourcePart } from './ISourcePart.js';
|
|
4
|
+
export type SourceMapContextKind = 'attribute' | 'style-declaration' | 'text-node';
|
|
5
|
+
export interface ISourceMapContext {
|
|
6
|
+
designItem: IDesignItem;
|
|
7
|
+
sourceKind: SourceMapContextKind;
|
|
8
|
+
name?: string;
|
|
9
|
+
value: string;
|
|
10
|
+
valueTextRange: IStringPosition;
|
|
11
|
+
}
|
|
12
|
+
export interface ISourceMapProvider {
|
|
13
|
+
canMap(context: ISourceMapContext): boolean;
|
|
14
|
+
map(context: ISourceMapContext): ISourcePart[];
|
|
15
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ISourceMapProvider.js","sourceRoot":"","sources":["../../../../src/elements/services/sourceMapService/ISourceMapProvider.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { IDesignItem } from '../../item/IDesignItem.js';
|
|
2
|
+
import { IStringPosition } from '../htmlWriterService/IStringPosition.js';
|
|
3
|
+
export type SourcePartKind = 'attribute' | 'attribute-value' | 'style-declaration' | 'style-value' | 'svg-path-handle' | string;
|
|
4
|
+
export interface ISourcePart<TData = unknown> {
|
|
5
|
+
designItem: IDesignItem;
|
|
6
|
+
kind: SourcePartKind;
|
|
7
|
+
key: string;
|
|
8
|
+
name?: string;
|
|
9
|
+
textRange: IStringPosition;
|
|
10
|
+
data?: TData;
|
|
11
|
+
}
|
|
12
|
+
export interface ISvgPathHandleSourcePartData {
|
|
13
|
+
attribute: 'd';
|
|
14
|
+
segmentIndex: number;
|
|
15
|
+
handleType: 'anchor' | 'cp1' | 'cp2';
|
|
16
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ISourcePart.js","sourceRoot":"","sources":["../../../../src/elements/services/sourceMapService/ISourcePart.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export type SvgPathHandleType = 'anchor' | 'cp1' | 'cp2';
|
|
2
|
+
export interface ISvgPathHandleRange {
|
|
3
|
+
segmentIndex: number;
|
|
4
|
+
handleType: SvgPathHandleType;
|
|
5
|
+
start: number;
|
|
6
|
+
length: number;
|
|
7
|
+
}
|
|
8
|
+
export declare function parseSvgPathDataSourceMap(value: string): ISvgPathHandleRange[];
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
const parameterCount = {
|
|
2
|
+
M: 2,
|
|
3
|
+
L: 2,
|
|
4
|
+
H: 1,
|
|
5
|
+
V: 1,
|
|
6
|
+
C: 6,
|
|
7
|
+
S: 4,
|
|
8
|
+
Q: 4,
|
|
9
|
+
T: 2,
|
|
10
|
+
A: 7,
|
|
11
|
+
Z: 0,
|
|
12
|
+
};
|
|
13
|
+
function isCommandToken(token) {
|
|
14
|
+
return 'command' in token;
|
|
15
|
+
}
|
|
16
|
+
function isNumberToken(token) {
|
|
17
|
+
return 'value' in token;
|
|
18
|
+
}
|
|
19
|
+
function tokenizePathData(value) {
|
|
20
|
+
const tokens = [];
|
|
21
|
+
const tokenRegex = /[AaCcHhLlMmQqSsTtVvZz]|[-+]?(?:(?:\d*\.\d+)|(?:\d+\.?))(?:[eE][-+]?\d+)?/g;
|
|
22
|
+
let match;
|
|
23
|
+
while ((match = tokenRegex.exec(value))) {
|
|
24
|
+
const token = match[0];
|
|
25
|
+
if (/^[AaCcHhLlMmQqSsTtVvZz]$/.test(token))
|
|
26
|
+
tokens.push({ command: token, start: match.index, end: match.index + token.length });
|
|
27
|
+
else
|
|
28
|
+
tokens.push({ value: Number(token), start: match.index, end: match.index + token.length });
|
|
29
|
+
}
|
|
30
|
+
return tokens;
|
|
31
|
+
}
|
|
32
|
+
function getRange(numbers, indexes) {
|
|
33
|
+
const selected = indexes.map(index => numbers[index]).filter(x => x);
|
|
34
|
+
const start = Math.min(...selected.map(x => x.start));
|
|
35
|
+
const end = Math.max(...selected.map(x => x.end));
|
|
36
|
+
return { start, length: end - start };
|
|
37
|
+
}
|
|
38
|
+
function addHandleRange(ranges, segmentIndex, handleType, numbers, indexes) {
|
|
39
|
+
const range = getRange(numbers, indexes);
|
|
40
|
+
ranges.push({ segmentIndex, handleType, start: range.start, length: range.length });
|
|
41
|
+
}
|
|
42
|
+
function addSegmentRanges(ranges, command, segmentIndex, numbers) {
|
|
43
|
+
switch (command.toUpperCase()) {
|
|
44
|
+
case 'M':
|
|
45
|
+
case 'L':
|
|
46
|
+
case 'T':
|
|
47
|
+
addHandleRange(ranges, segmentIndex, 'anchor', numbers, [0, 1]);
|
|
48
|
+
break;
|
|
49
|
+
case 'H':
|
|
50
|
+
case 'V':
|
|
51
|
+
addHandleRange(ranges, segmentIndex, 'anchor', numbers, [0]);
|
|
52
|
+
break;
|
|
53
|
+
case 'C':
|
|
54
|
+
addHandleRange(ranges, segmentIndex, 'cp1', numbers, [0, 1]);
|
|
55
|
+
addHandleRange(ranges, segmentIndex, 'cp2', numbers, [2, 3]);
|
|
56
|
+
addHandleRange(ranges, segmentIndex, 'anchor', numbers, [4, 5]);
|
|
57
|
+
break;
|
|
58
|
+
case 'S':
|
|
59
|
+
addHandleRange(ranges, segmentIndex, 'cp2', numbers, [0, 1]);
|
|
60
|
+
addHandleRange(ranges, segmentIndex, 'anchor', numbers, [2, 3]);
|
|
61
|
+
break;
|
|
62
|
+
case 'Q':
|
|
63
|
+
addHandleRange(ranges, segmentIndex, 'cp1', numbers, [0, 1]);
|
|
64
|
+
addHandleRange(ranges, segmentIndex, 'anchor', numbers, [2, 3]);
|
|
65
|
+
break;
|
|
66
|
+
case 'A':
|
|
67
|
+
addHandleRange(ranges, segmentIndex, 'anchor', numbers, [5, 6]);
|
|
68
|
+
break;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
export function parseSvgPathDataSourceMap(value) {
|
|
72
|
+
const tokens = tokenizePathData(value);
|
|
73
|
+
const ranges = [];
|
|
74
|
+
let index = 0;
|
|
75
|
+
let command = null;
|
|
76
|
+
let segmentIndex = 0;
|
|
77
|
+
while (index < tokens.length) {
|
|
78
|
+
const token = tokens[index];
|
|
79
|
+
if (isCommandToken(token)) {
|
|
80
|
+
command = token.command;
|
|
81
|
+
index++;
|
|
82
|
+
if (command.toUpperCase() === 'Z') {
|
|
83
|
+
segmentIndex++;
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
else if (!command) {
|
|
88
|
+
index++;
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
let effectiveCommand = command;
|
|
92
|
+
let parameters = parameterCount[effectiveCommand.toUpperCase()];
|
|
93
|
+
if (parameters == null || parameters === 0)
|
|
94
|
+
continue;
|
|
95
|
+
let firstMoveSegment = effectiveCommand.toUpperCase() === 'M';
|
|
96
|
+
while (index < tokens.length && !isCommandToken(tokens[index])) {
|
|
97
|
+
if (firstMoveSegment) {
|
|
98
|
+
effectiveCommand = command;
|
|
99
|
+
firstMoveSegment = false;
|
|
100
|
+
}
|
|
101
|
+
else if (command.toUpperCase() === 'M') {
|
|
102
|
+
effectiveCommand = command === command.toLowerCase() ? 'l' : 'L';
|
|
103
|
+
}
|
|
104
|
+
parameters = parameterCount[effectiveCommand.toUpperCase()];
|
|
105
|
+
const numbers = [];
|
|
106
|
+
for (let parameterIndex = 0; parameterIndex < parameters && index < tokens.length; parameterIndex++, index++) {
|
|
107
|
+
const numberToken = tokens[index];
|
|
108
|
+
if (!isNumberToken(numberToken))
|
|
109
|
+
break;
|
|
110
|
+
numbers.push(numberToken);
|
|
111
|
+
}
|
|
112
|
+
if (numbers.length !== parameters)
|
|
113
|
+
break;
|
|
114
|
+
addSegmentRanges(ranges, effectiveCommand, segmentIndex, numbers);
|
|
115
|
+
segmentIndex++;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
return ranges;
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=SvgPathDataSourceMap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SvgPathDataSourceMap.js","sourceRoot":"","sources":["../../../../src/elements/services/sourceMapService/SvgPathDataSourceMap.ts"],"names":[],"mappings":"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"}
|