@gedit/editor-2d 0.1.114 → 0.1.115
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/browser/editor2d-context-key-service.js +24 -35
- package/lib/browser/editor2d-context-key-service.js.map +1 -1
- package/lib/browser/editor2d-contribution.js +89 -139
- package/lib/browser/editor2d-contribution.js.map +1 -1
- package/lib/browser/editor2d-frontend-module.js +20 -20
- package/lib/browser/editor2d-frontend-module.js.map +1 -1
- package/lib/browser/editor2d-label-provider.d.ts +0 -1
- package/lib/browser/editor2d-label-provider.d.ts.map +1 -1
- package/lib/browser/editor2d-label-provider.js +37 -58
- package/lib/browser/editor2d-label-provider.js.map +1 -1
- package/lib/browser/editor2d-model-provider.js +61 -127
- package/lib/browser/editor2d-model-provider.js.map +1 -1
- package/lib/browser/editor2d-ref-provider-contribution.js +44 -110
- package/lib/browser/editor2d-ref-provider-contribution.js.map +1 -1
- package/lib/browser/editor2d-service.js +66 -85
- package/lib/browser/editor2d-service.js.map +1 -1
- package/lib/browser/model/editor2d-document.d.ts +1 -1
- package/lib/browser/model/editor2d-document.d.ts.map +1 -1
- package/lib/browser/model/editor2d-document.js +358 -526
- package/lib/browser/model/editor2d-document.js.map +1 -1
- package/lib/browser/model/editor2d-iterator.js +27 -67
- package/lib/browser/model/editor2d-iterator.js.map +1 -1
- package/lib/browser/model/editor2d-model-container.js +10 -21
- package/lib/browser/model/editor2d-model-container.js.map +1 -1
- package/lib/browser/model/editor2d-model.js +77 -92
- package/lib/browser/model/editor2d-model.js.map +1 -1
- package/lib/browser/model/editor2d-selection.js +16 -43
- package/lib/browser/model/editor2d-selection.js.map +1 -1
- package/lib/browser/model/editor2d-widget.js +71 -90
- package/lib/browser/model/editor2d-widget.js.map +1 -1
- package/lib/browser/model/editor2d.js +41 -127
- package/lib/browser/model/editor2d.js.map +1 -1
- package/lib/browser/model/utils/anim.utils.js +14 -14
- package/lib/browser/model/utils/anim.utils.js.map +1 -1
- package/lib/browser/playground/canvas-draw-layer.js +45 -69
- package/lib/browser/playground/canvas-draw-layer.js.map +1 -1
- package/lib/browser/playground/canvas-draw.js +142 -244
- package/lib/browser/playground/canvas-draw.js.map +1 -1
- package/lib/browser/playground/canvas-layer.js +54 -101
- package/lib/browser/playground/canvas-layer.js.map +1 -1
- package/lib/browser/playground/entities/document-entity.js +8 -28
- package/lib/browser/playground/entities/document-entity.js.map +1 -1
- package/lib/browser/playground/entities/editor2d-entity.js +14 -37
- package/lib/browser/playground/entities/editor2d-entity.js.map +1 -1
- package/lib/browser/playground/playground-context.d.ts +3 -1
- package/lib/browser/playground/playground-context.d.ts.map +1 -1
- package/lib/browser/playground/playground-context.js +49 -47
- package/lib/browser/playground/playground-context.js.map +1 -1
- package/lib/browser/playground/playground-contribution.js +61 -65
- package/lib/browser/playground/playground-contribution.js.map +1 -1
- package/lib/browser/playground/selection-entity-manager.js +74 -132
- package/lib/browser/playground/selection-entity-manager.js.map +1 -1
- package/lib/browser/playground/selector-extend-icons.js +15 -16
- package/lib/browser/playground/selector-extend-icons.js.map +1 -1
- package/lib/browser/playground/selector-extend-renderer.d.ts +3 -2
- package/lib/browser/playground/selector-extend-renderer.d.ts.map +1 -1
- package/lib/browser/playground/selector-extend-renderer.js +67 -52
- package/lib/browser/playground/selector-extend-renderer.js.map +1 -1
- package/lib/browser/utils/snapshot.js +81 -172
- package/lib/browser/utils/snapshot.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/editor2d-label-provider.ts +1 -15
- package/src/browser/model/editor2d-document.ts +6 -2
- package/src/browser/playground/playground-context.ts +2 -0
- package/src/browser/playground/selector-extend-renderer.tsx +43 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor2d.js","sourceRoot":"","sources":["../../../src/browser/model/editor2d.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"editor2d.js","sourceRoot":"","sources":["../../../src/browser/model/editor2d.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getChangeAnimationData = exports.getAnimationKeys = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
const editor2d_1 = require("../editor2d");
|
|
5
|
+
const utils_1 = require("@gedit/utils");
|
|
6
6
|
// 添加进时间轴动画的条件；
|
|
7
|
-
|
|
7
|
+
const supportKeys = ['integer', 'float', 'color'];
|
|
8
8
|
function readAnimationKeys(deco, keyList, currentKey, parentName, parentKey) {
|
|
9
|
-
|
|
9
|
+
const currentLabel = parentName && deco.label ? `${parentName}.${deco.label}` : deco.label;
|
|
10
10
|
currentKey =
|
|
11
|
-
parentKey && currentKey ?
|
|
11
|
+
parentKey && currentKey ? `${parentKey}.${currentKey}` : currentKey;
|
|
12
12
|
// 进时间轴条件，必须带 label, ref: { label: 'xxx', type: 'float' };
|
|
13
13
|
if (deco.properties) {
|
|
14
|
-
Object.keys(deco.properties).forEach(
|
|
14
|
+
Object.keys(deco.properties).forEach((property) => {
|
|
15
15
|
readAnimationKeys(deco.properties[property], keyList, property, currentLabel, currentKey);
|
|
16
16
|
});
|
|
17
17
|
}
|
|
@@ -26,23 +26,23 @@ function readAnimationKeys(deco, keyList, currentKey, parentName, parentKey) {
|
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
const getAnimationKeys = (renderEngineService, register, timelineDisabledKeys) => {
|
|
30
|
+
let keyList = [];
|
|
31
31
|
if (register.defaultDataDecoration) {
|
|
32
|
-
|
|
32
|
+
const deco = typeof register.defaultDataDecoration === 'function'
|
|
33
33
|
? register.defaultDataDecoration(renderEngineService)
|
|
34
34
|
: register.defaultDataDecoration;
|
|
35
35
|
readAnimationKeys(deco, keyList);
|
|
36
36
|
}
|
|
37
|
-
keyList = keyList.filter(
|
|
37
|
+
keyList = keyList.filter(f => !timelineDisabledKeys.find(c => f.key.indexOf(c) >= 0));
|
|
38
38
|
return keyList;
|
|
39
39
|
};
|
|
40
40
|
exports.getAnimationKeys = getAnimationKeys;
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
const getChangeAnimationData = (values, nodeData, newData) => {
|
|
42
|
+
const data = editor2d_1.Editor2dNode.clone(nodeData);
|
|
43
43
|
Object.assign(data, { id: nodeData.id });
|
|
44
|
-
values.forEach(
|
|
45
|
-
|
|
44
|
+
values.forEach(item => {
|
|
45
|
+
const v = (0, utils_1.getByKey)(newData, item.key);
|
|
46
46
|
if (typeof v !== 'undefined') {
|
|
47
47
|
(0, utils_1.setByKey)(data, item.key, v);
|
|
48
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anim.utils.js","sourceRoot":"","sources":["../../../../src/browser/model/utils/anim.utils.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"anim.utils.js","sourceRoot":"","sources":["../../../../src/browser/model/utils/anim.utils.ts"],"names":[],"mappings":";;;AAIA,0CAA2C;AAC3C,wCAAkD;AAMlD,eAAe;AACf,MAAM,WAAW,GAAiB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAChE,SAAS,iBAAiB,CACxB,IAAsB,EACtB,OAAwC,EACxC,UAAmB,EACnB,UAAmB,EACnB,SAAkB;IAElB,MAAM,YAAY,GAChB,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IACxE,UAAU;QACR,SAAS,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;IACtE,0DAA0D;IAC1D,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,QAAgB,EAAE,EAAE;YACxD,iBAAiB,CACf,IAAI,CAAC,UAAW,CAAC,QAAQ,CAAqB,EAC9C,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,UAAU,CACX,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;SAAM,IACL,YAAY;QACZ,UAAU;QACV,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAC/B,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO;MACtC;QACA,OAAO,CAAC,IAAI,CAAC;YACX,GAAG,EAAE,UAAU;YACf,IAAI,EAAE,YAAY,CAAC,WAAW,EAAE;SACjC,CAAC,CAAC;KACJ;AACH,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAC9B,mBAAwC,EACxC,QAA+C,EAC/C,oBAA8B,EACjB,EAAE;IACf,IAAI,OAAO,GAAoC,EAAE,CAAC;IAClD,IAAI,QAAQ,CAAC,qBAAqB,EAAE;QAClC,MAAM,IAAI,GACR,OAAO,QAAQ,CAAC,qBAAqB,KAAK,UAAU;YAClD,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,mBAAmB,CAAC;YACrD,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC;QACrC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAClC;IACD,OAAO,GAAG,OAAO,CAAC,MAAM,CACtB,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAC5D,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAjBW,QAAA,gBAAgB,oBAiB3B;AAEK,MAAM,sBAAsB,GAAG,CACpC,MAAmB,EACnB,QAAsB,EACtB,OAAqB,EACG,EAAE;IAC1B,MAAM,IAAI,GAAG,uBAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpB,MAAM,CAAC,GAAG,IAAA,gBAAQ,EAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,OAAO,CAAC,KAAK,WAAW,EAAE;YAC5B,IAAA,gBAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAdW,QAAA,sBAAsB,0BAcjC"}
|
|
@@ -1,19 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __extends = (this && this.__extends) || (function () {
|
|
3
|
-
var extendStatics = function (d, b) {
|
|
4
|
-
extendStatics = Object.setPrototypeOf ||
|
|
5
|
-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
-
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
7
|
-
return extendStatics(d, b);
|
|
8
|
-
};
|
|
9
|
-
return function (d, b) {
|
|
10
|
-
if (typeof b !== "function" && b !== null)
|
|
11
|
-
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
|
12
|
-
extendStatics(d, b);
|
|
13
|
-
function __() { this.constructor = d; }
|
|
14
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
|
-
};
|
|
16
|
-
})();
|
|
17
2
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
3
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
4
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -25,48 +10,45 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
25
10
|
};
|
|
26
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
12
|
exports.CanvasDrawLayer = void 0;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
13
|
+
const React = require("react");
|
|
14
|
+
const playground_1 = require("@gedit/playground");
|
|
15
|
+
const document_entity_1 = require("./entities/document-entity");
|
|
16
|
+
const browser_1 = require("@gedit/utils/lib/browser");
|
|
17
|
+
const render_engine_1 = require("@gedit/render-engine");
|
|
18
|
+
const EDIT_PATH_STATE = 'STATE_PATH';
|
|
34
19
|
/**
|
|
35
20
|
* 动态绘制层
|
|
36
21
|
*/
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
_this.node = browser_1.domUtils.createDivWithClass('gedit-canvas-draw-layer');
|
|
42
|
-
return _this;
|
|
22
|
+
class CanvasDrawLayer extends playground_1.Layer {
|
|
23
|
+
constructor() {
|
|
24
|
+
super(...arguments);
|
|
25
|
+
this.node = browser_1.domUtils.createDivWithClass('gedit-canvas-draw-layer');
|
|
43
26
|
}
|
|
44
|
-
|
|
45
|
-
var _this = this;
|
|
27
|
+
onReady() {
|
|
46
28
|
this.toDispose.pushAll([
|
|
47
29
|
// 退出路径编辑
|
|
48
|
-
this.editorState.onCancel(EDIT_PATH_STATE,
|
|
30
|
+
this.editorState.onCancel(EDIT_PATH_STATE, () => {
|
|
49
31
|
var _a;
|
|
50
32
|
// 如果只有一个点代表绘制不成功，则删除
|
|
51
|
-
if (
|
|
52
|
-
(_a =
|
|
33
|
+
if (this.currentPathNode && this.currentPathNode.path.paths.length <= 1) {
|
|
34
|
+
(_a = this.document) === null || _a === void 0 ? void 0 : _a.delNode(this.currentPathNode);
|
|
53
35
|
}
|
|
54
|
-
|
|
36
|
+
this.currentPathNode = undefined;
|
|
55
37
|
}),
|
|
56
|
-
this.listenPlaygroundEvent('mousedown',
|
|
38
|
+
this.listenPlaygroundEvent('mousedown', (e) => {
|
|
57
39
|
// 当前编辑模式为路径编辑
|
|
58
|
-
if (
|
|
59
|
-
|
|
60
|
-
|
|
40
|
+
if (this.editorState.is(EDIT_PATH_STATE)) {
|
|
41
|
+
const pos = this.getPosFromMouseEvent(e);
|
|
42
|
+
this.drawPath(pos);
|
|
61
43
|
}
|
|
62
44
|
}, 10)
|
|
63
45
|
]);
|
|
64
|
-
}
|
|
46
|
+
}
|
|
65
47
|
/**
|
|
66
48
|
* 创建路径
|
|
67
49
|
* @param pos - 当前鼠标点击的位置
|
|
68
50
|
*/
|
|
69
|
-
|
|
51
|
+
drawPath(pos) {
|
|
70
52
|
if (!this.document)
|
|
71
53
|
return;
|
|
72
54
|
// 创建一个空的路径节点，用于存储数据
|
|
@@ -78,27 +60,22 @@ var CanvasDrawLayer = /** @class */ (function (_super) {
|
|
|
78
60
|
y: pos.y,
|
|
79
61
|
});
|
|
80
62
|
this.document.updateNode(this.currentPathNode, {}, true);
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
enumerable: false,
|
|
87
|
-
configurable: true
|
|
88
|
-
});
|
|
89
|
-
CanvasDrawLayer.prototype.draw = function () {
|
|
90
|
-
var _this = this;
|
|
63
|
+
}
|
|
64
|
+
get document() {
|
|
65
|
+
return this.documentEntity.config.document;
|
|
66
|
+
}
|
|
67
|
+
draw() {
|
|
91
68
|
if (!this.document)
|
|
92
69
|
return React.createElement(React.Fragment, null);
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
this.document.queryNodesByTypes([render_engine_1.GameObjectBaseType.PATH]).forEach(
|
|
96
|
-
node.path.paths.forEach(
|
|
97
|
-
|
|
98
|
-
|
|
70
|
+
const allPoints = [];
|
|
71
|
+
const document = this.document;
|
|
72
|
+
this.document.queryNodesByTypes([render_engine_1.GameObjectBaseType.PATH]).forEach((node) => {
|
|
73
|
+
node.path.paths.forEach((p, i) => {
|
|
74
|
+
const onMouseDown = (e) => {
|
|
75
|
+
this.startDrag(e.clientX, e.clientY, {
|
|
99
76
|
// 拖动
|
|
100
|
-
onDrag
|
|
101
|
-
|
|
77
|
+
onDrag(dragEvent) {
|
|
78
|
+
const pos = dragEvent.endPos;
|
|
102
79
|
p.x = pos.x;
|
|
103
80
|
p.y = pos.y;
|
|
104
81
|
document.updateNode(node, {}, true);
|
|
@@ -107,20 +84,19 @@ var CanvasDrawLayer = /** @class */ (function (_super) {
|
|
|
107
84
|
e.preventDefault();
|
|
108
85
|
e.stopPropagation();
|
|
109
86
|
};
|
|
110
|
-
allPoints.push(React.createElement("div", { className: "gedit-canvas-draw-layer-point", key:
|
|
87
|
+
allPoints.push(React.createElement("div", { className: "gedit-canvas-draw-layer-point", key: `${node.id}.${i}`, style: { left: p.x, top: p.y }, onMouseDown: onMouseDown }));
|
|
111
88
|
});
|
|
112
89
|
});
|
|
113
90
|
return React.createElement(React.Fragment, null, allPoints);
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}(playground_1.Layer));
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
__decorate([
|
|
94
|
+
(0, playground_1.entity)(playground_1.EditorStateConfigEntity),
|
|
95
|
+
__metadata("design:type", playground_1.EditorStateConfigEntity)
|
|
96
|
+
], CanvasDrawLayer.prototype, "editorState", void 0);
|
|
97
|
+
__decorate([
|
|
98
|
+
(0, playground_1.entity)(document_entity_1.DocumentEntity),
|
|
99
|
+
__metadata("design:type", document_entity_1.DocumentEntity)
|
|
100
|
+
], CanvasDrawLayer.prototype, "documentEntity", void 0);
|
|
125
101
|
exports.CanvasDrawLayer = CanvasDrawLayer;
|
|
126
102
|
//# sourceMappingURL=canvas-draw-layer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas-draw-layer.js","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw-layer.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"canvas-draw-layer.js","sourceRoot":"","sources":["../../../src/browser/playground/canvas-draw-layer.tsx"],"names":[],"mappings":"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"}
|