@gedit/editor-2d 0.1.84 → 0.1.87

package/src/browser/playground/selection-entity-manager.tsx

@@ -20,6 +20,7 @@ export class SelectionEntityManager {
   constructor(
     protected entityManager: EntityManager,
     protected context: PlaygroundContext2d,
+    protected loading: () => boolean,
     protected getDocument: () => Editor2dDocument | undefined,
     protected isVisible: () => boolean,
   ) {
@@ -30,9 +31,11 @@ export class SelectionEntityManager {
       if (this.context.options.extendEntityRenderer) {
         newProps.extendRenderer = () => this.context.options.extendEntityRenderer!({ ...props, context: this.context });
       }
-      const deco = this.context.renderEngine.getGameObjectDecoration(entity.gameObject.scene.config.engine, entity.node.displayType);
+      const deco = entity.node
+        ? this.context.renderEngine.getGameObjectDecoration(entity.gameObject.scene.config.engine, entity.node.displayType)
+        : undefined;
       // 自定义渲染器
-      if (deco.selectionRenderer) {
+      if (deco && deco.selectionRenderer) {
         const Comp = deco.selectionRenderer;
         return <Comp {...newProps} />;
       }
@@ -57,8 +60,9 @@ export class SelectionEntityManager {
     entity.mouseSelect = selectable && (deco.mouseSelect === undefined ? true : deco.mouseSelect);
     entity.adsorbable = adsorbable && (deco.adsorbable === undefined ? true : deco.adsorbable);
     entity.gameObject = gameObject;
+    entity.document = this.getDocument()!;
+    entity.nodeId = node.id;
     entity.context = this.context;
-    entity.node = node;
     entity.transform.sizeToScale = !!deco.sizeToScale;
     // 切换选择框的类型，如圆形、矩形, 默认矩形
     if (deco.selectDisplayType) {
@@ -68,9 +72,10 @@ export class SelectionEntityManager {
     }
     // 实体选中状态改变
     entity.onToggleSelect((selected: boolean) => {
-      if (node.selected !== selected) {
+      const newNode = entity.node;
+      if (newNode && newNode.selected !== selected) {
         // 这个只记录选择，但不会真实触发tree组件的选择器，所以需要再同步一次
-        node.selected = selected;
+        newNode.selected = selected;
         // 点击画布后则同步选择器
         this.context.syncToSelectionTree(this);
       }
@@ -83,7 +88,7 @@ export class SelectionEntityManager {
     // let lastTransform: TransformSchema | undefined;
     entity.onTransformChanged((newTransform: TransformSchema) => {
       const document = this.getDocument();
-      if (!document) {
+      if (this.loading() || !document) {
         return;
       }
       /* if (!lastTransform || !document || document.animationStarted || entity.ignoreTransformChanged) {
@@ -91,7 +96,7 @@ export class SelectionEntityManager {
         return;
       }; */
       // const delta = TransformSchema.getDelta(lastTransform, newTransform);
-      document.updateNode(node, newTransform, true);
+      document.updateNode(entity.nodeId, newTransform, true);
       // lastTransform = newTransform;
     });
     // 设置控制key
@@ -110,15 +115,14 @@ export class SelectionEntityManager {
       entity.dispose();
     }
   }
-  updateEntity(nodePath: string, gameObject: GameObject, node?: Editor2dNode): void {
+  updateEntity(nodePath: string, gameObject: GameObject): void {
     const register = this.context.renderEngine.getGameObjectIDERegister(gameObject.scene.config.engine, gameObject.type);
     const deco = register.decoration;
     const entity = this.nodeEntitiesCache.get(nodePath);
     if (!entity || !register.getSelectionData) {
       return;
     }
-    node = node || entity.node;
-    entity.node = node;
+    const node = entity.node;
     entity.ignoreTransformChanged = true;
     if (gameObject.parent) {
       const parentEntity = this.nodeEntitiesCache.get(gameObject.parent.id as string);
@@ -137,7 +141,7 @@ export class SelectionEntityManager {
     // 是否支持吸附
     entity.adsorbable = entity.adsorbableInit && sizeVisible && (deco.adsorbable === undefined ? true : deco.adsorbable);
     // 同步选中状态
-    entity.selected = node.selected;
+    entity.selected = !!node?.selected;
     // 更新zIndex, 每次都要更新，因为节点拖拽会导致所有的zIndex顺序错乱
     entity.zIndex = gameObject.data.depth || 0;
   }
@@ -156,7 +160,7 @@ export class SelectionEntityManager {
   scrollToSelectedNodes = debounce(() => {
     const entitiesScrollTo: Editor2dEntity[] = [];
     for (const entity of this.nodeEntitiesCache.values()) {
-      if (!Editor2dNode.isRootNode(entity.node) && entity.selectable) {
+      if (!Editor2dNode.isRootNode(entity.node) && entity.node && entity.selectable) {
         if (!entity.selected && entity.node.selected) {
           entitiesScrollTo.push(entity);
         }

package/lib/browser/editor2d-history-contribution.d.ts

@@ -1,5 +0,0 @@
-import { HistoryContribution, HistoryRegistry } from '@gedit/history';
-export declare class Editor2dHistoryContribution implements HistoryContribution {
-    register(registry: HistoryRegistry): void;
-}
-//# sourceMappingURL=editor2d-history-contribution.d.ts.map

package/lib/browser/editor2d-history-contribution.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"editor2d-history-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/editor2d-history-contribution.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAe,MAAM,gBAAgB,CAAC;AAEnF,qBACa,2BAA4B,YAAW,mBAAmB;IACrE,QAAQ,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;CAc1C"}

package/lib/browser/editor2d-history-contribution.js

@@ -1,34 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Editor2dHistoryContribution = void 0;
-var inversify_1 = require("inversify");
-var Editor2dHistoryContribution = /** @class */ (function () {
-    function Editor2dHistoryContribution() {
-    }
-    Editor2dHistoryContribution.prototype.register = function (registry) {
-        registry.add({
-            undoHandle: function (item, resource) {
-                console.log('undo');
-            },
-            redoHandle: function (item, resource) {
-                console.log('redo');
-            },
-            canbeMerge: function (item, resource) {
-                console.log('canbe merge');
-                return false;
-            },
-        });
-    };
-    Editor2dHistoryContribution = __decorate([
-        inversify_1.injectable()
-    ], Editor2dHistoryContribution);
-    return Editor2dHistoryContribution;
-}());
-exports.Editor2dHistoryContribution = Editor2dHistoryContribution;
-//# sourceMappingURL=editor2d-history-contribution.js.map

package/lib/browser/editor2d-history-contribution.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"editor2d-history-contribution.js","sourceRoot":"","sources":["../../src/browser/editor2d-history-contribution.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAAuC;AAKvC;IAAA;IAeA,CAAC;IAdC,8CAAQ,GAAR,UAAS,QAAyB;QAChC,QAAQ,CAAC,GAAG,CAAC;YACX,UAAU,EAAV,UAAW,IAAsB,EAAE,QAAkB;gBACnD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC;YACD,UAAU,EAAV,UAAW,IAAsB,EAAE,QAAkB;gBACnD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC;YACD,UAAU,EAAV,UAAW,IAAsB,EAAE,QAAkB;gBACnD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBAC3B,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAdU,2BAA2B;QADvC,sBAAU,EAAE;OACA,2BAA2B,CAevC;IAAD,kCAAC;CAAA,AAfD,IAeC;AAfY,kEAA2B"}

package/lib/browser/model/editor2d-history.d.ts

@@ -1,6 +0,0 @@
-/**
- * TODO 文档历史记录管理
- */
-export declare class Editor2dHistory {
-}
-//# sourceMappingURL=editor2d-history.d.ts.map

package/lib/browser/model/editor2d-history.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"editor2d-history.d.ts","sourceRoot":"","sources":["../../../src/browser/model/editor2d-history.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,qBACa,eAAe;CAC3B"}

package/lib/browser/model/editor2d-history.js

@@ -1,23 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Editor2dHistory = void 0;
-var inversify_1 = require("inversify");
-/**
- * TODO 文档历史记录管理
- */
-var Editor2dHistory = /** @class */ (function () {
-    function Editor2dHistory() {
-    }
-    Editor2dHistory = __decorate([
-        inversify_1.injectable()
-    ], Editor2dHistory);
-    return Editor2dHistory;
-}());
-exports.Editor2dHistory = Editor2dHistory;
-//# sourceMappingURL=editor2d-history.js.map

package/lib/browser/model/editor2d-history.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"editor2d-history.js","sourceRoot":"","sources":["../../../src/browser/model/editor2d-history.ts"],"names":[],"mappings":";;;;;;;;;AAAA,uCAAuC;AAEvC;;GAEG;AAEH;IAAA;IACA,CAAC;IADY,eAAe;QAD3B,sBAAU,EAAE;OACA,eAAe,CAC3B;IAAD,sBAAC;CAAA,AADD,IACC;AADY,0CAAe"}

package/src/browser/editor2d-history-contribution.ts

@@ -1,21 +0,0 @@
-import { injectable } from 'inversify';
-import { Resource } from '@gedit/resource';
-import { HistoryContribution, HistoryRegistry, HistoryItem } from '@gedit/history';
-
-@injectable()
-export class Editor2dHistoryContribution implements HistoryContribution {
-  register(registry: HistoryRegistry): void {
-    registry.add({
-      undoHandle(item: HistoryItem<any>, resource: Resource): void {
-        console.log('undo');
-      },
-      redoHandle(item: HistoryItem<any>, resource: Resource): void {
-        console.log('redo');
-      },
-      canbeMerge(item: HistoryItem<any>, resource: Resource): boolean {
-        console.log('canbe merge');
-        return false;
-      },
-    });
-  }
-}

package/src/browser/model/editor2d-history.ts

@@ -1,8 +0,0 @@
-import { injectable } from 'inversify';
-
-/**
- * TODO 文档历史记录管理
- */
-@injectable()
-export class Editor2dHistory {
-}