@gedit/editor-2d 0.2.35 → 0.2.38

package/src/browser/playground/extend-edit-layer.tsx

@@ -410,6 +410,7 @@ export class ExtendEditLayer extends Layer {
       top: bounds.y * scale,
       width,
       height,
+      transformOrigin: `${transform.origin.x * 100}% ${transform.origin.y * 100}%`,
       transform: rotate ? `rotate(${rotate}deg)` : undefined,
     };
     const data = this.getNodeValue();

package/src/browser/playground/playground-context.ts

@@ -14,6 +14,8 @@ import { Editor2dContextKeyService } from '../editor2d-context-key-service';
 import type { CanvasDraw } from './canvas-draw';
 import SelectionType = TreeSelection.SelectionType;
 import { FormService } from '@gedit/ui';
+import { OpenerService } from '@gedit/application-common/lib/browser';
+import { WorkspaceService } from '@gedit/workspace-2d';
 
 export const Editor2dPlayGround = Symbol('Editor2dPlayGround');
 
@@ -26,6 +28,7 @@ export class PlaygroundContext2d {
    * 监听画布变化，可用于生成缩略图
    */
   readonly onCanvasDataChanged = this.onCanvasDataChangedEmitter.event;
+  readonly rootURI: URI;
   constructor(
     @inject(RenderEngineIDEService) readonly renderEngine: RenderEngineIDEService,
     @inject(Editor2dDocument) readonly document: Editor2dDocument,
@@ -34,8 +37,12 @@ export class PlaygroundContext2d {
     @inject(AppConfigService) readonly appConfig: AppConfigService,
     @inject(Editor2dModelOptions) readonly options: Editor2dModelOptions,
     @inject(FormService) readonly formService: FormService,
-    @inject(Editor2dContextKeyService) readonly contextKeyService: Editor2dContextKeyService
+    @inject(Editor2dContextKeyService) readonly contextKeyService: Editor2dContextKeyService,
+    @inject(OpenerService) readonly openerService: OpenerService,
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService,
   ) {
+    this.rootURI = new URI(this.workspaceService.currentRoot!.uri);
     this.document.toDispose.push(this.onCanvasDataChangedEmitter);
     if (options.onCanvasDataChanged) {
       this.onCanvasDataChanged(drawer => options.onCanvasDataChanged!(drawer));

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

@@ -32,7 +32,7 @@ const numberToFixed4 = (data: {[key: string]: any}) => {
  * 选择器实体相关逻辑
  */
 export class SelectionEntityManager {
-  protected nodeEntitiesCache: Map<string, Editor2dEntity> = new Map();
+  nodeEntitiesCache: Map<string, Editor2dEntity> = new Map();
   constructor(
     protected entityManager: EntityManager,
     protected context: PlaygroundContext2d,
@@ -61,6 +61,26 @@ export class SelectionEntityManager {
       return DefaultSelectorEntityRenderer(newProps);
     });
   }
+
+  setTransformMask(entity: Editor2dEntity, nodePath: string, node?: Editor2dNode): void {
+    let maskEntity;
+    if (node) {
+      entity.transform.isMask = node.isMask;
+      if (node.mask && !node.ignoreMask) {
+        // 组件里取不到 node
+        const p = nodePath.split('/');
+        p.splice(p.length - 1, 1);
+        const maskNodePath = p.concat(node.mask).join('/');
+        maskEntity = this.nodeEntitiesCache.get(maskNodePath);
+        if (maskEntity) {
+          entity.transform.maskTransform = maskEntity?.transform;
+        }
+        // maskEntity?.transform && entity.transform.setMaskBounds(maskEntity?.transform);
+      } else {
+        entity.transform.maskTransform = undefined;
+      }
+    }
+  }
   /**
    * 创建画布对应的选择器实体
    * @param nodePath
@@ -83,6 +103,8 @@ export class SelectionEntityManager {
     entity.nodeId = node.id;
     entity.context = this.context;
     entity.transform.sizeToScale = !!deco.sizeToScale;
+
+    this.setTransformMask(entity, nodePath, node);
     // 切换选择框的类型，如圆形、矩形, 默认矩形
     if (deco.selectDisplayType) {
       entity.selectState.update({
@@ -131,6 +153,11 @@ export class SelectionEntityManager {
     } else {
       entity.setControlKeys([]);
     }
+    if (deco.originBtnDisabled) {
+      entity.selectState.update({
+        originBtnDisabled: deco.originBtnDisabled,
+      });
+    }
     entity.selectable = false;
 
     return entity;
@@ -171,6 +198,7 @@ export class SelectionEntityManager {
     entity.selected = !!node?.selected;
     // 更新zIndex, 每次都要更新，因为节点拖拽会导致所有的zIndex顺序错乱
     entity.zIndex = gameObject.data.depth || 0;
+    this.setTransformMask(entity, nodePath, node);
   }
   getSelectedEntities(): Editor2dEntity[] {
     const selectedEntities: Editor2dEntity[] = [];