@visactor/vrender-core 0.16.20-alpha.3 → 0.16.20

package/es/render/contributions/render/contributions/rect-contribution-render.js

@@ -1,24 +1,29 @@
+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;
+};
+
 import { isArray } from "@visactor/vutils";
 
+import { injectable } from "../../../../common/inversify-lite";
+
 import { getScaledStroke } from "../../../../common/canvas-utils";
 
-import { defaultBaseBackgroundRenderContribution, defaultBaseTextureRenderContribution } from "./base-contribution-render";
+import { DefaultBaseBackgroundRenderContribution, DefaultBaseTextureRenderContribution } from "./base-contribution-render";
 
 import { createRectPath } from "../../../../common/shape/rect";
 
 import { BaseRenderContributionTime } from "../../../../common/enums";
 
-export class DefaultRectRenderContribution {
+let DefaultRectRenderContribution = class {
     constructor() {
         this.time = BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
     }
     drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
         const {outerBorder: outerBorder, innerBorder: innerBorder} = rect.attribute, doOuterBorder = outerBorder && !1 !== outerBorder.visible, doInnerBorder = innerBorder && !1 !== innerBorder.visible;
         if (!doOuterBorder && !doInnerBorder) return;
-        const {cornerRadius: cornerRadius = rectAttribute.cornerRadius, opacity: opacity = rectAttribute.opacity, x: originX = rectAttribute.x, y: originY = rectAttribute.y, scaleX: scaleX = rectAttribute.scaleX, scaleY: scaleY = rectAttribute.scaleY, x1: x1, y1: y1} = rect.attribute;
-        let {width: width, height: height} = rect.attribute;
-        width = (null != width ? width : x1 - x) || 0, height = (null != height ? height : y1 - y) || 0;
-        const doStrokeOuter = !(!outerBorder || !outerBorder.stroke), doStrokeInner = !(!innerBorder || !innerBorder.stroke);
+        const {width: width = rectAttribute.width, height: height = rectAttribute.height, cornerRadius: cornerRadius = rectAttribute.cornerRadius, opacity: opacity = rectAttribute.opacity, x: originX = rectAttribute.x, y: originY = rectAttribute.y, scaleX: scaleX = rectAttribute.scaleX, scaleY: scaleY = rectAttribute.scaleY} = rect.attribute, doStrokeOuter = !(!outerBorder || !outerBorder.stroke), doStrokeInner = !(!innerBorder || !innerBorder.stroke);
         if (doOuterBorder) {
             const {distance: distance = rectAttribute.outerBorder.distance} = outerBorder, d = getScaledStroke(context, distance, context.dpr), nextX = x - d, nextY = y - d, dw = 2 * d;
             if (0 === cornerRadius || isArray(cornerRadius) && cornerRadius.every((num => 0 === num)) ? (context.beginPath(), 
@@ -42,9 +47,33 @@ export class DefaultRectRenderContribution {
             }
         }
     }
-}
+};
+
+DefaultRectRenderContribution = __decorate([ injectable() ], DefaultRectRenderContribution);
+
+export { DefaultRectRenderContribution };
+
+let DefaultRectBackgroundRenderContribution = class extends DefaultBaseBackgroundRenderContribution {
+    constructor() {
+        super(...arguments), this.time = BaseRenderContributionTime.beforeFillStroke;
+    }
+};
+
+DefaultRectBackgroundRenderContribution = __decorate([ injectable() ], DefaultRectBackgroundRenderContribution);
 
-export class SplitRectBeforeRenderContribution {
+export { DefaultRectBackgroundRenderContribution };
+
+let DefaultRectTextureRenderContribution = class extends DefaultBaseTextureRenderContribution {
+    constructor() {
+        super(...arguments), this.time = BaseRenderContributionTime.afterFillStroke;
+    }
+};
+
+DefaultRectTextureRenderContribution = __decorate([ injectable() ], DefaultRectTextureRenderContribution);
+
+export { DefaultRectTextureRenderContribution };
+
+let SplitRectBeforeRenderContribution = class {
     constructor() {
         this.time = BaseRenderContributionTime.beforeFillStroke, this.useStyle = !0, this.order = 0;
     }
@@ -52,9 +81,13 @@ export class SplitRectBeforeRenderContribution {
         const {stroke: stroke = groupAttribute.stroke} = group.attribute;
         Array.isArray(stroke) && stroke.some((s => !1 === s)) && (doFillOrStroke.doStroke = !1);
     }
-}
+};
+
+SplitRectBeforeRenderContribution = __decorate([ injectable() ], SplitRectBeforeRenderContribution);
 
-export class SplitRectAfterRenderContribution {
+export { SplitRectBeforeRenderContribution };
+
+let SplitRectAfterRenderContribution = class {
     constructor() {
         this.time = BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
     }
@@ -71,15 +104,9 @@ export class SplitRectAfterRenderContribution {
             context.stroke();
         }
     }
-}
-
-export const defaultRectRenderContribution = new DefaultRectRenderContribution;
-
-export const splitRectBeforeRenderContribution = new SplitRectBeforeRenderContribution;
-
-export const splitRectAfterRenderContribution = new SplitRectAfterRenderContribution;
+};
 
-export const defaultRectTextureRenderContribution = defaultBaseTextureRenderContribution;
+SplitRectAfterRenderContribution = __decorate([ injectable() ], SplitRectAfterRenderContribution);
 
-export const defaultRectBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
+export { SplitRectAfterRenderContribution };
 //# sourceMappingURL=rect-contribution-render.js.map

package/es/render/contributions/render/contributions/rect-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { injectable } from '../../../../common/inversify-lite';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IRectGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  defaultBaseBackgroundRenderContribution,\n  defaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { createRectPath } from '../../../../common/shape/rect';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\nexport class DefaultRectRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\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 { outerBorder, innerBorder } = rect.attribute;\n    const doOuterBorder = outerBorder && outerBorder.visible !== false;\n    const doInnerBorder = innerBorder && innerBorder.visible !== false;\n    if (!(doOuterBorder || doInnerBorder)) {\n      return;\n    }\n    const {\n      cornerRadius = rectAttribute.cornerRadius,\n      opacity = rectAttribute.opacity,\n      x: originX = rectAttribute.x,\n      y: originY = rectAttribute.y,\n      scaleX = rectAttribute.scaleX,\n      scaleY = rectAttribute.scaleY,\n      x1,\n      y1\n    } = rect.attribute;\n\n    let { width, height } = rect.attribute;\n\n    width = (width ?? x1 - x) || 0;\n    height = (height ?? y1 - y) || 0;\n\n    const doStrokeOuter = !!(outerBorder && outerBorder.stroke);\n    const doStrokeInner = !!(innerBorder && innerBorder.stroke);\n\n    if (doOuterBorder) {\n      const { distance = rectAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x - d;\n      const nextY = y - d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width + dw, height + dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width + dw, height + dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, rectAttribute.outerBorder);\n      } else if (doStrokeOuter) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.outerBorder as any).opacity;\n        (rectAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          rect,\n          outerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          rectAttribute.outerBorder as any\n        );\n        (rectAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (doInnerBorder) {\n      const { distance = rectAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x + d;\n      const nextY = y + d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width - dw, height - dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width - dw, height - dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, rectAttribute.innerBorder);\n      } else if (doStrokeInner) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.innerBorder as any).opacity;\n        (rectAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          rect,\n          innerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          rectAttribute.innerBorder as any\n        );\n        (rectAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    group: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const { stroke = groupAttribute.stroke } = group.attribute as any;\n\n    // 数组且存在为false的项目，那就不绘制\n    if (Array.isArray(stroke) && stroke.some(s => s === false)) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\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 {\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      stroke = groupAttribute.stroke\n    } = rect.attribute as any;\n\n    // 不是数组\n    if (!(Array.isArray(stroke) && stroke.some(s => s === false))) {\n      return;\n    }\n\n    context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute);\n    // 单独处理每条边界，目前不考虑圆角\n    context.beginPath();\n    context.moveTo(x, y);\n    // top\n    if (stroke[0]) {\n      context.lineTo(x + width, y);\n    } else {\n      context.moveTo(x + width, y);\n    }\n    // right\n    if (stroke[1]) {\n      context.lineTo(x + width, y + height);\n    } else {\n      context.moveTo(x + width, y + height);\n    }\n    // bottom\n    if (stroke[2]) {\n      context.lineTo(x, y + height);\n    } else {\n      context.moveTo(x, y + height);\n    }\n    // left\n    if (stroke[3]) {\n      // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n      const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n      context.lineTo(x, adjustY);\n    } else {\n      context.moveTo(x, y);\n    }\n\n    context.stroke();\n  }\n}\n\nexport const defaultRectRenderContribution = new DefaultRectRenderContribution();\nexport const splitRectBeforeRenderContribution = new SplitRectBeforeRenderContribution();\nexport const splitRectAfterRenderContribution = new SplitRectAfterRenderContribution();\nexport const defaultRectTextureRenderContribution = defaultBaseTextureRenderContribution;\nexport const defaultRectBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;\n"]}
+{"version":3,"sources":["../src/render/contributions/render/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { injectable } from '../../../../common/inversify-lite';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IRectGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { createRectPath } from '../../../../common/shape/rect';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n@injectable()\nexport class DefaultRectRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\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 { outerBorder, innerBorder } = rect.attribute;\n    const doOuterBorder = outerBorder && outerBorder.visible !== false;\n    const doInnerBorder = innerBorder && innerBorder.visible !== false;\n    if (!(doOuterBorder || doInnerBorder)) {\n      return;\n    }\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      cornerRadius = rectAttribute.cornerRadius,\n      opacity = rectAttribute.opacity,\n      x: originX = rectAttribute.x,\n      y: originY = rectAttribute.y,\n      scaleX = rectAttribute.scaleX,\n      scaleY = rectAttribute.scaleY\n    } = rect.attribute;\n\n    const doStrokeOuter = !!(outerBorder && outerBorder.stroke);\n    const doStrokeInner = !!(innerBorder && innerBorder.stroke);\n\n    if (doOuterBorder) {\n      const { distance = rectAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x - d;\n      const nextY = y - d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width + dw, height + dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width + dw, height + dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, rectAttribute.outerBorder);\n      } else if (doStrokeOuter) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.outerBorder as any).opacity;\n        (rectAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          rect,\n          outerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          rectAttribute.outerBorder as any\n        );\n        (rectAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (doInnerBorder) {\n      const { distance = rectAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x + d;\n      const nextY = y + d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width - dw, height - dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width - dw, height - dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, rectAttribute.innerBorder);\n      } else if (doStrokeInner) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.innerBorder as any).opacity;\n        (rectAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          rect,\n          innerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          rectAttribute.innerBorder as any\n        );\n        (rectAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\n@injectable()\nexport class DefaultRectBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\n@injectable()\nexport class DefaultRectTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    group: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\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    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const { stroke = groupAttribute.stroke } = group.attribute as any;\n\n    // 数组且存在为false的项目，那就不绘制\n    if (Array.isArray(stroke) && stroke.some(s => s === false)) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\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 {\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      stroke = groupAttribute.stroke\n    } = rect.attribute as any;\n\n    // 不是数组\n    if (!(Array.isArray(stroke) && stroke.some(s => s === false))) {\n      return;\n    }\n\n    context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute);\n    // 单独处理每条边界，目前不考虑圆角\n    context.beginPath();\n    context.moveTo(x, y);\n    // top\n    if (stroke[0]) {\n      context.lineTo(x + width, y);\n    } else {\n      context.moveTo(x + width, y);\n    }\n    // right\n    if (stroke[1]) {\n      context.lineTo(x + width, y + height);\n    } else {\n      context.moveTo(x + width, y + height);\n    }\n    // bottom\n    if (stroke[2]) {\n      context.lineTo(x, y + height);\n    } else {\n      context.moveTo(x, y + height);\n    }\n    // left\n    if (stroke[3]) {\n      // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n      const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n      context.lineTo(x, adjustY);\n    } else {\n      context.moveTo(x, y);\n    }\n\n    context.stroke();\n  }\n}\n"]}

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

@@ -1,4 +1,5 @@
 import type { IGraphicAttribute, IContext2d, IMarkAttribute, ISymbol, ISymbolGraphicAttribute, IThemeAttribute, ISymbolRenderContribution, IDrawContext } from '../../../../interface';
+import { DefaultBaseBackgroundRenderContribution, DefaultBaseTextureRenderContribution } from './base-contribution-render';
 import { BaseRenderContributionTime } from '../../../../common/enums';
 export declare class DefaultSymbolRenderContribution implements ISymbolRenderContribution {
     time: BaseRenderContributionTime;
@@ -6,6 +7,9 @@ export declare class DefaultSymbolRenderContribution implements ISymbolRenderCon
     order: number;
     drawShape(symbol: ISymbol, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, symbolAttribute: Required<ISymbolGraphicAttribute>, drawContext: IDrawContext, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
 }
-export declare const defaultSymbolRenderContribution: DefaultSymbolRenderContribution;
-export declare const defaultSymbolTextureRenderContribution: import("./base-contribution-render").DefaultBaseTextureRenderContribution;
-export declare const defaultSymbolBackgroundRenderContribution: import("./base-contribution-render").DefaultBaseBackgroundRenderContribution;
+export declare class DefaultSymbolBackgroundRenderContribution extends DefaultBaseBackgroundRenderContribution implements ISymbolRenderContribution {
+    time: BaseRenderContributionTime;
+}
+export declare class DefaultSymbolTextureRenderContribution extends DefaultBaseTextureRenderContribution implements ISymbolRenderContribution {
+    time: BaseRenderContributionTime;
+}

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

@@ -1,10 +1,18 @@
+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;
+};
+
+import { injectable } from "../../../../common/inversify-lite";
+
 import { getScaledStroke } from "../../../../common/canvas-utils";
 
-import { defaultBaseBackgroundRenderContribution, defaultBaseTextureRenderContribution } from "./base-contribution-render";
+import { DefaultBaseBackgroundRenderContribution, DefaultBaseTextureRenderContribution } from "./base-contribution-render";
 
 import { BaseRenderContributionTime } from "../../../../common/enums";
 
-export class DefaultSymbolRenderContribution {
+let DefaultSymbolRenderContribution = class {
     constructor() {
         this.time = BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
     }
@@ -35,11 +43,21 @@ export class DefaultSymbolRenderContribution {
             }
         }
     }
-}
+};
 
-export const defaultSymbolRenderContribution = new DefaultSymbolRenderContribution;
+DefaultSymbolRenderContribution = __decorate([ injectable() ], DefaultSymbolRenderContribution);
 
-export const defaultSymbolTextureRenderContribution = defaultBaseTextureRenderContribution;
+export { DefaultSymbolRenderContribution };
+
+export class DefaultSymbolBackgroundRenderContribution extends DefaultBaseBackgroundRenderContribution {
+    constructor() {
+        super(...arguments), this.time = BaseRenderContributionTime.beforeFillStroke;
+    }
+}
 
-export const defaultSymbolBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;
+export class DefaultSymbolTextureRenderContribution extends DefaultBaseTextureRenderContribution {
+    constructor() {
+        super(...arguments), this.time = BaseRenderContributionTime.afterFillStroke;
+    }
+}
 //# sourceMappingURL=symbol-contribution-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/contributions/symbol-contribution-render.ts"],"names":[],"mappings":"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","file":"symbol-contribution-render.js","sourcesContent":["import { injectable } from '../../../../common/inversify-lite';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  ISymbolGraphicAttribute,\n  IThemeAttribute,\n  ISymbolRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  defaultBaseBackgroundRenderContribution,\n  defaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\nexport class DefaultSymbolRenderContribution implements ISymbolRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    symbolAttribute: Required<ISymbolGraphicAttribute>,\n    drawContext: IDrawContext,\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 parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { outerBorder, innerBorder } = symbol.attribute;\n    const doOuterBorder = outerBorder && outerBorder.visible !== false;\n    const doInnerBorder = innerBorder && innerBorder.visible !== false;\n    if (!(doOuterBorder || doInnerBorder)) {\n      return;\n    }\n\n    const {\n      size = symbolAttribute.size,\n      opacity = symbolAttribute.opacity,\n      x: originX = symbolAttribute.x,\n      y: originY = symbolAttribute.y,\n      scaleX = symbolAttribute.scaleX,\n      scaleY = symbolAttribute.scaleY\n    } = symbol.attribute;\n\n    const doStrokeOuter = !!(outerBorder && outerBorder.stroke);\n    const doStrokeInner = !!(innerBorder && innerBorder.stroke);\n\n    if (doOuterBorder) {\n      const { distance = symbolAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n\n      context.beginPath();\n      if (parsedPath.drawOffset(context, size, x, y, d) === false) {\n        context.closePath();\n      }\n\n      // shadow\n      context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, symbolAttribute.outerBorder);\n      } else if (doStrokeOuter) {\n        // 存在stroke\n        const lastOpacity = (symbolAttribute.outerBorder as any).opacity;\n        (symbolAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          symbol,\n          outerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute.outerBorder as any\n        );\n        (symbolAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (doInnerBorder) {\n      const { distance = symbolAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n\n      context.beginPath();\n      if (parsedPath.drawOffset(context, size, x, y, -d) === false) {\n        context.closePath();\n      }\n\n      // shadow\n      context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, symbolAttribute.innerBorder);\n      } else if (doStrokeInner) {\n        // 存在stroke\n        const lastOpacity = (symbolAttribute.innerBorder as any).opacity;\n        (symbolAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          symbol,\n          innerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute.innerBorder as any\n        );\n        (symbolAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\nexport const defaultSymbolRenderContribution = new DefaultSymbolRenderContribution();\nexport const defaultSymbolTextureRenderContribution = defaultBaseTextureRenderContribution;\nexport const defaultSymbolBackgroundRenderContribution = defaultBaseBackgroundRenderContribution;\n"]}
+{"version":3,"sources":["../src/render/contributions/render/contributions/symbol-contribution-render.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAW/D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EACL,uCAAuC,EACvC,oCAAoC,EACrC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAG/D,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAArC;QACL,SAAI,GAA+B,0BAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAY,IAAI,CAAC;QACzB,UAAK,GAAW,CAAC,CAAC;IA4GpB,CAAC;IA3GC,SAAS,CACP,MAAe,EACf,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,eAAkD,EAClD,WAAyB,EACzB,MAIY,EACZ,QAIY;QAEZ,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;QAE1C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QACtD,MAAM,aAAa,GAAG,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,KAAK,CAAC;QACnE,MAAM,aAAa,GAAG,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,KAAK,CAAC;QACnE,IAAI,CAAC,CAAC,aAAa,IAAI,aAAa,CAAC,EAAE;YACrC,OAAO;SACR;QAED,MAAM,EACJ,IAAI,GAAG,eAAe,CAAC,IAAI,EAC3B,OAAO,GAAG,eAAe,CAAC,OAAO,EACjC,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,EAC9B,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,EAC9B,MAAM,GAAG,eAAe,CAAC,MAAM,EAC/B,MAAM,GAAG,eAAe,CAAC,MAAM,EAChC,GAAG,MAAM,CAAC,SAAS,CAAC;QAErB,MAAM,aAAa,GAAG,CAAC,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,aAAa,GAAG,CAAC,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;QAE5D,IAAI,aAAa,EAAE;YACjB,MAAM,EAAE,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,WAAW,CAAC;YACxE,MAAM,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,QAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAEpE,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,EAAE;gBAC3D,OAAO,CAAC,SAAS,EAAE,CAAC;aACrB;YAGD,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAEtG,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;aAC7D;iBAAM,IAAI,aAAa,EAAE;gBAExB,MAAM,WAAW,GAAI,eAAe,CAAC,WAAmB,CAAC,OAAO,CAAC;gBAChE,eAAe,CAAC,WAAmB,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvD,OAAO,CAAC,cAAc,CACpB,MAAM,EACN,WAAW,EACX,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,EACtB,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,EACtB,eAAe,CAAC,WAAkB,CACnC,CAAC;gBACD,eAAe,CAAC,WAAmB,CAAC,OAAO,GAAG,WAAW,CAAC;gBAC3D,OAAO,CAAC,MAAM,EAAE,CAAC;aAClB;SACF;QAED,IAAI,aAAa,EAAE;YACjB,MAAM,EAAE,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,WAAW,CAAC;YACxE,MAAM,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,QAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAEpE,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;gBAC5D,OAAO,CAAC,SAAS,EAAE,CAAC;aACrB;YAGD,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAEtG,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;aAC7D;iBAAM,IAAI,aAAa,EAAE;gBAExB,MAAM,WAAW,GAAI,eAAe,CAAC,WAAmB,CAAC,OAAO,CAAC;gBAChE,eAAe,CAAC,WAAmB,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvD,OAAO,CAAC,cAAc,CACpB,MAAM,EACN,WAAW,EACX,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,EACtB,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,MAAM,EACtB,eAAe,CAAC,WAAkB,CACnC,CAAC;gBACD,eAAe,CAAC,WAAmB,CAAC,OAAO,GAAG,WAAW,CAAC;gBAC3D,OAAO,CAAC,MAAM,EAAE,CAAC;aAClB;SACF;IACH,CAAC;CACF,CAAA;AA/GY,+BAA+B;IAD3C,UAAU,EAAE;GACA,+BAA+B,CA+G3C;SA/GY,+BAA+B;AAiH5C,MAAM,OAAO,yCACX,SAAQ,uCAAuC;IADjD;;QAIE,SAAI,GAA+B,0BAA0B,CAAC,gBAAgB,CAAC;IACjF,CAAC;CAAA;AAED,MAAM,OAAO,sCACX,SAAQ,oCAAoC;IAD9C;;QAIE,SAAI,GAA+B,0BAA0B,CAAC,eAAe,CAAC;IAChF,CAAC;CAAA","file":"symbol-contribution-render.js","sourcesContent":["import { injectable } from '../../../../common/inversify-lite';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  ISymbolGraphicAttribute,\n  IThemeAttribute,\n  ISymbolRenderContribution,\n  IDrawContext\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n@injectable()\nexport class DefaultSymbolRenderContribution implements ISymbolRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    symbol: ISymbol,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    symbolAttribute: Required<ISymbolGraphicAttribute>,\n    drawContext: IDrawContext,\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 parsedPath = symbol.getParsedPath();\n    // todo: 考虑使用path\n    if (!parsedPath) {\n      return;\n    }\n\n    const { outerBorder, innerBorder } = symbol.attribute;\n    const doOuterBorder = outerBorder && outerBorder.visible !== false;\n    const doInnerBorder = innerBorder && innerBorder.visible !== false;\n    if (!(doOuterBorder || doInnerBorder)) {\n      return;\n    }\n\n    const {\n      size = symbolAttribute.size,\n      opacity = symbolAttribute.opacity,\n      x: originX = symbolAttribute.x,\n      y: originY = symbolAttribute.y,\n      scaleX = symbolAttribute.scaleX,\n      scaleY = symbolAttribute.scaleY\n    } = symbol.attribute;\n\n    const doStrokeOuter = !!(outerBorder && outerBorder.stroke);\n    const doStrokeInner = !!(innerBorder && innerBorder.stroke);\n\n    if (doOuterBorder) {\n      const { distance = symbolAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n\n      context.beginPath();\n      if (parsedPath.drawOffset(context, size, x, y, d) === false) {\n        context.closePath();\n      }\n\n      // shadow\n      context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, symbolAttribute.outerBorder);\n      } else if (doStrokeOuter) {\n        // 存在stroke\n        const lastOpacity = (symbolAttribute.outerBorder as any).opacity;\n        (symbolAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          symbol,\n          outerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute.outerBorder as any\n        );\n        (symbolAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (doInnerBorder) {\n      const { distance = symbolAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n\n      context.beginPath();\n      if (parsedPath.drawOffset(context, size, x, y, -d) === false) {\n        context.closePath();\n      }\n\n      // shadow\n      context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, symbolAttribute.innerBorder);\n      } else if (doStrokeInner) {\n        // 存在stroke\n        const lastOpacity = (symbolAttribute.innerBorder as any).opacity;\n        (symbolAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(\n          symbol,\n          innerBorder,\n          (originX - x) / scaleX,\n          (originY - y) / scaleY,\n          symbolAttribute.innerBorder as any\n        );\n        (symbolAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\nexport class DefaultSymbolBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements ISymbolRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\nexport class DefaultSymbolTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements ISymbolRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n"]}

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

@@ -1,8 +1 @@
-import { BaseRenderContributionTime } from '../../../../common/enums';
-import type { IContext2d, IDrawContext, IGraphicAttribute, IText, ITextRenderContribution, IThemeAttribute } from '../../../../interface';
-import { DefaultBaseBackgroundRenderContribution } from './base-contribution-render';
-export declare class DefaultTextBackgroundRenderContribution extends DefaultBaseBackgroundRenderContribution implements ITextRenderContribution {
-    time: BaseRenderContributionTime;
-    drawShape(graphic: IText, context: IContext2d, x: number, y: number, doFill: boolean, doStroke: boolean, fVisible: boolean, sVisible: boolean, graphicAttribute: Required<IGraphicAttribute>, drawContext: IDrawContext, fillCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
-}
-export declare const defaultTextBackgroundRenderContribution: DefaultTextBackgroundRenderContribution;
+export {};

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

@@ -1,25 +1,2 @@
-import { BaseRenderContributionTime } from "../../../../common/enums";
-
-import { DefaultBaseBackgroundRenderContribution } from "./base-contribution-render";
-
-export class DefaultTextBackgroundRenderContribution extends DefaultBaseBackgroundRenderContribution {
-    constructor() {
-        super(...arguments), this.time = BaseRenderContributionTime.beforeFillStroke;
-    }
-    drawShape(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb) {
-        const {background: background, backgroundMode: backgroundMode = graphicAttribute.backgroundMode} = graphic.attribute;
-        if (!background) return;
-        const b = graphic.AABBBounds;
-        if (graphic.backgroundImg && graphic.resources) {
-            const res = graphic.resources.get(background);
-            if ("success" !== res.state || !res.data) return;
-            context.highPerformanceSave(), context.setTransformFromMatrix(graphic.parent.globalTransMatrix, !0), 
-            this.doDrawImage(context, res.data, b, backgroundMode), context.highPerformanceRestore(), 
-            context.setTransformForCurrent();
-        } else context.highPerformanceSave(), context.fillStyle = background, context.fillRect(b.x1, b.y1, b.width(), b.height()), 
-        context.highPerformanceRestore();
-    }
-}
-
-export const defaultTextBackgroundRenderContribution = new DefaultTextBackgroundRenderContribution;
+export { };
 //# sourceMappingURL=text-contribution-render.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/render/contributions/text-contribution-render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAStE,OAAO,EAAE,uCAAuC,EAAE,MAAM,4BAA4B,CAAC;AAErF,MAAM,OAAO,uCACX,SAAQ,uCAAuC;IADjD;;QAIE,SAAI,GAA+B,0BAA0B,CAAC,gBAAgB,CAAC;IA0CjF,CAAC;IAxCC,SAAS,CACP,OAAc,EACd,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,gBAA6C,EAC7C,WAAyB,EACzB,MAAiH,EACjH,QAAmH;QAEnH,MAAM,EAAE,UAAU,EAAE,cAAc,GAAG,gBAAgB,CAAC,cAAc,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QAC3F,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QAED,MAAM,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;QAC7B,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE;YAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC9C,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBACxC,OAAO;aACR;YAED,OAAO,CAAC,mBAAmB,EAAE,CAAC;YAE9B,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YAEvE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;YACvD,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACjC,OAAO,CAAC,sBAAsB,EAAE,CAAC;SAClC;aAAM;YACL,OAAO,CAAC,mBAAmB,EAAE,CAAC;YAC9B,OAAO,CAAC,SAAS,GAAG,UAAoB,CAAC;YACzC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;YACpD,OAAO,CAAC,sBAAsB,EAAE,CAAC;SAClC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,uCAAuC,GAAG,IAAI,uCAAuC,EAAE,CAAC","file":"text-contribution-render.js","sourcesContent":["import { BaseRenderContributionTime } from '../../../../common/enums';\nimport type {\n  IContext2d,\n  IDrawContext,\n  IGraphicAttribute,\n  IText,\n  ITextRenderContribution,\n  IThemeAttribute\n} from '../../../../interface';\nimport { DefaultBaseBackgroundRenderContribution } from './base-contribution-render';\n\nexport class DefaultTextBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements ITextRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n\n  drawShape(\n    graphic: IText,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    graphicAttribute: Required<IGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    strokeCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean\n  ) {\n    const { background, backgroundMode = graphicAttribute.backgroundMode } = graphic.attribute;\n    if (!background) {\n      return;\n    }\n\n    const b = graphic.AABBBounds;\n    if (graphic.backgroundImg && graphic.resources) {\n      const res = graphic.resources.get(background);\n      if (res.state !== 'success' || !res.data) {\n        return;\n      }\n\n      context.highPerformanceSave();\n\n      context.setTransformFromMatrix(graphic.parent.globalTransMatrix, true);\n\n      this.doDrawImage(context, res.data, b, backgroundMode);\n      context.highPerformanceRestore();\n      context.setTransformForCurrent();\n    } else {\n      context.highPerformanceSave();\n      context.fillStyle = background as string;\n      context.fillRect(b.x1, b.y1, b.width(), b.height());\n      context.highPerformanceRestore();\n    }\n  }\n}\n\nexport const defaultTextBackgroundRenderContribution = new DefaultTextBackgroundRenderContribution();\n\n// @injectable()\n// export class DefaultTextPopTipRenderContribution\n//   extends DefaultBasePopTipRenderContribution\n//   implements ITextRenderContribution\n// {\n//   time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n// }\n"]}
+{"version":3,"sources":["../src/render/contributions/render/contributions/text-contribution-render.ts"],"names":[],"mappings":"","file":"text-contribution-render.js","sourcesContent":["import { injectable } from '../../../../common/inversify-lite';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IArc,\n  IArcGraphicAttribute,\n  IThemeAttribute,\n  IArcRenderContribution,\n  ITextRenderContribution\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  DefaultBaseBackgroundRenderContribution,\n  // DefaultBasePopTipRenderContribution,\n  DefaultBaseTextureRenderContribution\n} from './base-contribution-render';\nimport { drawArcPath } from '../utils';\nimport { BaseRenderContributionTime } from '../../../../common/enums';\n\n// @injectable()\n// export class DefaultTextPopTipRenderContribution\n//   extends DefaultBasePopTipRenderContribution\n//   implements ITextRenderContribution\n// {\n//   time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n// }\n"]}

package/es/render/contributions/render/draw-contribution.d.ts

@@ -1,26 +1,25 @@
-import type { IContext2d, MaybePromise, IGraphic, IGroup, IDrawContext, IRenderService, IGraphicRender, IGraphicRenderDrawParams, IContributionProvider, IDrawItemInterceptorContribution, IDrawContribution, IGlobal } from '../../../interface';
-import type { IBounds, IMatrix } from '@visactor/vutils';
+import type { IContext2d, MaybePromise, IGraphic, IGroup, IDrawContext, IRenderService, IGraphicRender, IGraphicRenderDrawParams, IContributionProvider, IDrawItemInterceptorContribution, IDrawContribution, IRenderSelector, IGlobal } from '../../../interface';
+import type { IBounds } from '@visactor/vutils';
 import type { ILayerService } from '../../../interface/core';
 export declare class DefaultDrawContribution implements IDrawContribution {
     protected readonly contributions: IGraphicRender[];
+    protected readonly renderSelector: IRenderSelector;
+    protected readonly layerService: ILayerService;
     protected readonly drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>;
     currentRenderMap: Map<number, IGraphicRender>;
     defaultRenderMap: Map<number, IGraphicRender>;
     styleRenderMap: Map<string, Map<number, IGraphicRender>>;
     dirtyBounds: IBounds;
     backupDirtyBounds: IBounds;
-    useDirtyBounds: boolean;
     currentRenderService: IRenderService;
     InterceptorContributions: IDrawItemInterceptorContribution[];
     global: IGlobal;
-    layerService: ILayerService;
-    constructor(contributions: IGraphicRender[], drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>);
+    constructor(contributions: IGraphicRender[], renderSelector: IRenderSelector, layerService: ILayerService, drawItemInterceptorContributions: IContributionProvider<IDrawItemInterceptorContribution>);
     init(): void;
-    prepareForDraw(renderService: IRenderService, drawContext: IDrawContext): void;
     draw(renderService: IRenderService, drawContext: IDrawContext): MaybePromise<void>;
     doRegister(): void;
     protected _findNextGraphic(group: IGroup): IGraphic | null;
-    renderGroup(group: IGroup, drawContext: IDrawContext, parentMatrix: IMatrix, skipSort?: boolean): void;
+    renderGroup(group: IGroup, drawContext: IDrawContext, skipSort?: boolean): void;
     protected _increaseRender(group: IGroup, drawContext: IDrawContext): void;
     getRenderContribution(graphic: IGraphic): IGraphicRender | null;
     renderItem(graphic: IGraphic, drawContext: IDrawContext, params?: IGraphicRenderDrawParams): void;

package/es/render/contributions/render/draw-contribution.js

@@ -10,7 +10,7 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     };
 };
 
-import { injectable, inject, named, multiInject } from "../../../common/inversify-lite";
+import { injectable, inject, postConstruct, named, multiInject } from "../../../common/inversify-lite";
 
 import { findNextGraphic, foreach } from "../../../common/sort";
 
@@ -20,26 +20,24 @@ import { DefaultAttribute } from "../../../graphic";
 
 import { Bounds, Logger, getRectIntersect, isRectIntersect } from "@visactor/vutils";
 
+import { LayerService } from "../../../core/constants";
+
 import { container } from "../../../container";
 
-import { GraphicRender, IncrementalDrawContribution } from "./symbol";
+import { GraphicRender, IncrementalDrawContribution, RenderSelector } from "./symbol";
 
 import { DrawItemInterceptor } from "./draw-interceptor";
 
 import { createColor } from "../../../common/canvas-utils";
 
-import { boundsAllocate } from "../../../allocator/bounds-allocate";
-
-import { matrixAllocate } from "../../../allocator/matrix-allocate";
-
-import { application } from "../../../application";
+import { VGlobal } from "../../../constants";
 
 let DefaultDrawContribution = class {
-    constructor(contributions, drawItemInterceptorContributions) {
-        this.contributions = contributions, this.drawItemInterceptorContributions = drawItemInterceptorContributions, 
-        this.currentRenderMap = new Map, this.defaultRenderMap = new Map, this.styleRenderMap = new Map, 
-        this.dirtyBounds = new Bounds, this.backupDirtyBounds = new Bounds, this.global = application.global, 
-        this.layerService = application.layerService, this.init();
+    constructor(contributions, renderSelector, layerService, drawItemInterceptorContributions) {
+        this.contributions = contributions, this.renderSelector = renderSelector, this.layerService = layerService, 
+        this.drawItemInterceptorContributions = drawItemInterceptorContributions, this.currentRenderMap = new Map, 
+        this.defaultRenderMap = new Map, this.styleRenderMap = new Map, this.dirtyBounds = new Bounds, 
+        this.backupDirtyBounds = new Bounds;
     }
     init() {
         this.contributions.forEach((item => {
@@ -49,12 +47,8 @@ let DefaultDrawContribution = class {
             } else this.defaultRenderMap.set(item.numberType, item);
         })), this.InterceptorContributions = this.drawItemInterceptorContributions.getContributions().sort(((a, b) => a.order - b.order));
     }
-    prepareForDraw(renderService, drawContext) {
-        drawContext.updateBounds ? this.useDirtyBounds = !0 : this.useDirtyBounds = !drawContext.stage.params.optimize.disableCheckGraphicWidthOutRange;
-    }
     draw(renderService, drawContext) {
-        this.prepareForDraw(renderService, drawContext), drawContext.drawContribution = this, 
-        this.currentRenderMap = this.styleRenderMap.get(drawContext.renderStyle) || this.defaultRenderMap, 
+        drawContext.drawContribution = this, this.currentRenderMap = this.styleRenderMap.get(drawContext.renderStyle) || this.defaultRenderMap, 
         this.currentRenderService = renderService;
         const {context: context, stage: stage, x: x = 0, y: y = 0, width: width, height: height} = drawContext;
         if (!context) return;
@@ -78,7 +72,7 @@ let DefaultDrawContribution = class {
             var _a, _b;
             return (null !== (_a = a.attribute.zIndex) && void 0 !== _a ? _a : DefaultAttribute.zIndex) - (null !== (_b = b.attribute.zIndex) && void 0 !== _b ? _b : DefaultAttribute.zIndex);
         })).forEach((group => {
-            this.renderGroup(group, drawContext, matrixAllocate.allocate(1, 0, 0, 1, 0, 0));
+            this.renderGroup(group, drawContext);
         })), context.restore(), context.restore(), context.draw(), context.inuse = !1;
     }
     doRegister() {
@@ -93,29 +87,22 @@ let DefaultDrawContribution = class {
         }
         return null;
     }
-    renderGroup(group, drawContext, parentMatrix, skipSort) {
+    renderGroup(group, drawContext, skipSort) {
         if (drawContext.break || !1 === group.attribute.visibleAll) return;
         if (group.incremental && (null == drawContext.startAtId || drawContext.startAtId === group._uid)) return drawContext.break = !0, 
         void this._increaseRender(group, drawContext);
-        if (this.useDirtyBounds && !isRectIntersect(group.AABBBounds, this.dirtyBounds, !1)) return;
-        let tempBounds, nextM = parentMatrix;
-        if (this.useDirtyBounds) {
-            tempBounds = boundsAllocate.allocateByObj(this.dirtyBounds);
-            const gm = group.transMatrix;
-            nextM = matrixAllocate.allocateByObj(parentMatrix).multiply(gm.a, gm.b, gm.c, gm.d, gm.e, gm.f), 
-            this.dirtyBounds.copy(this.backupDirtyBounds).transformWithMatrix(nextM.getInverse());
-        }
-        this.renderItem(group, drawContext, {
+        if (!isRectIntersect(group.AABBBounds, this.dirtyBounds, !1)) return;
+        const tempBounds = this.dirtyBounds.clone(), m = group.globalTransMatrix.getInverse();
+        this.dirtyBounds.copy(this.backupDirtyBounds).transformWithMatrix(m), this.renderItem(group, drawContext, {
             drawingCb: () => {
                 var _a;
                 skipSort ? group.forEachChildren((item => {
-                    drawContext.break || (item.isContainer ? this.renderGroup(item, drawContext, nextM) : this.renderItem(item, drawContext));
+                    drawContext.break || (item.isContainer ? this.renderGroup(item, drawContext) : this.renderItem(item, drawContext));
                 })) : foreach(group, DefaultAttribute.zIndex, (item => {
-                    drawContext.break || (item.isContainer ? this.renderGroup(item, drawContext, nextM) : this.renderItem(item, drawContext));
+                    drawContext.break || (item.isContainer ? this.renderGroup(item, drawContext) : this.renderItem(item, drawContext));
                 }), !1, !!(null === (_a = drawContext.context) || void 0 === _a ? void 0 : _a.camera));
             }
-        }), this.useDirtyBounds && (this.dirtyBounds.copy(tempBounds), boundsAllocate.free(tempBounds), 
-        matrixAllocate.free(nextM));
+        }), this.dirtyBounds.copy(tempBounds);
     }
     _increaseRender(group, drawContext) {
         const {layer: layer, stage: stage} = drawContext, {subLayers: subLayers} = layer;
@@ -154,7 +141,7 @@ let DefaultDrawContribution = class {
         }
     }
     getRenderContribution(graphic) {
-        let renderer;
+        let renderer = this.renderSelector.selector(graphic);
         return renderer || (renderer = this.selectRenderByNumberType(graphic.numberType)), 
         renderer || (renderer = this.selectRenderByType(graphic.type)), renderer;
     }
@@ -174,7 +161,7 @@ let DefaultDrawContribution = class {
                 this.dirtyBounds.copy(this.backupDirtyBounds).transformWithMatrix(m), this.dirtyBounds.translate(-scrollX, -scrollY);
             }
         }
-        if (this.useDirtyBounds && !graphic.isContainer && !isRectIntersect(graphic.AABBBounds, this.dirtyBounds, !1)) return void (retrans && this.dirtyBounds.copy(tempBounds));
+        if (!graphic.isContainer && !isRectIntersect(graphic.AABBBounds, this.dirtyBounds, !1)) return void (retrans && this.dirtyBounds.copy(tempBounds));
         const skipDraw = null != drawContext.startAtId && graphic._uid !== drawContext.startAtId;
         if (graphic._uid === drawContext.startAtId && (drawContext.startAtId = null), params && (params.skipDraw = skipDraw), 
         skipDraw ? graphic.isContainer && renderer.draw(graphic, this.currentRenderService, drawContext, params) : renderer.draw(graphic, this.currentRenderService, drawContext, params), 
@@ -212,7 +199,9 @@ let DefaultDrawContribution = class {
     afterDraw(renderService, drawParams) {}
 };
 
-DefaultDrawContribution = __decorate([ injectable(), __param(0, multiInject(GraphicRender)), __param(1, inject(ContributionProvider)), __param(1, named(DrawItemInterceptor)), __metadata("design:paramtypes", [ Array, Object ]) ], DefaultDrawContribution);
+__decorate([ inject(VGlobal), __metadata("design:type", Object) ], DefaultDrawContribution.prototype, "global", void 0), 
+__decorate([ postConstruct(), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0) ], DefaultDrawContribution.prototype, "init", null), 
+DefaultDrawContribution = __decorate([ injectable(), __param(0, multiInject(GraphicRender)), __param(1, inject(RenderSelector)), __param(2, inject(LayerService)), __param(3, inject(ContributionProvider)), __param(3, named(DrawItemInterceptor)), __metadata("design:paramtypes", [ Array, Object, Object, Object ]) ], DefaultDrawContribution);
 
 export { DefaultDrawContribution };
 //# sourceMappingURL=draw-contribution.js.map