@visactor/vrender-kits 0.16.20-alpha.4 → 0.16.21

package/cjs/picker/contributions/math-picker/rect-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/math-picker/rect-picker.ts"],"names":[],"mappings":"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","file":"rect-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { isArray, isNumber, AABBBounds } from '@visactor/vutils';\nimport { inject, injectable, getTheme, RectRender, RECT_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultMathRectPicker implements IGraphicPicker {\n  type: string = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(rect: IRect, point: IPoint, params?: IPickParams): boolean {\n    if (!rect.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (rect.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    const rectAttribute = getTheme(rect).rect;\n    const { cornerRadius = rectAttribute.cornerRadius } = rect.attribute;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    pickContext.highPerformanceSave();\n    let onlyTranslate = true;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      onlyTranslate = false;\n      pickContext.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    let picked = true;\n    // 处理圆角情况，无圆角直接使用bounds判断结果\n    if (\n      !onlyTranslate ||\n      (isNumber(cornerRadius, true) && cornerRadius !== 0) ||\n      (isArray(cornerRadius) && (<number[]>cornerRadius).some(num => num !== 0))\n    ) {\n      // 详细形状判断\n      picked = false;\n      this.canvasRenderer.drawShape(\n        rect,\n        pickContext,\n        x,\n        y,\n        {} as any,\n        null,\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          picked = context.isPointInPath(point.x, point.y);\n          return picked;\n        },\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;\n          pickContext.lineWidth = lineWidth;\n          picked = context.isPointInStroke(point.x, point.y);\n          return picked;\n        }\n      );\n    } else if (picked) {\n      // 如果只有描边那需要测试描边\n      const {\n        fill = rectAttribute.fill,\n        stroke = rectAttribute.stroke,\n        lineWidth = rectAttribute.lineWidth\n      } = rect.attribute;\n      if (fill) {\n        picked = true;\n      } else if (stroke) {\n        const bounds = rect.AABBBounds;\n        _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n        _bounds.expand(-lineWidth / 2);\n        picked = !_bounds.containsPoint(point);\n      }\n    }\n\n    pickContext.highPerformanceRestore();\n    return picked; // 无圆角形状判断通过\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/math-picker/rect-picker.ts"],"names":[],"mappings":"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","file":"rect-picker.js","sourcesContent":["import type { IPoint } from '@visactor/vutils';\nimport { isArray, isNumber, AABBBounds } from '@visactor/vutils';\nimport { inject, injectable, getTheme, RectRender, RECT_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultMathRectPicker implements IGraphicPicker {\n  type: string = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(rect: IRect, point: IPoint, params?: IPickParams): boolean {\n    if (!rect.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (rect.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    const rectAttribute = getTheme(rect).rect;\n    const { cornerRadius = rectAttribute.cornerRadius } = rect.attribute;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    pickContext.highPerformanceSave();\n    let onlyTranslate = true;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      onlyTranslate = false;\n      pickContext.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    let picked = true;\n    // 处理圆角情况，无圆角直接使用bounds判断结果\n    if (\n      !onlyTranslate ||\n      (isNumber(cornerRadius, true) && cornerRadius !== 0) ||\n      (isArray(cornerRadius) && (<number[]>cornerRadius).some(num => num !== 0))\n    ) {\n      // 详细形状判断\n      picked = false;\n      this.canvasRenderer.drawShape(\n        rect,\n        pickContext,\n        x,\n        y,\n        {} as any,\n        null,\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          picked = context.isPointInPath(point.x, point.y);\n          return picked;\n        },\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;\n          const pickStrokeBuffer = rectAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;\n          pickContext.lineWidth = lineWidth + pickStrokeBuffer;\n          picked = context.isPointInStroke(point.x, point.y);\n          return picked;\n        }\n      );\n    } else if (picked) {\n      // 如果只有描边那需要测试描边\n      const {\n        fill = rectAttribute.fill,\n        stroke = rectAttribute.stroke,\n        lineWidth = rectAttribute.lineWidth\n      } = rect.attribute;\n      if (fill) {\n        picked = true;\n      } else if (stroke) {\n        const bounds = rect.AABBBounds;\n        _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n        _bounds.expand(-lineWidth / 2);\n        picked = !_bounds.containsPoint(point);\n      }\n    }\n\n    pickContext.highPerformanceRestore();\n    return picked; // 无圆角形状判断通过\n  }\n}\n"]}

package/cjs/picker/contributions/math-picker/symbol-picker.js

@@ -37,8 +37,8 @@ let DefaultMathSymbolPicker = class {
         return this.canvasRenderer.drawShape(symbol, pickContext, x, y, {}, null, ((context, symbolAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), 
         picked)), ((context, symbolAttribute, themeAttribute) => {
             if (picked) return !0;
-            const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;
-            return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), 
+            const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth, pickStrokeBuffer = symbolAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;
+            return pickContext.lineWidth = lineWidth + pickStrokeBuffer, picked = context.isPointInStroke(point.x, point.y), 
             picked;
         })), pickContext.highPerformanceRestore(), picked;
     }

package/cjs/picker/contributions/math-picker/symbol-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/contributions/math-picker/symbol-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAwG;AAcjG,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YAAkD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHhF,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,iCAAkB,CAAC;IAE2C,CAAC;IAEpF,QAAQ,CAAC,MAAe,EAAE,KAAa,EAAE,MAAoB;QAC3D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC;SACd;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAGD,MAAM,eAAe,GAAG,IAAA,uBAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAChD,IAAI,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QAExE,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEvC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAC3D;aAAM;YACL,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAClD,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,MAAM,EACN,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,eAA4D,EAC5D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,eAA4D,EAC5D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACxE,WAAW,CAAC,SAAS,GAAG,SAAS,CAAC;YAClC,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA7EY,uBAAuB;IADnC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,2BAAY,CAAC,CAAA;;GAJtB,uBAAuB,CA6EnC;AA7EY,0DAAuB","file":"symbol-picker.js","sourcesContent":["import { inject, injectable, getTheme, SymbolRender, SYMBOL_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\n@injectable()\nexport class DefaultMathSymbolPicker implements IGraphicPicker {\n  type: string = 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n\n  constructor(@inject(SymbolRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(symbol: ISymbol, point: IPoint, params?: IPickParams): boolean {\n    if (!symbol.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (symbol.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol).symbol;\n    let { x = symbolAttribute.x, y = symbolAttribute.y } = symbol.attribute;\n\n    pickContext.highPerformanceSave();\n    if (!symbol.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(symbol.transMatrix, true);\n    } else {\n      const point = symbol.getOffsetXY(symbolAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      symbol,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;\n        pickContext.lineWidth = lineWidth;\n        picked = context.isPointInStroke(point.x, point.y);\n        return picked;\n      }\n    );\n\n    pickContext.highPerformanceRestore();\n    return picked;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/contributions/math-picker/symbol-picker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yDAAwG;AAcjG,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAIlC,YAAkD,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAHhF,SAAI,GAAW,QAAQ,CAAC;QACxB,eAAU,GAAW,iCAAkB,CAAC;IAE2C,CAAC;IAEpF,QAAQ,CAAC,MAAe,EAAE,KAAa,EAAE,MAAoB;QAC3D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC;SACd;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,KAAK,WAAW,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,KAAK,CAAC;SACd;QAGD,MAAM,eAAe,GAAG,IAAA,uBAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAChD,IAAI,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QAExE,WAAW,CAAC,mBAAmB,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAEvC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,WAAW,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAC3D;aAAM;YACL,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAClD,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YACb,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;YAEb,WAAW,CAAC,sBAAsB,EAAE,CAAC;SACtC;QAGD,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3B,MAAM,EACN,WAAW,EACX,CAAC,EACD,CAAC,EACD,EAAS,EACT,IAAI,EACJ,CACE,OAAmB,EACnB,eAA4D,EAC5D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CACE,OAAmB,EACnB,eAA4D,EAC5D,cAA+B,EAC/B,EAAE;YAEF,IAAI,MAAM,EAAE;gBACV,OAAO,IAAI,CAAC;aACb;YACD,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;YACxE,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,IAAI,cAAc,CAAC,gBAAgB,CAAC;YAC7F,WAAW,CAAC,SAAS,GAAG,SAAS,GAAG,gBAAgB,CAAC;YACrD,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,WAAW,CAAC,sBAAsB,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA9EY,uBAAuB;IADnC,IAAA,yBAAU,GAAE;IAKE,WAAA,IAAA,qBAAM,EAAC,2BAAY,CAAC,CAAA;;GAJtB,uBAAuB,CA8EnC;AA9EY,0DAAuB","file":"symbol-picker.js","sourcesContent":["import { inject, injectable, getTheme, SymbolRender, SYMBOL_NUMBER_TYPE } from '@visactor/vrender-core';\nimport type { IPoint } from '@visactor/vutils';\nimport type {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  ISymbol,\n  IThemeAttribute,\n  IGraphicPicker,\n  IGraphicRender,\n  IPickParams\n} from '@visactor/vrender-core';\n\n@injectable()\nexport class DefaultMathSymbolPicker implements IGraphicPicker {\n  type: string = 'symbol';\n  numberType: number = SYMBOL_NUMBER_TYPE;\n\n  constructor(@inject(SymbolRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(symbol: ISymbol, point: IPoint, params?: IPickParams): boolean {\n    if (!symbol.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (symbol.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const symbolAttribute = graphicService.themeService.getCurrentTheme().symbolAttribute;\n    const symbolAttribute = getTheme(symbol).symbol;\n    let { x = symbolAttribute.x, y = symbolAttribute.y } = symbol.attribute;\n\n    pickContext.highPerformanceSave();\n    if (!symbol.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      pickContext.transformFromMatrix(symbol.transMatrix, true);\n    } else {\n      const point = symbol.getOffsetXY(symbolAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    // 详细形状判断\n    let picked = false;\n    this.canvasRenderer.drawShape(\n      symbol,\n      pickContext,\n      x,\n      y,\n      {} as any,\n      null,\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        picked = context.isPointInPath(point.x, point.y);\n        return picked;\n      },\n      (\n        context: IContext2d,\n        symbolAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n        themeAttribute: IThemeAttribute\n      ) => {\n        // 选中后面就不需要再走逻辑了\n        if (picked) {\n          return true;\n        }\n        const lineWidth = symbolAttribute.lineWidth || themeAttribute.lineWidth;\n        const pickStrokeBuffer = symbolAttribute.pickStrokeBuffer || themeAttribute.pickStrokeBuffer;\n        pickContext.lineWidth = lineWidth + pickStrokeBuffer;\n        picked = context.isPointInStroke(point.x, point.y);\n        return picked;\n      }\n    );\n\n    pickContext.highPerformanceRestore();\n    return picked;\n  }\n}\n"]}

package/cjs/picker/index.d.ts

@@ -1 +1 @@
-
+export * from './module';

package/cjs/picker/index.js

@@ -1 +1,21 @@
-//# sourceMappingURL=index.js.map
+"use strict";
+
+var __createBinding = this && this.__createBinding || (Object.create ? function(o, m, k, k2) {
+    void 0 === k2 && (k2 = k);
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    desc && !("get" in desc ? !m.__esModule : desc.writable || desc.configurable) || (desc = {
+        enumerable: !0,
+        get: function() {
+            return m[k];
+        }
+    }), Object.defineProperty(o, k2, desc);
+} : function(o, m, k, k2) {
+    void 0 === k2 && (k2 = k), o[k2] = m[k];
+}), __exportStar = this && this.__exportStar || function(m, exports) {
+    for (var p in m) "default" === p || Object.prototype.hasOwnProperty.call(exports, p) || __createBinding(exports, m, p);
+};
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), __exportStar(require("./module"), exports);
+//# sourceMappingURL=index.js.map

package/cjs/picker/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/index.ts"],"names":[],"mappings":"","file":"index.js","sourcesContent":["// export * from './canvas-module';\n// export * from './math-module';\n"]}
+{"version":3,"sources":["../src/picker/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB","file":"index.js","sourcesContent":["export * from './module';\n"]}

package/cjs/picker/math-picker-service.d.ts

@@ -3,12 +3,13 @@ import { DefaultPickService } from '@visactor/vrender-core';
 import type { ICanvas, IContext2d, IGraphic, EnvType, IGlobal, IGraphicPicker, IPickerService, IContributionProvider, IPickItemInterceptorContribution, IPickParams, PickResult } from '@visactor/vrender-core';
 export declare class DefaultMathPickerService extends DefaultPickService implements IPickerService {
     protected readonly contributions: IContributionProvider<IGraphicPicker>;
+    readonly global: IGlobal;
     protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>;
     type: 'default';
     pickCanvas: ICanvas;
     pickContext: IContext2d;
     pickerMap: Map<number, IGraphicPicker>;
-    constructor(contributions: IContributionProvider<IGraphicPicker>, pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>);
+    constructor(contributions: IContributionProvider<IGraphicPicker>, global: IGlobal, pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>);
     init(): void;
     configure(global: IGlobal, env: EnvType): void;
     pickItem(graphic: IGraphic, point: IPointLike, parentMatrix: IMatrix | null, params?: IPickParams): PickResult | null;

package/cjs/picker/math-picker-service.js

@@ -19,11 +19,12 @@ Object.defineProperty(exports, "__esModule", {
 const vrender_core_1 = require("@visactor/vrender-core"), constants_1 = require("./contributions/constants");
 
 let DefaultMathPickerService = class extends vrender_core_1.DefaultPickService {
-    constructor(contributions, pickItemInterceptorContributions) {
-        super(pickItemInterceptorContributions), this.contributions = contributions, this.pickItemInterceptorContributions = pickItemInterceptorContributions, 
+    constructor(contributions, global, pickItemInterceptorContributions) {
+        super(global, pickItemInterceptorContributions), this.contributions = contributions, 
+        this.global = global, this.pickItemInterceptorContributions = pickItemInterceptorContributions, 
         this.global.hooks.onSetEnv.tap("math-picker-service", ((lastEnv, env, global) => {
             this.configure(global, env);
-        })), this.configure(this.global, this.global.env), this.pickerMap = new Map, this.init();
+        })), this.configure(this.global, this.global.env), this.pickerMap = new Map;
     }
     init() {
         this.contributions.getContributions().forEach((item => {
@@ -44,8 +45,10 @@ let DefaultMathPickerService = class extends vrender_core_1.DefaultPickService {
     }
 };
 
+__decorate([ (0, vrender_core_1.postConstruct)(), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0) ], DefaultMathPickerService.prototype, "init", null), 
 DefaultMathPickerService = __decorate([ (0, vrender_core_1.injectable)(), __param(0, (0, 
 vrender_core_1.inject)(vrender_core_1.ContributionProvider)), __param(0, (0, vrender_core_1.named)(constants_1.MathPickerContribution)), __param(1, (0, 
-vrender_core_1.inject)(vrender_core_1.ContributionProvider)), __param(1, (0, vrender_core_1.named)(vrender_core_1.PickItemInterceptor)), __metadata("design:paramtypes", [ Object, Object ]) ], DefaultMathPickerService), 
+vrender_core_1.inject)(vrender_core_1.VGlobal)), __param(2, (0, vrender_core_1.inject)(vrender_core_1.ContributionProvider)), __param(2, (0, 
+vrender_core_1.named)(vrender_core_1.PickItemInterceptor)), __metadata("design:paramtypes", [ Object, Object, Object ]) ], DefaultMathPickerService), 
 exports.DefaultMathPickerService = DefaultMathPickerService;
 //# sourceMappingURL=math-picker-service.js.map

package/cjs/picker/math-picker-service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/picker/math-picker-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,yDAQgC;AAchC,yDAAmE;AAK5D,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,iCAAkB;IAO9D,YAGqB,aAAoD,EAIpD,gCAAyF;QAE5G,KAAK,CAAC,gCAAgC,CAAC,CAAC;QANrB,kBAAa,GAAb,aAAa,CAAuC;QAIpD,qCAAgC,GAAhC,gCAAgC,CAAyD;QAG5G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;YAC7E,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;IAED,IAAI;QACF,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,MAAe,EAAE,GAAY;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,6BAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAGD,QAAQ,CACN,OAAiB,EACjB,KAAiB,EACjB,YAA4B,EAC5B,MAAoB;QAEpB,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,KAAK,KAAK,EAAE;YACxC,OAAO,IAAI,CAAC;SACb;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,IAAI,CAAC,EAAE;YACL,OAAO;gBACL,OAAO,EAAE,CAAC;aACX,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA1DY,wBAAwB;IADpC,IAAA,yBAAU,GAAE;IASR,WAAA,IAAA,qBAAM,EAAC,mCAAoB,CAAC,CAAA;IAC5B,WAAA,IAAA,oBAAK,EAAC,kCAAsB,CAAC,CAAA;IAG7B,WAAA,IAAA,qBAAM,EAAC,mCAAoB,CAAC,CAAA;IAC5B,WAAA,IAAA,oBAAK,EAAC,kCAAmB,CAAC,CAAA;;GAblB,wBAAwB,CA0DpC;AA1DY,4DAAwB","file":"math-picker-service.js","sourcesContent":["import type { IMatrix, IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line\nimport {\n  ContributionProvider,\n  inject,\n  injectable,\n  named,\n  DefaultPickService,\n  EmptyContext2d,\n  PickItemInterceptor\n} from '@visactor/vrender-core';\nimport type {\n  ICanvas,\n  IContext2d,\n  IGraphic,\n  EnvType,\n  IGlobal,\n  IGraphicPicker,\n  IPickerService,\n  IContributionProvider,\n  IPickItemInterceptorContribution,\n  IPickParams,\n  PickResult\n} from '@visactor/vrender-core';\nimport { MathPickerContribution } from './contributions/constants';\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultMathPickerService extends DefaultPickService implements IPickerService {\n  declare type: 'default';\n  // pcik canvas\n  declare pickCanvas: ICanvas;\n  declare pickContext: IContext2d;\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(MathPickerContribution)\n    protected readonly contributions: IContributionProvider<IGraphicPicker>,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>\n  ) {\n    super(pickItemInterceptorContributions);\n    this.global.hooks.onSetEnv.tap('math-picker-service', (lastEnv, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n    this.pickerMap = new Map();\n    this.init();\n  }\n\n  init() {\n    this.contributions.getContributions().forEach(item => {\n      this.pickerMap.set(item.numberType, item);\n    });\n    super._init();\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    this.pickContext = new EmptyContext2d(null, 1);\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(\n    graphic: IGraphic,\n    point: IPointLike,\n    parentMatrix: IMatrix | null,\n    params?: IPickParams\n  ): PickResult | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    const g = picker.contains(graphic, point, params) ? graphic : null;\n    if (g) {\n      return {\n        graphic: g\n      };\n    }\n    return null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/picker/math-picker-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,yDAUgC;AAchC,yDAAmE;AAK5D,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,iCAAkB;IAO9D,YAGqB,aAAoD,EACtC,MAAe,EAI7B,gCAAyF;QAE5G,KAAK,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;QAP7B,kBAAa,GAAb,aAAa,CAAuC;QACtC,WAAM,GAAN,MAAM,CAAS;QAI7B,qCAAgC,GAAhC,gCAAgC,CAAyD;QAG5G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;YAC7E,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;IAC7B,CAAC;IAGD,IAAI;QACF,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAED,SAAS,CAAC,MAAe,EAAE,GAAY;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,6BAAc,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAGD,QAAQ,CACN,OAAiB,EACjB,KAAiB,EACjB,YAA4B,EAC5B,MAAoB;QAEpB,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,KAAK,KAAK,EAAE;YACxC,OAAO,IAAI,CAAC;SACb;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,IAAI,CAAC,EAAE;YACL,OAAO;gBACL,OAAO,EAAE,CAAC;aACX,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAlCC;IAAC,IAAA,4BAAa,GAAE;;;;oDAMf;AA/BU,wBAAwB;IADpC,IAAA,yBAAU,GAAE;IASR,WAAA,IAAA,qBAAM,EAAC,mCAAoB,CAAC,CAAA;IAC5B,WAAA,IAAA,oBAAK,EAAC,kCAAsB,CAAC,CAAA;IAE7B,WAAA,IAAA,qBAAM,EAAC,sBAAO,CAAC,CAAA;IAEf,WAAA,IAAA,qBAAM,EAAC,mCAAoB,CAAC,CAAA;IAC5B,WAAA,IAAA,oBAAK,EAAC,kCAAmB,CAAC,CAAA;;GAdlB,wBAAwB,CA2DpC;AA3DY,4DAAwB","file":"math-picker-service.js","sourcesContent":["import type { IMatrix, IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line\nimport {\n  ContributionProvider,\n  inject,\n  injectable,\n  named,\n  postConstruct,\n  DefaultPickService,\n  EmptyContext2d,\n  VGlobal,\n  PickItemInterceptor\n} from '@visactor/vrender-core';\nimport type {\n  ICanvas,\n  IContext2d,\n  IGraphic,\n  EnvType,\n  IGlobal,\n  IGraphicPicker,\n  IPickerService,\n  IContributionProvider,\n  IPickItemInterceptorContribution,\n  IPickParams,\n  PickResult\n} from '@visactor/vrender-core';\nimport { MathPickerContribution } from './contributions/constants';\n\n// 默认的pick-service，提供基本的最优选中策略，尽量不需要用户自己实现contribution\n// 用户可以写plugin\n@injectable()\nexport class DefaultMathPickerService extends DefaultPickService implements IPickerService {\n  declare type: 'default';\n  // pcik canvas\n  declare pickCanvas: ICanvas;\n  declare pickContext: IContext2d;\n  declare pickerMap: Map<number, IGraphicPicker>;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(MathPickerContribution)\n    protected readonly contributions: IContributionProvider<IGraphicPicker>,\n    @inject(VGlobal) public readonly global: IGlobal,\n    // 拦截器\n    @inject(ContributionProvider)\n    @named(PickItemInterceptor)\n    protected readonly pickItemInterceptorContributions: IContributionProvider<IPickItemInterceptorContribution>\n  ) {\n    super(global, pickItemInterceptorContributions);\n    this.global.hooks.onSetEnv.tap('math-picker-service', (lastEnv, env, global) => {\n      this.configure(global, env);\n    });\n    this.configure(this.global, this.global.env);\n    this.pickerMap = new Map();\n  }\n\n  @postConstruct()\n  init() {\n    this.contributions.getContributions().forEach(item => {\n      this.pickerMap.set(item.numberType, item);\n    });\n    super._init();\n  }\n\n  configure(global: IGlobal, env: EnvType) {\n    this.pickContext = new EmptyContext2d(null, 1);\n  }\n\n  // todo: switch统一改为数字map\n  pickItem(\n    graphic: IGraphic,\n    point: IPointLike,\n    parentMatrix: IMatrix | null,\n    params?: IPickParams\n  ): PickResult | null {\n    if (graphic.attribute.pickable === false) {\n      return null;\n    }\n    const picker = this.pickerMap.get(graphic.numberType);\n    if (!picker) {\n      return null;\n    }\n    const g = picker.contains(graphic, point, params) ? graphic : null;\n    if (g) {\n      return {\n        graphic: g\n      };\n    }\n    return null;\n  }\n}\n"]}

package/cjs/picker/module.d.ts

@@ -0,0 +1,6 @@
+import type { container } from '@visactor/vrender-core';
+import { ContainerModule } from '@visactor/vrender-core';
+export declare const canvasPickerModule: ContainerModule;
+export declare function loadCanvasPicker(c: typeof container): void;
+export declare const mathPickerModule: ContainerModule;
+export declare function loadMathPicker(c: typeof container): void;

package/cjs/picker/module.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var __importDefault = this && this.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : {
+        default: mod
+    };
+};
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.loadMathPicker = exports.mathPickerModule = exports.loadCanvasPicker = exports.canvasPickerModule = void 0;
+
+const vrender_core_1 = require("@visactor/vrender-core"), canvas_picker_service_1 = require("./canvas-picker-service"), module_1 = __importDefault(require("./contributions/canvas-picker/module")), module_2 = __importDefault(require("./contributions/math-picker/module")), math_picker_service_1 = require("./math-picker-service");
+
+function loadCanvasPicker(c) {
+    c.load(module_1.default), c.load(exports.canvasPickerModule);
+}
+
+function loadMathPicker(c) {
+    c.load(module_2.default), c.load(exports.mathPickerModule);
+}
+
+exports.canvasPickerModule = new vrender_core_1.ContainerModule(((bind, unbind, isBound, rebind) => {
+    isBound(canvas_picker_service_1.DefaultCanvasPickerService) || bind(canvas_picker_service_1.DefaultCanvasPickerService).toSelf().inSingletonScope(), 
+    isBound(vrender_core_1.PickerService) ? rebind(vrender_core_1.PickerService).toService(canvas_picker_service_1.DefaultCanvasPickerService) : bind(vrender_core_1.PickerService).toService(canvas_picker_service_1.DefaultCanvasPickerService);
+})), exports.loadCanvasPicker = loadCanvasPicker, exports.mathPickerModule = new vrender_core_1.ContainerModule(((bind, unbind, isBound, rebind) => {
+    isBound(math_picker_service_1.DefaultMathPickerService) || bind(math_picker_service_1.DefaultMathPickerService).toSelf().inSingletonScope(), 
+    isBound(vrender_core_1.PickerService) ? rebind(vrender_core_1.PickerService).toService(math_picker_service_1.DefaultMathPickerService) : bind(vrender_core_1.PickerService).toService(math_picker_service_1.DefaultMathPickerService);
+})), exports.loadMathPicker = loadMathPicker;
+//# sourceMappingURL=module.js.map

package/cjs/picker/module.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/picker/module.ts"],"names":[],"mappings":";;;;;;AACA,yDAAwE;AACxE,mEAAqE;AACrE,kFAAgE;AAChE,gFAA4D;AAC5D,+DAAiE;AAGpD,QAAA,kBAAkB,GAAG,IAAI,8BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACtF,IAAI,CAAC,OAAO,CAAC,kDAA0B,CAAC,EAAE;QACxC,IAAI,CAAC,kDAA0B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;KAC9D;IACD,IAAI,OAAO,CAAC,4BAAa,CAAC,EAAE;QAC1B,MAAM,CAAC,4BAAa,CAAC,CAAC,SAAS,CAAC,kDAA0B,CAAC,CAAC;KAC7D;SAAM;QACL,IAAI,CAAC,4BAAa,CAAC,CAAC,SAAS,CAAC,kDAA0B,CAAC,CAAC;KAC3D;AACH,CAAC,CAAC,CAAC;AAEH,SAAgB,gBAAgB,CAAC,CAAmB;IAClD,CAAC,CAAC,IAAI,CAAC,gBAAY,CAAC,CAAC;IACrB,CAAC,CAAC,IAAI,CAAC,0BAAkB,CAAC,CAAC;AAC7B,CAAC;AAHD,4CAGC;AAGY,QAAA,gBAAgB,GAAG,IAAI,8BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACpF,IAAI,CAAC,OAAO,CAAC,8CAAwB,CAAC,EAAE;QACtC,IAAI,CAAC,8CAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;KAC5D;IACD,IAAI,OAAO,CAAC,4BAAa,CAAC,EAAE;QAC1B,MAAM,CAAC,4BAAa,CAAC,CAAC,SAAS,CAAC,8CAAwB,CAAC,CAAC;KAC3D;SAAM;QACL,IAAI,CAAC,4BAAa,CAAC,CAAC,SAAS,CAAC,8CAAwB,CAAC,CAAC;KACzD;AACH,CAAC,CAAC,CAAC;AAEH,SAAgB,cAAc,CAAC,CAAmB;IAChD,CAAC,CAAC,IAAI,CAAC,gBAAU,CAAC,CAAC;IACnB,CAAC,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC;AAC3B,CAAC;AAHD,wCAGC","file":"module.js","sourcesContent":["import type { container } from '@visactor/vrender-core';\nimport { ContainerModule, PickerService } from '@visactor/vrender-core';\nimport { DefaultCanvasPickerService } from './canvas-picker-service';\nimport canvasModule from './contributions/canvas-picker/module';\nimport mathModule from './contributions/math-picker/module';\nimport { DefaultMathPickerService } from './math-picker-service';\n\n// canvas\nexport const canvasPickerModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (!isBound(DefaultCanvasPickerService)) {\n    bind(DefaultCanvasPickerService).toSelf().inSingletonScope();\n  }\n  if (isBound(PickerService)) {\n    rebind(PickerService).toService(DefaultCanvasPickerService);\n  } else {\n    bind(PickerService).toService(DefaultCanvasPickerService);\n  }\n});\n\nexport function loadCanvasPicker(c: typeof container) {\n  c.load(canvasModule);\n  c.load(canvasPickerModule);\n}\n\n// math\nexport const mathPickerModule = new ContainerModule((bind, unbind, isBound, rebind) => {\n  if (!isBound(DefaultMathPickerService)) {\n    bind(DefaultMathPickerService).toSelf().inSingletonScope();\n  }\n  if (isBound(PickerService)) {\n    rebind(PickerService).toService(DefaultMathPickerService);\n  } else {\n    bind(PickerService).toService(DefaultMathPickerService);\n  }\n});\n\nexport function loadMathPicker(c: typeof container) {\n  c.load(mathModule);\n  c.load(mathPickerModule);\n}\n"]}

package/cjs/render/contributions/rough/rough-rect.js

@@ -38,9 +38,7 @@ let RoughCanvasRectRender = class {
             const {dx: dx = rectAttribute.dx, dy: dy = rectAttribute.dy} = rect.attribute;
             x += dx, y += dy, context.setTransformForCurrent();
         } else x = 0, y = 0, context.transformFromMatrix(rect.transMatrix, !0);
-        const {fill: fill = rectAttribute.fill, stroke: stroke = rectAttribute.stroke, fillColor: fillColor = rectAttribute.fill, strokeColor: strokeColor = rectAttribute.stroke, x1: x1, y1: y1, lineWidth: lineWidth = rectAttribute.lineWidth, maxRandomnessOffset: maxRandomnessOffset = config_1.defaultRouthThemeSpec.maxRandomnessOffset, roughness: roughness = config_1.defaultRouthThemeSpec.roughness, bowing: bowing = config_1.defaultRouthThemeSpec.bowing, curveFitting: curveFitting = config_1.defaultRouthThemeSpec.curveFitting, curveTightness: curveTightness = config_1.defaultRouthThemeSpec.curveTightness, curveStepCount: curveStepCount = config_1.defaultRouthThemeSpec.curveStepCount, fillStyle: fillStyle = config_1.defaultRouthThemeSpec.fillStyle, fillWeight: fillWeight = config_1.defaultRouthThemeSpec.fillWeight, hachureAngle: hachureAngle = config_1.defaultRouthThemeSpec.hachureAngle, hachureGap: hachureGap = config_1.defaultRouthThemeSpec.hachureGap, simplification: simplification = config_1.defaultRouthThemeSpec.simplification, dashOffset: dashOffset = config_1.defaultRouthThemeSpec.dashOffset, dashGap: dashGap = config_1.defaultRouthThemeSpec.dashGap, zigzagOffset: zigzagOffset = config_1.defaultRouthThemeSpec.zigzagOffset, seed: seed = config_1.defaultRouthThemeSpec.seed, fillLineDash: fillLineDash = config_1.defaultRouthThemeSpec.fillLineDash, fillLineDashOffset: fillLineDashOffset = config_1.defaultRouthThemeSpec.fillLineDashOffset, disableMultiStroke: disableMultiStroke = config_1.defaultRouthThemeSpec.disableMultiStroke, disableMultiStrokeFill: disableMultiStrokeFill = config_1.defaultRouthThemeSpec.disableMultiStrokeFill, preserveVertices: preserveVertices = config_1.defaultRouthThemeSpec.preserveVertices, fixedDecimalPlaceDigits: fixedDecimalPlaceDigits = config_1.defaultRouthThemeSpec.fixedDecimalPlaceDigits} = rect.attribute;
-        let {width: width = rectAttribute.width, height: height = rectAttribute.height} = rect.attribute;
-        width = (null != width ? width : x1 - x) || 0, height = (null != height ? height : y1 - y) || 0, 
+        const {fill: fill = rectAttribute.fill, stroke: stroke = rectAttribute.stroke, fillColor: fillColor = rectAttribute.fill, strokeColor: strokeColor = rectAttribute.stroke, width: width = rectAttribute.width, height: height = rectAttribute.height, lineWidth: lineWidth = rectAttribute.lineWidth, maxRandomnessOffset: maxRandomnessOffset = config_1.defaultRouthThemeSpec.maxRandomnessOffset, roughness: roughness = config_1.defaultRouthThemeSpec.roughness, bowing: bowing = config_1.defaultRouthThemeSpec.bowing, curveFitting: curveFitting = config_1.defaultRouthThemeSpec.curveFitting, curveTightness: curveTightness = config_1.defaultRouthThemeSpec.curveTightness, curveStepCount: curveStepCount = config_1.defaultRouthThemeSpec.curveStepCount, fillStyle: fillStyle = config_1.defaultRouthThemeSpec.fillStyle, fillWeight: fillWeight = config_1.defaultRouthThemeSpec.fillWeight, hachureAngle: hachureAngle = config_1.defaultRouthThemeSpec.hachureAngle, hachureGap: hachureGap = config_1.defaultRouthThemeSpec.hachureGap, simplification: simplification = config_1.defaultRouthThemeSpec.simplification, dashOffset: dashOffset = config_1.defaultRouthThemeSpec.dashOffset, dashGap: dashGap = config_1.defaultRouthThemeSpec.dashGap, zigzagOffset: zigzagOffset = config_1.defaultRouthThemeSpec.zigzagOffset, seed: seed = config_1.defaultRouthThemeSpec.seed, fillLineDash: fillLineDash = config_1.defaultRouthThemeSpec.fillLineDash, fillLineDashOffset: fillLineDashOffset = config_1.defaultRouthThemeSpec.fillLineDashOffset, disableMultiStroke: disableMultiStroke = config_1.defaultRouthThemeSpec.disableMultiStroke, disableMultiStrokeFill: disableMultiStrokeFill = config_1.defaultRouthThemeSpec.disableMultiStrokeFill, preserveVertices: preserveVertices = config_1.defaultRouthThemeSpec.preserveVertices, fixedDecimalPlaceDigits: fixedDecimalPlaceDigits = config_1.defaultRouthThemeSpec.fixedDecimalPlaceDigits} = rect.attribute;
         rc.rectangle(x, y, width, height, {
             fill: fill ? fillColor : void 0,
             stroke: stroke ? strokeColor : void 0,

package/cjs/render/contributions/rough/rough-rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/rough/rough-rect.ts"],"names":[],"mappings":"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","file":"rough-rect.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  IRect,\n  IGraphicAttribute,\n  IContext2d,\n  IGraphic,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport { RECT_NUMBER_TYPE, DefaultCanvasRectRender, getTheme, inject, injectable } from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\n\n@injectable()\nexport class RoughCanvasRectRender implements IGraphicRender {\n  type: 'rect';\n  numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor(\n    @inject(DefaultCanvasRectRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    this.type = 'rect';\n    this.numberType = RECT_NUMBER_TYPE;\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas);\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect).rect;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const { dx = rectAttribute.dx, dy = rectAttribute.dy } = rect.attribute;\n      x += dx;\n      y += dy;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    const {\n      fill = rectAttribute.fill,\n      stroke = rectAttribute.stroke,\n      fillColor = rectAttribute.fill,\n      strokeColor = rectAttribute.stroke,\n      x1,\n      y1,\n      lineWidth = rectAttribute.lineWidth,\n      maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset,\n      roughness = defaultRouthThemeSpec.roughness,\n      bowing = defaultRouthThemeSpec.bowing,\n      curveFitting = defaultRouthThemeSpec.curveFitting,\n      curveTightness = defaultRouthThemeSpec.curveTightness,\n      curveStepCount = defaultRouthThemeSpec.curveStepCount,\n      fillStyle = defaultRouthThemeSpec.fillStyle,\n      fillWeight = defaultRouthThemeSpec.fillWeight,\n      hachureAngle = defaultRouthThemeSpec.hachureAngle,\n      hachureGap = defaultRouthThemeSpec.hachureGap,\n      simplification = defaultRouthThemeSpec.simplification,\n      dashOffset = defaultRouthThemeSpec.dashOffset,\n      dashGap = defaultRouthThemeSpec.dashGap,\n      zigzagOffset = defaultRouthThemeSpec.zigzagOffset,\n      seed = defaultRouthThemeSpec.seed,\n      fillLineDash = defaultRouthThemeSpec.fillLineDash,\n      fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset,\n      disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke,\n      disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill,\n      preserveVertices = defaultRouthThemeSpec.preserveVertices,\n      fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits\n    } = rect.attribute as any;\n\n    let { width = rectAttribute.width, height = rectAttribute.height } = rect.attribute;\n\n    width = (width ?? x1 - x) || 0;\n    height = (height ?? y1 - y) || 0;\n\n    rc.rectangle(x, y, width, height, {\n      fill: fill ? (fillColor as string) : undefined,\n      stroke: stroke ? (strokeColor as string) : undefined,\n      strokeWidth: lineWidth,\n      maxRandomnessOffset,\n      roughness,\n      bowing,\n      curveFitting,\n      curveTightness,\n      curveStepCount,\n      fillStyle,\n      fillWeight,\n      hachureAngle,\n      hachureGap,\n      simplification,\n      dashOffset,\n      dashGap,\n      zigzagOffset,\n      seed,\n      fillLineDash,\n      fillLineDashOffset,\n      disableMultiStroke,\n      disableMultiStrokeFill,\n      preserveVertices,\n      fixedDecimalPlaceDigits\n    });\n\n    context.highPerformanceRestore();\n  }\n\n  drawShape(\n    graphic: IGraphic,\n    ctx: 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  ): void {\n    if (this.canvasRenderer.drawShape) {\n      return this.canvasRenderer.drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/rough/rough-rect.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAYA,yDAAiH;AACjH,sDAA4B;AAC5B,qCAAiD;AAG1C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAKhC,YAEkB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAJhD,UAAK,GAAY,OAAO,CAAC;QAMvB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,+BAAgB,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,IAAW,EAAE,aAA6B,EAAE,WAAyB,EAAE,MAAiC;QAC3G,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;QAC3C,MAAM,EAAE,GAAG,iBAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAG9B,MAAM,aAAa,GAAG,IAAA,uBAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC;QAC1C,IAAI,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,EAAE;YAErC,CAAC,GAAG,CAAC,CAAC;YACN,CAAC,GAAG,CAAC,CAAC;YACN,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACrD;aAAM;YACL,MAAM,EAAE,EAAE,GAAG,aAAa,CAAC,EAAE,EAAE,EAAE,GAAG,aAAa,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;YACxE,CAAC,IAAI,EAAE,CAAC;YACR,CAAC,IAAI,EAAE,CAAC;YAER,OAAO,CAAC,sBAAsB,EAAE,CAAC;SAClC;QAED,MAAM,EACJ,IAAI,GAAG,aAAa,CAAC,IAAI,EACzB,MAAM,GAAG,aAAa,CAAC,MAAM,EAC7B,SAAS,GAAG,aAAa,CAAC,IAAI,EAC9B,WAAW,GAAG,aAAa,CAAC,MAAM,EAClC,KAAK,GAAG,aAAa,CAAC,KAAK,EAC3B,MAAM,GAAG,aAAa,CAAC,MAAM,EAC7B,SAAS,GAAG,aAAa,CAAC,SAAS,EACnC,mBAAmB,GAAG,8BAAqB,CAAC,mBAAmB,EAC/D,SAAS,GAAG,8BAAqB,CAAC,SAAS,EAC3C,MAAM,GAAG,8BAAqB,CAAC,MAAM,EACrC,YAAY,GAAG,8BAAqB,CAAC,YAAY,EACjD,cAAc,GAAG,8BAAqB,CAAC,cAAc,EACrD,cAAc,GAAG,8BAAqB,CAAC,cAAc,EACrD,SAAS,GAAG,8BAAqB,CAAC,SAAS,EAC3C,UAAU,GAAG,8BAAqB,CAAC,UAAU,EAC7C,YAAY,GAAG,8BAAqB,CAAC,YAAY,EACjD,UAAU,GAAG,8BAAqB,CAAC,UAAU,EAC7C,cAAc,GAAG,8BAAqB,CAAC,cAAc,EACrD,UAAU,GAAG,8BAAqB,CAAC,UAAU,EAC7C,OAAO,GAAG,8BAAqB,CAAC,OAAO,EACvC,YAAY,GAAG,8BAAqB,CAAC,YAAY,EACjD,IAAI,GAAG,8BAAqB,CAAC,IAAI,EACjC,YAAY,GAAG,8BAAqB,CAAC,YAAY,EACjD,kBAAkB,GAAG,8BAAqB,CAAC,kBAAkB,EAC7D,kBAAkB,GAAG,8BAAqB,CAAC,kBAAkB,EAC7D,sBAAsB,GAAG,8BAAqB,CAAC,sBAAsB,EACrE,gBAAgB,GAAG,8BAAqB,CAAC,gBAAgB,EACzD,uBAAuB,GAAG,8BAAqB,CAAC,uBAAuB,EACxE,GAAG,IAAI,CAAC,SAAgB,CAAC;QAC1B,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE;YAChC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAE,SAAoB,CAAC,CAAC,CAAC,SAAS;YAC9C,MAAM,EAAE,MAAM,CAAC,CAAC,CAAE,WAAsB,CAAC,CAAC,CAAC,SAAS;YACpD,WAAW,EAAE,SAAS;YACtB,mBAAmB;YACnB,SAAS;YACT,MAAM;YACN,YAAY;YACZ,cAAc;YACd,cAAc;YACd,SAAS;YACT,UAAU;YACV,YAAY;YACZ,UAAU;YACV,cAAc;YACd,UAAU;YACV,OAAO;YACP,YAAY;YACZ,IAAI;YACJ,YAAY;YACZ,kBAAkB;YAClB,kBAAkB;YAClB,sBAAsB;YACtB,gBAAgB;YAChB,uBAAuB;SACxB,CAAC,CAAC;QAEH,OAAO,CAAC,sBAAsB,EAAE,CAAC;IACnC,CAAC;IAED,SAAS,CACP,OAAiB,EACjB,GAAe,EACf,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;QAEZ,IAAI,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;YACjC,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;SACjG;IACH,CAAC;CACF,CAAA;AA1HY,qBAAqB;IADjC,IAAA,yBAAU,GAAE;IAOR,WAAA,IAAA,qBAAM,EAAC,sCAAuB,CAAC,CAAA;;GANvB,qBAAqB,CA0HjC;AA1HY,sDAAqB","file":"rough-rect.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  IRect,\n  IGraphicAttribute,\n  IContext2d,\n  IGraphic,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport { RECT_NUMBER_TYPE, DefaultCanvasRectRender, getTheme, inject, injectable } from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\n\n@injectable()\nexport class RoughCanvasRectRender implements IGraphicRender {\n  type: 'rect';\n  numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor(\n    @inject(DefaultCanvasRectRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    this.type = 'rect';\n    this.numberType = RECT_NUMBER_TYPE;\n  }\n\n  draw(rect: IRect, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas);\n\n    context.highPerformanceSave();\n\n    // const rectAttribute = graphicService.themeService.getCurrentTheme().rectAttribute;\n    const rectAttribute = getTheme(rect).rect;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const { dx = rectAttribute.dx, dy = rectAttribute.dy } = rect.attribute;\n      x += dx;\n      y += dy;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    const {\n      fill = rectAttribute.fill,\n      stroke = rectAttribute.stroke,\n      fillColor = rectAttribute.fill,\n      strokeColor = rectAttribute.stroke,\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      lineWidth = rectAttribute.lineWidth,\n      maxRandomnessOffset = defaultRouthThemeSpec.maxRandomnessOffset,\n      roughness = defaultRouthThemeSpec.roughness,\n      bowing = defaultRouthThemeSpec.bowing,\n      curveFitting = defaultRouthThemeSpec.curveFitting,\n      curveTightness = defaultRouthThemeSpec.curveTightness,\n      curveStepCount = defaultRouthThemeSpec.curveStepCount,\n      fillStyle = defaultRouthThemeSpec.fillStyle,\n      fillWeight = defaultRouthThemeSpec.fillWeight,\n      hachureAngle = defaultRouthThemeSpec.hachureAngle,\n      hachureGap = defaultRouthThemeSpec.hachureGap,\n      simplification = defaultRouthThemeSpec.simplification,\n      dashOffset = defaultRouthThemeSpec.dashOffset,\n      dashGap = defaultRouthThemeSpec.dashGap,\n      zigzagOffset = defaultRouthThemeSpec.zigzagOffset,\n      seed = defaultRouthThemeSpec.seed,\n      fillLineDash = defaultRouthThemeSpec.fillLineDash,\n      fillLineDashOffset = defaultRouthThemeSpec.fillLineDashOffset,\n      disableMultiStroke = defaultRouthThemeSpec.disableMultiStroke,\n      disableMultiStrokeFill = defaultRouthThemeSpec.disableMultiStrokeFill,\n      preserveVertices = defaultRouthThemeSpec.preserveVertices,\n      fixedDecimalPlaceDigits = defaultRouthThemeSpec.fixedDecimalPlaceDigits\n    } = rect.attribute as any;\n    rc.rectangle(x, y, width, height, {\n      fill: fill ? (fillColor as string) : undefined,\n      stroke: stroke ? (strokeColor as string) : undefined,\n      strokeWidth: lineWidth,\n      maxRandomnessOffset,\n      roughness,\n      bowing,\n      curveFitting,\n      curveTightness,\n      curveStepCount,\n      fillStyle,\n      fillWeight,\n      hachureAngle,\n      hachureGap,\n      simplification,\n      dashOffset,\n      dashGap,\n      zigzagOffset,\n      seed,\n      fillLineDash,\n      fillLineDashOffset,\n      disableMultiStroke,\n      disableMultiStrokeFill,\n      preserveVertices,\n      fixedDecimalPlaceDigits\n    });\n\n    context.highPerformanceRestore();\n  }\n\n  drawShape(\n    graphic: IGraphic,\n    ctx: 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  ): void {\n    if (this.canvasRenderer.drawShape) {\n      return this.canvasRenderer.drawShape(graphic, ctx, x, y, drawContext, params, fillCb, strokeCb);\n    }\n  }\n}\n"]}

package/cjs/window/contributions/browser-contribution.d.ts

@@ -1,19 +1,16 @@
 import { BaseWindowHandlerContribution, ContainerModule } from '@visactor/vrender-core';
-import type { IContext2d, ICanvas, IDomRectLike, EnvType, IWindowHandlerContribution, IWindowParams } from '@visactor/vrender-core';
+import type { IContext2d, ICanvas, IDomRectLike, EnvType, IGlobal, IWindowHandlerContribution, IWindowParams } from '@visactor/vrender-core';
 import type { IBoundsLike } from '@visactor/vutils';
 export declare class BrowserWindowHandlerContribution extends BaseWindowHandlerContribution implements IWindowHandlerContribution {
+    private readonly global;
     static env: EnvType;
     type: EnvType;
     canvas: ICanvas;
     observer?: MutationObserver;
     protected _canvasIsIntersecting: boolean;
     protected _onVisibleChangeCb: (currentVisible: boolean) => void;
-    private readonly global;
     get container(): HTMLElement | null;
-    static idprefix: string;
-    static prefix_count: number;
-    static GenerateCanvasId(): string;
-    constructor();
+    constructor(global: IGlobal);
     getTitle(): string;
     getWH(): {
         width: number;

package/cjs/window/contributions/browser-contribution.js

@@ -1,11 +1,15 @@
 "use strict";
 
-var BrowserWindowHandlerContribution_1, __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+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);
+    };
 };
 
 Object.defineProperty(exports, "__esModule", {
@@ -14,15 +18,12 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), browser_1 = require("../../canvas/contributions/browser");
 
-let BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = class extends vrender_core_1.BaseWindowHandlerContribution {
+let BrowserWindowHandlerContribution = class extends vrender_core_1.BaseWindowHandlerContribution {
     get container() {
         return this.canvas.nativeCanvas.parentElement;
     }
-    static GenerateCanvasId() {
-        return `${BrowserWindowHandlerContribution_1.idprefix}_${BrowserWindowHandlerContribution_1.prefix_count++}`;
-    }
-    constructor() {
-        super(), this.type = "browser", this._canvasIsIntersecting = !0, this.global = vrender_core_1.application.global;
+    constructor(global) {
+        super(), this.global = global, this.type = "browser", this._canvasIsIntersecting = !0;
     }
     getTitle() {
         return this.canvas.id.toString();
@@ -41,7 +42,7 @@ let BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = clas
         this.postInit();
     }
     postInit() {
-        if (this.global.optimizeVisible) try {
+        try {
             this.observerCanvas();
         } catch (err) {
             console.error("发生错误，该环境不存在IntersectionObserver");
@@ -76,7 +77,7 @@ let BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = clas
             dpr: params.dpr,
             nativeCanvas: nativeCanvas,
             container: container,
-            id: BrowserWindowHandlerContribution_1.GenerateCanvasId(),
+            id: vrender_core_1.Generator.GenAutoIncrementId().toString(),
             canvasControled: !0
         };
         this.canvas = new browser_1.BrowserCanvas(options);
@@ -168,9 +169,8 @@ let BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = clas
     }
 };
 
-BrowserWindowHandlerContribution.env = "browser", BrowserWindowHandlerContribution.idprefix = "visactor_window", 
-BrowserWindowHandlerContribution.prefix_count = 0, BrowserWindowHandlerContribution = BrowserWindowHandlerContribution_1 = __decorate([ (0, 
-vrender_core_1.injectable)(), __metadata("design:paramtypes", []) ], BrowserWindowHandlerContribution), 
+BrowserWindowHandlerContribution.env = "browser", BrowserWindowHandlerContribution = __decorate([ (0, 
+vrender_core_1.injectable)(), __param(0, (0, vrender_core_1.inject)(vrender_core_1.VGlobal)), __metadata("design:paramtypes", [ Object ]) ], BrowserWindowHandlerContribution), 
 exports.BrowserWindowHandlerContribution = BrowserWindowHandlerContribution, exports.browserWindowModule = new vrender_core_1.ContainerModule((bind => {
     bind(BrowserWindowHandlerContribution).toSelf(), bind(vrender_core_1.WindowHandlerContribution).toDynamicValue((ctx => ctx.container.get(BrowserWindowHandlerContribution))).whenTargetNamed(BrowserWindowHandlerContribution.env);
 }));

package/cjs/window/contributions/browser-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/window/contributions/browser-contribution.ts"],"names":[],"mappings":"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","file":"browser-contribution.js","sourcesContent":["import {\n  inject,\n  injectable,\n  Generator,\n  BaseWindowHandlerContribution,\n  ContainerModule,\n  WindowHandlerContribution,\n  application\n} from '@visactor/vrender-core';\nimport type {\n  IContext2d,\n  ICanvas,\n  IDomRectLike,\n  EnvType,\n  IGlobal,\n  IWindowHandlerContribution,\n  IWindowParams\n} from '@visactor/vrender-core';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport { BrowserCanvas } from '../../canvas/contributions/browser';\n\n@injectable()\nexport class BrowserWindowHandlerContribution\n  extends BaseWindowHandlerContribution\n  implements IWindowHandlerContribution\n{\n  static env: EnvType = 'browser';\n\n  type: EnvType = 'browser';\n\n  canvas: ICanvas;\n\n  observer?: MutationObserver;\n\n  protected _canvasIsIntersecting: boolean;\n  protected _onVisibleChangeCb: (currentVisible: boolean) => void;\n\n  private readonly global: IGlobal;\n\n  get container(): HTMLElement | null {\n    return this.canvas.nativeCanvas.parentElement;\n  }\n\n  static idprefix: string = 'visactor_window';\n  static prefix_count: number = 0;\n\n  static GenerateCanvasId() {\n    return `${BrowserWindowHandlerContribution.idprefix}_${BrowserWindowHandlerContribution.prefix_count++}`;\n  }\n\n  constructor() {\n    super();\n    this._canvasIsIntersecting = true;\n    this.global = application.global;\n  }\n\n  getTitle(): string {\n    return this.canvas.id.toString();\n  }\n\n  getWH(): { width: number; height: number } {\n    return {\n      width: this.canvas.width / (this.canvas.dpr || 1),\n      height: this.canvas.height / (this.canvas.dpr || 1)\n    };\n  }\n\n  getXY(): { x: number; y: number } {\n    return this.canvas.nativeCanvas.getBoundingClientRect();\n  }\n\n  createWindow(params: IWindowParams): void {\n    // 如果没有传入canvas，那么就创建一个canvas\n    if (!params.canvas) {\n      this.createWindowByConfig(params);\n    } else {\n      this.createWindowByCanvas(params);\n    }\n\n    this.postInit();\n\n    // this.bindOnChangeEvent();\n  }\n\n  protected postInit() {\n    if (!this.global.optimizeVisible) {\n      return;\n    }\n    try {\n      this.observerCanvas();\n    } catch (err) {\n      console.error('发生错误，该环境不存在IntersectionObserver');\n    }\n  }\n\n  isElementVisible(el: HTMLElement) {\n    const rect = el.getBoundingClientRect();\n    const vWidth = window.innerWidth || document.documentElement.clientWidth;\n    const vHeight = window.innerHeight || document.documentElement.clientHeight;\n\n    if (rect.right < 0 || rect.bottom < 0 || rect.left > vWidth || rect.top > vHeight) {\n      return false;\n    }\n\n    return true;\n  }\n\n  protected observerCanvas() {\n    this._canvasIsIntersecting = this.isElementVisible(this.canvas.nativeCanvas);\n    const observer = new IntersectionObserver((entries, observer) => {\n      entries.forEach(entry => {\n        if (this._canvasIsIntersecting !== entry.isIntersecting) {\n          this._canvasIsIntersecting = entry.isIntersecting;\n          this._onVisibleChangeCb && this._onVisibleChangeCb(entry.isIntersecting);\n        } else {\n          this._canvasIsIntersecting = entry.isIntersecting;\n        }\n      });\n    });\n    if (!observer) {\n      return;\n    }\n    observer.observe(this.canvas.nativeCanvas);\n  }\n\n  // private bindOnChangeEvent() {\n  //   const { nativeCanvas } = this.canvas;\n  //   const observer = new MutationObserver((mutations, observer) => {\n  //     mutations.forEach((mutaion) => {\n  //       console.log(mutaion);\n  //     })\n  //   });\n  //   observer.observe(nativeCanvas, { attributes: true, childList: true, subtree: true })\n  // }\n\n  private createWindowByConfig(params: IWindowParams) {\n    // 创建canvas\n    const nativeCanvas = this.global.createCanvas({\n      width: params.width,\n      height: params.height\n    });\n    // 保存到dom中\n    let container: HTMLElement | null;\n    if (typeof params.container === 'string') {\n      container = this.global.getElementById(params.container);\n    } else if (params.container) {\n      container = params.container;\n    } else {\n      container = this.global.getRootElement();\n    }\n    if (!container) {\n      throw new Error('发生错误，containerId可能传入有误');\n    }\n\n    if (!params.offscreen) {\n      container.appendChild(nativeCanvas);\n    } else {\n      container = null;\n    }\n\n    // 绑定\n    const options = {\n      width: params.width,\n      height: params.height,\n      dpr: params.dpr,\n      nativeCanvas,\n      container,\n      id: BrowserWindowHandlerContribution.GenerateCanvasId(),\n      canvasControled: true\n    };\n    this.canvas = new BrowserCanvas(options);\n    // 应用位置属性\n    // window上的不需要设置position\n    // this.canvas.applyPosition();\n    // this.canvas.resetStyle(options);\n  }\n  private createWindowByCanvas(params: IWindowParams) {\n    // 获取canvas\n    let canvas: HTMLCanvasElement | null;\n    if (typeof params.canvas === 'string') {\n      canvas = this.global.getElementById(params.canvas) as HTMLCanvasElement | null;\n      if (!canvas) {\n        throw new Error('canvasId 参数不正确，请确认canvas存在并插入dom');\n      }\n    } else {\n      canvas = params!.canvas as HTMLCanvasElement | null;\n    }\n    if (!canvas) {\n      throw new Error('发生错误，传入的canvas不正确');\n    }\n\n    // 如果没有传入wh，或者是不受控制的canvas，那就用canvas的原始wh\n    let width = params.width;\n    let height = params.height;\n    if (width == null || height == null || !params.canvasControled) {\n      const data = canvas.getBoundingClientRect();\n      width = data.width;\n      height = data.height;\n    }\n    // 如果没有dpr，就使用canvas的原始dpr\n    let dpr = params.dpr;\n    // if (params.canvasControled === false) {\n    //   if (dpr) {\n    //     console.warn('canvasControled为false后，dpr参数将无效');\n    //   }\n    //   dpr = null;\n    // }\n    if (dpr == null) {\n      const ctx = canvas.getContext('2d');\n      // 兼容XTable\n      dpr = (ctx as any).pixelRatio ?? canvas.width / width;\n    }\n    this.canvas = new BrowserCanvas({\n      width: width,\n      height: height,\n      dpr: dpr,\n      nativeCanvas: canvas,\n      canvasControled: params.canvasControled\n    });\n    // if (params.canvasControled) {\n    //   this.canvas.resetStyle({\n    //     width,\n    //     height,\n    //     dpr\n    //   });\n    // }\n  }\n  releaseWindow(): void {\n    this.canvas.release();\n  }\n  resizeWindow(width: number, height: number): void {\n    this.canvas.resize(width, height);\n  }\n  setDpr(dpr: number): void {\n    this.canvas.dpr = dpr;\n  }\n\n  getContext(): IContext2d {\n    return this.canvas.getContext();\n  }\n  getNativeHandler(): ICanvas {\n    return this.canvas;\n  }\n  getDpr(): number {\n    return this.canvas.dpr;\n  }\n\n  addEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | AddEventListenerOptions\n  ): void;\n  addEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | AddEventListenerOptions\n  ): void {\n    return (this.canvas.nativeCanvas as HTMLCanvasElement).addEventListener(type, listener, options);\n  }\n  removeEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | EventListenerOptions\n  ): void;\n  removeEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | EventListenerOptions\n  ): void {\n    return (this.canvas.nativeCanvas as HTMLCanvasElement).removeEventListener(type, listener, options);\n  }\n  dispatchEvent(event: any): boolean {\n    return (this.canvas.nativeCanvas as HTMLCanvasElement).dispatchEvent(event);\n  }\n\n  getStyle(): CSSStyleDeclaration | Record<string, any> {\n    return this.canvas.nativeCanvas.style;\n  }\n  setStyle(style: CSSStyleDeclaration | Record<string, any>) {\n    this.canvas.nativeCanvas.style = style;\n  }\n\n  getBoundingClientRect(): IDomRectLike {\n    const c = this.canvas.nativeCanvas as HTMLCanvasElement;\n    const wh = this.getWH();\n    if (!c.parentElement) {\n      return {\n        x: 0,\n        y: 0,\n        width: wh.width,\n        height: wh.height,\n        left: 0,\n        top: 0,\n        right: 0,\n        bottom: 0\n      };\n    }\n    return this.canvas.nativeCanvas.getBoundingClientRect();\n  }\n\n  clearViewBox(vb: IBoundsLike, color?: string): void {\n    const context = this.getContext();\n    const dpr = this.getDpr();\n    context.nativeContext.save();\n    (context.nativeContext as CanvasRenderingContext2D).setTransform(dpr, 0, 0, dpr, 0, 0);\n    context.clearRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1);\n    if (color) {\n      context.fillStyle = color;\n      context.fillRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1);\n    }\n    context.nativeContext.restore();\n  }\n\n  isVisible(bbox?: IBoundsLike) {\n    return this._canvasIsIntersecting;\n  }\n\n  onVisibleChange(cb: (currentVisible: boolean) => void) {\n    this._onVisibleChangeCb = cb;\n  }\n\n  getTopLeft(baseWindow?: boolean): { top: number; left: number } {\n    return this.global.getElementTopLeft(this.canvas.nativeCanvas, baseWindow);\n  }\n}\n\nexport const browserWindowModule = new ContainerModule(bind => {\n  // browser\n  bind(BrowserWindowHandlerContribution).toSelf();\n  bind(WindowHandlerContribution)\n    .toDynamicValue(ctx => ctx.container.get(BrowserWindowHandlerContribution))\n    .whenTargetNamed(BrowserWindowHandlerContribution.env);\n});\n"]}
+{"version":3,"sources":["../src/window/contributions/browser-contribution.ts"],"names":[],"mappings":"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","file":"browser-contribution.js","sourcesContent":["import {\n  inject,\n  injectable,\n  Generator,\n  BaseWindowHandlerContribution,\n  VGlobal,\n  ContainerModule,\n  WindowHandlerContribution\n} from '@visactor/vrender-core';\nimport type {\n  IContext2d,\n  ICanvas,\n  IDomRectLike,\n  EnvType,\n  IGlobal,\n  IWindowHandlerContribution,\n  IWindowParams\n} from '@visactor/vrender-core';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport { BrowserCanvas } from '../../canvas/contributions/browser';\n\n@injectable()\nexport class BrowserWindowHandlerContribution\n  extends BaseWindowHandlerContribution\n  implements IWindowHandlerContribution\n{\n  static env: EnvType = 'browser';\n\n  type: EnvType = 'browser';\n\n  canvas: ICanvas;\n\n  observer?: MutationObserver;\n\n  protected _canvasIsIntersecting: boolean;\n  protected _onVisibleChangeCb: (currentVisible: boolean) => void;\n\n  get container(): HTMLElement | null {\n    return this.canvas.nativeCanvas.parentElement;\n  }\n\n  constructor(@inject(VGlobal) private readonly global: IGlobal) {\n    super();\n    this._canvasIsIntersecting = true;\n  }\n\n  getTitle(): string {\n    return this.canvas.id.toString();\n  }\n\n  getWH(): { width: number; height: number } {\n    return {\n      width: this.canvas.width / (this.canvas.dpr || 1),\n      height: this.canvas.height / (this.canvas.dpr || 1)\n    };\n  }\n\n  getXY(): { x: number; y: number } {\n    return this.canvas.nativeCanvas.getBoundingClientRect();\n  }\n\n  createWindow(params: IWindowParams): void {\n    // 如果没有传入canvas，那么就创建一个canvas\n    if (!params.canvas) {\n      this.createWindowByConfig(params);\n    } else {\n      this.createWindowByCanvas(params);\n    }\n\n    this.postInit();\n\n    // this.bindOnChangeEvent();\n  }\n\n  protected postInit() {\n    try {\n      this.observerCanvas();\n    } catch (err) {\n      console.error('发生错误，该环境不存在IntersectionObserver');\n    }\n  }\n\n  isElementVisible(el: HTMLElement) {\n    const rect = el.getBoundingClientRect();\n    const vWidth = window.innerWidth || document.documentElement.clientWidth;\n    const vHeight = window.innerHeight || document.documentElement.clientHeight;\n\n    if (rect.right < 0 || rect.bottom < 0 || rect.left > vWidth || rect.top > vHeight) {\n      return false;\n    }\n\n    return true;\n  }\n\n  protected observerCanvas() {\n    this._canvasIsIntersecting = this.isElementVisible(this.canvas.nativeCanvas);\n    const observer = new IntersectionObserver((entries, observer) => {\n      entries.forEach(entry => {\n        if (this._canvasIsIntersecting !== entry.isIntersecting) {\n          this._canvasIsIntersecting = entry.isIntersecting;\n          this._onVisibleChangeCb && this._onVisibleChangeCb(entry.isIntersecting);\n        } else {\n          this._canvasIsIntersecting = entry.isIntersecting;\n        }\n      });\n    });\n    if (!observer) {\n      return;\n    }\n    observer.observe(this.canvas.nativeCanvas);\n  }\n\n  // private bindOnChangeEvent() {\n  //   const { nativeCanvas } = this.canvas;\n  //   const observer = new MutationObserver((mutations, observer) => {\n  //     mutations.forEach((mutaion) => {\n  //       console.log(mutaion);\n  //     })\n  //   });\n  //   observer.observe(nativeCanvas, { attributes: true, childList: true, subtree: true })\n  // }\n\n  private createWindowByConfig(params: IWindowParams) {\n    // 创建canvas\n    const nativeCanvas = this.global.createCanvas({\n      width: params.width,\n      height: params.height\n    });\n    // 保存到dom中\n    let container: HTMLElement | null;\n    if (typeof params.container === 'string') {\n      container = this.global.getElementById(params.container);\n    } else if (params.container) {\n      container = params.container;\n    } else {\n      container = this.global.getRootElement();\n    }\n    if (!container) {\n      throw new Error('发生错误，containerId可能传入有误');\n    }\n\n    if (!params.offscreen) {\n      container.appendChild(nativeCanvas);\n    } else {\n      container = null;\n    }\n\n    // 绑定\n    const options = {\n      width: params.width,\n      height: params.height,\n      dpr: params.dpr,\n      nativeCanvas,\n      container,\n      id: Generator.GenAutoIncrementId().toString(),\n      canvasControled: true\n    };\n    this.canvas = new BrowserCanvas(options);\n    // 应用位置属性\n    // window上的不需要设置position\n    // this.canvas.applyPosition();\n    // this.canvas.resetStyle(options);\n  }\n  private createWindowByCanvas(params: IWindowParams) {\n    // 获取canvas\n    let canvas: HTMLCanvasElement | null;\n    if (typeof params.canvas === 'string') {\n      canvas = this.global.getElementById(params.canvas) as HTMLCanvasElement | null;\n      if (!canvas) {\n        throw new Error('canvasId 参数不正确，请确认canvas存在并插入dom');\n      }\n    } else {\n      canvas = params!.canvas as HTMLCanvasElement | null;\n    }\n    if (!canvas) {\n      throw new Error('发生错误，传入的canvas不正确');\n    }\n\n    // 如果没有传入wh，或者是不受控制的canvas，那就用canvas的原始wh\n    let width = params.width;\n    let height = params.height;\n    if (width == null || height == null || !params.canvasControled) {\n      const data = canvas.getBoundingClientRect();\n      width = data.width;\n      height = data.height;\n    }\n    // 如果没有dpr，就使用canvas的原始dpr\n    let dpr = params.dpr;\n    // if (params.canvasControled === false) {\n    //   if (dpr) {\n    //     console.warn('canvasControled为false后，dpr参数将无效');\n    //   }\n    //   dpr = null;\n    // }\n    if (dpr == null) {\n      const ctx = canvas.getContext('2d');\n      // 兼容XTable\n      dpr = (ctx as any).pixelRatio ?? canvas.width / width;\n    }\n    this.canvas = new BrowserCanvas({\n      width: width,\n      height: height,\n      dpr: dpr,\n      nativeCanvas: canvas,\n      canvasControled: params.canvasControled\n    });\n    // if (params.canvasControled) {\n    //   this.canvas.resetStyle({\n    //     width,\n    //     height,\n    //     dpr\n    //   });\n    // }\n  }\n  releaseWindow(): void {\n    this.canvas.release();\n  }\n  resizeWindow(width: number, height: number): void {\n    this.canvas.resize(width, height);\n  }\n  setDpr(dpr: number): void {\n    this.canvas.dpr = dpr;\n  }\n\n  getContext(): IContext2d {\n    return this.canvas.getContext();\n  }\n  getNativeHandler(): ICanvas {\n    return this.canvas;\n  }\n  getDpr(): number {\n    return this.canvas.dpr;\n  }\n\n  addEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | AddEventListenerOptions\n  ): void;\n  addEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | AddEventListenerOptions\n  ): void {\n    return (this.canvas.nativeCanvas as HTMLCanvasElement).addEventListener(type, listener, options);\n  }\n  removeEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | EventListenerOptions\n  ): void;\n  removeEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | EventListenerOptions\n  ): void {\n    return (this.canvas.nativeCanvas as HTMLCanvasElement).removeEventListener(type, listener, options);\n  }\n  dispatchEvent(event: any): boolean {\n    return (this.canvas.nativeCanvas as HTMLCanvasElement).dispatchEvent(event);\n  }\n\n  getStyle(): CSSStyleDeclaration | Record<string, any> {\n    return this.canvas.nativeCanvas.style;\n  }\n  setStyle(style: CSSStyleDeclaration | Record<string, any>) {\n    this.canvas.nativeCanvas.style = style;\n  }\n\n  getBoundingClientRect(): IDomRectLike {\n    const c = this.canvas.nativeCanvas as HTMLCanvasElement;\n    const wh = this.getWH();\n    if (!c.parentElement) {\n      return {\n        x: 0,\n        y: 0,\n        width: wh.width,\n        height: wh.height,\n        left: 0,\n        top: 0,\n        right: 0,\n        bottom: 0\n      };\n    }\n    return this.canvas.nativeCanvas.getBoundingClientRect();\n  }\n\n  clearViewBox(vb: IBoundsLike, color?: string): void {\n    const context = this.getContext();\n    const dpr = this.getDpr();\n    context.nativeContext.save();\n    (context.nativeContext as CanvasRenderingContext2D).setTransform(dpr, 0, 0, dpr, 0, 0);\n    context.clearRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1);\n    if (color) {\n      context.fillStyle = color;\n      context.fillRect(vb.x1, vb.y1, vb.x2 - vb.x1, vb.y2 - vb.y1);\n    }\n    context.nativeContext.restore();\n  }\n\n  isVisible(bbox?: IBoundsLike) {\n    return this._canvasIsIntersecting;\n  }\n\n  onVisibleChange(cb: (currentVisible: boolean) => void) {\n    this._onVisibleChangeCb = cb;\n  }\n\n  getTopLeft(baseWindow?: boolean): { top: number; left: number } {\n    return this.global.getElementTopLeft(this.canvas.nativeCanvas, baseWindow);\n  }\n}\n\nexport const browserWindowModule = new ContainerModule(bind => {\n  // browser\n  bind(BrowserWindowHandlerContribution).toSelf();\n  bind(WindowHandlerContribution)\n    .toDynamicValue(ctx => ctx.container.get(BrowserWindowHandlerContribution))\n    .whenTargetNamed(BrowserWindowHandlerContribution.env);\n});\n"]}