@visactor/vrender-kits 1.0.37-alpha.1 → 1.1.0-alpha.0

package/es/register/register-richtext.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/register/register-richtext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAE7F,SAAS,iBAAiB;IACxB,IAAI,iBAAiB,CAAC,QAAQ,EAAE;QAC9B,OAAO;KACR;IACD,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC;IAClC,uBAAuB,EAAE,CAAC;IAC1B,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC/B,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC;AAC9E,CAAC;AAED,iBAAiB,CAAC,QAAQ,GAAG,KAAK,CAAC;AAEnC,MAAM,CAAC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC","file":"register-richtext.js","sourcesContent":["import { container, registerRichtextGraphic, richtextModule } from '@visactor/vrender-core';\nimport { browser } from './env';\nimport { richtextCanvasPickModule } from '../picker/contributions/canvas-picker/richtext-module';\nimport { richTextMathPickModule } from '../picker/contributions/math-picker/richtext-module';\n\nfunction _registerRichtext() {\n  if (_registerRichtext.__loaded) {\n    return;\n  }\n  _registerRichtext.__loaded = true;\n  registerRichtextGraphic();\n  container.load(richtextModule);\n  container.load(browser ? richtextCanvasPickModule : richTextMathPickModule);\n}\n\n_registerRichtext.__loaded = false;\n\nexport const registerRichtext = _registerRichtext;\n"]}
+{"version":3,"sources":["../src/register/register-richtext.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,aAAa,EACb,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,4BAA4B,EAAE,MAAM,uDAAuD,CAAC;AACrG,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AAEjG,SAAS,iBAAiB;IACxB,IAAI,iBAAiB,CAAC,QAAQ,EAAE;QAC9B,OAAO;KACR;IACD,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC;IAClC,uBAAuB,EAAE,CAAC;IAC1B,IAAI,OAAO,EAAE;QACX,4BAA4B,EAAE,CAAC;KAChC;SAAM;QACL,0BAA0B,EAAE,CAAC;KAC9B;IAED,oBAAoB,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,2BAA2B,EAAE,CAAC,CAAC;AAClF,CAAC;AAED,iBAAiB,CAAC,QAAQ,GAAG,KAAK,CAAC;AAEnC,MAAM,CAAC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC","file":"register-richtext.js","sourcesContent":["import {\n  contributionRegistry,\n  DefaultCanvasRichTextRender,\n  GraphicRender,\n  registerRichtextGraphic\n} from '@visactor/vrender-core';\nimport { browser } from './env';\nimport { registerCanvasRichtextPicker } from '../picker/contributions/canvas-picker/richtext-module';\nimport { registerMathRichTextPicker } from '../picker/contributions/math-picker/richtext-module';\n\nfunction _registerRichtext() {\n  if (_registerRichtext.__loaded) {\n    return;\n  }\n  _registerRichtext.__loaded = true;\n  registerRichtextGraphic();\n  if (browser) {\n    registerCanvasRichtextPicker();\n  } else {\n    registerMathRichTextPicker();\n  }\n\n  contributionRegistry.register(GraphicRender, new DefaultCanvasRichTextRender());\n}\n\n_registerRichtext.__loaded = false;\n\nexport const registerRichtext = _registerRichtext;\n"]}

package/es/register/register-star.js

@@ -1,12 +1,10 @@
-import { container, starModule, registerStarGraphic } from "@visactor/vrender-core";
+import { contributionRegistry, DefaultCanvasStarRender, GraphicRender, registerStarGraphic } from "@visactor/vrender-core";
 
-import { browser } from "./env";
-
-import { starCanvasPickModule } from "../picker/contributions/canvas-picker/star-module";
+import { registerCanvasStarPicker } from "../picker/contributions/canvas-picker/star-module";
 
 function _registerStar() {
-    _registerStar.__loaded || (_registerStar.__loaded = !0, registerStarGraphic(), container.load(starModule), 
-    container.load(starCanvasPickModule));
+    _registerStar.__loaded || (_registerStar.__loaded = !0, registerStarGraphic(), registerCanvasStarPicker(), 
+    contributionRegistry.register(GraphicRender, new DefaultCanvasStarRender));
 }
 
 _registerStar.__loaded = !1;

package/es/register/register-star.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/register/register-star.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAEzF,SAAS,aAAa;IACpB,IAAI,aAAa,CAAC,QAAQ,EAAE;QAC1B,OAAO;KACR;IACD,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC9B,mBAAmB,EAAE,CAAC;IACtB,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3B,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;AACxE,CAAC;AAED,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;AAE/B,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC","file":"register-star.js","sourcesContent":["import { container, starModule, registerStarGraphic } from '@visactor/vrender-core';\nimport { browser } from './env';\nimport { starCanvasPickModule } from '../picker/contributions/canvas-picker/star-module';\n\nfunction _registerStar() {\n  if (_registerStar.__loaded) {\n    return;\n  }\n  _registerStar.__loaded = true;\n  registerStarGraphic();\n  container.load(starModule);\n  container.load(browser ? starCanvasPickModule : starCanvasPickModule);\n}\n\n_registerStar.__loaded = false;\n\nexport const registerStar = _registerStar;\n"]}
+{"version":3,"sources":["../src/register/register-star.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,aAAa,EACb,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F,SAAS,aAAa;IACpB,IAAI,aAAa,CAAC,QAAQ,EAAE;QAC1B,OAAO;KACR;IACD,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC9B,mBAAmB,EAAE,CAAC;IACtB,wBAAwB,EAAE,CAAC;IAE3B,oBAAoB,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,uBAAuB,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;AAE/B,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC","file":"register-star.js","sourcesContent":["import {\n  contributionRegistry,\n  DefaultCanvasStarRender,\n  GraphicRender,\n  registerStarGraphic\n} from '@visactor/vrender-core';\nimport { browser } from './env';\nimport { registerCanvasStarPicker } from '../picker/contributions/canvas-picker/star-module';\n\nfunction _registerStar() {\n  if (_registerStar.__loaded) {\n    return;\n  }\n  _registerStar.__loaded = true;\n  registerStarGraphic();\n  registerCanvasStarPicker();\n\n  contributionRegistry.register(GraphicRender, new DefaultCanvasStarRender());\n}\n\n_registerStar.__loaded = false;\n\nexport const registerStar = _registerStar;\n"]}

package/es/register/register-symbol.js

@@ -1,14 +1,15 @@
-import { container, registerSymbolGraphic, symbolModule } from "@visactor/vrender-core";
+import { contributionRegistry, DefaultBaseInteractiveRenderContribution, DefaultCanvasSymbolRender, GraphicRender, registerSymbolGraphic, serviceRegistry, SymbolRenderContribution } from "@visactor/vrender-core";
 
 import { browser } from "./env";
 
-import { symbolCanvasPickModule } from "../picker/contributions/canvas-picker/symbol-module";
+import { registerCanvasSymbolPicker } from "../picker/contributions/canvas-picker/symbol-module";
 
-import { symbolMathPickModule } from "../picker/contributions/math-picker/symbol-module";
+import { registerMathSymbolPicker } from "../picker/contributions/math-picker/symbol-module";
 
 function _registerSymbol() {
     _registerSymbol.__loaded || (_registerSymbol.__loaded = !0, registerSymbolGraphic(), 
-    container.load(symbolModule), container.load(browser ? symbolCanvasPickModule : symbolMathPickModule));
+    browser ? registerCanvasSymbolPicker() : registerMathSymbolPicker(), contributionRegistry.register(SymbolRenderContribution, serviceRegistry.get(DefaultBaseInteractiveRenderContribution)), 
+    contributionRegistry.register(GraphicRender, new DefaultCanvasSymbolRender));
 }
 
 _registerSymbol.__loaded = !1;

package/es/register/register-symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/register/register-symbol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAEzF,SAAS,eAAe;IACtB,IAAI,eAAe,CAAC,QAAQ,EAAE;QAC5B,OAAO;KACR;IACD,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAC;IAChC,qBAAqB,EAAE,CAAC;IACxB,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7B,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;AAC1E,CAAC;AAED,eAAe,CAAC,QAAQ,GAAG,KAAK,CAAC;AAEjC,MAAM,CAAC,MAAM,cAAc,GAAG,eAAe,CAAC","file":"register-symbol.js","sourcesContent":["import { container, registerSymbolGraphic, symbolModule } from '@visactor/vrender-core';\nimport { browser } from './env';\nimport { symbolCanvasPickModule } from '../picker/contributions/canvas-picker/symbol-module';\nimport { symbolMathPickModule } from '../picker/contributions/math-picker/symbol-module';\n\nfunction _registerSymbol() {\n  if (_registerSymbol.__loaded) {\n    return;\n  }\n  _registerSymbol.__loaded = true;\n  registerSymbolGraphic();\n  container.load(symbolModule);\n  container.load(browser ? symbolCanvasPickModule : symbolMathPickModule);\n}\n\n_registerSymbol.__loaded = false;\n\nexport const registerSymbol = _registerSymbol;\n"]}
+{"version":3,"sources":["../src/register/register-symbol.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,wCAAwC,EACxC,yBAAyB,EACzB,aAAa,EACb,qBAAqB,EACrB,eAAe,EACf,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAE7F,SAAS,eAAe;IACtB,IAAI,eAAe,CAAC,QAAQ,EAAE;QAC5B,OAAO;KACR;IACD,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAC;IAChC,qBAAqB,EAAE,CAAC;IACxB,IAAI,OAAO,EAAE;QACX,0BAA0B,EAAE,CAAC;KAC9B;SAAM;QACL,wBAAwB,EAAE,CAAC;KAC5B;IACD,oBAAoB,CAAC,QAAQ,CAC3B,wBAAwB,EACxB,eAAe,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAC9D,CAAC;IACF,oBAAoB,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,yBAAyB,EAAE,CAAC,CAAC;AAChF,CAAC;AAED,eAAe,CAAC,QAAQ,GAAG,KAAK,CAAC;AAEjC,MAAM,CAAC,MAAM,cAAc,GAAG,eAAe,CAAC","file":"register-symbol.js","sourcesContent":["import {\n  contributionRegistry,\n  DefaultBaseInteractiveRenderContribution,\n  DefaultCanvasSymbolRender,\n  GraphicRender,\n  registerSymbolGraphic,\n  serviceRegistry,\n  SymbolRenderContribution\n} from '@visactor/vrender-core';\nimport { browser } from './env';\nimport { registerCanvasSymbolPicker } from '../picker/contributions/canvas-picker/symbol-module';\nimport { registerMathSymbolPicker } from '../picker/contributions/math-picker/symbol-module';\n\nfunction _registerSymbol() {\n  if (_registerSymbol.__loaded) {\n    return;\n  }\n  _registerSymbol.__loaded = true;\n  registerSymbolGraphic();\n  if (browser) {\n    registerCanvasSymbolPicker();\n  } else {\n    registerMathSymbolPicker();\n  }\n  contributionRegistry.register(\n    SymbolRenderContribution,\n    serviceRegistry.get(DefaultBaseInteractiveRenderContribution)\n  );\n  contributionRegistry.register(GraphicRender, new DefaultCanvasSymbolRender());\n}\n\n_registerSymbol.__loaded = false;\n\nexport const registerSymbol = _registerSymbol;\n"]}

package/es/register/register-text.js

@@ -1,14 +1,15 @@
-import { container, registerTextGraphic, textModule } from "@visactor/vrender-core";
+import { contributionRegistry, DefaultBaseInteractiveRenderContribution, DefaultCanvasTextRender, GraphicRender, registerTextGraphic, serviceRegistry, TextRenderContribution } from "@visactor/vrender-core";
 
 import { browser } from "./env";
 
-import { textCanvasPickModule } from "../picker/contributions/canvas-picker/text-module";
+import { registerCanvasTextPicker } from "../picker/contributions/canvas-picker/text-module";
 
-import { textMathPickModule } from "../picker/contributions/math-picker/text-module";
+import { registerMathTextPicker } from "../picker/contributions/math-picker/text-module";
 
 function _registerText() {
-    _registerText.__loaded || (_registerText.__loaded = !0, registerTextGraphic(), container.load(textModule), 
-    container.load(browser ? textCanvasPickModule : textMathPickModule));
+    _registerText.__loaded || (_registerText.__loaded = !0, registerTextGraphic(), browser ? registerCanvasTextPicker() : registerMathTextPicker(), 
+    contributionRegistry.register(TextRenderContribution, serviceRegistry.get(DefaultBaseInteractiveRenderContribution)), 
+    contributionRegistry.register(GraphicRender, new DefaultCanvasTextRender));
 }
 
 _registerText.__loaded = !1;

package/es/register/register-text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/register/register-text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,SAAS,aAAa;IACpB,IAAI,aAAa,CAAC,QAAQ,EAAE;QAC1B,OAAO;KACR;IACD,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC9B,mBAAmB,EAAE,CAAC;IACtB,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3B,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;AACtE,CAAC;AAED,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;AAE/B,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC","file":"register-text.js","sourcesContent":["import { container, registerTextGraphic, textModule } from '@visactor/vrender-core';\nimport { browser } from './env';\nimport { textCanvasPickModule } from '../picker/contributions/canvas-picker/text-module';\nimport { textMathPickModule } from '../picker/contributions/math-picker/text-module';\nfunction _registerText() {\n  if (_registerText.__loaded) {\n    return;\n  }\n  _registerText.__loaded = true;\n  registerTextGraphic();\n  container.load(textModule);\n  container.load(browser ? textCanvasPickModule : textMathPickModule);\n}\n\n_registerText.__loaded = false;\n\nexport const registerText = _registerText;\n"]}
+{"version":3,"sources":["../src/register/register-text.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,wCAAwC,EACxC,uBAAuB,EACvB,aAAa,EACb,mBAAmB,EACnB,eAAe,EACf,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,SAAS,aAAa;IACpB,IAAI,aAAa,CAAC,QAAQ,EAAE;QAC1B,OAAO;KACR;IACD,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC9B,mBAAmB,EAAE,CAAC;IACtB,IAAI,OAAO,EAAE;QACX,wBAAwB,EAAE,CAAC;KAC5B;SAAM;QACL,sBAAsB,EAAE,CAAC;KAC1B;IACD,oBAAoB,CAAC,QAAQ,CAAC,sBAAsB,EAAE,eAAe,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC,CAAC;IACrH,oBAAoB,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,uBAAuB,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;AAE/B,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC","file":"register-text.js","sourcesContent":["import {\n  contributionRegistry,\n  DefaultBaseInteractiveRenderContribution,\n  DefaultCanvasTextRender,\n  GraphicRender,\n  registerTextGraphic,\n  serviceRegistry,\n  TextRenderContribution\n} from '@visactor/vrender-core';\nimport { browser } from './env';\nimport { registerCanvasTextPicker } from '../picker/contributions/canvas-picker/text-module';\nimport { registerMathTextPicker } from '../picker/contributions/math-picker/text-module';\nfunction _registerText() {\n  if (_registerText.__loaded) {\n    return;\n  }\n  _registerText.__loaded = true;\n  registerTextGraphic();\n  if (browser) {\n    registerCanvasTextPicker();\n  } else {\n    registerMathTextPicker();\n  }\n  contributionRegistry.register(TextRenderContribution, serviceRegistry.get(DefaultBaseInteractiveRenderContribution));\n  contributionRegistry.register(GraphicRender, new DefaultCanvasTextRender());\n}\n\n_registerText.__loaded = false;\n\nexport const registerText = _registerText;\n"]}

package/es/register/register-wraptext.js

@@ -6,5 +6,4 @@ function _registerWrapText() {
 
 _registerWrapText.__loaded = !1;
 
-export const registerWrapText = _registerWrapText;
-//# sourceMappingURL=register-wraptext.js.map
+export const registerWrapText = _registerWrapText;

package/es/render/contributions/canvas/gif-image-module.d.ts

@@ -1,2 +1 @@
-import { ContainerModule } from '@visactor/vrender-core';
-export declare const gifImageModule: ContainerModule;
+export declare function registerCanvasGifImageRender(): void;

package/es/render/contributions/canvas/gif-image-module.js

@@ -1,11 +1,10 @@
-import { ContainerModule, GraphicRender } from "@visactor/vrender-core";
+import { contributionRegistry, GraphicRender } from "@visactor/vrender-core";
 
 import { DefaultCanvasGifImageRender } from "./gif-image-render";
 
-let loadGifImageModule = !1;
+let _registered = !1;
 
-export const gifImageModule = new ContainerModule((bind => {
-    loadGifImageModule || (loadGifImageModule = !0, bind(DefaultCanvasGifImageRender).toSelf().inSingletonScope(), 
-    bind(GraphicRender).toService(DefaultCanvasGifImageRender));
-}));
+export function registerCanvasGifImageRender() {
+    _registered || (_registered = !0, contributionRegistry.register(GraphicRender, new DefaultCanvasGifImageRender));
+}
 //# sourceMappingURL=gif-image-module.js.map

package/es/render/contributions/canvas/gif-image-module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/canvas/gif-image-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,IAAI,kBAAkB,GAAG,KAAK,CAAC;AAC/B,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACvD,IAAI,kBAAkB,EAAE;QACtB,OAAO;KACR;IACD,kBAAkB,GAAG,IAAI,CAAC;IAE1B,IAAI,CAAC,2BAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC","file":"gif-image-module.js","sourcesContent":["import { ContainerModule, GraphicRender } from '@visactor/vrender-core';\nimport { DefaultCanvasGifImageRender } from './gif-image-render';\n\nlet loadGifImageModule = false;\nexport const gifImageModule = new ContainerModule(bind => {\n  if (loadGifImageModule) {\n    return;\n  }\n  loadGifImageModule = true;\n  // gifImage渲染器\n  bind(DefaultCanvasGifImageRender).toSelf().inSingletonScope();\n  bind(GraphicRender).toService(DefaultCanvasGifImageRender);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/canvas/gif-image-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,MAAM,UAAU,4BAA4B;IAC1C,IAAI,WAAW,EAAE;QACf,OAAO;KACR;IACD,WAAW,GAAG,IAAI,CAAC;IACnB,oBAAoB,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,2BAA2B,EAAE,CAAC,CAAC;AAClF,CAAC","file":"gif-image-module.js","sourcesContent":["import { contributionRegistry, GraphicRender } from '@visactor/vrender-core';\nimport { DefaultCanvasGifImageRender } from './gif-image-render';\n\nlet _registered = false;\nexport function registerCanvasGifImageRender() {\n  if (_registered) {\n    return;\n  }\n  _registered = true;\n  contributionRegistry.register(GraphicRender, new DefaultCanvasGifImageRender());\n}\n"]}

package/es/render/contributions/canvas/gif-image-render.d.ts

@@ -1,11 +1,10 @@
-import type { IContext2d, IContributionProvider, IDrawContext, IGraphicAttribute, IGraphicRender, IGraphicRenderDrawParams, IImageRenderContribution, IMarkAttribute, IRenderService, IThemeAttribute } from '@visactor/vrender-core';
+import type { IContext2d, IDrawContext, IGraphicAttribute, IGraphicRender, IGraphicRenderDrawParams, IImageRenderContribution, IMarkAttribute, IRenderService, IThemeAttribute } from '@visactor/vrender-core';
 import { BaseRenderContributionTime, DefaultCanvasImageRender, DefaultRectRenderContribution } from '@visactor/vrender-core';
 import type { IGifImage } from '../../../interface/gif-image';
 export declare class DefaultCanvasGifImageRender extends DefaultCanvasImageRender implements IGraphicRender {
-    protected readonly imageRenderContribitions: IContributionProvider<IImageRenderContribution>;
     type: 'image';
     numberType: number;
-    constructor(imageRenderContribitions: IContributionProvider<IImageRenderContribution>);
+    constructor();
     drawShape(image: IGifImage, context: IContext2d, x: number, y: number, drawContext: IDrawContext, params?: IGraphicRenderDrawParams, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
     draw(image: IGifImage, renderService: IRenderService, drawContext: IDrawContext): void;
 }

package/es/render/contributions/canvas/gif-image-render.js

@@ -1,24 +1,11 @@
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}, __metadata = this && this.__metadata || function(k, v) {
-    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
-};
-
-import { BaseRenderContributionTime, ContributionProvider, DefaultCanvasImageRender, DefaultRectRenderContribution, getTheme, ImageRenderContribution, inject, injectable, named } from "@visactor/vrender-core";
+import { BaseRenderContributionTime, DefaultCanvasImageRender, DefaultRectRenderContribution, getTheme } from "@visactor/vrender-core";
 
 import { GIFIMAGE_NUMBER_TYPE } from "../../../graphic/constants";
 
-let DefaultCanvasGifImageRender = class extends DefaultCanvasImageRender {
-    constructor(imageRenderContribitions) {
-        super(imageRenderContribitions), this.imageRenderContribitions = imageRenderContribitions, 
-        this.numberType = GIFIMAGE_NUMBER_TYPE, this._renderContribitions = void 0, this.builtinContributions = [ defaultGifImageRenderContribution ], 
-        this.init(imageRenderContribitions);
+export class DefaultCanvasGifImageRender extends DefaultCanvasImageRender {
+    constructor() {
+        super(), this.numberType = GIFIMAGE_NUMBER_TYPE, this._renderContribitions = void 0, 
+        this.builtinContributions = [ defaultGifImageRenderContribution ];
     }
     drawShape(image, context, x, y, drawContext, params, fillCb, strokeCb) {
         const imageAttribute = getTheme(image).image, {x: originX = imageAttribute.x, y: originY = imageAttribute.y, fillStrokeOrder: fillStrokeOrder = imageAttribute.fillStrokeOrder} = image.attribute, data = this.valid(image, imageAttribute, fillCb);
@@ -39,11 +26,7 @@ let DefaultCanvasGifImageRender = class extends DefaultCanvasImageRender {
         const imageAttribute = getTheme(image).image;
         this._draw(image, imageAttribute, !1, drawContext);
     }
-};
-
-DefaultCanvasGifImageRender = __decorate([ injectable(), __param(0, inject(ContributionProvider)), __param(0, named(ImageRenderContribution)), __metadata("design:paramtypes", [ Object ]) ], DefaultCanvasGifImageRender);
-
-export { DefaultCanvasGifImageRender };
+}
 
 export class DefaultGifImageRenderContribution extends DefaultRectRenderContribution {
     constructor() {

package/es/render/contributions/canvas/gif-image-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/canvas/gif-image-render.ts"],"names":[],"mappings":"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","file":"gif-image-render.js","sourcesContent":["import type {\n  IContext2d,\n  IContributionProvider,\n  IDrawContext,\n  IGraphicAttribute,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IImageRenderContribution,\n  IMarkAttribute,\n  IRenderService,\n  IThemeAttribute\n} from '@visactor/vrender-core';\nimport {\n  BaseRenderContributionTime,\n  ContributionProvider,\n  DefaultCanvasImageRender,\n  DefaultRectRenderContribution,\n  getTheme,\n  ImageRenderContribution,\n  inject,\n  injectable,\n  named\n} from '@visactor/vrender-core';\nimport { GIFIMAGE_NUMBER_TYPE } from '../../../graphic/constants';\nimport type { IGifImage } from '../../../interface/gif-image';\n\n@injectable()\nexport class DefaultCanvasGifImageRender extends DefaultCanvasImageRender implements IGraphicRender {\n  type: 'image';\n  numberType: number = GIFIMAGE_NUMBER_TYPE;\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(ImageRenderContribution)\n    protected readonly imageRenderContribitions: IContributionProvider<IImageRenderContribution>\n  ) {\n    super(imageRenderContribitions);\n    this._renderContribitions = undefined;\n    this.builtinContributions = [defaultGifImageRenderContribution];\n    this.init(imageRenderContribitions);\n  }\n\n  drawShape(\n    image: IGifImage,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const imageAttribute = graphicService.themeService.getCurrentTheme().imageAttribute;\n    const imageAttribute = getTheme(image).image;\n    const {\n      x: originX = imageAttribute.x,\n      y: originY = imageAttribute.y,\n      fillStrokeOrder = imageAttribute.fillStrokeOrder\n    } = image.attribute;\n\n    const data = this.valid(image, imageAttribute, fillCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    // deal with cornerRadius\n    const needRestore = true;\n\n    const _runFill = () => {\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, image.attribute, imageAttribute);\n        } else if (fVisible) {\n        }\n      }\n    };\n\n    const _runStroke = () => {\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, image.attribute, imageAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    if (!fillStrokeOrder) {\n      if (needRestore) {\n        context.save();\n        context.clip();\n      }\n      this.beforeRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n      _runFill();\n      if (needRestore) {\n        context.restore();\n      }\n      _runStroke();\n    } else {\n      _runStroke();\n      if (needRestore) {\n        context.save();\n        context.clip();\n      }\n      this.beforeRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n      _runFill();\n      if (needRestore) {\n        context.restore();\n      }\n    }\n\n    this.afterRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n  }\n\n  draw(image: IGifImage, renderService: IRenderService, drawContext: IDrawContext) {\n    const { context } = renderService.drawParams;\n    if (!context) {\n      return;\n    }\n    const imageAttribute = getTheme(image).image;\n    this._draw(image, imageAttribute, false, drawContext);\n  }\n}\n\nexport class DefaultGifImageRenderContribution\n  extends DefaultRectRenderContribution\n  implements IImageRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    image: any,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: any,\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    if (image.renderFrame && image.playing) {\n      image.renderFrame(context, x, y);\n    }\n  }\n}\n\nexport const defaultGifImageRenderContribution = new DefaultGifImageRenderContribution();\n"]}
+{"version":3,"sources":["../src/render/contributions/canvas/gif-image-render.ts"],"names":[],"mappings":"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","file":"gif-image-render.js","sourcesContent":["import type {\n  IContext2d,\n  IDrawContext,\n  IGraphicAttribute,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IImageRenderContribution,\n  IMarkAttribute,\n  IRenderService,\n  IThemeAttribute\n} from '@visactor/vrender-core';\nimport {\n  BaseRenderContributionTime,\n  DefaultCanvasImageRender,\n  DefaultRectRenderContribution,\n  getTheme\n} from '@visactor/vrender-core';\nimport { GIFIMAGE_NUMBER_TYPE } from '../../../graphic/constants';\nimport type { IGifImage } from '../../../interface/gif-image';\n\nexport class DefaultCanvasGifImageRender extends DefaultCanvasImageRender implements IGraphicRender {\n  type: 'image';\n  numberType: number = GIFIMAGE_NUMBER_TYPE;\n\n  constructor() {\n    super();\n    this._renderContribitions = undefined;\n    this.builtinContributions = [defaultGifImageRenderContribution];\n  }\n\n  drawShape(\n    image: IGifImage,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const imageAttribute = getTheme(image).image;\n    const {\n      x: originX = imageAttribute.x,\n      y: originY = imageAttribute.y,\n      fillStrokeOrder = imageAttribute.fillStrokeOrder\n    } = image.attribute;\n\n    const data = this.valid(image, imageAttribute, fillCb);\n    if (!data) {\n      return;\n    }\n    const { fVisible, sVisible, doFill, doStroke } = data;\n\n    const needRestore = true;\n\n    const _runFill = () => {\n      if (doFill) {\n        if (fillCb) {\n          fillCb(context, image.attribute, imageAttribute);\n        } else if (fVisible) {\n        }\n      }\n    };\n\n    const _runStroke = () => {\n      if (doStroke) {\n        if (strokeCb) {\n          strokeCb(context, image.attribute, imageAttribute);\n        } else if (sVisible) {\n          context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute);\n          context.stroke();\n        }\n      }\n    };\n\n    if (!fillStrokeOrder) {\n      if (needRestore) {\n        context.save();\n        context.clip();\n      }\n      this.beforeRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n      _runFill();\n      if (needRestore) {\n        context.restore();\n      }\n      _runStroke();\n    } else {\n      _runStroke();\n      if (needRestore) {\n        context.save();\n        context.clip();\n      }\n      this.beforeRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n      _runFill();\n      if (needRestore) {\n        context.restore();\n      }\n    }\n\n    this.afterRenderStep(image, context, x, y, doFill, false, fVisible, false, imageAttribute, drawContext, fillCb);\n  }\n\n  draw(image: IGifImage, renderService: IRenderService, drawContext: IDrawContext) {\n    const { context } = renderService.drawParams;\n    if (!context) {\n      return;\n    }\n    const imageAttribute = getTheme(image).image;\n    this._draw(image, imageAttribute, false, drawContext);\n  }\n}\n\nexport class DefaultGifImageRenderContribution\n  extends DefaultRectRenderContribution\n  implements IImageRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    image: any,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: any,\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    if (image.renderFrame && image.playing) {\n      image.renderFrame(context, x, y);\n    }\n  }\n}\n\nexport const defaultGifImageRenderContribution = new DefaultGifImageRenderContribution();\n"]}

package/es/render/contributions/canvas/lottie-module.d.ts

@@ -1,2 +1 @@
-import { ContainerModule } from '@visactor/vrender-core';
-export declare const lottieModule: ContainerModule;
+export declare function registerCanvasLottieRender(): void;

package/es/render/contributions/canvas/lottie-module.js

@@ -1,11 +1,13 @@
-import { ContainerModule, GraphicRender } from "@visactor/vrender-core";
+import { serviceRegistry, contributionRegistry, GraphicRender } from "@visactor/vrender-core";
 
 import { DefaultCanvasLottieRender } from "./lottie-render";
 
-let loadLottieModule = !1;
+let _registered = !1;
 
-export const lottieModule = new ContainerModule((bind => {
-    loadLottieModule || (loadLottieModule = !0, bind(DefaultCanvasLottieRender).toSelf().inSingletonScope(), 
-    bind(GraphicRender).toService(DefaultCanvasLottieRender));
-}));
+export function registerCanvasLottieRender() {
+    if (_registered) return;
+    _registered = !0;
+    const render = new DefaultCanvasLottieRender;
+    serviceRegistry.registerSingleton(GraphicRender, render), contributionRegistry.register(GraphicRender, render);
+}
 //# sourceMappingURL=lottie-module.js.map

package/es/render/contributions/canvas/lottie-module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/canvas/lottie-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAC7B,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACrD,IAAI,gBAAgB,EAAE;QACpB,OAAO;KACR;IACD,gBAAgB,GAAG,IAAI,CAAC;IAExB,IAAI,CAAC,yBAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC","file":"lottie-module.js","sourcesContent":["import { ContainerModule, GraphicRender } from '@visactor/vrender-core';\nimport { DefaultCanvasLottieRender } from './lottie-render';\n\nlet loadLottieModule = false;\nexport const lottieModule = new ContainerModule(bind => {\n  if (loadLottieModule) {\n    return;\n  }\n  loadLottieModule = true;\n  // lottie渲染器\n  bind(DefaultCanvasLottieRender).toSelf().inSingletonScope();\n  bind(GraphicRender).toService(DefaultCanvasLottieRender);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/canvas/lottie-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,MAAM,UAAU,0BAA0B;IACxC,IAAI,WAAW,EAAE;QACf,OAAO;KACR;IACD,WAAW,GAAG,IAAI,CAAC;IACnB,MAAM,MAAM,GAAG,IAAI,yBAAyB,EAAE,CAAC;IAC/C,eAAe,CAAC,iBAAiB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACzD,oBAAoB,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AACvD,CAAC","file":"lottie-module.js","sourcesContent":["import { serviceRegistry, contributionRegistry, GraphicRender } from '@visactor/vrender-core';\nimport { DefaultCanvasLottieRender } from './lottie-render';\n\nlet _registered = false;\nexport function registerCanvasLottieRender() {\n  if (_registered) {\n    return;\n  }\n  _registered = true;\n  const render = new DefaultCanvasLottieRender();\n  serviceRegistry.registerSingleton(GraphicRender, render);\n  contributionRegistry.register(GraphicRender, render);\n}\n"]}

package/es/render/contributions/canvas/lottie-render.js

@@ -1,14 +1,8 @@
-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 { DefaultCanvasRectRender, getTheme, injectable } from "@visactor/vrender-core";
+import { DefaultCanvasRectRender, getTheme } from "@visactor/vrender-core";
 
 import { LOTTIE_NUMBER_TYPE } from "../../../graphic/constants";
 
-let DefaultCanvasLottieRender = class extends DefaultCanvasRectRender {
+export class DefaultCanvasLottieRender extends DefaultCanvasRectRender {
     constructor() {
         super(...arguments), this.numberType = LOTTIE_NUMBER_TYPE;
     }
@@ -28,9 +22,5 @@ let DefaultCanvasLottieRender = class extends DefaultCanvasRectRender {
         }
         context.fill();
     }
-};
-
-DefaultCanvasLottieRender = __decorate([ injectable() ], DefaultCanvasLottieRender);
-
-export { DefaultCanvasLottieRender };
+}
 //# sourceMappingURL=lottie-render.js.map

package/es/render/contributions/canvas/lottie-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/canvas/lottie-render.ts"],"names":[],"mappings":";;;;;;AASA,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAIzD,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,uBAAuB;IAA/D;;QAEL,eAAU,GAAW,kBAAkB,CAAC;IA8C1C,CAAC;IA5CC,SAAS,CACP,MAAe,EACf,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;QAEZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QACzG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAED,UAAU,CACR,MAAe,EACf,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC;;QAEjC,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,SAAS,mCAAI,QAAQ,CAAC,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,IAAI,CAAC;QAC/E,MAAM,EAAE,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QAC5F,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;QAE5F,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,MAAM,EAAE;YAEV,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YAC3D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YACxB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5F,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;SAC7B;QACD,OAAO,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;CACF,CAAA;AAhDY,yBAAyB;IADrC,UAAU,EAAE;GACA,yBAAyB,CAgDrC;SAhDY,yBAAyB","file":"lottie-render.js","sourcesContent":["import type {\n  IContext2d,\n  IDrawContext,\n  IGraphicAttribute,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IMarkAttribute,\n  IThemeAttribute\n} from '@visactor/vrender-core';\nimport { DefaultCanvasRectRender, getTheme, injectable } from '@visactor/vrender-core';\nimport { LOTTIE_NUMBER_TYPE } from '../../../graphic/constants';\nimport type { ILottie } from '../../../graphic/interface/lottie';\n\n@injectable()\nexport class DefaultCanvasLottieRender extends DefaultCanvasRectRender implements IGraphicRender {\n  type: 'glyph';\n  numberType: number = LOTTIE_NUMBER_TYPE;\n\n  drawShape(\n    lottie: ILottie,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ): void {\n    const _fillCb = fillCb || (() => this._drawShape.call(this, lottie, context, x, y, drawContext, params));\n    super.drawShape(lottie, context, x, y, drawContext, params, _fillCb, strokeCb);\n  }\n\n  _drawShape(\n    lottie: ILottie,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams\n  ): void {\n    const lottieAttribute = this.tempTheme ?? getTheme(lottie, params?.theme).rect;\n    const { x: originX = lottieAttribute.x, y: originY = lottieAttribute.y } = lottie.attribute;\n    context.setCommonStyle(lottie, lottie.attribute, originX - x, originY - y, lottieAttribute);\n    // 设置pattern，绘制lottie\n    const canvas = lottie.canvas;\n    if (canvas) {\n      // const _ctx = canvas.getContext('2d');\n      const pattern = context.createPattern(canvas, 'no-repeat');\n      const dpr = context.dpr;\n      pattern.setTransform && pattern.setTransform(new DOMMatrix([1 / dpr, 0, 0, 1 / dpr, x, y]));\n      context.fillStyle = pattern;\n    }\n    context.fill();\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/canvas/lottie-render.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGhE,MAAM,OAAO,yBAA0B,SAAQ,uBAAuB;IAAtE;;QAEE,eAAU,GAAW,kBAAkB,CAAC;IA4C1C,CAAC;IA1CC,SAAS,CACP,MAAe,EACf,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC,EACjC,MAIY,EACZ,QAIY;QAEZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QACzG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAED,UAAU,CACR,MAAe,EACf,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,WAAyB,EACzB,MAAiC;;QAEjC,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,SAAS,mCAAI,QAAQ,CAAC,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,IAAI,CAAC;QAC/E,MAAM,EAAE,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC;QAC5F,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,eAAe,CAAC,CAAC;QAC5F,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,IAAI,MAAM,EAAE;YACV,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YAC3D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;YACxB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5F,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;SAC7B;QACD,OAAO,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;CACF","file":"lottie-render.js","sourcesContent":["import type {\n  IContext2d,\n  IDrawContext,\n  IGraphicAttribute,\n  IGraphicRender,\n  IGraphicRenderDrawParams,\n  IMarkAttribute,\n  IThemeAttribute\n} from '@visactor/vrender-core';\nimport { DefaultCanvasRectRender, getTheme } from '@visactor/vrender-core';\nimport { LOTTIE_NUMBER_TYPE } from '../../../graphic/constants';\nimport type { ILottie } from '../../../graphic/interface/lottie';\n\nexport class DefaultCanvasLottieRender extends DefaultCanvasRectRender implements IGraphicRender {\n  type: 'glyph';\n  numberType: number = LOTTIE_NUMBER_TYPE;\n\n  drawShape(\n    lottie: ILottie,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ): void {\n    const _fillCb = fillCb || (() => this._drawShape.call(this, lottie, context, x, y, drawContext, params));\n    super.drawShape(lottie, context, x, y, drawContext, params, _fillCb, strokeCb);\n  }\n\n  _drawShape(\n    lottie: ILottie,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams\n  ): void {\n    const lottieAttribute = this.tempTheme ?? getTheme(lottie, params?.theme).rect;\n    const { x: originX = lottieAttribute.x, y: originY = lottieAttribute.y } = lottie.attribute;\n    context.setCommonStyle(lottie, lottie.attribute, originX - x, originY - y, lottieAttribute);\n    const canvas = lottie.canvas;\n    if (canvas) {\n      const pattern = context.createPattern(canvas, 'no-repeat');\n      const dpr = context.dpr;\n      pattern.setTransform && pattern.setTransform(new DOMMatrix([1 / dpr, 0, 0, 1 / dpr, x, y]));\n      context.fillStyle = pattern;\n    }\n    context.fill();\n  }\n}\n"]}

package/es/render/contributions/rough/module.d.ts

@@ -1,3 +1 @@
-import { ContainerModule } from '@visactor/vrender-core';
-declare const _default: ContainerModule;
-export default _default;
+export declare function registerRoughCanvasRenders(): void;

package/es/render/contributions/rough/module.js

@@ -1,4 +1,4 @@
-import { ContainerModule, GraphicRender } from "@visactor/vrender-core";
+import { contributionRegistry, GraphicRender } from "@visactor/vrender-core";
 
 import { RoughCanvasArcRender } from "./rough-arc";
 
@@ -14,13 +14,12 @@ import { RoughCanvasRectRender } from "./rough-rect";
 
 import { RoughCanvasSymbolRender } from "./rough-symbol";
 
-export default new ContainerModule((bind => {
-    bind(RoughCanvasCircleRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasCircleRender), 
-    bind(RoughCanvasRectRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasRectRender), 
-    bind(RoughCanvasPathRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasPathRender), 
-    bind(RoughCanvasSymbolRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasSymbolRender), 
-    bind(RoughCanvasLineRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasLineRender), 
-    bind(RoughCanvasAreaRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasAreaRender), 
-    bind(RoughCanvasArcRender).toSelf().inSingletonScope(), bind(GraphicRender).to(RoughCanvasArcRender);
-}));
+let _registered = !1;
+
+export function registerRoughCanvasRenders() {
+    if (_registered) return;
+    _registered = !0;
+    const renders = [ new RoughCanvasCircleRender, new RoughCanvasRectRender, new RoughCanvasPathRender, new RoughCanvasSymbolRender, new RoughCanvasLineRender, new RoughCanvasAreaRender, new RoughCanvasArcRender ];
+    for (const render of renders) contributionRegistry.register(GraphicRender, render);
+}
 //# sourceMappingURL=module.js.map

package/es/render/contributions/rough/module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/rough/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IAExC,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC;IAGhD,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC;IAG9C,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC;IAG9C,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC;IAGhD,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC;IAG9C,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC;IAG9C,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC","file":"module.js","sourcesContent":["import { ContainerModule, GraphicRender } from '@visactor/vrender-core';\nimport { RoughCanvasArcRender } from './rough-arc';\nimport { RoughCanvasAreaRender } from './rough-area';\nimport { RoughCanvasCircleRender } from './rough-circle';\nimport { RoughCanvasLineRender } from './rough-line';\nimport { RoughCanvasPathRender } from './rough-path';\nimport { RoughCanvasRectRender } from './rough-rect';\nimport { RoughCanvasSymbolRender } from './rough-symbol';\n\nexport default new ContainerModule(bind => {\n  // circle\n  bind(RoughCanvasCircleRender).toSelf().inSingletonScope();\n  bind(GraphicRender).to(RoughCanvasCircleRender);\n\n  // rect\n  bind(RoughCanvasRectRender).toSelf().inSingletonScope();\n  bind(GraphicRender).to(RoughCanvasRectRender);\n\n  // path\n  bind(RoughCanvasPathRender).toSelf().inSingletonScope();\n  bind(GraphicRender).to(RoughCanvasPathRender);\n\n  // symbol\n  bind(RoughCanvasSymbolRender).toSelf().inSingletonScope();\n  bind(GraphicRender).to(RoughCanvasSymbolRender);\n\n  // line\n  bind(RoughCanvasLineRender).toSelf().inSingletonScope();\n  bind(GraphicRender).to(RoughCanvasLineRender);\n\n  // area\n  bind(RoughCanvasAreaRender).toSelf().inSingletonScope();\n  bind(GraphicRender).to(RoughCanvasAreaRender);\n\n  // area\n  bind(RoughCanvasArcRender).toSelf().inSingletonScope();\n  bind(GraphicRender).to(RoughCanvasArcRender);\n});\n"]}
+{"version":3,"sources":["../src/render/contributions/rough/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,IAAI,WAAW,GAAG,KAAK,CAAC;AACxB,MAAM,UAAU,0BAA0B;IACxC,IAAI,WAAW,EAAE;QACf,OAAO;KACR;IACD,WAAW,GAAG,IAAI,CAAC;IACnB,MAAM,OAAO,GAAG;QACd,IAAI,uBAAuB,EAAE;QAC7B,IAAI,qBAAqB,EAAE;QAC3B,IAAI,qBAAqB,EAAE;QAC3B,IAAI,uBAAuB,EAAE;QAC7B,IAAI,qBAAqB,EAAE;QAC3B,IAAI,qBAAqB,EAAE;QAC3B,IAAI,oBAAoB,EAAE;KAC3B,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,oBAAoB,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;KACtD;AACH,CAAC","file":"module.js","sourcesContent":["import { contributionRegistry, GraphicRender } from '@visactor/vrender-core';\nimport { RoughCanvasArcRender } from './rough-arc';\nimport { RoughCanvasAreaRender } from './rough-area';\nimport { RoughCanvasCircleRender } from './rough-circle';\nimport { RoughCanvasLineRender } from './rough-line';\nimport { RoughCanvasPathRender } from './rough-path';\nimport { RoughCanvasRectRender } from './rough-rect';\nimport { RoughCanvasSymbolRender } from './rough-symbol';\n\nlet _registered = false;\nexport function registerRoughCanvasRenders() {\n  if (_registered) {\n    return;\n  }\n  _registered = true;\n  const renders = [\n    new RoughCanvasCircleRender(),\n    new RoughCanvasRectRender(),\n    new RoughCanvasPathRender(),\n    new RoughCanvasSymbolRender(),\n    new RoughCanvasLineRender(),\n    new RoughCanvasAreaRender(),\n    new RoughCanvasArcRender()\n  ];\n  for (const render of renders) {\n    contributionRegistry.register(GraphicRender, render);\n  }\n}\n"]}

package/es/render/contributions/rough/rough-arc.d.ts

@@ -1,10 +1,9 @@
 import type { IGraphicRender, IRenderService, IArc, IDrawContext, IGraphicRenderDrawParams } from '@visactor/vrender-core';
 import { RoughBaseRender } from './base-render';
 export declare class RoughCanvasArcRender extends RoughBaseRender implements IGraphicRender {
-    readonly canvasRenderer: IGraphicRender;
     type: 'arc';
     numberType: number;
     style: 'rough';
-    constructor(canvasRenderer: IGraphicRender);
+    constructor();
     draw(arc: IArc, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams): void;
 }

package/es/render/contributions/rough/rough-arc.js

@@ -1,16 +1,4 @@
-var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
-    var d, c = arguments.length, r = c < 3 ? target : null === desc ? desc = Object.getOwnPropertyDescriptor(target, key) : desc;
-    if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(decorators, target, key, desc); else for (var i = decorators.length - 1; i >= 0; i--) (d = decorators[i]) && (r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r);
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}, __metadata = this && this.__metadata || function(k, v) {
-    if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
-}, __param = this && this.__param || function(paramIndex, decorator) {
-    return function(target, key) {
-        decorator(target, key, paramIndex);
-    };
-};
-
-import { ARC_NUMBER_TYPE, DefaultCanvasArcRender, CustomPath2D, drawArcPath, inject, injectable } from "@visactor/vrender-core";
+import { ARC_NUMBER_TYPE, DefaultCanvasArcRender, CustomPath2D, drawArcPath, serviceRegistry, contributionRegistry } from "@visactor/vrender-core";
 
 import rough from "roughjs";
 
@@ -18,10 +6,15 @@ import { defaultRouthThemeSpec } from "./config";
 
 import { RoughBaseRender } from "./base-render";
 
-let RoughCanvasArcRender = class extends RoughBaseRender {
-    constructor(canvasRenderer) {
-        super(), this.canvasRenderer = canvasRenderer, this.style = "rough", this.type = "arc", 
-        this.numberType = ARC_NUMBER_TYPE;
+export class RoughCanvasArcRender extends RoughBaseRender {
+    constructor() {
+        super(), this.style = "rough";
+        try {
+            this.canvasRenderer = serviceRegistry.get(DefaultCanvasArcRender);
+        } catch (_) {
+            this.canvasRenderer = contributionRegistry.get(DefaultCanvasArcRender)[0];
+        }
+        this.type = "arc", this.numberType = ARC_NUMBER_TYPE;
     }
     draw(arc, renderService, drawContext, params) {
         const {context: context} = drawContext;
@@ -62,9 +55,5 @@ let RoughCanvasArcRender = class extends RoughBaseRender {
             fixedDecimalPlaceDigits: fixedDecimalPlaceDigits
         }), context.highPerformanceRestore();
     }
-};
-
-RoughCanvasArcRender = __decorate([ injectable(), __param(0, inject(DefaultCanvasArcRender)), __metadata("design:paramtypes", [ Object ]) ], RoughCanvasArcRender);
-
-export { RoughCanvasArcRender };
+}
 //# sourceMappingURL=rough-arc.js.map

package/es/render/contributions/rough/rough-arc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/rough/rough-arc.ts"],"names":[],"mappings":"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","file":"rough-arc.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  IArc,\n  IGraphicAttribute,\n  IContext2d,\n  IGraphic,\n  IMarkAttribute,\n  IThemeAttribute,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport {\n  ARC_NUMBER_TYPE,\n  DefaultCanvasArcRender,\n  getTheme,\n  CustomPath2D,\n  drawArcPath,\n  inject,\n  injectable\n} from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\nimport { RoughBaseRender } from './base-render';\n\n@injectable()\nexport class RoughCanvasArcRender extends RoughBaseRender implements IGraphicRender {\n  type: 'arc';\n  numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor(\n    @inject(DefaultCanvasArcRender)\n    public readonly canvasRenderer: IGraphicRender\n  ) {\n    super();\n    this.type = 'arc';\n    this.numberType = ARC_NUMBER_TYPE;\n  }\n\n  draw(arc: IArc, 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 arcAttribute = graphicService.themeService.getCurrentTheme().arcAttribute;\n    const arcAttribute = arc.getGraphicTheme();\n    let { x = arcAttribute.x, y = arcAttribute.y } = arc.attribute;\n    if (!arc.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(arc.transMatrix, true);\n    } else {\n      const { dx = arcAttribute.dx, dy = arcAttribute.dy } = arc.attribute;\n      x += dx;\n      y += dy;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    const customPath = new CustomPath2D();\n\n    const {\n      fill = arcAttribute.fill,\n      stroke = arcAttribute.stroke,\n      lineWidth = arcAttribute.lineWidth,\n      outerRadius = arcAttribute.outerRadius,\n      innerRadius = arcAttribute.innerRadius,\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    } = arc.attribute as any;\n\n    drawArcPath(arc, customPath, x, y, outerRadius, innerRadius);\n\n    rc.path(customPath.toString(), {\n      fill: fill ? (fill as string) : undefined,\n      stroke: stroke ? (stroke 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"]}
+{"version":3,"sources":["../src/render/contributions/rough/rough-arc.ts"],"names":[],"mappings":"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","file":"rough-arc.js","sourcesContent":["import type {\n  IGraphicRender,\n  IRenderService,\n  IArc,\n  IDrawContext,\n  IGraphicRenderDrawParams\n} from '@visactor/vrender-core';\nimport {\n  ARC_NUMBER_TYPE,\n  DefaultCanvasArcRender,\n  getTheme,\n  CustomPath2D,\n  drawArcPath,\n  serviceRegistry,\n  contributionRegistry\n} from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\nimport { RoughBaseRender } from './base-render';\n\nexport class RoughCanvasArcRender extends RoughBaseRender implements IGraphicRender {\n  type: 'arc';\n  numberType: number;\n  style: 'rough' = 'rough';\n\n  constructor() {\n    super();\n    try {\n      this.canvasRenderer = serviceRegistry.get(DefaultCanvasArcRender) as IGraphicRender;\n    } catch (_) {\n      this.canvasRenderer = contributionRegistry.get<IGraphicRender>(DefaultCanvasArcRender)[0];\n    }\n    this.type = 'arc';\n    this.numberType = ARC_NUMBER_TYPE;\n  }\n\n  draw(arc: IArc, 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 arcAttribute = graphicService.themeService.getCurrentTheme().arcAttribute;\n    const arcAttribute = arc.getGraphicTheme();\n    let { x = arcAttribute.x, y = arcAttribute.y } = arc.attribute;\n    if (!arc.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(arc.transMatrix, true);\n    } else {\n      const { dx = arcAttribute.dx, dy = arcAttribute.dy } = arc.attribute;\n      x += dx;\n      y += dy;\n      // 当前context有rotate/scale，重置matrix\n      context.setTransformForCurrent();\n    }\n\n    const customPath = new CustomPath2D();\n\n    const {\n      fill = arcAttribute.fill,\n      stroke = arcAttribute.stroke,\n      lineWidth = arcAttribute.lineWidth,\n      outerRadius = arcAttribute.outerRadius,\n      innerRadius = arcAttribute.innerRadius,\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    } = arc.attribute as any;\n\n    drawArcPath(arc, customPath, x, y, outerRadius, innerRadius);\n\n    rc.path(customPath.toString(), {\n      fill: fill ? (fill as string) : undefined,\n      stroke: stroke ? (stroke 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"]}

package/es/render/contributions/rough/rough-area.js

@@ -1,16 +1,10 @@
-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 { drawAreaSegments, DefaultCanvasAreaRender, CustomPath2D, injectable } from "@visactor/vrender-core";
+import { drawAreaSegments, DefaultCanvasAreaRender, CustomPath2D } from "@visactor/vrender-core";
 
 import rough from "roughjs";
 
 import { defaultRouthThemeSpec } from "./config";
 
-let RoughCanvasAreaRender = class extends DefaultCanvasAreaRender {
+export class RoughCanvasAreaRender extends DefaultCanvasAreaRender {
     constructor() {
         super(...arguments), this.style = "rough";
     }
@@ -54,9 +48,5 @@ let RoughCanvasAreaRender = class extends DefaultCanvasAreaRender {
             fixedDecimalPlaceDigits: fixedDecimalPlaceDigits
         }), context.highPerformanceRestore(), !1;
     }
-};
-
-RoughCanvasAreaRender = __decorate([ injectable() ], RoughCanvasAreaRender);
-
-export { RoughCanvasAreaRender };
+}
 //# sourceMappingURL=rough-area.js.map

package/es/render/contributions/rough/rough-area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/render/contributions/rough/rough-area.ts"],"names":[],"mappings":"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","file":"rough-area.js","sourcesContent":["import type {\n  IGraphicRender,\n  IAreaCacheItem,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicAttribute,\n  IArea,\n  IAreaGraphicAttribute,\n  IDrawContext\n} from '@visactor/vrender-core';\nimport { drawAreaSegments, DefaultCanvasAreaRender, CustomPath2D, injectable } from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\n\n@injectable()\nexport class RoughCanvasAreaRender extends DefaultCanvasAreaRender implements IGraphicRender {\n  declare type: 'area';\n  declare numberType: number;\n  style: 'rough' = 'rough';\n\n  /**\n   * 绘制segment\n   * @param context\n   * @param cache\n   * @param fill\n   * @param stroke\n   * @param attribute\n   * @param defaultAttribute\n   * @param clipRange\n   * @param offsetX\n   * @param offsetY\n   * @param fillCb\n   * @param strokeCb\n   * @returns 返回true代表跳过后续绘制\n   */\n  protected drawSegmentItem(\n    context: IContext2d,\n    cache: IAreaCacheItem,\n    fill: boolean,\n    fillOpacity: number,\n    stroke: boolean,\n    strokeOpacity: number,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    clipRange: number,\n    offsetX: number,\n    offsetY: number,\n    offsetZ: number,\n    area: IArea,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ): boolean {\n    if (fillCb) {\n      return super.drawSegmentItem(\n        context,\n        cache,\n        fill,\n        fillOpacity,\n        stroke,\n        strokeOpacity,\n        attribute,\n        defaultAttribute,\n        clipRange,\n        offsetX,\n        offsetY,\n        offsetZ,\n        area,\n        drawContext,\n        fillCb\n      );\n    }\n    context.highPerformanceSave();\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas, {});\n\n    const customPath = new CustomPath2D();\n\n    drawAreaSegments(customPath, cache, clipRange, {\n      offsetX,\n      offsetY\n    });\n\n    const {\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    } = attribute as any;\n\n    let { fill: fillColor, stroke: strokeColor, lineWidth } = attribute;\n\n    if (Array.isArray(defaultAttribute)) {\n      defaultAttribute.forEach(item => {\n        fillColor = fillColor ?? item.fill;\n        strokeColor = strokeColor ?? item.stroke;\n        lineWidth = lineWidth ?? item.lineWidth;\n      });\n    } else {\n      fillColor = fillColor ?? defaultAttribute.fill;\n      strokeColor = strokeColor ?? defaultAttribute.stroke;\n      lineWidth = lineWidth ?? defaultAttribute.lineWidth;\n    }\n\n    rc.path(customPath.toString(), {\n      fill: fill ? (fillColor 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    return false;\n  }\n}\n"]}
+{"version":3,"sources":["../src/render/contributions/rough/rough-area.ts"],"names":[],"mappings":"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","file":"rough-area.js","sourcesContent":["import type {\n  IGraphicRender,\n  IAreaCacheItem,\n  IContext2d,\n  IMarkAttribute,\n  IThemeAttribute,\n  IGraphicAttribute,\n  IArea,\n  IAreaGraphicAttribute,\n  IDrawContext\n} from '@visactor/vrender-core';\nimport { drawAreaSegments, DefaultCanvasAreaRender, CustomPath2D } from '@visactor/vrender-core';\nimport rough from 'roughjs';\nimport { defaultRouthThemeSpec } from './config';\n\nexport class RoughCanvasAreaRender extends DefaultCanvasAreaRender implements IGraphicRender {\n  declare type: 'area';\n  declare numberType: number;\n  style: 'rough' = 'rough';\n\n  /**\n   * 绘制segment\n   * @param context\n   * @param cache\n   * @param fill\n   * @param stroke\n   * @param attribute\n   * @param defaultAttribute\n   * @param clipRange\n   * @param offsetX\n   * @param offsetY\n   * @param fillCb\n   * @param strokeCb\n   * @returns 返回true代表跳过后续绘制\n   */\n  protected drawSegmentItem(\n    context: IContext2d,\n    cache: IAreaCacheItem,\n    fill: boolean,\n    fillOpacity: number,\n    stroke: boolean,\n    strokeOpacity: number,\n    attribute: Partial<IAreaGraphicAttribute>,\n    defaultAttribute: Required<IAreaGraphicAttribute> | Partial<IAreaGraphicAttribute>[],\n    clipRange: number,\n    offsetX: number,\n    offsetY: number,\n    offsetZ: number,\n    area: IArea,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      lineAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute | IThemeAttribute[]\n    ) => boolean\n  ): boolean {\n    if (fillCb) {\n      return super.drawSegmentItem(\n        context,\n        cache,\n        fill,\n        fillOpacity,\n        stroke,\n        strokeOpacity,\n        attribute,\n        defaultAttribute,\n        clipRange,\n        offsetX,\n        offsetY,\n        offsetZ,\n        area,\n        drawContext,\n        fillCb\n      );\n    }\n    context.highPerformanceSave();\n    // 获取到原生canvas\n    const canvas = context.canvas.nativeCanvas;\n    const rc = rough.canvas(canvas, {});\n\n    const customPath = new CustomPath2D();\n\n    drawAreaSegments(customPath, cache, clipRange, {\n      offsetX,\n      offsetY\n    });\n\n    const {\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    } = attribute as any;\n\n    let { fill: fillColor, stroke: strokeColor, lineWidth } = attribute;\n\n    if (Array.isArray(defaultAttribute)) {\n      defaultAttribute.forEach(item => {\n        fillColor = fillColor ?? item.fill;\n        strokeColor = strokeColor ?? item.stroke;\n        lineWidth = lineWidth ?? item.lineWidth;\n      });\n    } else {\n      fillColor = fillColor ?? defaultAttribute.fill;\n      strokeColor = strokeColor ?? defaultAttribute.stroke;\n      lineWidth = lineWidth ?? defaultAttribute.lineWidth;\n    }\n\n    rc.path(customPath.toString(), {\n      fill: fill ? (fillColor 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    return false;\n  }\n}\n"]}

package/es/render/contributions/rough/rough-circle.d.ts

@@ -1,10 +1,9 @@
 import type { IGraphicRender, IRenderService, ICircle, IDrawContext, IGraphicRenderDrawParams } from '@visactor/vrender-core';
 import { RoughBaseRender } from './base-render';
 export declare class RoughCanvasCircleRender extends RoughBaseRender implements IGraphicRender {
-    readonly canvasRenderer: IGraphicRender;
     type: 'circle';
     numberType: number;
     style: 'rough';
-    constructor(canvasRenderer: IGraphicRender);
+    constructor();
     draw(circle: ICircle, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams): void;
 }