@visactor/vrender-core 1.0.47-alpha.0 → 1.1.0-alpha.1

package/es/render/contributions/render/symbol-module.d.ts

@@ -1,2 +1,4 @@
-import { ContainerModule } from '../../../common/inversify';
-export declare const symbolModule: ContainerModule;
+export declare function bindSymbolRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const symbolModule: typeof bindSymbolRenderModule;

package/es/render/contributions/render/symbol-module.js

@@ -1,7 +1,5 @@
 import { bindContributionProvider } from "../../../common/contribution-provider";
 
-import { ContainerModule } from "../../../common/inversify";
-
 import { DefaultBaseInteractiveRenderContribution } from "./contributions";
 
 import { SymbolRenderContribution } from "./contributions/constants";
@@ -12,10 +10,12 @@ import { DefaultCanvasSymbolRender } from "./symbol-render";
 
 let loadSymbolModule = !1;
 
-export const symbolModule = new ContainerModule((bind => {
+export function bindSymbolRenderModule({bind: bind}) {
     loadSymbolModule || (loadSymbolModule = !0, bind(DefaultCanvasSymbolRender).toSelf().inSingletonScope(), 
     bind(SymbolRender).to(DefaultCanvasSymbolRender).inSingletonScope(), bind(GraphicRender).toService(SymbolRender), 
     bind(SymbolRenderContribution).toService(DefaultBaseInteractiveRenderContribution), 
     bindContributionProvider(bind, SymbolRenderContribution));
-}));
+}
+
+export const symbolModule = bindSymbolRenderModule;
 //# sourceMappingURL=symbol-module.js.map

package/es/render/contributions/render/symbol-module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/symbol-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAC7B,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACrD,IAAI,gBAAgB,EAAE;QACpB,OAAO;KACR;IACD,gBAAgB,GAAG,IAAI,CAAC;IAExB,IAAI,CAAC,yBAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAEnF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC","file":"symbol-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { ContainerModule } from '../../../common/inversify';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { SymbolRenderContribution } from './contributions/constants';\nimport { GraphicRender, SymbolRender } from './symbol';\nimport { DefaultCanvasSymbolRender } from './symbol-render';\n\nlet loadSymbolModule = false;\nexport const symbolModule = new ContainerModule(bind => {\n  if (loadSymbolModule) {\n    return;\n  }\n  loadSymbolModule = true;\n  // symbol渲染器\n  bind(DefaultCanvasSymbolRender).toSelf().inSingletonScope();\n  bind(SymbolRender).to(DefaultCanvasSymbolRender).inSingletonScope();\n  bind(GraphicRender).toService(SymbolRender);\n  bind(SymbolRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n  // symbol 渲染器注入contributions\n  bindContributionProvider(bind, SymbolRenderContribution);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/render/symbol-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAC7B,MAAM,UAAU,sBAAsB,CAAC,EAAE,IAAI,EAAiB;IAC5D,IAAI,gBAAgB,EAAE;QACpB,OAAO;KACR;IACD,gBAAgB,GAAG,IAAI,CAAC;IAExB,IAAI,CAAC,yBAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAEnF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,sBAAsB,CAAC","file":"symbol-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { SymbolRenderContribution } from './contributions/constants';\nimport { GraphicRender, SymbolRender } from './symbol';\nimport { DefaultCanvasSymbolRender } from './symbol-render';\n\nlet loadSymbolModule = false;\nexport function bindSymbolRenderModule({ bind }: { bind: any }) {\n  if (loadSymbolModule) {\n    return;\n  }\n  loadSymbolModule = true;\n  // symbol渲染器\n  bind(DefaultCanvasSymbolRender).toSelf().inSingletonScope();\n  bind(SymbolRender).to(DefaultCanvasSymbolRender).inSingletonScope();\n  bind(GraphicRender).toService(SymbolRender);\n  bind(SymbolRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n  // symbol 渲染器注入contributions\n  bindContributionProvider(bind, SymbolRenderContribution);\n}\n\nexport const symbolModule = bindSymbolRenderModule;\n"]}

package/es/render/contributions/render/symbol-render.js

@@ -1,32 +1,14 @@
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (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;
-}, __metadata = this && this.__metadata || function(k, v) {
-    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
-};
-
-import { inject, injectable, named } from "../../../common/inversify-lite";
-
-import { ContributionProvider } from "../../../common/contribution-provider";
-
 import { getTheme } from "../../../graphic/theme";
 
 import { SYMBOL_NUMBER_TYPE } from "../../../graphic/constants";
 
 import { BaseRender } from "./base-render";
 
-import { SymbolRenderContribution } from "./contributions/constants";
-
 import { isArray } from "@visactor/vutils";
 
 import { defaultSymbolBackgroundRenderContribution, defaultSymbolClipRangeStrokeRenderContribution, defaultSymbolRenderContribution, defaultSymbolTextureRenderContribution } from "./contributions";
 
-let DefaultCanvasSymbolRender = class extends BaseRender {
+export class DefaultCanvasSymbolRender extends BaseRender {
     constructor(graphicRenderContributions) {
         super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = SYMBOL_NUMBER_TYPE, 
         this.builtinContributions = [ defaultSymbolRenderContribution, defaultSymbolBackgroundRenderContribution, defaultSymbolTextureRenderContribution, defaultSymbolClipRangeStrokeRenderContribution ], 
@@ -85,9 +67,5 @@ let DefaultCanvasSymbolRender = class extends BaseRender {
         const symbolAttribute = getTheme(symbol, null == params ? void 0 : params.theme).symbol;
         this._draw(symbol, symbolAttribute, !1, drawContext, params);
     }
-};
-
-DefaultCanvasSymbolRender = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(SymbolRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasSymbolRender);
-
-export { DefaultCanvasSymbolRender };
+}
 //# sourceMappingURL=symbol-render.js.map

package/es/render/contributions/render/symbol-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/symbol-render.ts"],"names":[],"mappings":"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","file":"symbol-render.js","sourcesContent":["import { inject, injectable, named } from '../../../common/inversify-lite';\n// eslint-disable-next-line\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { getTheme } from '../../../graphic/theme';\nimport { SYMBOL_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  ISymbolRenderContribution,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IContributionProvider,\n  ICustomPath2D,\n  ISymbolGraphicAttribute\n} from '../../../interface';\nimport type {} from '../../render-service';\nimport { BaseRender } from './base-render';\nimport { SymbolRenderContribution } from './contributions/constants';\nimport { isArray } from '@visactor/vutils';\nimport {\n  defaultSymbolBackgroundRenderContribution,\n  defaultSymbolClipRangeStrokeRenderContribution,\n  defaultSymbolRenderContribution,\n  defaultSymbolTextureRenderContribution\n} from './contributions';\n\n@injectable()\nexport class DefaultCanvasSymbolRender extends BaseRender<ISymbol> implements IGraphicRender {\n  type: 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(SymbolRenderContribution)\n    protected readonly graphicRenderContributions: IContributionProvider<ISymbolRenderContribution>\n  ) {\n    super();\n    this.builtinContributions = [\n      defaultSymbolRenderContribution,\n      defaultSymbolBackgroundRenderContribution,\n      defaultSymbolTextureRenderContribution,\n      defaultSymbolClipRangeStrokeRenderContribution\n    ];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    symbolAttribute?: Required<ISymbolGraphicAttribute>\n  ) {\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    symbolAttribute = symbolAttribute ?? getTheme(symbol, params?.theme).symbol;\n\n    const {\n      size = symbolAttribute.size,\n      x: originX = symbolAttribute.x,\n      y: originY = symbolAttribute.y,\n      scaleX = symbolAttribute.scaleX,\n      scaleY = symbolAttribute.scaleY,\n      fillStrokeOrder = symbolAttribute.fillStrokeOrder,\n      clipRange = symbolAttribute.clipRange\n    } = symbol.attribute;\n\n    const data = this.valid(symbol, symbolAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    const parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { keepDirIn3d = symbolAttribute.keepDirIn3d } = symbol.attribute;\n    const z = this.z ?? 0;\n    context.beginPath();\n\n    const callback = (p: ICustomPath2D, a: any) => {\n      // 如果是svg的话，合并一下fill和stroke\n      if (symbol._parsedPath.svgCache) {\n        const obj = Object.assign({}, a);\n        obj.fill = a.fill ?? symbol.attribute.fill;\n        obj.opacity = a.opacity ?? symbol.attribute.opacity;\n        obj.fillOpacity = symbol.attribute.fillOpacity;\n        obj.stroke = a.stroke ?? symbol.attribute.stroke;\n        obj.lineWidth = a.lineWidth ?? symbol.attribute.lineWidth;\n        a = obj;\n      }\n      const _runFill = () => {\n        if (a.fill) {\n          if (fillCb) {\n            fillCb(context, symbol.attribute, symbolAttribute);\n          } else {\n            context.setCommonStyle(symbol, a, originX - x, originY - y, symbolAttribute);\n            context.fill();\n          }\n        }\n      };\n      const _runStroke = () => {\n        if (a.stroke) {\n          if (strokeCb) {\n            strokeCb(context, symbol.attribute, symbolAttribute);\n          } else if (sVisible && clipRange >= 1) {\n            context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute);\n            context.stroke();\n          }\n        }\n      };\n      if (!fillStrokeOrder) {\n        _runFill();\n        _runStroke();\n      } else {\n        _runStroke();\n        _runFill();\n      }\n    };\n    let _size = size;\n    let _x = x;\n    let _y = y;\n    let _z = z;\n    const camera = context.camera;\n    if (keepDirIn3d && camera && context.project) {\n      const p = context.project(x, y, z);\n      context.camera = null;\n      _size = isArray(size) ? [size[0] * scaleX, size[1] * scaleY] : size * scaleX;\n      _x = p.x;\n      _y = p.y;\n      _z = undefined;\n    }\n    if (parsedPath.draw(context, size, _x, _y, _z, callback) === false) {\n      context.closePath();\n    }\n    context.camera = camera;\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute);\n\n    this.beforeRenderStep(\n      symbol,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      symbolAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n\n    // if (fill !== false) {\n    //   context.setCommonStyle(symbol.attribute, symbolAttribute);\n    //   context.fill();\n    // }\n    // if (stroke !== false) {\n    //   context.setStrokeStyle(symbol.attribute, symbolAttribute);\n    //   context.stroke();\n    // }\n\n    // svg就不用fill和stroke了\n    // 内联的函数性能差\n    // const _runFill = () => {\n    //   if (doFill && !parsedPath.isSvg) {\n    //     if (fillCb) {\n    //       fillCb(context, symbol.attribute, symbolAttribute);\n    //     } else if (fVisible) {\n    //       context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute);\n    //       context.fill();\n    //     }\n    //   }\n    // };\n    // const _runStroke = () => {\n    //   if (doStroke && !parsedPath.isSvg) {\n    //     if (strokeCb) {\n    //       strokeCb(context, symbol.attribute, symbolAttribute);\n    //     } else if (sVisible && clipRange >= 1) {\n    //       // 如果clipRange < 1，就需要靠afterRender进行绘制了\n    //       context.setStrokeStyle(\n    //         symbol,\n    //         symbol.attribute,\n    //         (originX - x) / scaleX,\n    //         (originY - y) / scaleY,\n    //         symbolAttribute\n    //       );\n    //       context.stroke();\n    //     }\n    //   }\n    // };\n\n    if (!fillStrokeOrder) {\n      this._runFill(symbol, context, x, y, symbolAttribute, doFill, fVisible, originX, originY, parsedPath, fillCb);\n      this._runStroke(\n        symbol,\n        context,\n        x,\n        y,\n        symbolAttribute,\n        doStroke,\n        sVisible,\n        originX,\n        originY,\n        parsedPath,\n        clipRange,\n        scaleX,\n        scaleY,\n        strokeCb\n      );\n    } else {\n      this._runStroke(\n        symbol,\n        context,\n        x,\n        y,\n        symbolAttribute,\n        doStroke,\n        sVisible,\n        originX,\n        originY,\n        parsedPath,\n        clipRange,\n        scaleX,\n        scaleY,\n        strokeCb\n      );\n      this._runFill(symbol, context, x, y, symbolAttribute, doFill, fVisible, originX, originY, parsedPath, fillCb);\n    }\n\n    this.afterRenderStep(\n      symbol,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      symbolAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  private _runFill(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    symbolAttribute: Required<ISymbolGraphicAttribute>,\n    doFill: boolean,\n    fVisible: boolean,\n    originX: number,\n    originY: number,\n    parsedPath: any,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (doFill && !parsedPath.isSvg) {\n      if (fillCb) {\n        fillCb(context, symbol.attribute, symbolAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute);\n        context.fill();\n      }\n    }\n  }\n\n  private _runStroke(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    symbolAttribute: Required<ISymbolGraphicAttribute>,\n    doStroke: boolean,\n    sVisible: boolean,\n    originX: number,\n    originY: number,\n    parsedPath: any,\n    clipRange: number,\n    scaleX: number,\n    scaleY: number,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (doStroke && !parsedPath.isSvg) {\n      if (strokeCb) {\n        strokeCb(context, symbol.attribute, symbolAttribute);\n      } else if (sVisible && clipRange >= 1) {\n        // 如果clipRange < 1，就需要靠afterRender进行绘制了\n        context.setStrokeStyle(\n          symbol,\n          symbol.attribute,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute\n        );\n        context.stroke();\n      }\n    }\n  }\n\n  draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n    this._draw(symbol, symbolAttribute, false, drawContext, params);\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/symbol-render.ts"],"names":[],"mappings":"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","file":"symbol-render.js","sourcesContent":["import { getTheme } from '../../../graphic/theme';\nimport { SYMBOL_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  ISymbolRenderContribution,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IContributionProvider,\n  ICustomPath2D,\n  ISymbolGraphicAttribute\n} from '../../../interface';\nimport type {} from '../../render-service';\nimport { BaseRender } from './base-render';\nimport { SymbolRenderContribution } from './contributions/constants';\nimport { isArray } from '@visactor/vutils';\nimport {\n  defaultSymbolBackgroundRenderContribution,\n  defaultSymbolClipRangeStrokeRenderContribution,\n  defaultSymbolRenderContribution,\n  defaultSymbolTextureRenderContribution\n} from './contributions';\n\nexport class DefaultCanvasSymbolRender extends BaseRender<ISymbol> implements IGraphicRender {\n  type: 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n\n  constructor(protected readonly graphicRenderContributions: IContributionProvider<ISymbolRenderContribution>) {\n    super();\n    this.builtinContributions = [\n      defaultSymbolRenderContribution,\n      defaultSymbolBackgroundRenderContribution,\n      defaultSymbolTextureRenderContribution,\n      defaultSymbolClipRangeStrokeRenderContribution\n    ];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    symbolAttribute?: Required<ISymbolGraphicAttribute>\n  ) {\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    symbolAttribute = symbolAttribute ?? getTheme(symbol, params?.theme).symbol;\n\n    const {\n      size = symbolAttribute.size,\n      x: originX = symbolAttribute.x,\n      y: originY = symbolAttribute.y,\n      scaleX = symbolAttribute.scaleX,\n      scaleY = symbolAttribute.scaleY,\n      fillStrokeOrder = symbolAttribute.fillStrokeOrder,\n      clipRange = symbolAttribute.clipRange\n    } = symbol.attribute;\n\n    const data = this.valid(symbol, symbolAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    const parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { keepDirIn3d = symbolAttribute.keepDirIn3d } = symbol.attribute;\n    const z = this.z ?? 0;\n    context.beginPath();\n\n    const callback = (p: ICustomPath2D, a: any) => {\n      // 如果是svg的话，合并一下fill和stroke\n      if (symbol._parsedPath.svgCache) {\n        const obj = Object.assign({}, a);\n        obj.fill = a.fill ?? symbol.attribute.fill;\n        obj.opacity = a.opacity ?? symbol.attribute.opacity;\n        obj.fillOpacity = symbol.attribute.fillOpacity;\n        obj.stroke = a.stroke ?? symbol.attribute.stroke;\n        obj.lineWidth = a.lineWidth ?? symbol.attribute.lineWidth;\n        a = obj;\n      }\n      const _runFill = () => {\n        if (a.fill) {\n          if (fillCb) {\n            fillCb(context, symbol.attribute, symbolAttribute);\n          } else {\n            context.setCommonStyle(symbol, a, originX - x, originY - y, symbolAttribute);\n            context.fill();\n          }\n        }\n      };\n      const _runStroke = () => {\n        if (a.stroke) {\n          if (strokeCb) {\n            strokeCb(context, symbol.attribute, symbolAttribute);\n          } else if (sVisible && clipRange >= 1) {\n            context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute);\n            context.stroke();\n          }\n        }\n      };\n      if (!fillStrokeOrder) {\n        _runFill();\n        _runStroke();\n      } else {\n        _runStroke();\n        _runFill();\n      }\n    };\n    let _size = size;\n    let _x = x;\n    let _y = y;\n    let _z = z;\n    const camera = context.camera;\n    if (keepDirIn3d && camera && context.project) {\n      const p = context.project(x, y, z);\n      context.camera = null;\n      _size = isArray(size) ? [size[0] * scaleX, size[1] * scaleY] : size * scaleX;\n      _x = p.x;\n      _y = p.y;\n      _z = undefined;\n    }\n    if (parsedPath.draw(context, size, _x, _y, _z, callback) === false) {\n      context.closePath();\n    }\n    context.camera = camera;\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute);\n\n    this.beforeRenderStep(\n      symbol,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      symbolAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n\n    // if (fill !== false) {\n    //   context.setCommonStyle(symbol.attribute, symbolAttribute);\n    //   context.fill();\n    // }\n    // if (stroke !== false) {\n    //   context.setStrokeStyle(symbol.attribute, symbolAttribute);\n    //   context.stroke();\n    // }\n\n    // svg就不用fill和stroke了\n    // 内联的函数性能差\n    // const _runFill = () => {\n    //   if (doFill && !parsedPath.isSvg) {\n    //     if (fillCb) {\n    //       fillCb(context, symbol.attribute, symbolAttribute);\n    //     } else if (fVisible) {\n    //       context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute);\n    //       context.fill();\n    //     }\n    //   }\n    // };\n    // const _runStroke = () => {\n    //   if (doStroke && !parsedPath.isSvg) {\n    //     if (strokeCb) {\n    //       strokeCb(context, symbol.attribute, symbolAttribute);\n    //     } else if (sVisible && clipRange >= 1) {\n    //       // 如果clipRange < 1，就需要靠afterRender进行绘制了\n    //       context.setStrokeStyle(\n    //         symbol,\n    //         symbol.attribute,\n    //         (originX - x) / scaleX,\n    //         (originY - y) / scaleY,\n    //         symbolAttribute\n    //       );\n    //       context.stroke();\n    //     }\n    //   }\n    // };\n\n    if (!fillStrokeOrder) {\n      this._runFill(symbol, context, x, y, symbolAttribute, doFill, fVisible, originX, originY, parsedPath, fillCb);\n      this._runStroke(\n        symbol,\n        context,\n        x,\n        y,\n        symbolAttribute,\n        doStroke,\n        sVisible,\n        originX,\n        originY,\n        parsedPath,\n        clipRange,\n        scaleX,\n        scaleY,\n        strokeCb\n      );\n    } else {\n      this._runStroke(\n        symbol,\n        context,\n        x,\n        y,\n        symbolAttribute,\n        doStroke,\n        sVisible,\n        originX,\n        originY,\n        parsedPath,\n        clipRange,\n        scaleX,\n        scaleY,\n        strokeCb\n      );\n      this._runFill(symbol, context, x, y, symbolAttribute, doFill, fVisible, originX, originY, parsedPath, fillCb);\n    }\n\n    this.afterRenderStep(\n      symbol,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      symbolAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  private _runFill(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    symbolAttribute: Required<ISymbolGraphicAttribute>,\n    doFill: boolean,\n    fVisible: boolean,\n    originX: number,\n    originY: number,\n    parsedPath: any,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (doFill && !parsedPath.isSvg) {\n      if (fillCb) {\n        fillCb(context, symbol.attribute, symbolAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute);\n        context.fill();\n      }\n    }\n  }\n\n  private _runStroke(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    symbolAttribute: Required<ISymbolGraphicAttribute>,\n    doStroke: boolean,\n    sVisible: boolean,\n    originX: number,\n    originY: number,\n    parsedPath: any,\n    clipRange: number,\n    scaleX: number,\n    scaleY: number,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    if (doStroke && !parsedPath.isSvg) {\n      if (strokeCb) {\n        strokeCb(context, symbol.attribute, symbolAttribute);\n      } else if (sVisible && clipRange >= 1) {\n        // 如果clipRange < 1，就需要靠afterRender进行绘制了\n        context.setStrokeStyle(\n          symbol,\n          symbol.attribute,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute\n        );\n        context.stroke();\n      }\n    }\n  }\n\n  draw(symbol: ISymbol, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const symbolAttribute = getTheme(symbol, params?.theme).symbol;\n    this._draw(symbol, symbolAttribute, false, drawContext, params);\n  }\n}\n"]}

package/es/render/contributions/render/text-module.d.ts

@@ -1,2 +1,4 @@
-import { ContainerModule } from '../../../common/inversify';
-export declare const textModule: ContainerModule;
+export declare function bindTextRenderModule({ bind }: {
+    bind: any;
+}): void;
+export declare const textModule: typeof bindTextRenderModule;

package/es/render/contributions/render/text-module.js

@@ -1,7 +1,5 @@
 import { bindContributionProvider } from "../../../common/contribution-provider";
 
-import { ContainerModule } from "../../../common/inversify";
-
 import { DefaultBaseInteractiveRenderContribution } from "./contributions";
 
 import { TextRenderContribution } from "./contributions/constants";
@@ -12,9 +10,11 @@ import { DefaultCanvasTextRender } from "./text-render";
 
 let loadTextModule = !1;
 
-export const textModule = new ContainerModule((bind => {
+export function bindTextRenderModule({bind: bind}) {
     loadTextModule || (loadTextModule = !0, bind(TextRender).to(DefaultCanvasTextRender).inSingletonScope(), 
     bind(GraphicRender).toService(TextRender), bind(TextRenderContribution).toService(DefaultBaseInteractiveRenderContribution), 
     bindContributionProvider(bind, TextRenderContribution));
-}));
+}
+
+export const textModule = bindTextRenderModule;
 //# sourceMappingURL=text-module.js.map

package/es/render/contributions/render/text-module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/text-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAA4B,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAgB,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACnD,IAAI,cAAc,EAAE;QAClB,OAAO;KACR;IACD,cAAc,GAAG,IAAI,CAAC;IAEtB,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAEjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC","file":"text-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { ContainerModule } from '../../../common/inversify';\nimport { DefaultCanvasCircleRender } from './circle-render';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { CircleRenderContribution, TextRenderContribution } from './contributions/constants';\nimport { CircleRender, GraphicRender, TextRender } from './symbol';\nimport { DefaultCanvasTextRender } from './text-render';\n\nlet loadTextModule = false;\nexport const textModule = new ContainerModule(bind => {\n  if (loadTextModule) {\n    return;\n  }\n  loadTextModule = true;\n  // text 渲染器\n  bind(TextRender).to(DefaultCanvasTextRender).inSingletonScope();\n  bind(GraphicRender).toService(TextRender);\n  bind(TextRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n  bindContributionProvider(bind, TextRenderContribution);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/render/text-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAA4B,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAgB,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,cAAc,EAAE;QAClB,OAAO;KACR;IACD,cAAc,GAAG,IAAI,CAAC;IAEtB,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAEjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"text-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { DefaultCanvasCircleRender } from './circle-render';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { CircleRenderContribution, TextRenderContribution } from './contributions/constants';\nimport { CircleRender, GraphicRender, TextRender } from './symbol';\nimport { DefaultCanvasTextRender } from './text-render';\n\nlet loadTextModule = false;\nexport function bindTextRenderModule({ bind }: { bind: any }) {\n  if (loadTextModule) {\n    return;\n  }\n  loadTextModule = true;\n  // text 渲染器\n  bind(TextRender).to(DefaultCanvasTextRender).inSingletonScope();\n  bind(GraphicRender).toService(TextRender);\n  bind(TextRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n  bindContributionProvider(bind, TextRenderContribution);\n}\n\nexport const textModule = bindTextRenderModule;\n"]}

package/es/render/contributions/render/text-render.js

@@ -1,17 +1,3 @@
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (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;
-}, __metadata = this && this.__metadata || function(k, v) {
-    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
-};
-
-import { inject, injectable, named } from "../../../common/inversify-lite";
-
 import { getTheme } from "../../../graphic/theme";
 
 import { TEXT_NUMBER_TYPE } from "../../../graphic/constants";
@@ -20,10 +6,6 @@ import { textDrawOffsetX } from "../../../common/text";
 
 import { BaseRender } from "./base-render";
 
-import { ContributionProvider } from "../../../common/contribution-provider";
-
-import { TextRenderContribution } from "./contributions/constants";
-
 import { matrixAllocate } from "../../../allocator/matrix-allocate";
 
 import { isNil, max } from "@visactor/vutils";
@@ -32,7 +14,7 @@ import { calculateLineHeight } from "../../../common/utils";
 
 import { defaultTextBackgroundRenderContribution } from "./contributions/text-contribution-render";
 
-let DefaultCanvasTextRender = class extends BaseRender {
+export class DefaultCanvasTextRender extends BaseRender {
     constructor(graphicRenderContributions) {
         super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = TEXT_NUMBER_TYPE, 
         this.builtinContributions = [ defaultTextBackgroundRenderContribution ], this.init(graphicRenderContributions);
@@ -134,9 +116,5 @@ let DefaultCanvasTextRender = class extends BaseRender {
             context.stroke();
         }
     }
-};
-
-DefaultCanvasTextRender = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(TextRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasTextRender);
-
-export { DefaultCanvasTextRender };
+}
 //# sourceMappingURL=text-render.js.map

package/es/render/contributions/render/text-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/text-render.ts"],"names":[],"mappings":"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","file":"text-render.js","sourcesContent":["import { inject, injectable, named } from '../../../common/inversify-lite';\nimport { getTheme } from '../../../graphic/theme';\nimport { TEXT_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  ITextRenderContribution,\n  IContributionProvider\n} from '../../../interface';\nimport { textDrawOffsetX, textDrawOffsetY, textLayoutOffsetY } from '../../../common/text';\nimport type { IText, ITextGraphicAttribute } from '../../../interface/graphic/text';\nimport { BaseRender } from './base-render';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { TextRenderContribution } from './contributions/constants';\nimport { matrixAllocate } from '../../../allocator/matrix-allocate';\nimport { isNil, max } from '@visactor/vutils';\nimport { calculateLineHeight } from '../../../common/utils';\nimport { defaultTextBackgroundRenderContribution } from './contributions/text-contribution-render';\n\n@injectable()\nexport class DefaultCanvasTextRender extends BaseRender<IText> implements IGraphicRender {\n  type: 'text';\n  numberType: number = TEXT_NUMBER_TYPE;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(TextRenderContribution)\n    protected readonly graphicRenderContributions: IContributionProvider<ITextRenderContribution>\n  ) {\n    super();\n    this.builtinContributions = [defaultTextBackgroundRenderContribution as any];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    text: IText,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const textAttribute = getTheme(text, params?.theme).text;\n    const {\n      text: str,\n      underline = textAttribute.underline,\n      lineThrough = textAttribute.lineThrough,\n      keepDirIn3d = textAttribute.keepDirIn3d,\n      direction = textAttribute.direction,\n      // lineHeight = textAttribute.lineHeight,\n      // whiteSpace = textAttribute.whiteSpace,\n      fontSize = textAttribute.fontSize,\n      verticalMode = textAttribute.verticalMode,\n      x: originX = textAttribute.x,\n      y: originY = textAttribute.y\n    } = text.attribute;\n\n    const lineHeight = calculateLineHeight(text.attribute.lineHeight, fontSize) ?? fontSize;\n\n    const data = this.valid(text, textAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    // 文字如果需要变换，那就需要将3dmatrix转成context的2dmatrix\n    const transform3dMatrixToContextMatrix = !keepDirIn3d;\n\n    const z = this.z || 0;\n\n    context.beginPath();\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(text, text.attribute, textAttribute);\n\n    this.beforeRenderStep(\n      text,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      textAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n\n    transform3dMatrixToContextMatrix && this.transformUseContext2d(text, textAttribute, z, context);\n\n    const drawText = (t: string, offsetX: number, offsetY: number, direction: number) => {\n      let _x = x + offsetX;\n      const _y = y + offsetY;\n      if (direction) {\n        context.highPerformanceSave();\n        _x += fontSize;\n        const matrix = matrixAllocate.allocate(1, 0, 0, 1, 0, 0);\n        // matrix.translate(fontSize, 0);\n        matrix.rotateByCenter(Math.PI / 2, _x, _y);\n        context.transformFromMatrix(matrix, true);\n        matrixAllocate.free(matrix);\n      }\n\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, text.attribute, textAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute);\n          context.strokeText(t, _x, _y, z);\n        }\n      }\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, text.attribute, textAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute);\n          context.fillText(t, _x, _y, z);\n          // 垂直布局的情况下不支持下划线和中划线\n          // this.drawUnderLine(underline, lineThrough, text, _x, _y, 0, 0, z, textAttribute, context);\n        }\n      }\n\n      if (direction) {\n        context.highPerformanceRestore();\n        context.setTransformForCurrent();\n      }\n    };\n    context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);\n    if (direction === 'horizontal') {\n      const { multilineLayout } = text;\n      if (!multilineLayout) {\n        context.highPerformanceRestore();\n        return;\n      } // 如果不存在的话，需要render层自行布局\n      const { xOffset, yOffset } = multilineLayout.bbox;\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, text.attribute, textAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute);\n          multilineLayout.lines.forEach(line => {\n            context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);\n          });\n        }\n      }\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, text.attribute, textAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute);\n          multilineLayout.lines.forEach(line => {\n            context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);\n            this.drawUnderLine(\n              underline,\n              lineThrough,\n              text,\n              (line.leftOffset || 0) + xOffset + x,\n              (line.topOffset || 0) + yOffset + y,\n              line.descent,\n              (line.descent - line.ascent) / 2,\n              z,\n              textAttribute,\n              context,\n              {\n                width: line.width\n              }\n            );\n          });\n        }\n      }\n    } else {\n      let { textAlign = textAttribute.textAlign, textBaseline = textAttribute.textBaseline } = text.attribute;\n      if (!verticalMode) {\n        const t = textAlign;\n        textAlign = text.getBaselineMapAlign()[textBaseline] ?? ('left' as any);\n        textBaseline = text.getAlignMapBaseline()[t] ?? ('top' as any);\n      }\n      text.tryUpdateAABBBounds(); // 更新cache\n      const cache = text.cache;\n      const { verticalList } = cache;\n      context.textAlign = 'left';\n      context.textBaseline = 'top';\n      const totalHeight = lineHeight * verticalList.length;\n      let totalW = 0;\n      verticalList.forEach(verticalData => {\n        const _w = verticalData.reduce((a, b) => a + (b.width || 0), 0);\n        totalW = max(_w, totalW);\n      });\n      let offsetY = 0;\n      let offsetX = 0;\n      if (textBaseline === 'bottom') {\n        offsetX = -totalHeight;\n      } else if (textBaseline === 'middle') {\n        offsetX = -totalHeight / 2;\n      }\n      if (textAlign === 'center') {\n        offsetY -= totalW / 2;\n      } else if (textAlign === 'right') {\n        offsetY -= totalW;\n      }\n      verticalList.forEach((verticalData, i) => {\n        const currentW = verticalData.reduce((a, b) => a + (b.width || 0), 0);\n        const dw = totalW - currentW;\n        let currentOffsetY = offsetY;\n        if (textAlign === 'center') {\n          currentOffsetY += dw / 2;\n        } else if (textAlign === 'right') {\n          currentOffsetY += dw;\n        }\n        verticalData.forEach(item => {\n          const { text, width, direction } = item;\n          drawText(text, totalHeight - (i + 1) * lineHeight + offsetX, currentOffsetY, direction);\n          currentOffsetY += width;\n        });\n      });\n    }\n    transform3dMatrixToContextMatrix && this.restoreTransformUseContext2d(text, textAttribute, z, context);\n\n    this.afterRenderStep(\n      text,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      textAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  draw(text: IText, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const textAttribute = getTheme(text, params?.theme).text;\n    const { keepDirIn3d = textAttribute.keepDirIn3d } = text.attribute;\n    // 文字如果需要变换，那就一定要计算3d矩阵\n    const computed3dMatrix = !keepDirIn3d;\n    this._draw(text, textAttribute, computed3dMatrix, drawContext, params);\n  }\n\n  drawUnderLine(\n    underline: number,\n    lineThrough: number,\n    text: IText,\n    anchorX: number,\n    anchorY: number,\n    offsetUnderLineY: number,\n    offsetThroughLineY: number,\n    z: number,\n    textAttribute: Required<ITextGraphicAttribute>,\n    context: IContext2d,\n    multiOption?: {\n      width: number;\n    }\n  ) {\n    if (lineThrough + underline <= 0) {\n      return;\n    }\n\n    const {\n      textAlign = textAttribute.textAlign,\n      // textBaseline = textAttribute.textBaseline,\n      // fontSize = textAttribute.fontSize,\n      fill = textAttribute.fill,\n      opacity = textAttribute.opacity,\n      underlineOffset = textAttribute.underlineOffset,\n      underlineDash = textAttribute.underlineDash,\n      fillOpacity = textAttribute.fillOpacity\n    } = text.attribute;\n    const isMulti = !isNil(multiOption);\n    const w = isMulti ? multiOption!.width : text.clipedWidth;\n    const offsetX = isMulti ? 0 : textDrawOffsetX(textAlign, w);\n    // const offsetY = textLayoutOffsetY(isMulti ? 'alphabetic' : textBaseline, fontSize, fontSize);\n    const attribute = { lineWidth: 0, stroke: fill, opacity, strokeOpacity: fillOpacity };\n    // let deltaY = isMulti ? -3 : 0;\n    if (underline) {\n      attribute.lineWidth = underline;\n      context.setStrokeStyle(text, attribute, anchorX, anchorY, textAttribute);\n      underlineDash && context.setLineDash(underlineDash);\n      context.beginPath();\n      // const dy = y + offsetY + fontSize + underlineOffset + deltaY;\n      const dy = anchorY + offsetUnderLineY + underlineOffset;\n      context.moveTo(anchorX + offsetX, dy, z);\n      context.lineTo(anchorX + offsetX + w, dy, z);\n      context.stroke();\n    }\n    // if (isMulti) {\n    //   deltaY = -1;\n    // }\n    if (lineThrough) {\n      attribute.lineWidth = lineThrough;\n      context.setStrokeStyle(text, attribute, anchorX, anchorY, textAttribute);\n      context.beginPath();\n      // const dy = y + offsetY + fontSize / 2 + deltaY;\n      const dy = anchorY + offsetThroughLineY;\n      context.moveTo(anchorX + offsetX, dy, z);\n      context.lineTo(anchorX + offsetX + w, dy, z);\n      context.stroke();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/render/text-render.ts"],"names":[],"mappings":"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","file":"text-render.js","sourcesContent":["import { getTheme } from '../../../graphic/theme';\nimport { TEXT_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IRenderService,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  ITextRenderContribution,\n  IContributionProvider\n} from '../../../interface';\nimport { textDrawOffsetX, textDrawOffsetY, textLayoutOffsetY } from '../../../common/text';\nimport type { IText, ITextGraphicAttribute } from '../../../interface/graphic/text';\nimport { BaseRender } from './base-render';\nimport { TextRenderContribution } from './contributions/constants';\nimport { matrixAllocate } from '../../../allocator/matrix-allocate';\nimport { isNil, max } from '@visactor/vutils';\nimport { calculateLineHeight } from '../../../common/utils';\nimport { defaultTextBackgroundRenderContribution } from './contributions/text-contribution-render';\n\nexport class DefaultCanvasTextRender extends BaseRender<IText> implements IGraphicRender {\n  type: 'text';\n  numberType: number = TEXT_NUMBER_TYPE;\n\n  constructor(protected readonly graphicRenderContributions: IContributionProvider<ITextRenderContribution>) {\n    super();\n    this.builtinContributions = [defaultTextBackgroundRenderContribution as any];\n    this.init(graphicRenderContributions);\n  }\n\n  drawShape(\n    text: IText,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const textAttribute = getTheme(text, params?.theme).text;\n    const {\n      text: str,\n      underline = textAttribute.underline,\n      lineThrough = textAttribute.lineThrough,\n      keepDirIn3d = textAttribute.keepDirIn3d,\n      direction = textAttribute.direction,\n      // lineHeight = textAttribute.lineHeight,\n      // whiteSpace = textAttribute.whiteSpace,\n      fontSize = textAttribute.fontSize,\n      verticalMode = textAttribute.verticalMode,\n      x: originX = textAttribute.x,\n      y: originY = textAttribute.y\n    } = text.attribute;\n\n    const lineHeight = calculateLineHeight(text.attribute.lineHeight, fontSize) ?? fontSize;\n\n    const data = this.valid(text, textAttribute, fillCb, strokeCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    // 文字如果需要变换，那就需要将3dmatrix转成context的2dmatrix\n    const transform3dMatrixToContextMatrix = !keepDirIn3d;\n\n    const z = this.z || 0;\n\n    context.beginPath();\n\n    // shadow\n    context.setShadowBlendStyle && context.setShadowBlendStyle(text, text.attribute, textAttribute);\n\n    this.beforeRenderStep(\n      text,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      textAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n\n    transform3dMatrixToContextMatrix && this.transformUseContext2d(text, textAttribute, z, context);\n\n    const drawText = (t: string, offsetX: number, offsetY: number, direction: number) => {\n      let _x = x + offsetX;\n      const _y = y + offsetY;\n      if (direction) {\n        context.highPerformanceSave();\n        _x += fontSize;\n        const matrix = matrixAllocate.allocate(1, 0, 0, 1, 0, 0);\n        // matrix.translate(fontSize, 0);\n        matrix.rotateByCenter(Math.PI / 2, _x, _y);\n        context.transformFromMatrix(matrix, true);\n        matrixAllocate.free(matrix);\n      }\n\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, text.attribute, textAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute);\n          context.strokeText(t, _x, _y, z);\n        }\n      }\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, text.attribute, textAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute);\n          context.fillText(t, _x, _y, z);\n          // 垂直布局的情况下不支持下划线和中划线\n          // this.drawUnderLine(underline, lineThrough, text, _x, _y, 0, 0, z, textAttribute, context);\n        }\n      }\n\n      if (direction) {\n        context.highPerformanceRestore();\n        context.setTransformForCurrent();\n      }\n    };\n    context.setTextStyleWithoutAlignBaseline(text.attribute, textAttribute, z);\n    if (direction === 'horizontal') {\n      const { multilineLayout } = text;\n      if (!multilineLayout) {\n        context.highPerformanceRestore();\n        return;\n      } // 如果不存在的话，需要render层自行布局\n      const { xOffset, yOffset } = multilineLayout.bbox;\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, text.attribute, textAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(text, text.attribute, originX - x, originY - y, textAttribute);\n          multilineLayout.lines.forEach(line => {\n            context.strokeText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);\n          });\n        }\n      }\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, text.attribute, textAttribute);\n        } else if (fVisible) {\n          context.setCommonStyle(text, text.attribute, originX - x, originY - y, textAttribute);\n          multilineLayout.lines.forEach(line => {\n            context.fillText(line.str, (line.leftOffset || 0) + xOffset + x, (line.topOffset || 0) + yOffset + y, z);\n            this.drawUnderLine(\n              underline,\n              lineThrough,\n              text,\n              (line.leftOffset || 0) + xOffset + x,\n              (line.topOffset || 0) + yOffset + y,\n              line.descent,\n              (line.descent - line.ascent) / 2,\n              z,\n              textAttribute,\n              context,\n              {\n                width: line.width\n              }\n            );\n          });\n        }\n      }\n    } else {\n      let { textAlign = textAttribute.textAlign, textBaseline = textAttribute.textBaseline } = text.attribute;\n      if (!verticalMode) {\n        const t = textAlign;\n        textAlign = text.getBaselineMapAlign()[textBaseline] ?? ('left' as any);\n        textBaseline = text.getAlignMapBaseline()[t] ?? ('top' as any);\n      }\n      text.tryUpdateAABBBounds(); // 更新cache\n      const cache = text.cache;\n      const { verticalList } = cache;\n      context.textAlign = 'left';\n      context.textBaseline = 'top';\n      const totalHeight = lineHeight * verticalList.length;\n      let totalW = 0;\n      verticalList.forEach(verticalData => {\n        const _w = verticalData.reduce((a, b) => a + (b.width || 0), 0);\n        totalW = max(_w, totalW);\n      });\n      let offsetY = 0;\n      let offsetX = 0;\n      if (textBaseline === 'bottom') {\n        offsetX = -totalHeight;\n      } else if (textBaseline === 'middle') {\n        offsetX = -totalHeight / 2;\n      }\n      if (textAlign === 'center') {\n        offsetY -= totalW / 2;\n      } else if (textAlign === 'right') {\n        offsetY -= totalW;\n      }\n      verticalList.forEach((verticalData, i) => {\n        const currentW = verticalData.reduce((a, b) => a + (b.width || 0), 0);\n        const dw = totalW - currentW;\n        let currentOffsetY = offsetY;\n        if (textAlign === 'center') {\n          currentOffsetY += dw / 2;\n        } else if (textAlign === 'right') {\n          currentOffsetY += dw;\n        }\n        verticalData.forEach(item => {\n          const { text, width, direction } = item;\n          drawText(text, totalHeight - (i + 1) * lineHeight + offsetX, currentOffsetY, direction);\n          currentOffsetY += width;\n        });\n      });\n    }\n    transform3dMatrixToContextMatrix && this.restoreTransformUseContext2d(text, textAttribute, z, context);\n\n    this.afterRenderStep(\n      text,\n      context,\n      x,\n      y,\n      doFill,\n      doStroke,\n      fVisible,\n      sVisible,\n      textAttribute,\n      drawContext,\n      fillCb,\n      strokeCb\n    );\n  }\n\n  draw(text: IText, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const textAttribute = getTheme(text, params?.theme).text;\n    const { keepDirIn3d = textAttribute.keepDirIn3d } = text.attribute;\n    // 文字如果需要变换，那就一定要计算3d矩阵\n    const computed3dMatrix = !keepDirIn3d;\n    this._draw(text, textAttribute, computed3dMatrix, drawContext, params);\n  }\n\n  drawUnderLine(\n    underline: number,\n    lineThrough: number,\n    text: IText,\n    anchorX: number,\n    anchorY: number,\n    offsetUnderLineY: number,\n    offsetThroughLineY: number,\n    z: number,\n    textAttribute: Required<ITextGraphicAttribute>,\n    context: IContext2d,\n    multiOption?: {\n      width: number;\n    }\n  ) {\n    if (lineThrough + underline <= 0) {\n      return;\n    }\n\n    const {\n      textAlign = textAttribute.textAlign,\n      // textBaseline = textAttribute.textBaseline,\n      // fontSize = textAttribute.fontSize,\n      fill = textAttribute.fill,\n      opacity = textAttribute.opacity,\n      underlineOffset = textAttribute.underlineOffset,\n      underlineDash = textAttribute.underlineDash,\n      fillOpacity = textAttribute.fillOpacity\n    } = text.attribute;\n    const isMulti = !isNil(multiOption);\n    const w = isMulti ? multiOption!.width : text.clipedWidth;\n    const offsetX = isMulti ? 0 : textDrawOffsetX(textAlign, w);\n    // const offsetY = textLayoutOffsetY(isMulti ? 'alphabetic' : textBaseline, fontSize, fontSize);\n    const attribute = { lineWidth: 0, stroke: fill, opacity, strokeOpacity: fillOpacity };\n    // let deltaY = isMulti ? -3 : 0;\n    if (underline) {\n      attribute.lineWidth = underline;\n      context.setStrokeStyle(text, attribute, anchorX, anchorY, textAttribute);\n      underlineDash && context.setLineDash(underlineDash);\n      context.beginPath();\n      // const dy = y + offsetY + fontSize + underlineOffset + deltaY;\n      const dy = anchorY + offsetUnderLineY + underlineOffset;\n      context.moveTo(anchorX + offsetX, dy, z);\n      context.lineTo(anchorX + offsetX + w, dy, z);\n      context.stroke();\n    }\n    // if (isMulti) {\n    //   deltaY = -1;\n    // }\n    if (lineThrough) {\n      attribute.lineWidth = lineThrough;\n      context.setStrokeStyle(text, attribute, anchorX, anchorY, textAttribute);\n      context.beginPath();\n      // const dy = y + offsetY + fontSize / 2 + deltaY;\n      const dy = anchorY + offsetThroughLineY;\n      context.moveTo(anchorX + offsetX, dy, z);\n      context.lineTo(anchorX + offsetX + w, dy, z);\n      context.stroke();\n    }\n  }\n}\n"]}

package/es/render/render-modules.d.ts

@@ -1,3 +1,4 @@
-import { ContainerModule } from '../common/inversify-lite';
-declare const _default: ContainerModule;
-export default _default;
+export declare function bindRenderServiceModule({ bind }: {
+    bind: any;
+}): void;
+export default bindRenderServiceModule;

package/es/render/render-modules.js

@@ -1,10 +1,10 @@
-import { ContainerModule } from "../common/inversify-lite";
-
 import { DefaultRenderService } from "./render-service";
 
 import { RenderService } from "./constants";
 
-export default new ContainerModule((bind => {
+export function bindRenderServiceModule({bind: bind}) {
     bind(RenderService).to(DefaultRenderService);
-}));
+}
+
+export default bindRenderServiceModule;
 //# sourceMappingURL=render-modules.js.map

package/es/render/render-modules.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/render-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACxC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC","file":"render-modules.js","sourcesContent":["import { ContainerModule } from '../common/inversify-lite';\nimport { DefaultRenderService } from './render-service';\nimport { RenderService } from './constants';\n\nexport default new ContainerModule(bind => {\n  bind(RenderService).to(DefaultRenderService);\n});\n"]}
+{"version":3,"sources":["../src/render/render-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,UAAU,uBAAuB,CAAC,EAAE,IAAI,EAAiB;IAC7D,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;AAC/C,CAAC;AAED,eAAe,uBAAuB,CAAC","file":"render-modules.js","sourcesContent":["import { DefaultRenderService } from './render-service';\nimport { RenderService } from './constants';\n\nexport function bindRenderServiceModule({ bind }: { bind: any }) {\n  bind(RenderService).to(DefaultRenderService);\n}\n\nexport default bindRenderServiceModule;\n"]}

package/es/render/render-service.d.ts

@@ -6,7 +6,7 @@ export declare class DefaultRenderService implements IRenderService {
     renderTreeRoots: IGraphic[];
     renderLists: IGraphic[];
     drawParams: IRenderServiceDrawParams;
-    constructor(drawContribution: IDrawContribution);
+    constructor(drawContribution?: IDrawContribution);
     prepare(updateBounds: boolean): void;
     protected _prepare(g: IGraphic, updateBounds: boolean): void;
     prepareRenderList(): void;

package/es/render/render-service.js

@@ -1,21 +1,7 @@
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (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;
-}, __metadata = this && this.__metadata || function(k, v) {
-    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
-};
+import { DefaultDrawContribution } from "./contributions/render/draw-contribution";
 
-import { injectable, inject } from "../common/inversify-lite";
-
-import { DrawContribution } from "./contributions/render";
-
-let DefaultRenderService = class {
-    constructor(drawContribution) {
+export class DefaultRenderService {
+    constructor(drawContribution = new DefaultDrawContribution) {
         this.drawContribution = drawContribution;
     }
     prepare(updateBounds) {
@@ -48,9 +34,5 @@ let DefaultRenderService = class {
         this.prepare(updateBounds), this.prepareRenderList(), this.beforeDraw(params), this.draw(params), 
         this.afterDraw(params), this.drawParams = null;
     }
-};
-
-DefaultRenderService = __decorate([ injectable(), __param(0, inject(DrawContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultRenderService);
-
-export { DefaultRenderService };
+}
 //# sourceMappingURL=render-service.js.map

package/es/render/render-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/render-service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAG9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAOnD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAO/B,YAEkB,gBAAmC;QAAnC,qBAAgB,GAAhB,gBAAgB,CAAmB;IAClD,CAAC;IAGJ,OAAO,CAAC,YAAqB;QAG3B,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;SACR;QACD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACS,QAAQ,CAAC,CAAW,EAAE,YAAqB;QACnD,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE;YACpB,IAAI,CAAC,QAAQ,CAAC,CAAa,EAAE,YAAY,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,iBAAiB;QACf,OAAO;IACT,CAAC;IAED,UAAU,CAAC,MAAgC;QACzC,OAAO;IACT,CAAC;IAED,IAAI,CAAC,MAAgC;QACnC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,oBAAO,IAAI,CAAC,UAAU,EAAG,CAAC;IAC3D,CAAC;IAED,SAAS,CAAC,MAAgC;QACxC,IAAI,CAAC,gBAAgB,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,oBAAO,IAAI,CAAC,UAAU,EAAG,CAAC;QACjG,OAAO;IACT,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,MAAgB,EAAE,MAAgC;QACvD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC3B,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAEzB,CAAC;CACF,CAAA;AAhEY,oBAAoB;IADhC,UAAU,EAAE;IASR,WAAA,MAAM,CAAC,gBAAgB,CAAC,CAAA;;GARhB,oBAAoB,CAgEhC;SAhEY,oBAAoB","file":"render-service.js","sourcesContent":["import { injectable, inject } from '../common/inversify-lite';\nimport type { IAABBBounds, IBounds } from '@visactor/vutils';\nimport type { IGroup, IGraphic, IRenderService, IRenderServiceDrawParams, IDrawContribution } from '../interface';\nimport { DrawContribution } from './contributions/render';\n\n/**\n * 渲染用的service，通常和stage一一绑定，\n * 并不是单例模式，所以会绑定此次渲染的一些数据\n */\n@injectable()\nexport class DefaultRenderService implements IRenderService {\n  // 每次render都会变的数据\n  dirtyBounds: IBounds;\n  renderTreeRoots: IGraphic[]; // 此次render的数组\n  renderLists: IGraphic[];\n  drawParams: IRenderServiceDrawParams;\n\n  constructor(\n    @inject(DrawContribution)\n    public readonly drawContribution: IDrawContribution\n  ) {}\n\n  // 渲染前准备工作，计算bounds等逻辑\n  prepare(updateBounds: boolean): void {\n    // 如果不需要计算Bounds，那么transMatrix也不需要计算\n    // TODO 后期可能存在依赖transMatrix的插件，但目前不存在\n    if (!updateBounds) {\n      return;\n    }\n    this.renderTreeRoots.forEach(g => {\n      this._prepare(g, updateBounds);\n    });\n    return;\n  }\n  protected _prepare(g: IGraphic, updateBounds: boolean) {\n    g.forEachChildren(g => {\n      this._prepare(g as IGraphic, updateBounds);\n    });\n    g.update({ bounds: updateBounds, trans: true });\n  }\n  // 获取要渲染的list，可能存在一些不用渲染的内容，以及外描边\n  prepareRenderList(): void {\n    return;\n  }\n  // 渲染前流程\n  beforeDraw(params: IRenderServiceDrawParams): void {\n    return;\n  }\n  // 具体渲染\n  draw(params: IRenderServiceDrawParams): void {\n    this.drawContribution.draw(this, { ...this.drawParams });\n  }\n  // 渲染后流程\n  afterDraw(params: IRenderServiceDrawParams): void {\n    this.drawContribution.afterDraw && this.drawContribution.afterDraw(this, { ...this.drawParams });\n    return;\n  }\n\n  reInit() {\n    this.drawContribution.reInit();\n  }\n  // 对外暴露的绘制方法\n  render(groups: IGroup[], params: IRenderServiceDrawParams): void {\n    this.renderTreeRoots = groups;\n    this.drawParams = params;\n    const updateBounds = params.updateBounds;\n    this.prepare(updateBounds);\n    this.prepareRenderList();\n    this.beforeDraw(params);\n    this.draw(params);\n    this.afterDraw(params);\n    this.drawParams = null;\n    // this.renderTreeRoots = [];\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/render-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AAMnF,MAAM,OAAO,oBAAoB;IAO/B,YAA4B,mBAAsC,IAAI,uBAAuB,EAAE;QAAnE,qBAAgB,GAAhB,gBAAgB,CAAmD;IAAG,CAAC;IAGnG,OAAO,CAAC,YAAqB;QAG3B,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;SACR;QACD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACS,QAAQ,CAAC,CAAW,EAAE,YAAqB;QACnD,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE;YACpB,IAAI,CAAC,QAAQ,CAAC,CAAa,EAAE,YAAY,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,iBAAiB;QACf,OAAO;IACT,CAAC;IAED,UAAU,CAAC,MAAgC;QACzC,OAAO;IACT,CAAC;IAED,IAAI,CAAC,MAAgC;QACnC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,oBAAO,IAAI,CAAC,UAAU,EAAG,CAAC;IAC3D,CAAC;IAED,SAAS,CAAC,MAAgC;QACxC,IAAI,CAAC,gBAAgB,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,oBAAO,IAAI,CAAC,UAAU,EAAG,CAAC;QACjG,OAAO;IACT,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,MAAgB,EAAE,MAAgC;QACvD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC3B,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAEzB,CAAC;CACF","file":"render-service.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport type { IGroup, IGraphic, IRenderService, IRenderServiceDrawParams, IDrawContribution } from '../interface';\nimport { DefaultDrawContribution } from './contributions/render/draw-contribution';\n\n/**\n * 渲染用的service，通常和stage一一绑定，\n * 并不是单例模式，所以会绑定此次渲染的一些数据\n */\nexport class DefaultRenderService implements IRenderService {\n  // 每次render都会变的数据\n  dirtyBounds: IBounds;\n  renderTreeRoots: IGraphic[]; // 此次render的数组\n  renderLists: IGraphic[];\n  drawParams: IRenderServiceDrawParams;\n\n  constructor(public readonly drawContribution: IDrawContribution = new DefaultDrawContribution()) {}\n\n  // 渲染前准备工作，计算bounds等逻辑\n  prepare(updateBounds: boolean): void {\n    // 如果不需要计算Bounds，那么transMatrix也不需要计算\n    // TODO 后期可能存在依赖transMatrix的插件，但目前不存在\n    if (!updateBounds) {\n      return;\n    }\n    this.renderTreeRoots.forEach(g => {\n      this._prepare(g, updateBounds);\n    });\n    return;\n  }\n  protected _prepare(g: IGraphic, updateBounds: boolean) {\n    g.forEachChildren(g => {\n      this._prepare(g as IGraphic, updateBounds);\n    });\n    g.update({ bounds: updateBounds, trans: true });\n  }\n  // 获取要渲染的list，可能存在一些不用渲染的内容，以及外描边\n  prepareRenderList(): void {\n    return;\n  }\n  // 渲染前流程\n  beforeDraw(params: IRenderServiceDrawParams): void {\n    return;\n  }\n  // 具体渲染\n  draw(params: IRenderServiceDrawParams): void {\n    this.drawContribution.draw(this, { ...this.drawParams });\n  }\n  // 渲染后流程\n  afterDraw(params: IRenderServiceDrawParams): void {\n    this.drawContribution.afterDraw && this.drawContribution.afterDraw(this, { ...this.drawParams });\n    return;\n  }\n\n  reInit() {\n    this.drawContribution.reInit();\n  }\n  // 对外暴露的绘制方法\n  render(groups: IGroup[], params: IRenderServiceDrawParams): void {\n    this.renderTreeRoots = groups;\n    this.drawParams = params;\n    const updateBounds = params.updateBounds;\n    this.prepare(updateBounds);\n    this.prepareRenderList();\n    this.beforeDraw(params);\n    this.draw(params);\n    this.afterDraw(params);\n    this.drawParams = null;\n    // this.renderTreeRoots = [];\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-core",
-  "version": "1.0.47-alpha.0",
+  "version": "1.1.0-alpha.1",
   "description": "",
   "sideEffects": [
     "./src/modules.ts",
@@ -28,7 +28,7 @@
     "@vitejs/plugin-react": "3.1.0",
     "@types/jest": "^26.0.0",
     "jest": "^26.0.0",
-    "jest-electron": "^0.1.12",
+    "jest-electron": "npm:@pixi/jest-electron@26.1.0",
     "jest-extended": "^1.2.1",
     "ts-jest": "^26.0.0",
     "eslint": "~8.18.0",
@@ -36,8 +36,8 @@
     "typescript": "4.9.5",
     "cross-env": "^7.0.3",
     "@internal/bundler": "0.0.1",
-    "@internal/eslint-config": "0.0.1",
-    "@internal/ts-config": "0.0.1"
+    "@internal/ts-config": "0.0.1",
+    "@internal/eslint-config": "0.0.1"
   },
   "keywords": [
     "VisActor",
@@ -73,10 +73,11 @@
     "build-umd": "cross-env DEBUG='Bundler*' bundle --clean -f umd",
     "dev": "cross-env DEBUG='Bundler*' bundle --clean -f es -w",
     "start": "vite ./__tests__/browser",
-    "test": "jest 2>&1",
+    "test": "jest -c jest.config.js",
+    "test:electron": "jest -c jest.electron.config.js --runInBand --passWithNoTests --testPathPattern='__tests__/(browser|electron)/'",
     "test-live": "npm run test-watch __tests__/unit/theme/line.test.ts",
-    "test-watch": "cross-env DEBUG_MODE=1 jest --watch",
-    "test-cov": "jest -w 16 --coverage",
+    "test-watch": "cross-env DEBUG_MODE=1 jest --watch -c jest.config.js",
+    "test-cov": "jest -c jest.config.js -w 16 --coverage",
     "build:spec-types": "rm -rf ./spec-types && tsc -p ./tsconfig.spec.json --declaration --emitDeclarationOnly --outDir ./spec-types"
   }
 }

package/cjs/common/inversify/annotation/inject.d.ts

@@ -1 +0,0 @@
-export declare const inject: <T = unknown>(serviceIdentifier: any) => (target: import("./inject_base").DecoratorTarget<T>, targetKey?: string | symbol, indexOrPropertyDescriptor?: number) => void;

package/cjs/common/inversify/annotation/inject.js

@@ -1,10 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.inject = void 0;
-
-const metadata_keys_1 = require("../metadata_keys"), inject_base_1 = require("./inject_base");
-
-exports.inject = (0, inject_base_1.injectBase)(metadata_keys_1.INJECT_TAG);
-//# sourceMappingURL=inject.js.map

package/cjs/common/inversify/annotation/inject.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/common/inversify/annotation/inject.ts"],"names":[],"mappings":";;;AAAA,oDAA8C;AAC9C,+CAA2C;AAE9B,QAAA,MAAM,GAAG,IAAA,wBAAU,EAAC,0BAAU,CAAC,CAAC","file":"inject.js","sourcesContent":["import { INJECT_TAG } from '../metadata_keys';\nimport { injectBase } from './inject_base';\n\nexport const inject = injectBase(INJECT_TAG);\n"]}

package/cjs/common/inversify/annotation/inject_base.d.ts

@@ -1,14 +0,0 @@
-import { Metadata } from '../meta-data';
-export declare function createTaggedDecorator(metadata: Metadata): <T>(target: DecoratorTarget, targetKey?: string | symbol, indexOrPropertyDescriptor?: number) => void;
-type Prototype<T> = {
-    [Property in keyof T]: T[Property] extends NewableFunction ? T[Property] : T[Property] | undefined;
-} & {
-    constructor: NewableFunction;
-};
-interface ConstructorFunction<T = Record<string, unknown>> {
-    new (...args: unknown[]): T;
-    prototype: Prototype<T>;
-}
-export type DecoratorTarget<T = unknown> = ConstructorFunction<T> | Prototype<T>;
-export declare function injectBase(metadataKey: string): <T = unknown>(serviceIdentifier: any) => (target: DecoratorTarget<T>, targetKey?: string | symbol, indexOrPropertyDescriptor?: number) => void;
-export {};

package/cjs/common/inversify/annotation/inject_base.js

@@ -1,39 +0,0 @@
-"use strict";
-
-var __importDefault = this && this.__importDefault || function(mod) {
-    return mod && mod.__esModule ? mod : {
-        default: mod
-    };
-};
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.injectBase = exports.createTaggedDecorator = void 0;
-
-const meta_data_1 = require("../meta-data"), metadata_keys_1 = require("../metadata_keys"), Reflect_metadata_1 = __importDefault(require("../../Reflect-metadata"));
-
-function _tagParameterOrProperty(metadataKey, annotationTarget, key, metadata) {
-    const metadatas = [ metadata ];
-    let paramsOrPropertiesMetadata = {};
-    Reflect_metadata_1.default.hasOwnMetadata(metadataKey, annotationTarget) && (paramsOrPropertiesMetadata = Reflect_metadata_1.default.getMetadata(metadataKey, annotationTarget));
-    let paramOrPropertyMetadata = paramsOrPropertiesMetadata[key];
-    void 0 === paramOrPropertyMetadata && (paramOrPropertyMetadata = []), paramOrPropertyMetadata.push(...metadatas), 
-    paramsOrPropertiesMetadata[key] = paramOrPropertyMetadata, Reflect_metadata_1.default.defineMetadata(metadataKey, paramsOrPropertiesMetadata, annotationTarget);
-}
-
-function tagParameter(annotationTarget, parameterName, parameterIndex, metadata) {
-    _tagParameterOrProperty(metadata_keys_1.TAGGED, annotationTarget, parameterIndex.toString(), metadata);
-}
-
-function createTaggedDecorator(metadata) {
-    return (target, targetKey, indexOrPropertyDescriptor) => {
-        tagParameter(target, targetKey, indexOrPropertyDescriptor, metadata);
-    };
-}
-
-function injectBase(metadataKey) {
-    return serviceIdentifier => (target, targetKey, indexOrPropertyDescriptor) => createTaggedDecorator(new meta_data_1.Metadata(metadataKey, serviceIdentifier))(target, targetKey, indexOrPropertyDescriptor);
-}
-
-exports.createTaggedDecorator = createTaggedDecorator, exports.injectBase = injectBase;
-//# sourceMappingURL=inject_base.js.map

package/cjs/common/inversify/annotation/inject_base.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/common/inversify/annotation/inject_base.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAwC;AACxC,oDAA0C;AAC1C,8EAA6C;AAE7C,SAAS,uBAAuB,CAC9B,WAAmB,EACnB,gBAAiC,EACjC,GAAoB,EACpB,QAAkB;IAElB,MAAM,SAAS,GAAe,CAAC,QAAQ,CAAC,CAAC;IAEzC,IAAI,0BAA0B,GAAoD,EAAE,CAAC;IAErF,IAAK,0BAAe,CAAC,cAAc,CAAC,WAAW,EAAE,gBAAgB,CAAC,EAAE;QAClE,0BAA0B,GAAI,0BAAe,CAAC,WAAW,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;KAC1F;IAED,IAAI,uBAAuB,GAA2B,0BAA0B,CAAC,GAAa,CAAC,CAAC;IAEhG,IAAI,uBAAuB,KAAK,SAAS,EAAE;QACzC,uBAAuB,GAAG,EAAE,CAAC;KAC9B;IAGD,uBAAuB,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;IAC3C,0BAA0B,CAAC,GAAG,CAAC,GAAG,uBAAuB,CAAC;IACzD,0BAAe,CAAC,cAAc,CAAC,WAAW,EAAE,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,YAAY,CACnB,gBAAiC,EACjC,aAA0C,EAC1C,cAAsB,EACtB,QAAkB;IAElB,uBAAuB,CAAC,sBAAM,EAAE,gBAAuC,EAAE,cAAc,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;AAChH,CAAC;AAED,SAAgB,qBAAqB,CAAC,QAAkB;IACtD,OAAO,CAAI,MAAuB,EAAE,SAA2B,EAAE,yBAAkC,EAAE,EAAE;QACrG,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,yBAAyB,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC,CAAC;AACJ,CAAC;AAJD,sDAIC;AAaD,SAAgB,UAAU,CAAC,WAAmB;IAC5C,OAAO,CAAc,iBAAsB,EAAE,EAAE;QAC7C,OAAO,CAAC,MAA0B,EAAE,SAA2B,EAAE,yBAAkC,EAAE,EAAE;YACrG,OAAO,qBAAqB,CAAC,IAAI,oBAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CACxE,MAAM,EACN,SAAS,EACT,yBAAyB,CAC1B,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAVD,gCAUC","file":"inject_base.js","sourcesContent":["import { Metadata } from '../meta-data';\nimport { TAGGED } from '../metadata_keys';\nimport Reflect from '../../Reflect-metadata';\n\nfunction _tagParameterOrProperty(\n  metadataKey: string,\n  annotationTarget: NewableFunction,\n  key: string | symbol,\n  metadata: Metadata\n) {\n  const metadatas: Metadata[] = [metadata];\n\n  let paramsOrPropertiesMetadata: Record<string | symbol, Metadata[] | undefined> = {};\n  // read metadata if available\n  if ((Reflect as any).hasOwnMetadata(metadataKey, annotationTarget)) {\n    paramsOrPropertiesMetadata = (Reflect as any).getMetadata(metadataKey, annotationTarget);\n  }\n\n  let paramOrPropertyMetadata: Metadata[] | undefined = paramsOrPropertiesMetadata[key as string];\n\n  if (paramOrPropertyMetadata === undefined) {\n    paramOrPropertyMetadata = [];\n  }\n\n  // set metadata\n  paramOrPropertyMetadata.push(...metadatas);\n  paramsOrPropertiesMetadata[key] = paramOrPropertyMetadata;\n  (Reflect as any).defineMetadata(metadataKey, paramsOrPropertiesMetadata, annotationTarget);\n}\n\nfunction tagParameter(\n  annotationTarget: DecoratorTarget,\n  parameterName: string | symbol | undefined,\n  parameterIndex: number,\n  metadata: Metadata\n) {\n  _tagParameterOrProperty(TAGGED, annotationTarget as ConstructorFunction, parameterIndex.toString(), metadata);\n}\n\nexport function createTaggedDecorator(metadata: Metadata) {\n  return <T>(target: DecoratorTarget, targetKey?: string | symbol, indexOrPropertyDescriptor?: number) => {\n    tagParameter(target, targetKey, indexOrPropertyDescriptor, metadata);\n  };\n}\n\ntype Prototype<T> = {\n  [Property in keyof T]: T[Property] extends NewableFunction ? T[Property] : T[Property] | undefined;\n} & { constructor: NewableFunction };\n\ninterface ConstructorFunction<T = Record<string, unknown>> {\n  new (...args: unknown[]): T;\n  prototype: Prototype<T>;\n}\n\nexport type DecoratorTarget<T = unknown> = ConstructorFunction<T> | Prototype<T>;\n\nexport function injectBase(metadataKey: string) {\n  return <T = unknown>(serviceIdentifier: any) => {\n    return (target: DecoratorTarget<T>, targetKey?: string | symbol, indexOrPropertyDescriptor?: number) => {\n      return createTaggedDecorator(new Metadata(metadataKey, serviceIdentifier))(\n        target,\n        targetKey,\n        indexOrPropertyDescriptor\n      );\n    };\n  };\n}\n"]}

package/cjs/common/inversify/annotation/injectable.d.ts

@@ -1 +0,0 @@
-export declare function injectable(): <T extends abstract new (...args: any) => unknown>(target: T) => T;