@visactor/vrender-core 0.19.4-alpha.5 → 0.19.5-alpha.1

package/es/core/layer-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/layer-service.ts"],"names":[],"mappings":"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","file":"layer-service.js","sourcesContent":["import { inject, injectable } from '../common/inversify-lite';\nimport type { ILayer, IStage, IGlobal, ILayerParams, LayerMode, ILayerHandlerContribution } from '../interface';\nimport { Layer } from './layer';\nimport type { ILayerService } from '../interface/core';\nimport { container } from '../container';\nimport {\n  DynamicLayerHandlerContribution,\n  StaticLayerHandlerContribution,\n  VirtualLayerHandlerContribution\n} from './constants';\nimport { application } from '../application';\n\n@injectable()\nexport class DefaultLayerService implements ILayerService {\n  declare layerMap: Map<IStage, ILayer[]>;\n  declare staticLayerCountInEnv: number;\n  declare dynamicLayerCountInEnv: number;\n  declare inited: boolean;\n  declare global: IGlobal;\n  static idprefix: string = 'visactor_layer';\n  static prefix_count: number = 0;\n\n  static GenerateLayerId() {\n    return `${DefaultLayerService.idprefix}_${DefaultLayerService.prefix_count++}`;\n  }\n\n  constructor() {\n    this.layerMap = new Map();\n    this.global = application.global;\n  }\n\n  tryInit() {\n    if (!this.inited) {\n      this.staticLayerCountInEnv = this.global.getStaticCanvasCount();\n      this.dynamicLayerCountInEnv = this.global.getDynamicCanvasCount();\n      this.inited = true;\n    }\n  }\n\n  getStageLayer(stage: IStage) {\n    return this.layerMap.get(stage);\n  }\n\n  getRecommendedLayerType(layerMode?: LayerMode): LayerMode {\n    if (layerMode) {\n      return layerMode;\n    }\n    // 默认推荐实体canvas，不行就推荐离屏canvas，最次才是virtual\n    if (this.staticLayerCountInEnv !== 0) {\n      return 'static';\n    } else if (this.dynamicLayerCountInEnv !== 0) {\n      return 'dynamic';\n    }\n    return 'virtual';\n  }\n\n  getLayerHandler(layerMode: LayerMode) {\n    let layerHandler: ILayerHandlerContribution;\n    if (layerMode === 'static') {\n      layerHandler = container.get<ILayerHandlerContribution>(StaticLayerHandlerContribution);\n    } else if (layerMode === 'dynamic') {\n      layerHandler = container.get<ILayerHandlerContribution>(DynamicLayerHandlerContribution);\n    } else {\n      layerHandler = container.get<ILayerHandlerContribution>(VirtualLayerHandlerContribution);\n    }\n    return layerHandler;\n  }\n\n  createLayer(stage: IStage, options: Partial<ILayerParams> = { main: false }): ILayer {\n    this.tryInit();\n    let layerMode = this.getRecommendedLayerType(options.layerMode);\n    layerMode = options.main ? 'static' : options.canvasId ? 'static' : layerMode;\n    const layerHandler = this.getLayerHandler(layerMode);\n    const layer = new Layer(stage, this.global, stage.window, {\n      main: false,\n      ...options,\n      layerMode,\n      canvasId: options.canvasId ?? DefaultLayerService.GenerateLayerId(),\n      layerHandler\n    });\n    const stageLayers = this.layerMap.get(stage) || [];\n    stageLayers.push(layer);\n    this.layerMap.set(stage, stageLayers);\n    this.staticLayerCountInEnv--;\n    return layer;\n  }\n\n  prepareStageLayer(stage: IStage) {\n    let mainHandler: ILayerHandlerContribution;\n    stage.forEachChildren((l: ILayer) => {\n      const handler = l.getNativeHandler();\n      if (handler.type === 'virtual') {\n        handler.mainHandler = mainHandler;\n        mainHandler.secondaryHandlers.push(handler);\n      } else {\n        mainHandler = handler;\n        mainHandler.secondaryHandlers = [];\n      }\n    });\n  }\n\n  releaseLayer(stage: IStage, layer: ILayer): void {\n    layer.release();\n    const stageLayers = this.layerMap.get(stage) || [];\n    this.layerMap.set(\n      stage,\n      stageLayers.filter(l => l !== layer)\n    );\n  }\n\n  layerCount(stage: IStage): number {\n    return (this.layerMap.get(stage) || []).length;\n  }\n  restLayerCount(stage: IStage): number {\n    // TODO: 设置精确的值\n    if (this.global.env === 'browser') {\n      return 10;\n    }\n    return 0;\n  }\n\n  releaseStage(stage: IStage) {\n    this.layerMap.delete(stage);\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/layer-service.ts"],"names":[],"mappings":"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","file":"layer-service.js","sourcesContent":["import { inject, injectable } from '../common/inversify-lite';\nimport type { ILayer, IStage, IGlobal, ILayerParams, LayerMode, ILayerHandlerContribution } from '../interface';\nimport { Layer } from './layer';\nimport type { ILayerService } from '../interface/core';\nimport { container } from '../container';\nimport {\n  DynamicLayerHandlerContribution,\n  StaticLayerHandlerContribution,\n  VirtualLayerHandlerContribution\n} from './constants';\nimport { application } from '../application';\n\n@injectable()\nexport class DefaultLayerService implements ILayerService {\n  declare layerMap: Map<IStage, ILayer[]>;\n  declare staticLayerCountInEnv: number;\n  declare dynamicLayerCountInEnv: number;\n  declare inited: boolean;\n  declare global: IGlobal;\n  static idprefix: string = 'visactor_layer';\n  static prefix_count: number = 0;\n\n  static GenerateLayerId() {\n    return `${DefaultLayerService.idprefix}_${DefaultLayerService.prefix_count++}`;\n  }\n\n  constructor() {\n    this.layerMap = new Map();\n    this.global = application.global;\n  }\n\n  tryInit() {\n    if (!this.inited) {\n      this.staticLayerCountInEnv = this.global.getStaticCanvasCount();\n      this.dynamicLayerCountInEnv = this.global.getDynamicCanvasCount();\n      this.inited = true;\n    }\n  }\n\n  getStageLayer(stage: IStage) {\n    return this.layerMap.get(stage);\n  }\n\n  getRecommendedLayerType(layerMode?: LayerMode): LayerMode {\n    if (layerMode) {\n      return layerMode;\n    }\n    // 默认推荐实体canvas，不行就推荐离屏canvas，最次才是virtual\n    if (this.staticLayerCountInEnv !== 0) {\n      return 'static';\n    } else if (this.dynamicLayerCountInEnv !== 0) {\n      return 'dynamic';\n    }\n    return 'virtual';\n  }\n\n  getLayerHandler(layerMode: LayerMode) {\n    let layerHandler: ILayerHandlerContribution;\n    if (layerMode === 'static') {\n      layerHandler = container.get<ILayerHandlerContribution>(StaticLayerHandlerContribution);\n    } else if (layerMode === 'dynamic') {\n      layerHandler = container.get<ILayerHandlerContribution>(DynamicLayerHandlerContribution);\n    } else {\n      layerHandler = container.get<ILayerHandlerContribution>(VirtualLayerHandlerContribution);\n    }\n    return layerHandler;\n  }\n\n  createLayer(stage: IStage, options: Partial<ILayerParams> = { main: false }): ILayer {\n    this.tryInit();\n    let layerMode = this.getRecommendedLayerType(options.layerMode);\n    layerMode = options.main ? 'static' : options.canvasId ? 'static' : layerMode;\n    const layerHandler = this.getLayerHandler(layerMode);\n    const layer = new Layer(stage, this.global, stage.window, {\n      main: false,\n      ...options,\n      layerMode,\n      canvasId: options.canvasId ?? DefaultLayerService.GenerateLayerId(),\n      layerHandler\n    });\n    const stageLayers = this.layerMap.get(stage) || [];\n    stageLayers.push(layer);\n    this.layerMap.set(stage, stageLayers);\n    this.staticLayerCountInEnv--;\n    return layer;\n  }\n\n  prepareStageLayer(stage: IStage) {\n    let mainHandler: ILayerHandlerContribution;\n    stage.forEachChildren((l: ILayer) => {\n      const handler = l.getNativeHandler();\n      if (handler.type === 'virtual') {\n        handler.mainHandler = mainHandler;\n        mainHandler.secondaryHandlers.push(handler);\n      } else {\n        mainHandler = handler;\n        mainHandler.secondaryHandlers = [];\n      }\n    });\n  }\n\n  releaseLayer(stage: IStage, layer: ILayer): void {\n    layer.release();\n    const stageLayers = this.layerMap.get(stage) || [];\n    this.layerMap.set(\n      stage,\n      stageLayers.filter(l => l !== layer)\n    );\n  }\n\n  layerCount(stage: IStage): number {\n    return (this.layerMap.get(stage) || []).length;\n  }\n  restLayerCount(stage: IStage): number {\n    // TODO: 设置精确的值\n    if (this.global.env === 'browser') {\n      return 10;\n    }\n    return 0;\n  }\n\n  releaseStage(stage: IStage) {\n    this.layerMap.delete(stage);\n  }\n}\n"]}

package/es/core/layer.js

@@ -30,14 +30,13 @@ export class Layer extends Group {
         return this._dpr;
     }
     constructor(stage, global, window, params) {
-        var _a;
         super({}), this.stage = stage, this.global = global, this.window = window, this.main = params.main, 
         this.layerHandler = params.layerHandler, this.layerHandler.init(this, window, {
             main: params.main,
             canvasId: params.canvasId,
             width: this.viewWidth,
             height: this.viewHeight,
-            zIndex: null !== (_a = params.zIndex) && void 0 !== _a ? _a : 0
+            zIndex: params.zIndex ?? 0
         }), this.layer = this, this.subLayers = new Map, this.theme = new Theme, this.background = "rgba(0, 0, 0, 0)", 
         this.afterDrawCbs = [];
     }
@@ -65,14 +64,13 @@ export class Layer extends Group {
         }));
     }
     render(params, userParams) {
-        var _a;
         this.layerHandler.render([ this ], {
             renderService: params.renderService,
             stage: this.stage,
             layer: this,
             viewBox: params.viewBox,
             transMatrix: params.transMatrix,
-            background: null !== (_a = params.background) && void 0 !== _a ? _a : this.background,
+            background: params.background ?? this.background,
             updateBounds: params.updateBounds
         }, userParams), this.afterDrawCbs.forEach((c => c(this))), this.tryRenderSecondaryLayer(params, userParams);
     }
@@ -101,15 +99,15 @@ export class Layer extends Group {
         }));
     }
     drawTo(target, params) {
-        var _a;
-        this.layerHandler.drawTo(target, [ this ], Object.assign({
-            background: null !== (_a = params.background) && void 0 !== _a ? _a : this.background,
+        this.layerHandler.drawTo(target, [ this ], {
+            background: params.background ?? this.background,
             renderService: params.renderService,
             viewBox: params.viewBox,
             transMatrix: params.transMatrix,
             stage: this.stage,
-            layer: this
-        }, params)), this.afterDrawCbs.forEach((c => c(this)));
+            layer: this,
+            ...params
+        }), this.afterDrawCbs.forEach((c => c(this)));
     }
 }
 //# sourceMappingURL=layer.js.map

package/es/core/layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/layer.ts"],"names":[],"mappings":"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","file":"layer.js","sourcesContent":["import type { AABBBounds, IBoundsLike } from '@visactor/vutils';\nimport { application } from '../application';\nimport { container } from '../container';\nimport type {\n  IDrawToParams,\n  IGraphic,\n  IGroup,\n  ILayer,\n  ILayerDrawParams,\n  IStage,\n  IGlobal,\n  ILayerHandlerContribution,\n  IDrawContext,\n  ILayerHandlerDrawParams,\n  IDrawContribution,\n  IWindow,\n  ILayerParams,\n  LayerMode\n} from '../interface';\nimport { Theme } from '../graphic/theme';\nimport { Group } from '../graphic/group';\n\ntype BlendMode = 'normal';\n\n// layer需要有多个，对于Canvas来说，layer可以绑定一个canvas或一个ImageData\n// 对于WebGL来说，layer对应一个FrameBuffer\n// 对于Native来说，layer保留一个FrameBufferHandler\nexport class Layer extends Group implements ILayer {\n  declare parent: any;\n\n  declare _dpr: number;\n  declare main: boolean;\n  declare renderCount: number;\n\n  declare afterDrawCbs: ((l: this) => void)[];\n\n  declare imageData?: ImageData;\n  // 混合模式，用于多图层混合\n  declare blendMode: BlendMode;\n\n  declare background: string;\n  declare opacity: number;\n\n  declare layer: this;\n  declare subLayers: Map<\n    number,\n    { layer: ILayer; group?: IGroup; zIndex: number; drawContribution?: IDrawContribution }\n  >;\n\n  get offscreen(): boolean {\n    return this.layerHandler.offscreen;\n  }\n\n  get layerMode(): LayerMode {\n    return this.layerHandler.type;\n  }\n\n  // stage控制\n  // width: number;\n  // height: number;\n  get width(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.width;\n  }\n  get height(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.height;\n  }\n  get viewWidth(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.viewWidth;\n  }\n  get viewHeight(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.viewHeight;\n  }\n  declare pickable: boolean;\n\n  get dirtyBound(): AABBBounds {\n    // this.getRootNode<any>();\n    throw new Error('暂不支持');\n  }\n\n  get dpr(): number {\n    return this._dpr;\n  }\n\n  declare stage?: IStage;\n  protected declare global: IGlobal;\n  protected declare window: IWindow;\n  protected declare layerHandler: ILayerHandlerContribution;\n\n  constructor(stage: IStage, global: IGlobal, window: IWindow, params: ILayerParams) {\n    super({});\n    this.stage = stage;\n    this.global = global;\n    this.window = window;\n    this.main = params.main;\n    this.layerHandler = params.layerHandler;\n    // this.layerHandler = container.get<ILayerHandlerContribution>(LayerHandlerContribution);\n    this.layerHandler.init(this, window, {\n      main: params.main,\n      canvasId: params.canvasId,\n      width: this.viewWidth,\n      height: this.viewHeight,\n      zIndex: params.zIndex ?? 0\n    });\n    this.layer = this;\n    this.subLayers = new Map();\n    this.theme = new Theme();\n    this.background = 'rgba(0, 0, 0, 0)';\n    this.afterDrawCbs = [];\n  }\n\n  combineSubLayer(removeIncrementalKey: boolean = true) {\n    const subLayers = Array.from(this.subLayers.values()).sort((a, b) => {\n      return a.zIndex - b.zIndex;\n    });\n    this.layerHandler.merge(\n      subLayers.map(l => {\n        if (l.layer.subLayers.size) {\n          l.layer.combineSubLayer(removeIncrementalKey);\n        }\n        return l.layer.getNativeHandler();\n      })\n    );\n    if (removeIncrementalKey) {\n      subLayers.forEach(l => {\n        l.group && (l.group.incremental = 0);\n      });\n    }\n    subLayers.forEach(l => {\n      // l.layer.release();\n      application.layerService.releaseLayer(this.stage, l.layer);\n    });\n    this.subLayers.clear();\n  }\n\n  getNativeHandler(): ILayerHandlerContribution {\n    return this.layerHandler;\n  }\n\n  setStage(stage?: IStage, layer?: ILayer) {\n    super.setStage(stage, this);\n  }\n\n  // 选中图层中的节点\n  pick(x: number, y: number): { graphic?: IGraphic; group?: IGroup } | false {\n    throw new Error('暂不支持');\n  }\n  // 绘制依赖的副layer\n  protected tryRenderSecondaryLayer(params: ILayerDrawParams, userParams?: Partial<IDrawContext>) {\n    if (this.layerHandler.secondaryHandlers && this.layerHandler.secondaryHandlers.length) {\n      this.layerHandler.secondaryHandlers.forEach(h => {\n        h.layer.renderCount = this.renderCount;\n        h.layer.render(params, userParams);\n      });\n    }\n  }\n  // 绘制图层\n  render(params: ILayerDrawParams, userParams?: Partial<IDrawContext>) {\n    this.layerHandler.render(\n      [this],\n      {\n        renderService: params.renderService,\n        stage: this.stage,\n        layer: this,\n        viewBox: params.viewBox,\n        transMatrix: params.transMatrix,\n        // TODO: 多图层时不应该再用默认background\n        background: params.background ?? this.background,\n        updateBounds: params.updateBounds\n      },\n      userParams\n    );\n    this.afterDrawCbs.forEach(c => c(this));\n    this.tryRenderSecondaryLayer(params, userParams);\n  }\n  resize(w: number, h: number) {\n    this.layerHandler.resize(w, h);\n  }\n  resizeView(w: number, h: number) {\n    this.layerHandler.resizeView(w, h);\n  }\n  setDpr(dpr: number) {\n    this.layerHandler.setDpr(dpr);\n  }\n  afterDraw(cb: (l: this) => void) {\n    this.afterDrawCbs.push(cb);\n  }\n\n  // 动画相关\n  startAnimate(t: number) {\n    throw new Error('暂不支持');\n  }\n\n  setToFrame(t: number) {\n    throw new Error('暂不支持');\n  }\n\n  prepare(dirtyBounds: IBoundsLike, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  // // 合并到某个target上\n  // combineTo(target: IWindow, params: IDrawToParams) {\n  //   if (this.offscreen) {\n  //     this.layerHandler.drawTo(target, [this], {\n  //       // TODO: 多图层时不应该再用默认background\n  //       background: params.background ?? this.background,\n  //       renderService: params.renderService,\n  //       stage: this.stage,\n  //       layer: this,\n  //       ...params\n  //     });\n  //     this.afterDrawCbs.forEach(c => c(this));\n  //   }\n  // }\n\n  release(): void {\n    super.release();\n    this.layerHandler.release();\n    if (this.subLayers) {\n      this.subLayers.forEach(l => {\n        // l.layer.release();\n        application.layerService.releaseLayer(this.stage, l.layer);\n      });\n    }\n  }\n\n  drawTo(target: IWindow, params: IDrawToParams) {\n    this.layerHandler.drawTo(target, [this], {\n      // TODO: 多图层时不应该再用默认background\n      background: params.background ?? this.background,\n      renderService: params.renderService,\n      viewBox: params.viewBox,\n      transMatrix: params.transMatrix,\n      stage: this.stage,\n      layer: this,\n      ...params\n    });\n    this.afterDrawCbs.forEach(c => c(this));\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/layer.ts"],"names":[],"mappings":"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","file":"layer.js","sourcesContent":["import type { AABBBounds, IBoundsLike } from '@visactor/vutils';\nimport { application } from '../application';\nimport { container } from '../container';\nimport type {\n  IDrawToParams,\n  IGraphic,\n  IGroup,\n  ILayer,\n  ILayerDrawParams,\n  IStage,\n  IGlobal,\n  ILayerHandlerContribution,\n  IDrawContext,\n  ILayerHandlerDrawParams,\n  IDrawContribution,\n  IWindow,\n  ILayerParams,\n  LayerMode\n} from '../interface';\nimport { Theme } from '../graphic/theme';\nimport { Group } from '../graphic/group';\n\ntype BlendMode = 'normal';\n\n// layer需要有多个，对于Canvas来说，layer可以绑定一个canvas或一个ImageData\n// 对于WebGL来说，layer对应一个FrameBuffer\n// 对于Native来说，layer保留一个FrameBufferHandler\nexport class Layer extends Group implements ILayer {\n  declare parent: any;\n\n  declare _dpr: number;\n  declare main: boolean;\n  declare renderCount: number;\n\n  declare afterDrawCbs: ((l: this) => void)[];\n\n  declare imageData?: ImageData;\n  // 混合模式，用于多图层混合\n  declare blendMode: BlendMode;\n\n  declare background: string;\n  declare opacity: number;\n\n  declare layer: this;\n  declare subLayers: Map<\n    number,\n    { layer: ILayer; group?: IGroup; zIndex: number; drawContribution?: IDrawContribution }\n  >;\n\n  get offscreen(): boolean {\n    return this.layerHandler.offscreen;\n  }\n\n  get layerMode(): LayerMode {\n    return this.layerHandler.type;\n  }\n\n  // stage控制\n  // width: number;\n  // height: number;\n  get width(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.width;\n  }\n  get height(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.height;\n  }\n  get viewWidth(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.viewWidth;\n  }\n  get viewHeight(): number {\n    if (!this.stage) {\n      return 0;\n    }\n    return this.stage.viewHeight;\n  }\n  declare pickable: boolean;\n\n  get dirtyBound(): AABBBounds {\n    // this.getRootNode<any>();\n    throw new Error('暂不支持');\n  }\n\n  get dpr(): number {\n    return this._dpr;\n  }\n\n  declare stage?: IStage;\n  protected declare global: IGlobal;\n  protected declare window: IWindow;\n  protected declare layerHandler: ILayerHandlerContribution;\n\n  constructor(stage: IStage, global: IGlobal, window: IWindow, params: ILayerParams) {\n    super({});\n    this.stage = stage;\n    this.global = global;\n    this.window = window;\n    this.main = params.main;\n    this.layerHandler = params.layerHandler;\n    // this.layerHandler = container.get<ILayerHandlerContribution>(LayerHandlerContribution);\n    this.layerHandler.init(this, window, {\n      main: params.main,\n      canvasId: params.canvasId,\n      width: this.viewWidth,\n      height: this.viewHeight,\n      zIndex: params.zIndex ?? 0\n    });\n    this.layer = this;\n    this.subLayers = new Map();\n    this.theme = new Theme();\n    this.background = 'rgba(0, 0, 0, 0)';\n    this.afterDrawCbs = [];\n  }\n\n  combineSubLayer(removeIncrementalKey: boolean = true) {\n    const subLayers = Array.from(this.subLayers.values()).sort((a, b) => {\n      return a.zIndex - b.zIndex;\n    });\n    this.layerHandler.merge(\n      subLayers.map(l => {\n        if (l.layer.subLayers.size) {\n          l.layer.combineSubLayer(removeIncrementalKey);\n        }\n        return l.layer.getNativeHandler();\n      })\n    );\n    if (removeIncrementalKey) {\n      subLayers.forEach(l => {\n        l.group && (l.group.incremental = 0);\n      });\n    }\n    subLayers.forEach(l => {\n      // l.layer.release();\n      application.layerService.releaseLayer(this.stage, l.layer);\n    });\n    this.subLayers.clear();\n  }\n\n  getNativeHandler(): ILayerHandlerContribution {\n    return this.layerHandler;\n  }\n\n  setStage(stage?: IStage, layer?: ILayer) {\n    super.setStage(stage, this);\n  }\n\n  // 选中图层中的节点\n  pick(x: number, y: number): { graphic?: IGraphic; group?: IGroup } | false {\n    throw new Error('暂不支持');\n  }\n  // 绘制依赖的副layer\n  protected tryRenderSecondaryLayer(params: ILayerDrawParams, userParams?: Partial<IDrawContext>) {\n    if (this.layerHandler.secondaryHandlers && this.layerHandler.secondaryHandlers.length) {\n      this.layerHandler.secondaryHandlers.forEach(h => {\n        h.layer.renderCount = this.renderCount;\n        h.layer.render(params, userParams);\n      });\n    }\n  }\n  // 绘制图层\n  render(params: ILayerDrawParams, userParams?: Partial<IDrawContext>) {\n    this.layerHandler.render(\n      [this],\n      {\n        renderService: params.renderService,\n        stage: this.stage,\n        layer: this,\n        viewBox: params.viewBox,\n        transMatrix: params.transMatrix,\n        // TODO: 多图层时不应该再用默认background\n        background: params.background ?? this.background,\n        updateBounds: params.updateBounds\n      },\n      userParams\n    );\n    this.afterDrawCbs.forEach(c => c(this));\n    this.tryRenderSecondaryLayer(params, userParams);\n  }\n  resize(w: number, h: number) {\n    this.layerHandler.resize(w, h);\n  }\n  resizeView(w: number, h: number) {\n    this.layerHandler.resizeView(w, h);\n  }\n  setDpr(dpr: number) {\n    this.layerHandler.setDpr(dpr);\n  }\n  afterDraw(cb: (l: this) => void) {\n    this.afterDrawCbs.push(cb);\n  }\n\n  // 动画相关\n  startAnimate(t: number) {\n    throw new Error('暂不支持');\n  }\n\n  setToFrame(t: number) {\n    throw new Error('暂不支持');\n  }\n\n  prepare(dirtyBounds: IBoundsLike, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  // // 合并到某个target上\n  // combineTo(target: IWindow, params: IDrawToParams) {\n  //   if (this.offscreen) {\n  //     this.layerHandler.drawTo(target, [this], {\n  //       // TODO: 多图层时不应该再用默认background\n  //       background: params.background ?? this.background,\n  //       renderService: params.renderService,\n  //       stage: this.stage,\n  //       layer: this,\n  //       ...params\n  //     });\n  //     this.afterDrawCbs.forEach(c => c(this));\n  //   }\n  // }\n\n  release(): void {\n    super.release();\n    this.layerHandler.release();\n    if (this.subLayers) {\n      this.subLayers.forEach(l => {\n        // l.layer.release();\n        application.layerService.releaseLayer(this.stage, l.layer);\n      });\n    }\n  }\n\n  drawTo(target: IWindow, params: IDrawToParams) {\n    this.layerHandler.drawTo(target, [this], {\n      // TODO: 多图层时不应该再用默认background\n      background: params.background ?? this.background,\n      renderService: params.renderService,\n      viewBox: params.viewBox,\n      transMatrix: params.transMatrix,\n      stage: this.stage,\n      layer: this,\n      ...params\n    });\n    this.afterDrawCbs.forEach(c => c(this));\n  }\n}\n"]}

package/es/core/stage.js

@@ -53,6 +53,13 @@ const DefaultConfig = {
 };
 
 export class Stage extends Group {
+    _background;
+    nextFrameRenderLayerSet;
+    willNextFrameRender;
+    _cursor;
+    renderCount;
+    dirtyBounds;
+    option3d;
     set viewBox(b) {
         this.window.setViewBox(b);
     }
@@ -104,8 +111,7 @@ export class Stage extends Group {
         this.setDpr(r);
     }
     get background() {
-        var _a;
-        return null !== (_a = this._background) && void 0 !== _a ? _a : DefaultConfig.BACKGROUND;
+        return this._background ?? DefaultConfig.BACKGROUND;
     }
     set background(b) {
         this._background = b;
@@ -113,25 +119,33 @@ export class Stage extends Group {
     get defaultLayer() {
         return this.at(0);
     }
+    ticker;
+    autoRender;
+    _enableLayout;
+    htmlAttribute;
+    reactAttribute;
+    increaseAutoRender;
+    view3dTranform;
+    window;
+    global;
+    renderService;
+    pickerService;
+    pluginService;
+    layerService;
+    _eventSystem;
     get eventSystem() {
         return this._eventSystem;
     }
+    _beforeRender;
+    _afterRender;
+    _skipRender;
+    _afterNextRenderCbs;
+    lastRenderparams;
+    interactiveLayer;
+    supportInteractiveLayer;
+    timeline;
     constructor(params = {}) {
-        var _a;
-        super({}), this._onVisibleChange = visible => {
-            if (!(this._skipRender < 0)) if (visible) {
-                if (this.dirtyBounds) {
-                    const b = this.window.getViewBox();
-                    this.dirtyBounds.setValue(b.x1, b.y1, b.width(), b.height());
-                }
-                this._skipRender > 1 && this.renderNextFrame(), this._skipRender = 0;
-            } else this._skipRender = 1;
-        }, this.beforeRender = stage => {
-            this._beforeRender && this._beforeRender(stage);
-        }, this.afterRender = stage => {
-            this.renderCount++, this._afterRender && this._afterRender(stage), this._afterNextRenderCbs && this._afterNextRenderCbs.forEach((cb => cb(stage))), 
-            this._afterNextRenderCbs = null;
-        }, this.params = params, this.theme = new Theme, this.hooks = {
+        super({}), this.params = params, this.theme = new Theme, this.hooks = {
             beforeRender: new SyncHook([ "stage" ]),
             afterRender: new SyncHook([ "stage" ])
         }, this.global = application.global, !this.global.env && isBrowserEnv() && this.global.setEnv("browser"), 
@@ -146,7 +160,7 @@ export class Stage extends Group {
             canvasControled: !1 !== params.canvasControled,
             title: params.title || "",
             canvas: params.canvas
-        }), this.state = "normal", this.renderCount = 0, this.tryInitEventSystem(), this._background = null !== (_a = params.background) && void 0 !== _a ? _a : DefaultConfig.BACKGROUND, 
+        }), this.state = "normal", this.renderCount = 0, this.tryInitEventSystem(), this._background = params.background ?? DefaultConfig.BACKGROUND, 
         this.appendChild(this.layerService.createLayer(this, {
             main: !0
         })), this.nextFrameRenderLayerSet = new Set, this.willNextFrameRender = !1, this.stage = this, 
@@ -168,14 +182,15 @@ export class Stage extends Group {
         this._skipRender = 0;
     }
     tryInitEventSystem() {
-        this.global.supportEvent && !this._eventSystem && (this._eventSystem = new EventSystem(Object.assign({
+        this.global.supportEvent && !this._eventSystem && (this._eventSystem = new EventSystem({
             targetElement: this.window,
             resolution: this.window.dpr || this.global.devicePixelRatio,
             rootNode: this,
             global: this.global,
             supportsPointerEvents: this.params.supportsPointerEvents,
-            supportsTouchEvents: this.params.supportsTouchEvents
-        }, this.params.event)));
+            supportsTouchEvents: this.params.supportsTouchEvents,
+            ...this.params.event
+        }));
     }
     preventRender(prevent) {
         prevent ? this._skipRender = -1 / 0 : !1 !== this.params.optimize.skipRenderWithOutRange ? this._skipRender = this.window.isVisible() ? 0 : 1 : this._skipRender = 0;
@@ -187,6 +202,15 @@ export class Stage extends Group {
         skipRenderWithOutRange && (this._skipRender = this._skipRender < 0 ? this._skipRender : this.window.isVisible() ? 0 : 1, 
         this.window.onVisibleChange(this._onVisibleChange));
     }
+    _onVisibleChange=visible => {
+        if (!(this._skipRender < 0)) if (visible) {
+            if (this.dirtyBounds) {
+                const b = this.window.getViewBox();
+                this.dirtyBounds.setValue(b.x1, b.y1, b.width(), b.height());
+            }
+            this._skipRender > 1 && this.renderNextFrame(), this._skipRender = 0;
+        } else this._skipRender = 1;
+    };
     getTimeline() {
         return this.timeline;
     }
@@ -199,7 +223,8 @@ export class Stage extends Group {
             dy: 0,
             dz: 0
         }, light: light = {}, alpha: alpha = 0, beta: beta = 0, camera: camera, fieldRatio: fieldRatio = 1, fieldDepth: fieldDepth} = options;
-        return Object.assign(Object.assign({}, options), {
+        return {
+            ...options,
             center: center,
             light: light,
             alpha: alpha,
@@ -207,12 +232,11 @@ export class Stage extends Group {
             camera: camera,
             fieldRatio: fieldRatio,
             fieldDepth: fieldDepth
-        });
+        };
     }
     set3dOptions(options) {
-        var _a, _b, _c, _d, _e, _f;
         this.option3d = options;
-        const options3d = this.get3dOptions(options), {light: light, center: center, camera: camera, alpha: alpha, beta: beta, fieldRatio: fieldRatio, fieldDepth: fieldDepth} = options3d, {dir: dir = [ 1, 1, -1 ], color: color = "white", ambient: ambient} = light, centerX = (null !== (_a = center.x) && void 0 !== _a ? _a : this.width / 2) + (null !== (_b = center.dx) && void 0 !== _b ? _b : 0), centerY = (null !== (_c = center.y) && void 0 !== _c ? _c : this.height / 2) + (null !== (_d = center.dy) && void 0 !== _d ? _d : 0), centerVec3 = [ centerX, centerY, (null !== (_e = center.z) && void 0 !== _e ? _e : 0) + (null !== (_f = center.dz) && void 0 !== _f ? _f : 0) ];
+        const options3d = this.get3dOptions(options), {light: light, center: center, camera: camera, alpha: alpha, beta: beta, fieldRatio: fieldRatio, fieldDepth: fieldDepth} = options3d, {dir: dir = [ 1, 1, -1 ], color: color = "white", ambient: ambient} = light, centerX = (center.x ?? this.width / 2) + (center.dx ?? 0), centerY = (center.y ?? this.height / 2) + (center.dy ?? 0), centerVec3 = [ centerX, centerY, (center.z ?? 0) + (center.dz ?? 0) ];
         let cameraX = 0, cameraY = 0, cameraZ = 0;
         camera || (cameraX = Math.sin(alpha) + centerX, cameraY = Math.sin(beta) + centerY, 
         cameraZ = Math.cos(alpha) * Math.cos(beta) * 1), this.light = new DirectionalLight(dir, color, ambient);
@@ -232,6 +256,13 @@ export class Stage extends Group {
         this.camera ? this.camera.params = cameraParams : this.camera = new OrthoCamera(cameraParams), 
         options.enableView3dTransform && this.enableView3dTransform();
     }
+    beforeRender=stage => {
+        this._beforeRender && this._beforeRender(stage);
+    };
+    afterRender=stage => {
+        this.renderCount++, this._afterRender && this._afterRender(stage), this._afterNextRenderCbs && this._afterNextRenderCbs.forEach((cb => cb(stage))), 
+        this._afterNextRenderCbs = null;
+    };
     setBeforeRender(cb) {
         this._beforeRender = cb;
     }
@@ -345,7 +376,17 @@ export class Stage extends Group {
         this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear()), this.hooks.afterRender.call(this)), 
         this.state = state, this._skipRender && this._skipRender++;
     }
-    combineLayersToWindow() {}
+    combineLayersToWindow() {
+        if ("harmony" === this.global.env) {
+            const ctx = this.window.getContext().nativeContext;
+            this.forEachChildren(((layer, i) => {
+                if (i > 0) {
+                    const image = layer.getNativeHandler().getContext().canvas.nativeCanvas.nativeCanvas._c.transferToImageBitmap();
+                    ctx.transferFromImageBitmap(image);
+                }
+            }));
+        }
+    }
     renderNextFrame(layers, force) {
         this.nextFrameRenderLayerSet.size !== this.childrenCount && (layers || this).forEach((layer => {
             this.nextFrameRenderLayerSet.add(layer);
@@ -375,17 +416,19 @@ export class Stage extends Group {
                 updateBounds: !(!this.dirtyBounds || this.dirtyBounds.empty()),
                 viewBox: this.window.getViewBox(),
                 transMatrix: this.window.getViewBoxTransform()
-            }, Object.assign({
-                renderStyle: this.renderStyle
-            }, params)));
+            }, {
+                renderStyle: this.renderStyle,
+                ...params
+            }));
         })), this.interactiveLayer && !layerList.includes(this.interactiveLayer) && this.interactiveLayer.render({
             renderService: this.renderService,
             updateBounds: !(!this.dirtyBounds || this.dirtyBounds.empty()),
             viewBox: this.window.getViewBox(),
             transMatrix: this.window.getViewBoxTransform()
-        }, Object.assign({
-            renderStyle: this.renderStyle
-        }, params));
+        }, {
+            renderStyle: this.renderStyle,
+            ...params
+        });
     }
     resizeWindow(w, h, rerender = !0) {
         this.window.resize(w, h), rerender && this.render();
@@ -400,10 +443,11 @@ export class Stage extends Group {
         this.viewBox.setValue(this.viewBox.x1, this.viewBox.y1, this.viewBox.x1 + w, this.viewBox.y1 + h), 
         this.forEachChildren((c => {
             c.resizeView(w, h);
-        })), this.camera && (this.camera.params = Object.assign(Object.assign({}, this.camera.params), {
+        })), this.camera && (this.camera.params = {
+            ...this.camera.params,
             right: this.width,
             bottom: this.height
-        })), rerender && this.render();
+        }), rerender && this.render();
     }
     setViewBox(x, y, w, h, rerender) {
         let isRerender = !0;
@@ -428,7 +472,7 @@ export class Stage extends Group {
         const result = this.pickerService.pick(this.children, new Point(x, y), {
             bounds: this.AABBBounds
         });
-        return !(!(null == result ? void 0 : result.graphic) && !(null == result ? void 0 : result.group)) && result;
+        return !(!result?.graphic && !result?.group) && result;
     }
     startAnimate(t) {
         throw new Error("暂不支持");