@gedit/editor-2d 0.2.47 → 0.2.49

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.
Files changed (30) hide show
  1. package/lib/browser/model/editor2d-document.d.ts +21 -7
  2. package/lib/browser/model/editor2d-document.d.ts.map +1 -1
  3. package/lib/browser/model/editor2d-document.js +169 -14
  4. package/lib/browser/model/editor2d-document.js.map +1 -1
  5. package/lib/browser/playground/canvas-draw.d.ts +6 -2
  6. package/lib/browser/playground/canvas-draw.d.ts.map +1 -1
  7. package/lib/browser/playground/canvas-draw.js +148 -26
  8. package/lib/browser/playground/canvas-draw.js.map +1 -1
  9. package/lib/browser/playground/canvas-layer.d.ts +2 -2
  10. package/lib/browser/playground/canvas-layer.d.ts.map +1 -1
  11. package/lib/browser/playground/canvas-layer.js +57 -41
  12. package/lib/browser/playground/canvas-layer.js.map +1 -1
  13. package/lib/browser/playground/playground-contribution.d.ts +2 -0
  14. package/lib/browser/playground/playground-contribution.d.ts.map +1 -1
  15. package/lib/browser/playground/playground-contribution.js +19 -2
  16. package/lib/browser/playground/playground-contribution.js.map +1 -1
  17. package/lib/browser/playground/selection-entity-manager.d.ts +1 -1
  18. package/lib/browser/playground/selection-entity-manager.d.ts.map +1 -1
  19. package/lib/browser/playground/selection-entity-manager.js +19 -3
  20. package/lib/browser/playground/selection-entity-manager.js.map +1 -1
  21. package/lib/browser/utils/snapshot.js +1 -1
  22. package/lib/browser/utils/snapshot.js.map +1 -1
  23. package/package.json +9 -9
  24. package/src/browser/model/editor2d-document.ts +183 -14
  25. package/src/browser/playground/canvas-draw.ts +308 -94
  26. package/src/browser/playground/canvas-layer.ts +41 -25
  27. package/src/browser/playground/playground-contribution.ts +15 -3
  28. package/src/browser/playground/selection-entity-manager.tsx +17 -3
  29. package/src/browser/style/index.less +6 -0
  30. package/src/browser/utils/snapshot.ts +1 -1
package/lib/browser/playground/playground-contribution.d.ts CHANGED
@@ -4,6 +4,7 @@ import { HistoryService } from '@gedit/history';
4
4
  import { Editor2dModelOptions } from '../model/editor2d';
5
5
  import { ContextMenuRenderer } from '@gedit/layout';
6
6
  import { CommandService } from '@gedit/command';
7
+ import { FrontendApplicationStateService } from '@gedit/application-common/lib/browser';
7
8
  import { Editor2dSelection } from '../model/editor2d-selection';
8
9
  export declare class PlaygroundContribution2d implements PlaygroundContribution {
9
10
  readonly appConfig: AppConfigService;
@@ -14,6 +15,7 @@ export declare class PlaygroundContribution2d implements PlaygroundContribution
14
15
  readonly menuRender: ContextMenuRenderer;
15
16
  readonly editor2dSelection: Editor2dSelection;
16
17
  readonly pathPointSelectionService: PathPointSelectionService;
18
+ readonly stateService: FrontendApplicationStateService;
17
19
  registerPlayground(registry: PlaygroundRegistry): void;
18
20
  onDispose(playground: Playground): void;
19
21
  onReady(playground: Playground): void;
package/lib/browser/playground/playground-contribution.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"playground-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/playground-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,yBAAyB,EACzB,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,EAInB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAgB,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,qBACa,wBAAyB,YAAW,sBAAsB;IAC3C,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAC/C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IACjG,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAMtD,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAEvC,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAmFrC,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;CAwBvE"}
1
+ {"version":3,"file":"playground-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/playground-contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,yBAAyB,EACzB,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,EAInB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAgB,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAkB,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAExG,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,qBACa,wBAAyB,YAAW,sBAAsB;IAC3C,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAC/C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IACxD,QAAQ,CAAC,YAAY,EAAE,+BAA+B,CAAC;IAChG,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAMtD,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAEvC,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IA8FrC,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;CAwBvE"}
package/lib/browser/playground/playground-contribution.js CHANGED
@@ -33,6 +33,7 @@ let PlaygroundContribution2d = class PlaygroundContribution2d {
33
33
  onDispose(playground) {
34
34
  }
35
35
  onReady(playground) {
36
+ var _a;
36
37
  // const resource = this.modelOpts.autoSaveService.resource;
37
38
  playground.onDispatch(e => {
38
39
  // console.log('>>>> onDispatch: ', e.payloadKey, e.payload);
@@ -102,8 +103,20 @@ let PlaygroundContribution2d = class PlaygroundContribution2d {
102
103
  percentageInfoVisible: false,
103
104
  });
104
105
  }
105
- playground.getConfigEntity(playground_1.SnaplineConfigEntity).updateConfig({
106
- originlineVisible: isComponent, // 是否隐藏原点线条，如果是组件模式则显示
106
+ const snaplineEntity = playground.getConfigEntity(playground_1.SnaplineConfigEntity);
107
+ snaplineEntity.updateConfig({
108
+ lines: [],
109
+ originlineVisible: ((_a = this.appConfig.configData) === null || _a === void 0 ? void 0 : _a.engine) === 'dom' ? false : isComponent, // 是否隐藏原点线条，如果是组件模式则显示
110
+ });
111
+ this.stateService.onStateChanged(state => {
112
+ var _a;
113
+ if (state === 'initialized_layout') {
114
+ // 部局完成后再是否显示中心线，pixi 组件用
115
+ snaplineEntity.updateConfig({
116
+ lines: [],
117
+ originlineVisible: ((_a = this.appConfig.configData) === null || _a === void 0 ? void 0 : _a.engine) === 'dom' ? false : isComponent,
118
+ });
119
+ }
107
120
  });
108
121
  playground.toDispose.push(
109
122
  // TODO 放在这里处理会增加复杂度
@@ -171,6 +184,10 @@ __decorate([
171
184
  (0, inversify_1.inject)(playground_1.PathPointSelectionService),
172
185
  __metadata("design:type", playground_1.PathPointSelectionService)
173
186
  ], PlaygroundContribution2d.prototype, "pathPointSelectionService", void 0);
187
+ __decorate([
188
+ (0, inversify_1.inject)(browser_1.FrontendApplicationStateService),
189
+ __metadata("design:type", browser_1.FrontendApplicationStateService)
190
+ ], PlaygroundContribution2d.prototype, "stateService", void 0);
174
191
  PlaygroundContribution2d = __decorate([
175
192
  (0, inversify_1.injectable)()
176
193
  ], PlaygroundContribution2d);
package/lib/browser/playground/playground-contribution.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"playground-contribution.js","sourceRoot":"","sources":["../../../src/browser/playground/playground-contribution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"playground-contribution.js","sourceRoot":"","sources":["../../../src/browser/playground/playground-contribution.ts"],"names":[],"mappings":"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"}
package/lib/browser/playground/selection-entity-manager.d.ts CHANGED
@@ -26,7 +26,7 @@ export declare class SelectionEntityManager {
26
26
  */
27
27
  createEntity(nodePath: string, node: Editor2dNode, gameObject: GameObject, selectable: boolean, adsorbable: boolean): Editor2dEntity | undefined;
28
28
  removeEntity(nodePath: string): void;
29
- updateEntity(nodePath: string, gameObject: GameObject): void;
29
+ updateEntity(nodePath: string, gameObject: GameObject, scale?: number): void;
30
30
  getSelectedEntities(): Editor2dEntity[];
31
31
  /**
32
32
  * 滚动到选择器所在位置
package/lib/browser/playground/selection-entity-manager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"selection-entity-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAIL,aAAa,EAId,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAoBlD;;GAEG;AACH,qBAAa,sBAAsB;IAG/B,SAAS,CAAC,aAAa,EAAE,aAAa;IACtC,SAAS,CAAC,OAAO,EAAE,mBAAmB;IACtC,SAAS,CAAC,OAAO,EAAE,MAAM,OAAO;IAChC,SAAS,CAAC,WAAW,EAAE,MAAM,gBAAgB,GAAG,SAAS;IACzD,SAAS,CAAC,SAAS,EAAE,MAAM,OAAO;IANpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAa;gBAE/C,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,OAAO,EACtB,WAAW,EAAE,MAAM,gBAAgB,GAAG,SAAS,EAC/C,SAAS,EAAE,MAAM,OAAO;IAqCpC,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,IAAI;IAmBrF;;;;;;;OAOG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS;IAiGhJ,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMpC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAgC5D,mBAAmB,IAAI,cAAc,EAAE;IAUvC;;OAEG;IACH,qBAAqB,IAAI,IAAI;IAkB7B;;OAEG;IACH,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;IAStE,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO;IAKtD,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO;IAKjD,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO;CAKlD"}
1
+ {"version":3,"file":"selection-entity-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAIL,aAAa,EAId,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAoBlD;;GAEG;AACH,qBAAa,sBAAsB;IAG/B,SAAS,CAAC,aAAa,EAAE,aAAa;IACtC,SAAS,CAAC,OAAO,EAAE,mBAAmB;IACtC,SAAS,CAAC,OAAO,EAAE,MAAM,OAAO;IAChC,SAAS,CAAC,WAAW,EAAE,MAAM,gBAAgB,GAAG,SAAS;IACzD,SAAS,CAAC,SAAS,EAAE,MAAM,OAAO;IANpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAa;gBAE/C,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,OAAO,EACtB,WAAW,EAAE,MAAM,gBAAgB,GAAG,SAAS,EAC/C,SAAS,EAAE,MAAM,OAAO;IAqCpC,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY,GAAG,IAAI;IAmBrF;;;;;;;OAOG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS;IAuGhJ,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMpC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAwC5E,mBAAmB,IAAI,cAAc,EAAE;IAUvC;;OAEG;IACH,qBAAqB,IAAI,IAAI;IAkB7B;;OAEG;IACH,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;IAStE,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO;IAKtD,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO;IAKjD,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO;CAKlD"}
package/lib/browser/playground/selection-entity-manager.js CHANGED
@@ -90,6 +90,7 @@ class SelectionEntityManager {
90
90
  * @param adsorbable
91
91
  */
92
92
  createEntity(nodePath, node, gameObject, selectable, adsorbable) {
93
+ var _a, _b;
93
94
  const register = this.context.renderEngine.getGameObjectIDERegister(gameObject.scene.config.engine, node.displayType);
94
95
  const deco = register.decoration;
95
96
  if (!register.getSelectionData || model_1.Editor2dNode.isRootNode(node))
@@ -104,6 +105,12 @@ class SelectionEntityManager {
104
105
  entity.nodeId = node.id;
105
106
  entity.context = this.context;
106
107
  entity.transform.sizeToScale = !!deco.sizeToScale;
108
+ if (deco.useComponentSceneSize) {
109
+ entity.transform.componentSceneSize = {
110
+ width: ((_a = gameObject.data.scene) === null || _a === void 0 ? void 0 : _a.width) || 400,
111
+ height: ((_b = gameObject.data.scene) === null || _b === void 0 ? void 0 : _b.height) || 400,
112
+ };
113
+ }
107
114
  this.setTransformMask(entity, nodePath, node);
108
115
  // 切换选择框的类型，如圆形、矩形, 默认矩形
109
116
  if (deco.selectDisplayType) {
@@ -185,7 +192,8 @@ class SelectionEntityManager {
185
192
  entity.dispose();
186
193
  }
187
194
  }
188
- updateEntity(nodePath, gameObject) {
195
+ updateEntity(nodePath, gameObject, scale) {
196
+ var _a, _b;
189
197
  const register = this.context.renderEngine.getGameObjectIDERegister(gameObject.scene.config.engine, gameObject.type);
190
198
  const deco = register.decoration;
191
199
  const entity = this.nodeEntitiesCache.get(nodePath);
@@ -201,7 +209,13 @@ class SelectionEntityManager {
201
209
  }
202
210
  }
203
211
  entity.transform.isContainer = !!deco.isContainer;
204
- entity.update(register.getSelectionData(gameObject));
212
+ if (deco.useComponentSceneSize) {
213
+ entity.transform.componentSceneSize = {
214
+ width: ((_a = gameObject.data.scene) === null || _a === void 0 ? void 0 : _a.width) || 400,
215
+ height: ((_b = gameObject.data.scene) === null || _b === void 0 ? void 0 : _b.height) || 400,
216
+ };
217
+ }
218
+ entity.update(register.getSelectionData(gameObject, scale));
205
219
  entity.ignoreTransformChanged = false;
206
220
  const sizeVisible = !this.isHidden(entity.node); // && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
207
221
  const opacityZero = this.isOpacityZero(node);
@@ -215,7 +229,9 @@ class SelectionEntityManager {
215
229
  entity.selected = !!(node === null || node === void 0 ? void 0 : node.selected);
216
230
  // 更新zIndex, 每次都要更新，因为节点拖拽会导致所有的zIndex顺序错乱
217
231
  entity.zIndex = gameObject.data.depth || 0;
218
- this.setTransformMask(entity, nodePath, node);
232
+ // 更新是否隐藏
233
+ entity.transform.visible = !this.isHidden(gameObject.data);
234
+ this.setTransformMask(entity, nodePath, gameObject.data);
219
235
  }
220
236
  getSelectedEntities() {
221
237
  const selectedEntities = [];
package/lib/browser/playground/selection-entity-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"selection-entity-manager.js","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.tsx"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,oCAA0D;AAC1D,gEAA4D;AAC5D,kDAQ2B;AAE3B,sCAAwC;AAExC,yEAAkE;AAClE,kEAA0D;AAE1D,MAAM,cAAc,GAAG,CAAC,IAA0B,EAAE,EAAE;IACpD,MAAM,CAAC,GAAQ,EAAE,CAAC;IAClB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,0BAA0B;QAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,GAAG,KAAK,UAAU,EAAE;YACnD,CAAC,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,CAAC,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;SAChC;aAAM;YACL,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAChB;IACH,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF;;GAEG;AACH,MAAa,sBAAsB;IAEjC,YACY,aAA4B,EAC5B,OAA4B,EAC5B,OAAsB,EACtB,WAA+C,EAC/C,SAAwB;QAJxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,YAAO,GAAP,OAAO,CAAqB;QAC5B,YAAO,GAAP,OAAO,CAAe;QACtB,gBAAW,GAAX,WAAW,CAAoC;QAC/C,cAAS,GAAT,SAAS,CAAe;QANpC,sBAAiB,GAAgC,IAAI,GAAG,EAAE,CAAC;QAQzD,MAAM,uBAAuB,GAAG,aAAa,CAAC,SAAS,CAA0B,oCAAuB,CAAC,CAAC;QAC1G,MAAM,qBAAqB,GAAG,aAAa,CAAC,SAAS,CAAuB,iCAAoB,CAAC,CAAC;QAClG,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,4BAA4B,CAAC,KAAK,CAAC,EAAE;;YAE1D,MAAM,mBAAmB,GAAG,CAAA,MAAA,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,eAAe,uEAAI,MAAK,wBAAW,CAAC,sBAAsB,CAAC;YAChH,MAAM,QAAQ,mCACT,KAAK;gBACR,wEAAwE;gBACxE,SAAS,EAAE,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAChD,CAAC;YACF,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAwB,CAAC;YACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI;gBAC1B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;gBACpH,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,IAAI,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,CAAC;YAClC,QAAQ,CAAC,cAAc,GAAG,GAAG,EAAE,CAAC,CAC9B,oBAAC,+CAAoB,oBACf,KAAK,IACT,kBAAkB,EAAE,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,YAAY,EACvD,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,IAAI,CAAC,OAAO,IACrB,CACH,CAAC;YACF;;gBAEI;YACJ,SAAS;YACT,IAAI,IAAI,IAAI,IAAI,CAAC,iBAAiB,EAAE;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC;gBACpC,OAAO,oBAAC,IAAI,oBAAK,QAAQ,EAAI,CAAC;aAC/B;YACD,OAAO,IAAA,0CAA6B,EAAC,QAAQ,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,MAAsB,EAAE,QAAgB,EAAE,IAAmB;QAC5E,IAAI,UAAU,CAAC;QACf,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YACtC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACjC,cAAc;gBACd,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC9B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1B,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACnD,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACtD,IAAI,UAAU,EAAE;oBACd,MAAM,CAAC,SAAS,CAAC,aAAa,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,CAAC;iBACxD;gBACD,kFAAkF;aACnF;iBAAM;gBACL,MAAM,CAAC,SAAS,CAAC,aAAa,GAAG,SAAS,CAAC;aAC5C;SACF;IACH,CAAC;IACD;;;;;;;OAOG;IACH,YAAY,CAAC,QAAgB,EAAE,IAAkB,EAAE,UAAsB,EAAE,UAAmB,EAAE,UAAmB;QACjH,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,wBAAwB,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACtH,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,IAAI,oBAAY,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO;QACxE,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAiB,gCAAc,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjG,MAAM,CAAC,cAAc,GAAG,UAAU,CAAC;QACnC,MAAM,CAAC,cAAc,GAAG,UAAU,CAAC;QACnC,MAAM,CAAC,WAAW,GAAG,UAAU,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9F,MAAM,CAAC,UAAU,GAAG,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3F,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAG,CAAC;QACtC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,MAAM,CAAC,SAAS,CAAC,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;QAElD,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC9C,wBAAwB;QACxB,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;gBACxB,WAAW,EAAE,IAAI,CAAC,iBAAiB;aACpC,CAAC,CAAC;SACJ;QACD,WAAW;QACX,MAAM,CAAC,cAAc,CAAC,CAAC,QAAiB,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC;YAC5B,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBAC5C,sCAAsC;gBACtC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAC5B,cAAc;gBACd,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;aACxC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO;QACP,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE;YACpB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH;;WAEG;QACH,IAAI,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC;QACjC,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE;YACzD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;YAClC,IAAI,UAAU,KAAK,WAAW,EAAE;gBAC9B,OAAO;aACR;YACD,WAAW,GAAG,UAAU,CAAC;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACpC,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;gBAC/B,OAAO;aACR;YACD,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC3D,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,IAAI,EAAE;gBACT,OAAO;aACR;YACD,SAAS;YACT,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;gBAC3C,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE;oBACnC,MAAM,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;oBAC3C,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACZ,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;wBACxC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;oBAC9C,CAAC,CAAC,CAAC;oBACH,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAC;oBACnD,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,EAAE;wBAC9C,QAAQ,CAAC,OAAO,CAAC,IAAI,CACnB,WAAW,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CACX,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,kCAAa,CAAC,CAAC,CAAC,EAC1B,IAAI,CAAC,GAAG,CAAC,MAAM,EAClB,EAAC,OAAO,EAAE,IAAI,EAAE,CACjB,CAAC;qBACH;iBACF;aACF;YACD,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,iCAAiC;QACjC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEnC,UAAU;QACV,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAC/C;aAAM;YACL,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;SAC3B;QACD,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;gBACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;aAC1C,CAAC,CAAC;SACJ;QACD,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC;QAE1B,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,YAAY,CAAC,QAAgB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,OAAO,EAAE,CAAC;SAClB;IACH,CAAC;IACD,YAAY,CAAC,QAAgB,EAAE,UAAsB;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,wBAAwB,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QACrH,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE;YACzC,OAAO;SACR;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,MAAM,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACrC,IAAI,UAAU,CAAC,MAAM,EAAE;YACrB,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAY,CAAC,CAAC;YAChF,IAAI,YAAY,EAAE;gBAChB,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;aACpD;SACF;QACD,MAAM,CAAC,SAAS,CAAC,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,sBAAsB,GAAG,KAAK,CAAC;QACtC,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,kGAAkG;QACnJ,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC7C,YAAY;QACZ,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,cAAc,IAAI,WAAW,CAAC;QACzD,kBAAkB;QAClB,MAAM,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxH,SAAS;QACT,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,cAAc,IAAI,WAAW,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrI,SAAS;QACT,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAA,CAAC;QACnC,0CAA0C;QAC1C,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IACD,mBAAmB;QACjB,MAAM,gBAAgB,GAAqB,EAAE,CAAC;QAC9C,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YAC/C,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,QAAQ,EAAE;gBAC9B,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAC1B;SACF;QACD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,qBAAqB;QACnB,MAAM,gBAAgB,GAAqB,EAAE,CAAC;QAC9C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACpD,IAAI,CAAC,oBAAY,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE;gBAC7E,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC5C,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC/B;gBACD,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;aACxC;SACF;QACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAAE,OAAO;QAC9B,6CAA6C;QAC7C,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,aAAa;YACb,IAAI,CAAC,aAAa,CAAC,SAAS,CAAyB,mCAAsB,CAAE,CAAC,YAAY,CAAC,EAAC,QAAQ,EAAE,gBAAgB,EAAC,CAAC,CAAC;SAC1H;IACH,CAAC;IAAA,CAAC;IAEF;;OAEG;IACH,sBAAsB,CAAC,QAAgB,EAAE,SAAiB;QACxD,MAAM,KAAK,GAAgB,CAAC,IAAI,gBAAS,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QACtE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE;YACpD,IAAI,MAAM,CAAC,SAAS,EAAE;gBACpB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;aACrC;SACF;QACD,OAAO,gBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IACD,aAAa,CAAC,IAA8B;QAC1C,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACpC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAsB,CAAC,CAAC;IACzD,CAAC;IACD,QAAQ,CAAC,IAA8B;QACrC,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC;QACjC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAkC,CAAC,CAAC;IAChE,CAAC;IACD,QAAQ,CAAC,IAA8B;QACrC,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAC7B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAkC,CAAC,CAAC;IAChE,CAAC;CACF;AAxQD,wDAwQC"}
1
+ {"version":3,"file":"selection-entity-manager.js","sourceRoot":"","sources":["../../../src/browser/playground/selection-entity-manager.tsx"],"names":[],"mappings":"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"}
package/lib/browser/utils/snapshot.js CHANGED
@@ -37,7 +37,7 @@ class SnapshotCreator extends utils_1.DisposableImpl {
37
37
  if (!host) {
38
38
  host = document.createElement('div');
39
39
  host.className = 'gedit-editor-snapshots';
40
- host.style.display = 'none';
40
+ // host.style.display = 'none';
41
41
  document.body.appendChild(host);
42
42
  }
43
43
  this.drawer = new canvas_draw_1.CanvasDraw(Object.assign({ host, isSnapshot: true }, opts));
package/lib/browser/utils/snapshot.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gedit/editor-2d",
3
- "version": "0.2.47",
3
+ "version": "0.2.49",
4
4
  "license": "MIT",
5
5
  "main": "lib/browser/index",
6
6
  "typings": "lib/browser/index.d.ts",
@@ -9,13 +9,13 @@
9
9
  "src"
10
10
  ],
11
11
  "dependencies": {
12
- "@gedit/app-config": "^0.2.40",
13
- "@gedit/canvas-draw": "^0.2.32",
14
- "@gedit/editor": "^0.2.13",
15
- "@gedit/playground": "^0.2.18",
16
- "@gedit/render-engine-ide": "^0.2.38",
17
- "@gedit/theme": "^0.2.10",
18
- "@gedit/workspace-2d": "^0.2.18",
12
+ "@gedit/app-config": "^0.2.42",
13
+ "@gedit/canvas-draw": "^0.2.34",
14
+ "@gedit/editor": "^0.2.14",
15
+ "@gedit/playground": "^0.2.20",
16
+ "@gedit/render-engine-ide": "^0.2.40",
17
+ "@gedit/theme": "^0.2.11",
18
+ "@gedit/workspace-2d": "^0.2.20",
19
19
  "bezier-js": "^4.0.3",
20
20
  "clsx": "^1.1.1",
21
21
  "json-stringify-pretty-compact": "^2.0.0",
@@ -39,5 +39,5 @@
39
39
  "nyc": {
40
40
  "extends": "../../configs/nyc.json"
41
41
  },
42
- "gitHead": "3556856ee2671257bd0c588bdfdc18ac0d57dab4"
42
+ "gitHead": "89db9469892cadbbc729fe75d32911e894c26558"
43
43
  }
package/src/browser/model/editor2d-document.ts CHANGED
@@ -32,6 +32,7 @@ import { AppConfigService } from '@gedit/app-config';
32
32
  import { Editor2dIterator } from './editor2d-iterator';
33
33
  import { ThemeService } from '@gedit/theme';
34
34
  import { followKeyType, getFollowValue } from '@gedit/render-engine-pixi';
35
+ import { ConfirmDialog } from '@gedit/layout';
35
36
  // import { getAnimationKeys, getChangeAnimationData } from './utils';
36
37
 
37
38
  export const maskShowArray: GameObjectType[] = [
@@ -65,6 +66,8 @@ export interface Editor2dComponentProvider {
65
66
 
66
67
  getAllComponentSymbols(): GameConfig.Symbol[];
67
68
 
69
+ getScriptsById(uri: string): string[];
70
+
68
71
  onComponentChanged: Event<URI>;
69
72
  onLoad: Event<void>;
70
73
  }
@@ -84,6 +87,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
84
87
  // protected componentContents: { [key: string]: Editor2dNode } = {};
85
88
  protected _snaplines: any[] = [];
86
89
  public loading = true;
90
+ protected deleteNames: string[] = [];
87
91
 
88
92
  get uri(): string {
89
93
  return this.options.autoSaveService.resource.uri.toString();
@@ -298,7 +302,107 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
298
302
  }
299
303
  }
300
304
 
301
- delNode(targetNode?: Editor2dNode, silent?: boolean): void {
305
+ async layerChangeDialog(name: string = this.deleteNames.join(',')): Promise<boolean | undefined> {
306
+ const dialog = new ConfirmDialog({
307
+ title: '警告',
308
+ msg: `元素${name ? `(${name})` : ''}在代码中被使用，移动或删除将会出错！`,
309
+ ok: '确定',
310
+ cancel: '取消'
311
+ });
312
+ return dialog.open();
313
+ }
314
+
315
+ inCodeFunc(node: Editor2dNode): boolean | undefined {
316
+ // 获取所有代码片段，判断是否在代码片段内被使用；
317
+ const uri = new URI(this.uri);
318
+ const id = uri.displayName.split('.')[0];
319
+ // const nodePath = Editor2dNode.getNodePath(node);
320
+ const nodePathName = Editor2dNode.getNodeNamePath(node);
321
+ const scripts = this.componentProvider?.getScriptsById(id);
322
+ if (scripts && scripts.length) {
323
+ const reg = new RegExp(
324
+ `select(|ByNamePath)\\((\\"|\\')(${node.id}|${node.name}|${nodePathName})(\\"|\\')\\)`,
325
+ 'i'
326
+ );
327
+ let inCode = scripts.some(c => c.match(reg));
328
+ if (!inCode) {
329
+ const matchReg = /selectMatch\((\'|\")(.*)(\'|\")\)/ig;
330
+ const selectMatch = scripts.map(c => {
331
+ const t = c.match(matchReg);
332
+ if (t) {
333
+ return t.some(tt => {
334
+ const text = tt.replace(matchReg, '$2');
335
+ return !!node.name?.match(text);
336
+ });
337
+ }
338
+ });
339
+ inCode = inCode || selectMatch.some(c => c);
340
+ }
341
+ if (inCode) {
342
+ this.deleteNames.push(node.name || '');
343
+ }
344
+ return inCode;
345
+ }
346
+ return false;
347
+ }
348
+
349
+ async nodeLayerChangeAll(nodes: Editor2dNode[]): Promise<boolean | undefined> {
350
+ const inCodes = await Promise.all(nodes.map(async node => this.inCodeFunc(node)));
351
+ if (inCodes.some(c => c)) {
352
+ return this.layerChangeDialog();
353
+ }
354
+ return true;
355
+ }
356
+
357
+ async nodeLayerChange(node: Editor2dNode): Promise<boolean | undefined> {
358
+ if (node.children) {
359
+ return this.nodeLayerChangeAll([node].concat(node.children as Editor2dNode[]));
360
+ }
361
+ const inCode = this.inCodeFunc(node);
362
+ if (inCode) {
363
+ return this.layerChangeDialog();
364
+ }
365
+ return true;
366
+ }
367
+
368
+ /**
369
+ * 元素分组移动，检测是否在代码中被 selectByNamePath 使用过
370
+ * @param nodes
371
+ * @param targetNode
372
+ * @returns
373
+ */
374
+ async layerNamePathChange(nodes: Editor2dNode[], targetNode?: Editor2dNode): Promise<boolean> {
375
+ const parentChange = targetNode ? nodes.filter(c => c.parent !== targetNode) : nodes;
376
+ const uri = new URI(this.uri);
377
+ const id = uri.displayName.split('.')[0];
378
+ // const nodePath = Editor2dNode.getNodePath(node);
379
+ const scripts = this.componentProvider?.getScriptsById(id);
380
+ // 判断是否有 byPathName;
381
+ let inCode = false;
382
+ this.deleteNames = [];
383
+ parentChange.forEach(c => {
384
+ const nodePathName = Editor2dNode.getNodeNamePath(c);
385
+ const reg = new RegExp(
386
+ `selectByNamePath\\((\\"|\\')(${nodePathName})(\\"|\\')\\)`,
387
+ 'i'
388
+ );
389
+ const inCodeChild = scripts?.some(d => d.match(reg));
390
+ if (inCodeChild) {
391
+ this.deleteNames.push(c.name || '');
392
+ inCode = true;
393
+ return c;
394
+ }
395
+ });
396
+ if (inCode) {
397
+ const del = await this.layerChangeDialog();
398
+ if (!del) {
399
+ return false;
400
+ }
401
+ }
402
+ return true;
403
+ }
404
+
405
+ deleteNode(targetNode?: Editor2dNode, silent?: boolean): void {
302
406
  if (!targetNode || Editor2dNode.isRootNode(targetNode)) return;
303
407
  const parent = targetNode.parent! as Readonly<Editor2dContainerNode>;
304
408
  this.delNodeSetMask(targetNode);
@@ -313,8 +417,20 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
313
417
  }
314
418
  }
315
419
 
316
- delNodes(...targetNodes: Editor2dNode[]): void {
317
- targetNodes.forEach(node => this.delNode(node, true));
420
+ async delNode(targetNode?: Editor2dNode, silent?: boolean): Promise<void> {
421
+ if (!targetNode || Editor2dNode.isRootNode(targetNode)) return;
422
+ if (!silent) {
423
+ this.deleteNames = [];
424
+ }
425
+ const del = await this.nodeLayerChange(targetNode);
426
+ if (del) {
427
+ this.deleteNode(targetNode, silent);
428
+ }
429
+ }
430
+
431
+ async delNodes(...targetNodes: Editor2dNode[]): Promise<void> {
432
+ this.deleteNames = [];
433
+ await Promise.all(targetNodes.map(async node => this.delNode(node, true)));
318
434
  if (targetNodes.length > 0) {
319
435
  this.fireContentChanged(targetNodes, 'delete');
320
436
  }
@@ -328,9 +444,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
328
444
  addChildren(node: Editor2dNode, parentNode: Editor2dContainerNode, index: number = 0): void {
329
445
  this.clearMask(node);
330
446
  if (node.parent) {
331
- this.delNode(node, true);
447
+ this.deleteNode(node, true);
332
448
  }
333
- ;
334
449
  if (!parentNode.children) parentNode.children = [];
335
450
  parentNode.children.splice(index, 0, node);
336
451
  CompositeTreeNode.setParent(node, index, parentNode);
@@ -567,7 +682,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
567
682
  * @param nodes
568
683
  * @param mask
569
684
  */
570
- toggleMask(nodes: Editor2dNode[], mask?: boolean): void {
685
+ async toggleMask(nodes: Editor2dNode[], mask?: boolean): Promise<void> {
571
686
  if (nodes.length === 1) {
572
687
  const node = nodes[0];
573
688
  // this.updateNode(node, { isMask: !!mask });
@@ -582,6 +697,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
582
697
  if (node.mask && node.ignoreMask || !node.mask) {
583
698
  this.setPrevNodeMask(node.previousSibling, mask ? node.id : undefined);
584
699
  }
700
+ this.refresh();
585
701
  this.fireContentChanged([node], 'update');
586
702
  return;
587
703
  }
@@ -593,7 +709,30 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
593
709
  * 2. 不是：Enabled 设定 mask, hierarchy-contribution 里判断
594
710
  */
595
711
  nodes = this.getSelectedNodes();
596
- const group = this.combineNodes(nodes);
712
+ if (!mask) {
713
+ // 取消 mask
714
+ nodes.forEach(n => {
715
+ if (n.isMask && (n.mask && n.ignoreMask || !n.mask)) {
716
+ this.setPrevNodeMask(n.previousSibling, mask ? n.id : undefined);
717
+ }
718
+ n.ignoreMask = undefined;
719
+ n.mask = undefined;
720
+ n.isMask = false;
721
+ });
722
+ this.refresh();
723
+ this.fireContentChanged([...nodes], 'update');
724
+ return;
725
+ }
726
+ // 判断父级是分组，，且子级只有nodes 时，，不需建分组；
727
+ const parent = nodes[0].parent;
728
+ let group;
729
+ const equalParent = nodes.every(n => n.parent === parent);
730
+ const l = parent?.children.length === nodes.length;
731
+ if (equalParent && l && parent?.displayType === GameObjectBaseType.GROUP) {
732
+ group = parent;
733
+ }
734
+
735
+ group = group || await this.combineNodes(nodes);
597
736
  if (!group) {
598
737
  return;
599
738
  }
@@ -618,6 +757,9 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
618
757
  if (id) {
619
758
  group.mask = id;
620
759
  }
760
+ if (group === parent) {
761
+ this.refresh();
762
+ }
621
763
  this.fireContentChanged(childNodes.concat([lastNode, group]), 'update');
622
764
  }
623
765
 
@@ -712,12 +854,22 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
712
854
  * @param targetNode
713
855
  * @param toAfter - 是否加到目标节点的后边，默认前面
714
856
  */
715
- moveToNode(node: Editor2dNode, targetNode: Editor2dNode, toAfter?: boolean): void {
857
+ async moveToNode(node: Editor2dNode, targetNode: Editor2dNode, toAfter?: boolean): Promise<void> {
716
858
  if (Editor2dNode.isRootNode(targetNode) || TreeNode.equals(node, targetNode)) return;
859
+ // 判断是否有被 selectByPath 选择；
860
+ if (
861
+ Editor2dNode.getNodePath(node.parent as Editor2dNode) !==
862
+ Editor2dNode.getNodePath(targetNode.parent as Editor2dNode)
863
+ ) {
864
+ const del = await this.layerNamePathChange([node], targetNode);
865
+ if (!del) {
866
+ return;
867
+ }
868
+ }
717
869
  this.clearMask(node);
718
870
  const parent = targetNode.parent! as Editor2dContainerNode;
719
871
  const children = parent.children! as Editor2dNode[];
720
- this.delNode(node, true);
872
+ this.deleteNode(node, true);
721
873
  const targetIndex = children.indexOf(targetNode);
722
874
  const previousSibling = targetNode.previousSibling;
723
875
  const nextSibling = targetNode.nextSibling;
@@ -758,7 +910,15 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
758
910
  this.fireContentChanged([node], 'update');
759
911
  }
760
912
 
761
- moveToNodesAsChildren(nodes: Editor2dNode[], targetNode: Editor2dNode): boolean {
913
+ async moveToNodesAsChildren(nodes: Editor2dNode[], targetNode: Editor2dNode, skip?: boolean): Promise<boolean> {
914
+ // 移动分组提示删除；
915
+ if (!skip) {
916
+ const del = await this.layerNamePathChange(nodes, targetNode);
917
+ if (!del) {
918
+ return false;
919
+ }
920
+ }
921
+ // await this.nodeLayerChangeAll(nodes);
762
922
  // 后边的先加
763
923
  nodes = nodes.slice().reverse();
764
924
  const canAddAsChild = !nodes.find(s => !this.canbeAddAsChild(targetNode, s.displayType, s));
@@ -837,15 +997,20 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
837
997
  * 合并分组
838
998
  * @param nodes
839
999
  */
840
- combineNodes(n?: Editor2dNode[]): Editor2dNode | undefined {
1000
+ async combineNodes(n?: Editor2dNode[]): Promise<Editor2dNode | undefined> {
841
1001
  // 合成分组保持图层顺序
842
1002
  const nodes = n || this.getSelectedNodes();
1003
+ const del = await this.layerNamePathChange(nodes);
1004
+ if (!del) {
1005
+ return;
1006
+ }
1007
+
843
1008
  if (nodes.length > 0) {
844
1009
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
845
1010
  const parent = nodes[0].parent as any;
846
1011
  const index = CompositeTreeNode.indexOf(parent, nodes[0]);
847
1012
  const group = this.createDisplayNode(GameObjectBaseType.GROUP, parent as Editor2dNode, undefined, index);
848
- this.moveToNodesAsChildren(nodes, group);
1013
+ await this.moveToNodesAsChildren(nodes, group, true);
849
1014
  return group;
850
1015
  }
851
1016
  }
@@ -854,8 +1019,12 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
854
1019
  * 解除分组，目前只支持图层
855
1020
  * @param node
856
1021
  */
857
- unCombineNode(node: Editor2dNode | Editor2dContainerNode): void {
1022
+ async unCombineNode(node: Editor2dNode | Editor2dContainerNode): Promise<void> {
858
1023
  if (node.children && node.parent) {
1024
+ const del = await this.layerNamePathChange(node.children as Editor2dNode[]);
1025
+ if (!del) {
1026
+ return;
1027
+ }
859
1028
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
860
1029
  const parentNode = node.parent as any;
861
1030
  const curIndex = CompositeTreeNode.indexOf(parentNode, node);
@@ -863,7 +1032,7 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
863
1032
  this.addChildren(n, parentNode, curIndex);
864
1033
  });
865
1034
  }
866
- this.delNode(node);
1035
+ this.deleteNode(node);
867
1036
  }
868
1037
 
869
1038
  /**