@visactor/vrender-core 1.1.0-alpha.20 → 1.1.0-alpha.22

package/cjs/resource-loader/loader.js

@@ -30,6 +30,11 @@ class ResourceLoader {
                 (null == res ? void 0 : res.data) ? (data.loadState = "success", data.data = res.data, 
                 mark.imageLoadSuccess(svgStr, res.data)) : (data.loadState = "fail", mark.imageLoadFail(svgStr));
             })), data.waitingMark && (data.waitingMark = []);
+        })).catch((() => {
+            var _a;
+            data.loadState = "fail", null === (_a = data.waitingMark) || void 0 === _a || _a.map((mark => {
+                mark.imageLoadFail(svgStr);
+            })), data.waitingMark && (data.waitingMark = []);
         }))) : (data.loadState = "fail", mark.imageLoadFail(svgStr)));
     }
     static GetFile(url, type) {

package/cjs/resource-loader/loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/resource-loader/loader.ts"],"names":[],"mappings":"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","file":"loader.js","sourcesContent":["import type { IImage, ImagePayload, ResourceData } from '../interface';\nimport { application } from '../application';\n\nconst PARALLEL_NUMBER = 10;\nexport class ResourceLoader {\n  private static cache: Map<string, ResourceData> = new Map();\n  private static isLoading: boolean = false;\n  private static toLoadAueue: { url: string; marks: ImagePayload[] }[] = [];\n  private static onLoadSuccessCb: (() => void)[] = [];\n\n  static GetImage(url: string, mark: ImagePayload) {\n    const data = ResourceLoader.cache.get(url);\n    if (data) {\n      // 存在缓存\n      if (data.loadState === 'fail') {\n        // 资源请求失败，修改mark状态\n        application.global.getRequestAnimationFrame()(() => {\n          mark.imageLoadFail(url);\n        });\n      } else if (data.loadState === 'init' || data.loadState === 'loading') {\n        // 资源padding队列加入mark信息\n        data.waitingMark?.push(mark);\n      } else if (mark) {\n        mark.imageLoadSuccess(url, data.data as HTMLImageElement);\n      }\n    } else {\n      ResourceLoader.loadImage(url, mark);\n      // data = { type: 'image', loadState: 'init' };\n      // ResourceLoader.cache.set(url, data);\n\n      // data.dataPromise = application.global.loadImage(url);\n      // if (!data.dataPromise) {\n      //   // 无法获取资源，修改缓存和mark状态\n      //   data.loadState = 'fail';\n      //   mark.imageLoadFail(url);\n      // } else {\n      //   // 资源padding队列加入mark信息\n      //   data.waitingMark = [mark];\n\n      //   data.dataPromise.then(res => {\n      //     data.loadState = res?.data ? 'success' : 'fail';\n      //     data.data = res?.data;\n      //     // 遍历资源padding队列，更新mark信息\n      //     data.waitingMark?.map((mark: IImage, index) => {\n      //       if (res?.data) {\n      //         data.loadState = 'success';\n      //         data.data = res.data;\n      //         mark.imageLoadSuccess(url, res.data as HTMLImageElement);\n      //       } else {\n      //         data.loadState = 'fail';\n      //         mark.imageLoadFail(url);\n      //       }\n      //     });\n      //   });\n      // }\n    }\n  }\n\n  static GetSvg(svgStr: string, mark: ImagePayload) {\n    let data = ResourceLoader.cache.get(svgStr);\n    if (data) {\n      // 存在缓存\n      if (data.loadState === 'fail') {\n        // 资源请求失败，修改mark状态\n        application.global.getRequestAnimationFrame()(() => {\n          mark.imageLoadFail(svgStr);\n        });\n      } else if (data.loadState === 'init' || data.loadState === 'loading') {\n        // 资源padding队列加入mark信息\n        data.waitingMark?.push(mark);\n      } else if (mark) {\n        mark.imageLoadSuccess(svgStr, data.data as HTMLImageElement);\n      }\n    } else {\n      data = { type: 'image', loadState: 'init' };\n      ResourceLoader.cache.set(svgStr, data);\n\n      data.dataPromise = application.global.loadSvg(svgStr);\n      if (!data.dataPromise) {\n        // 无法获取资源，修改缓存和mark状态\n        data.loadState = 'fail';\n        mark.imageLoadFail(svgStr);\n      } else {\n        // 资源padding队列加入mark信息\n        data.waitingMark = [mark];\n\n        data.dataPromise.then(res => {\n          data.loadState = res?.data ? 'success' : 'fail';\n          data.data = res?.data;\n          // 遍历资源padding队列，更新mark信息\n          data.waitingMark?.map((mark: IImage, index) => {\n            if (res?.data) {\n              data.loadState = 'success';\n              data.data = res.data;\n              mark.imageLoadSuccess(svgStr, res.data as HTMLImageElement);\n            } else {\n              data.loadState = 'fail';\n              mark.imageLoadFail(svgStr);\n            }\n          });\n          data.waitingMark && (data.waitingMark = []);\n        });\n      }\n    }\n  }\n\n  static GetFile(url: string, type: 'json' | 'arrayBuffer' | 'blob') {\n    let data = ResourceLoader.cache.get(url);\n    if (data) {\n      // 存在缓存\n      if (data.loadState === 'fail') {\n        return Promise.reject();\n      } else if (data.loadState === 'init' || data.loadState === 'loading') {\n        return data.dataPromise.then(data => data.data);\n      }\n      return Promise.resolve(data.data);\n    }\n    data = { type, loadState: 'init' };\n    ResourceLoader.cache.set(url, data);\n\n    if (type === 'arrayBuffer') {\n      data.dataPromise = application.global.loadArrayBuffer(url);\n    } else if (type === 'blob') {\n      data.dataPromise = application.global.loadBlob(url);\n    } else if (type === 'json') {\n      data.dataPromise = application.global.loadJson(url);\n    }\n\n    return data.dataPromise.then(data => data.data);\n  }\n\n  static loading() {\n    setTimeout(() => {\n      if (!ResourceLoader.isLoading && ResourceLoader.toLoadAueue.length) {\n        ResourceLoader.isLoading = true;\n        const tasks = ResourceLoader.toLoadAueue.splice(0, PARALLEL_NUMBER);\n        const promises: Promise<void>[] = [];\n        tasks.forEach(task => {\n          const { url, marks } = task;\n          const data: ResourceData = { type: 'image', loadState: 'init' };\n          ResourceLoader.cache.set(url, data);\n\n          data.dataPromise = application.global.loadImage(url);\n          if (!data.dataPromise) {\n            // 无法获取资源，修改缓存和mark状态\n            data.loadState = 'fail';\n            // mark.imageLoadFail(url);\n            marks.forEach(mark => mark.imageLoadFail(url));\n          } else {\n            // 资源padding队列加入mark信息\n            // data.waitingMark = [mark];\n            data.waitingMark = marks;\n\n            const end = data.dataPromise.then(res => {\n              data.loadState = res?.data ? 'success' : 'fail';\n              data.data = res?.data;\n              // 遍历资源padding队列，更新mark信息\n              data.waitingMark?.map((mark: IImage, index) => {\n                if (res?.data) {\n                  data.loadState = 'success';\n                  data.data = res.data;\n                  // console.log(mark.attribute.y)\n                  mark.imageLoadSuccess(url, res.data as HTMLImageElement);\n                } else {\n                  data.loadState = 'fail';\n                  mark.imageLoadFail(url);\n                }\n              });\n\n              data.waitingMark && (data.waitingMark = []);\n            });\n\n            promises.push(end);\n          }\n        });\n\n        Promise.all(promises)\n          .then(() => {\n            ResourceLoader.isLoading = false;\n            this.onLoadSuccessCb.forEach(cb => cb());\n            ResourceLoader.loading();\n          })\n          .catch(error => {\n            console.error(error);\n            ResourceLoader.isLoading = false;\n            this.onLoadSuccessCb.forEach(cb => cb());\n            ResourceLoader.loading();\n          });\n      }\n    }, 0);\n  }\n\n  static loadImage(url: string, mark: ImagePayload) {\n    // find url in toLoadAueue\n    const index = getIndex(url, ResourceLoader.toLoadAueue);\n    if (index !== -1) {\n      // add mark to aueue\n      ResourceLoader.toLoadAueue[index].marks.push(mark);\n      ResourceLoader.loading();\n      return;\n    }\n\n    // add task to aueue\n    ResourceLoader.toLoadAueue.push({ url, marks: [mark] });\n    ResourceLoader.loading();\n  }\n\n  static improveImageLoading(url: string) {\n    const index = getIndex(url, ResourceLoader.toLoadAueue);\n    if (index !== -1) {\n      const elememt = ResourceLoader.toLoadAueue.splice(index, 1);\n      ResourceLoader.toLoadAueue.unshift(elememt[0]);\n    }\n  }\n\n  static onLoadSuccess(cb: () => void) {\n    this.onLoadSuccessCb.push(cb);\n  }\n}\n\nfunction getIndex(url: string, arr: { url: string; marks: ImagePayload[] }[]) {\n  for (let i = 0; i < arr.length; i++) {\n    if (arr[i].url === url) {\n      return i;\n    }\n  }\n  return -1;\n}\n"]}
+{"version":3,"sources":["../src/resource-loader/loader.ts"],"names":[],"mappings":";;;AACA,gDAA6C;AAE7C,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,MAAa,cAAc;IAMzB,MAAM,CAAC,QAAQ,CAAC,GAAW,EAAE,IAAkB;;QAC7C,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,IAAI,EAAE;YAER,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE;gBAE7B,yBAAW,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC,GAAG,EAAE;oBACjD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAC1B,CAAC,CAAC,CAAC;aACJ;iBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;gBAEpE,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9B;iBAAM,IAAI,IAAI,EAAE;gBACf,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAwB,CAAC,CAAC;aAC3D;SACF;aAAM;YACL,cAAc,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SA6BrC;IACH,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,MAAc,EAAE,IAAkB;;QAC9C,IAAI,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,IAAI,EAAE;YAER,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE;gBAE7B,yBAAW,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC,GAAG,EAAE;oBACjD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;aACJ;iBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;gBAEpE,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9B;iBAAM,IAAI,IAAI,EAAE;gBACf,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAwB,CAAC,CAAC;aAC9D;SACF;aAAM;YACL,IAAI,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YAC5C,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAEvC,IAAI,CAAC,WAAW,GAAG,yBAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBAErB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;gBACxB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;aAC5B;iBAAM;gBAEL,IAAI,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,CAAC;gBAE1B,IAAI,CAAC,WAAW;qBACb,IAAI,CAAC,GAAG,CAAC,EAAE;;oBACV,IAAI,CAAC,SAAS,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;oBAChD,IAAI,CAAC,IAAI,GAAG,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,CAAC;oBAEtB,MAAA,IAAI,CAAC,WAAW,0CAAE,GAAG,CAAC,CAAC,IAAY,EAAE,KAAK,EAAE,EAAE;wBAC5C,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE;4BACb,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;4BAC3B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;4BACrB,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,IAAwB,CAAC,CAAC;yBAC7D;6BAAM;4BACL,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;4BACxB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;yBAC5B;oBACH,CAAC,CAAC,CAAC;oBACH,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;gBAC9C,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE;;oBACV,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;oBACxB,MAAA,IAAI,CAAC,WAAW,0CAAE,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;wBACrC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBAC7B,CAAC,CAAC,CAAC;oBACH,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;gBAC9C,CAAC,CAAC,CAAC;aACN;SACF;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,GAAW,EAAE,IAAqC;QAC/D,IAAI,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,IAAI,EAAE;YAER,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE;gBAC7B,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;aACzB;iBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;gBACpE,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjD;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnC;QACD,IAAI,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;QACnC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEpC,IAAI,IAAI,KAAK,aAAa,EAAE;YAC1B,IAAI,CAAC,WAAW,GAAG,yBAAW,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;SAC5D;aAAM,IAAI,IAAI,KAAK,MAAM,EAAE;YAC1B,IAAI,CAAC,WAAW,GAAG,yBAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACrD;aAAM,IAAI,IAAI,KAAK,MAAM,EAAE;YAC1B,IAAI,CAAC,WAAW,GAAG,yBAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACrD;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,OAAO;QACZ,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,cAAc,CAAC,SAAS,IAAI,cAAc,CAAC,WAAW,CAAC,MAAM,EAAE;gBAClE,cAAc,CAAC,SAAS,GAAG,IAAI,CAAC;gBAChC,MAAM,KAAK,GAAG,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;gBACpE,MAAM,QAAQ,GAAoB,EAAE,CAAC;gBACrC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBACnB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;oBAC5B,MAAM,IAAI,GAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;oBAChE,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAEpC,IAAI,CAAC,WAAW,GAAG,yBAAW,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBACrD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;wBAErB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;wBAExB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;qBAChD;yBAAM;wBAGL,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;wBAEzB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;;4BACtC,IAAI,CAAC,SAAS,GAAG,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;4BAChD,IAAI,CAAC,IAAI,GAAG,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,CAAC;4BAEtB,MAAA,IAAI,CAAC,WAAW,0CAAE,GAAG,CAAC,CAAC,IAAY,EAAE,KAAK,EAAE,EAAE;gCAC5C,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE;oCACb,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;oCAC3B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;oCAErB,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,IAAwB,CAAC,CAAC;iCAC1D;qCAAM;oCACL,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;oCACxB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;iCACzB;4BACH,CAAC,CAAC,CAAC;4BAEH,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;wBAC9C,CAAC,CAAC,CAAC;wBAEH,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;qBACpB;gBACH,CAAC,CAAC,CAAC;gBAEH,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;qBAClB,IAAI,CAAC,GAAG,EAAE;oBACT,cAAc,CAAC,SAAS,GAAG,KAAK,CAAC;oBACjC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;oBACzC,cAAc,CAAC,OAAO,EAAE,CAAC;gBAC3B,CAAC,CAAC;qBACD,KAAK,CAAC,KAAK,CAAC,EAAE;oBACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrB,cAAc,CAAC,SAAS,GAAG,KAAK,CAAC;oBACjC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;oBACzC,cAAc,CAAC,OAAO,EAAE,CAAC;gBAC3B,CAAC,CAAC,CAAC;aACN;QACH,CAAC,EAAE,CAAC,CAAC,CAAC;IACR,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,GAAW,EAAE,IAAkB;QAE9C,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAEhB,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnD,cAAc,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO;SACR;QAGD,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxD,cAAc,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,GAAW;QACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC5D,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SAChD;IACH,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,EAAc;QACjC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;;AA7NH,wCA8NC;AA7NgB,oBAAK,GAA8B,IAAI,GAAG,EAAE,CAAC;AAC7C,wBAAS,GAAY,KAAK,CAAC;AAC3B,0BAAW,GAA6C,EAAE,CAAC;AAC3D,8BAAe,GAAmB,EAAE,CAAC;AA4NtD,SAAS,QAAQ,CAAC,GAAW,EAAE,GAA6C;IAC1E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;YACtB,OAAO,CAAC,CAAC;SACV;KACF;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC","file":"loader.js","sourcesContent":["import type { IImage, ImagePayload, ResourceData } from '../interface';\nimport { application } from '../application';\n\nconst PARALLEL_NUMBER = 10;\nexport class ResourceLoader {\n  private static cache: Map<string, ResourceData> = new Map();\n  private static isLoading: boolean = false;\n  private static toLoadAueue: { url: string; marks: ImagePayload[] }[] = [];\n  private static onLoadSuccessCb: (() => void)[] = [];\n\n  static GetImage(url: string, mark: ImagePayload) {\n    const data = ResourceLoader.cache.get(url);\n    if (data) {\n      // 存在缓存\n      if (data.loadState === 'fail') {\n        // 资源请求失败，修改mark状态\n        application.global.getRequestAnimationFrame()(() => {\n          mark.imageLoadFail(url);\n        });\n      } else if (data.loadState === 'init' || data.loadState === 'loading') {\n        // 资源padding队列加入mark信息\n        data.waitingMark?.push(mark);\n      } else if (mark) {\n        mark.imageLoadSuccess(url, data.data as HTMLImageElement);\n      }\n    } else {\n      ResourceLoader.loadImage(url, mark);\n      // data = { type: 'image', loadState: 'init' };\n      // ResourceLoader.cache.set(url, data);\n\n      // data.dataPromise = application.global.loadImage(url);\n      // if (!data.dataPromise) {\n      //   // 无法获取资源，修改缓存和mark状态\n      //   data.loadState = 'fail';\n      //   mark.imageLoadFail(url);\n      // } else {\n      //   // 资源padding队列加入mark信息\n      //   data.waitingMark = [mark];\n\n      //   data.dataPromise.then(res => {\n      //     data.loadState = res?.data ? 'success' : 'fail';\n      //     data.data = res?.data;\n      //     // 遍历资源padding队列，更新mark信息\n      //     data.waitingMark?.map((mark: IImage, index) => {\n      //       if (res?.data) {\n      //         data.loadState = 'success';\n      //         data.data = res.data;\n      //         mark.imageLoadSuccess(url, res.data as HTMLImageElement);\n      //       } else {\n      //         data.loadState = 'fail';\n      //         mark.imageLoadFail(url);\n      //       }\n      //     });\n      //   });\n      // }\n    }\n  }\n\n  static GetSvg(svgStr: string, mark: ImagePayload) {\n    let data = ResourceLoader.cache.get(svgStr);\n    if (data) {\n      // 存在缓存\n      if (data.loadState === 'fail') {\n        // 资源请求失败，修改mark状态\n        application.global.getRequestAnimationFrame()(() => {\n          mark.imageLoadFail(svgStr);\n        });\n      } else if (data.loadState === 'init' || data.loadState === 'loading') {\n        // 资源padding队列加入mark信息\n        data.waitingMark?.push(mark);\n      } else if (mark) {\n        mark.imageLoadSuccess(svgStr, data.data as HTMLImageElement);\n      }\n    } else {\n      data = { type: 'image', loadState: 'init' };\n      ResourceLoader.cache.set(svgStr, data);\n\n      data.dataPromise = application.global.loadSvg(svgStr);\n      if (!data.dataPromise) {\n        // 无法获取资源，修改缓存和mark状态\n        data.loadState = 'fail';\n        mark.imageLoadFail(svgStr);\n      } else {\n        // 资源padding队列加入mark信息\n        data.waitingMark = [mark];\n\n        data.dataPromise\n          .then(res => {\n            data.loadState = res?.data ? 'success' : 'fail';\n            data.data = res?.data;\n            // 遍历资源padding队列，更新mark信息\n            data.waitingMark?.map((mark: IImage, index) => {\n              if (res?.data) {\n                data.loadState = 'success';\n                data.data = res.data;\n                mark.imageLoadSuccess(svgStr, res.data as HTMLImageElement);\n              } else {\n                data.loadState = 'fail';\n                mark.imageLoadFail(svgStr);\n              }\n            });\n            data.waitingMark && (data.waitingMark = []);\n          })\n          .catch(() => {\n            data.loadState = 'fail';\n            data.waitingMark?.map((mark: IImage) => {\n              mark.imageLoadFail(svgStr);\n            });\n            data.waitingMark && (data.waitingMark = []);\n          });\n      }\n    }\n  }\n\n  static GetFile(url: string, type: 'json' | 'arrayBuffer' | 'blob') {\n    let data = ResourceLoader.cache.get(url);\n    if (data) {\n      // 存在缓存\n      if (data.loadState === 'fail') {\n        return Promise.reject();\n      } else if (data.loadState === 'init' || data.loadState === 'loading') {\n        return data.dataPromise.then(data => data.data);\n      }\n      return Promise.resolve(data.data);\n    }\n    data = { type, loadState: 'init' };\n    ResourceLoader.cache.set(url, data);\n\n    if (type === 'arrayBuffer') {\n      data.dataPromise = application.global.loadArrayBuffer(url);\n    } else if (type === 'blob') {\n      data.dataPromise = application.global.loadBlob(url);\n    } else if (type === 'json') {\n      data.dataPromise = application.global.loadJson(url);\n    }\n\n    return data.dataPromise.then(data => data.data);\n  }\n\n  static loading() {\n    setTimeout(() => {\n      if (!ResourceLoader.isLoading && ResourceLoader.toLoadAueue.length) {\n        ResourceLoader.isLoading = true;\n        const tasks = ResourceLoader.toLoadAueue.splice(0, PARALLEL_NUMBER);\n        const promises: Promise<void>[] = [];\n        tasks.forEach(task => {\n          const { url, marks } = task;\n          const data: ResourceData = { type: 'image', loadState: 'init' };\n          ResourceLoader.cache.set(url, data);\n\n          data.dataPromise = application.global.loadImage(url);\n          if (!data.dataPromise) {\n            // 无法获取资源，修改缓存和mark状态\n            data.loadState = 'fail';\n            // mark.imageLoadFail(url);\n            marks.forEach(mark => mark.imageLoadFail(url));\n          } else {\n            // 资源padding队列加入mark信息\n            // data.waitingMark = [mark];\n            data.waitingMark = marks;\n\n            const end = data.dataPromise.then(res => {\n              data.loadState = res?.data ? 'success' : 'fail';\n              data.data = res?.data;\n              // 遍历资源padding队列，更新mark信息\n              data.waitingMark?.map((mark: IImage, index) => {\n                if (res?.data) {\n                  data.loadState = 'success';\n                  data.data = res.data;\n                  // console.log(mark.attribute.y)\n                  mark.imageLoadSuccess(url, res.data as HTMLImageElement);\n                } else {\n                  data.loadState = 'fail';\n                  mark.imageLoadFail(url);\n                }\n              });\n\n              data.waitingMark && (data.waitingMark = []);\n            });\n\n            promises.push(end);\n          }\n        });\n\n        Promise.all(promises)\n          .then(() => {\n            ResourceLoader.isLoading = false;\n            this.onLoadSuccessCb.forEach(cb => cb());\n            ResourceLoader.loading();\n          })\n          .catch(error => {\n            console.error(error);\n            ResourceLoader.isLoading = false;\n            this.onLoadSuccessCb.forEach(cb => cb());\n            ResourceLoader.loading();\n          });\n      }\n    }, 0);\n  }\n\n  static loadImage(url: string, mark: ImagePayload) {\n    // find url in toLoadAueue\n    const index = getIndex(url, ResourceLoader.toLoadAueue);\n    if (index !== -1) {\n      // add mark to aueue\n      ResourceLoader.toLoadAueue[index].marks.push(mark);\n      ResourceLoader.loading();\n      return;\n    }\n\n    // add task to aueue\n    ResourceLoader.toLoadAueue.push({ url, marks: [mark] });\n    ResourceLoader.loading();\n  }\n\n  static improveImageLoading(url: string) {\n    const index = getIndex(url, ResourceLoader.toLoadAueue);\n    if (index !== -1) {\n      const elememt = ResourceLoader.toLoadAueue.splice(index, 1);\n      ResourceLoader.toLoadAueue.unshift(elememt[0]);\n    }\n  }\n\n  static onLoadSuccess(cb: () => void) {\n    this.onLoadSuccessCb.push(cb);\n  }\n}\n\nfunction getIndex(url: string, arr: { url: string; marks: ImagePayload[] }[]) {\n  for (let i = 0; i < arr.length; i++) {\n    if (arr[i].url === url) {\n      return i;\n    }\n  }\n  return -1;\n}\n"]}

package/dist/index.es.js

@@ -4826,7 +4826,8 @@ class ResourceLoader {
             }
             else {
                 data.waitingMark = [mark];
-                data.dataPromise.then(res => {
+                data.dataPromise
+                    .then(res => {
                     var _a;
                     data.loadState = (res === null || res === void 0 ? void 0 : res.data) ? 'success' : 'fail';
                     data.data = res === null || res === void 0 ? void 0 : res.data;
@@ -4842,6 +4843,14 @@ class ResourceLoader {
                         }
                     });
                     data.waitingMark && (data.waitingMark = []);
+                })
+                    .catch(() => {
+                    var _a;
+                    data.loadState = 'fail';
+                    (_a = data.waitingMark) === null || _a === void 0 ? void 0 : _a.map((mark) => {
+                        mark.imageLoadFail(svgStr);
+                    });
+                    data.waitingMark && (data.waitingMark = []);
                 });
             }
         }
@@ -11540,6 +11549,7 @@ class Graphic extends Node {
         }
         const keys = Object.keys(params);
         this.captureTransientFromAttrsBeforePreventAnimate(params, keys, context);
+        this.syncFinalAttributesFromUpdateContext(context);
         this.visitTrackedAnimates(animate => {
             if (animate.priority === Infinity && !ignorePriority) {
                 return;
@@ -11548,6 +11558,21 @@ class Graphic extends Node {
         });
         this.applyTransientAttributes(params, forceUpdateTag, context);
     }
+    syncFinalAttributesFromUpdateContext(context) {
+        var _a;
+        const updateType = context === null || context === void 0 ? void 0 : context.type;
+        if (updateType === AttributeUpdateType.STATE ||
+            (updateType != null &&
+                updateType >= AttributeUpdateType.ANIMATE_BIND &&
+                updateType <= AttributeUpdateType.ANIMATE_END)) {
+            return;
+        }
+        const finalAttrs = (_a = this.context) === null || _a === void 0 ? void 0 : _a.finalAttrs;
+        const setFinalAttributes = this.setFinalAttributes;
+        if (finalAttrs && typeof setFinalAttributes === 'function') {
+            setFinalAttributes.call(this, finalAttrs);
+        }
+    }
     captureTransientFromAttrsBeforePreventAnimate(params, keys, context) {
         var _a, _b;
         const graphicContext = this.context;
@@ -22467,6 +22492,7 @@ class CanvasLayerHandlerContribution {
             }
             if (!nativeCanvas) {
                 nativeCanvas = this.global.createCanvas({
+                    id: params.canvasId,
                     width: window.width,
                     height: window.height
                 });

package/es/canvas/empty-context.js

@@ -205,5 +205,4 @@ export class EmptyContext2d {
     release(...params) {
         this.stack.forEach((m => matrixAllocate.free(m))), this.stack.length = 0;
     }
-}
-//# sourceMappingURL=empty-context.js.map
+}

package/es/color-string/index.js

@@ -2,4 +2,5 @@ export * from "./interpolate";
 
 export * from "./store";
 
-export * from "./colorName";
+export * from "./colorName";
+//# sourceMappingURL=index.js.map

package/es/common/Reflect-metadata.js

@@ -175,4 +175,4 @@ export default (function(Reflect) {
         }), previous && previous(key, value);
     })), Reflect;
 }({}));
-//# sourceMappingURL=Reflect-metadata.js.map
+//# sourceMappingURL=Reflect-metadata.js.map

package/es/common/bezier-utils.js

@@ -37,4 +37,4 @@ export function quadPointAt(p0, p1, p2, t) {
 export function quadLength(p0, p1, p2, iterationCount) {
     return snapLength([ p0.x, p1.x, p2.x ], [ p0.y, p1.y, p2.y ]);
 }
-//# sourceMappingURL=bezier-utils.js.map
+//# sourceMappingURL=bezier-utils.js.map

package/es/common/bounds-context.js

@@ -50,4 +50,4 @@ export class BoundsContext {
     }
     release(...params) {}
 }
-//# sourceMappingURL=bounds-context.js.map
+//# sourceMappingURL=bounds-context.js.map

package/es/common/canvas-utils.js

@@ -52,4 +52,4 @@ function createConicGradient(context, color, x, y, w, h) {
         canvasGradient.addColorStop(stop.offset, stop.color);
     })), canvasGradient.GetPattern ? canvasGradient.GetPattern(w + x, h + y, undefined) : canvasGradient;
 }
-//# sourceMappingURL=canvas-utils.js.map
+//# sourceMappingURL=canvas-utils.js.map

package/es/common/color-utils.js

@@ -238,4 +238,4 @@ export class GradientParser {
         };
     }
 }
-//# sourceMappingURL=color-utils.js.map
+//# sourceMappingURL=color-utils.js.map

package/es/common/contribution-provider.js

@@ -40,4 +40,4 @@ export class ContributionStore {
 }
 
 ContributionStore.store = new Map;
-//# sourceMappingURL=contribution-provider.js.map
+//# sourceMappingURL=contribution-provider.js.map

package/es/common/custom-path2d.js

@@ -373,4 +373,4 @@ function scale(current, sX, sY) {
     temp[7] = sY * current[7]; else if ("h" === c || "H" === c) temp[1] = sX * current[1]; else if ("v" === c || "V" === c) temp[1] = sY * current[1]; else for (let i = 1, n = current.length; i < n; ++i) temp[i] = (i % 2 == 1 ? sX : sY) * current[i];
     return temp;
 }
-//# sourceMappingURL=custom-path2d.js.map
+//# sourceMappingURL=custom-path2d.js.map

package/es/common/diff.js

@@ -8,4 +8,5 @@ export function diff(oldAttrs, newAttrs, getAttr) {
         void 0 !== value && (diffObj[key] = value);
     }
     return diffObj;
-}
+}
+//# sourceMappingURL=diff.js.map

package/es/common/enums.js

@@ -51,4 +51,4 @@ export var BaseRenderContributionTime;
     BaseRenderContributionTime[BaseRenderContributionTime.beforeFillStroke = 0] = "beforeFillStroke", 
     BaseRenderContributionTime[BaseRenderContributionTime.afterFillStroke = 1] = "afterFillStroke";
 }(BaseRenderContributionTime || (BaseRenderContributionTime = {}));
-//# sourceMappingURL=enums.js.map
+//# sourceMappingURL=enums.js.map

package/es/common/event-listener-manager.js

@@ -71,4 +71,4 @@ export class EventListenerManager {
         throw new Error("_nativeDispatchEvent must be implemented by derived classes");
     }
 }
-//# sourceMappingURL=event-listener-manager.js.map
+//# sourceMappingURL=event-listener-manager.js.map

package/es/common/event-transformer.js

@@ -114,4 +114,4 @@ export function mapToCanvasPointForCanvas(nativeEvent) {
         y: nativeEvent._canvasY || 0
     };
 }
-//# sourceMappingURL=event-transformer.js.map
+//# sourceMappingURL=event-transformer.js.map

package/es/common/explicit-binding.js

@@ -7,4 +7,4 @@ export function resolveContainerBinding(container, serviceIdentifier) {
     if (null == instance) throw new Error(`No binding found for ${describeServiceIdentifier(serviceIdentifier)}.`);
     return instance;
 }
-//# sourceMappingURL=explicit-binding.js.map
+//# sourceMappingURL=explicit-binding.js.map

package/es/common/generator.js

@@ -5,4 +5,4 @@ export class Generator {
 }
 
 Generator.auto_increment_id = 0;
-//# sourceMappingURL=generator.js.map
+//# sourceMappingURL=generator.js.map

package/es/common/matrix.js

@@ -118,4 +118,4 @@ export function transformMat4(out, a, m) {
     return w = w || 1, out[0] = (m[0] * x + m[4] * y + m[8] * z + m[12]) / w, out[1] = (m[1] * x + m[5] * y + m[9] * z + m[13]) / w, 
     out[2] = (m[2] * x + m[6] * y + m[10] * z + m[14]) / w, out;
 }
-//# sourceMappingURL=matrix.js.map
+//# sourceMappingURL=matrix.js.map

package/es/common/morphing-utils.js

@@ -189,4 +189,4 @@ export function bezierCurversToPath(bezierCurves) {
     }
     return path;
 }
-//# sourceMappingURL=morphing-utils.js.map
+//# sourceMappingURL=morphing-utils.js.map

package/es/common/path-svg.js

@@ -55,4 +55,4 @@ export function parseSvgPath(str) {
     } else result.push(currCommandData);
     return result;
 }
-//# sourceMappingURL=path-svg.js.map
+//# sourceMappingURL=path-svg.js.map

package/es/common/performance-raf.js

@@ -26,4 +26,4 @@ export class PerformanceRAF {
         }));
     }
 }
-//# sourceMappingURL=performance-raf.js.map
+//# sourceMappingURL=performance-raf.js.map

package/es/common/polygon.js

@@ -38,4 +38,4 @@ function getProportionPoint(point, segment, length, dx, dy) {
         y: point.y - dy * factor
     };
 }
-//# sourceMappingURL=polygon.js.map
+//# sourceMappingURL=polygon.js.map

package/es/common/rect-utils.js

@@ -17,4 +17,4 @@ export const normalizeRectAttributes = attribute => {
         height: height
     };
 };
-//# sourceMappingURL=rect-utils.js.map
+//# sourceMappingURL=rect-utils.js.map

package/es/common/render-area.js

@@ -61,4 +61,4 @@ function drawAreaBlock(path, topList, bottomList, params) {
     }
     path.closePath();
 }
-//# sourceMappingURL=render-area.js.map
+//# sourceMappingURL=render-area.js.map

package/es/common/render-command-list.js

@@ -6,4 +6,4 @@ export function renderCommandList(commandList, context, x = 0, y = 0, sx = 1, sy
         commandFuncs[command[0]](command, context, x, y, sx, sy, z);
     }
 }
-//# sourceMappingURL=render-command-list.js.map
+//# sourceMappingURL=render-command-list.js.map

package/es/common/render-curve.js

@@ -93,4 +93,4 @@ export function drawIncrementalAreaSegments(path, lastSeg, segments, params) {
         path.closePath();
     }));
 }
-//# sourceMappingURL=render-curve.js.map
+//# sourceMappingURL=render-curve.js.map

package/es/common/render-utils.js

@@ -11,4 +11,4 @@ export function drawSegItem(ctx, curve, endPercent, params) {
         ctx.lineTo(offsetX + p.x, offsetY + p.y, offsetZ);
     }
 }
-//# sourceMappingURL=render-utils.js.map
+//# sourceMappingURL=render-utils.js.map

package/es/common/seg-context.js

@@ -90,4 +90,5 @@ export class ReflectSegContext extends SegContext {
     clear() {
         return super.clear();
     }
-}
+}
+//# sourceMappingURL=seg-context.js.map

package/es/common/simplify.js

@@ -30,4 +30,4 @@ export function flatten_simplify(points, tolerance, highestQuality) {
     if (points.length <= 10) return points;
     return points = highestQuality ? points : simplifyRadialDist(points, void 0 !== tolerance ? tolerance * tolerance : 1);
 }
-//# sourceMappingURL=simplify.js.map
+//# sourceMappingURL=simplify.js.map

package/es/common/sort.js

@@ -94,4 +94,4 @@ export function findNextGraphic(graphic, id, defaultZIndex, reverse = !1) {
     !1)), reverse);
     return result;
 }
-//# sourceMappingURL=sort.js.map
+//# sourceMappingURL=sort.js.map

package/es/common/split-path.js

@@ -248,4 +248,4 @@ export const splitPath = (path, count) => {
     }
     return res;
 };
-//# sourceMappingURL=split-path.js.map
+//# sourceMappingURL=split-path.js.map

package/es/common/store.js

@@ -1,2 +1,2 @@
 class StageStore {}
-//# sourceMappingURL=store.js.map
+//# sourceMappingURL=store.js.map

package/es/common/text.js

@@ -24,4 +24,4 @@ export function textAttributesToStyle(attrs) {
     attrs.underline ? style["text-decoration"] = "underline" : attrs.lineThrough && (style["text-decoration"] = "line-through"), 
     attrs.fill && isString(attrs.fill) && (style.color = attrs.fill), style;
 }
-//# sourceMappingURL=text.js.map
+//# sourceMappingURL=text.js.map

package/es/common/utils.js

@@ -148,4 +148,4 @@ export const calculateLineHeight = (lineHeight, fontSize) => {
     const _lh = _calculateLineHeight(lineHeight, fontSize);
     return isNaN(_lh) ? _lh : Math.max(fontSize, _lh);
 };
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=utils.js.map

package/es/core/camera.js

@@ -66,4 +66,4 @@ export class OrthoCamera {
 export const registerOrthoCamera = () => {
     Factory.registerPlugin("OrthoCamera", OrthoCamera);
 };
-//# sourceMappingURL=camera.js.map
+//# sourceMappingURL=camera.js.map

package/es/core/constants.js

@@ -9,4 +9,4 @@ export const StaticLayerHandlerContribution = Symbol.for("StaticLayerHandlerCont
 export const DynamicLayerHandlerContribution = Symbol.for("DynamicLayerHandlerContribution");
 
 export const VirtualLayerHandlerContribution = Symbol.for("VirtualLayerHandlerContribution");
-//# sourceMappingURL=constants.js.map
+//# sourceMappingURL=constants.js.map

package/es/core/contributions/layerHandler/canvas2d-contribution.js

@@ -15,6 +15,7 @@ export class CanvasLayerHandlerContribution {
             let nativeCanvas;
             this.main = !1, params.canvasId && (nativeCanvas = this.global.getElementById(params.canvasId)), 
             nativeCanvas || (nativeCanvas = this.global.createCanvas({
+                id: params.canvasId,
                 width: window.width,
                 height: window.height
             })), nativeCanvas.style && (nativeCanvas.style["pointer-events"] = "none");

package/es/core/contributions/layerHandler/canvas2d-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/contributions/layerHandler/canvas2d-contribution.ts"],"names":[],"mappings":"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","file":"canvas2d-contribution.js","sourcesContent":["import { wrapCanvas } from '../../../canvas/util';\nimport type {\n  IGlobal,\n  ICanvas,\n  IContext2d,\n  IDrawToParams,\n  IGroup,\n  ILayer,\n  ILayerHandlerContribution,\n  IWindow,\n  ILayerHandlerInitParams,\n  ILayerHandlerDrawParams,\n  IDrawContext,\n  LayerMode\n} from '../../../interface';\nimport type { IBounds } from '@visactor/vutils';\nimport { application } from '../../../application';\n\nexport class CanvasLayerHandlerContribution implements ILayerHandlerContribution {\n  layer: ILayer;\n  canvas: ICanvas;\n  context: IContext2d;\n  offscreen: boolean;\n  main: boolean;\n  window: IWindow;\n  type: LayerMode = 'static';\n  global: IGlobal;\n  // 所绑定的副layer handler\n  secondaryHandlers: ILayerHandlerContribution[];\n\n  constructor() {\n    this.offscreen = false;\n    this.global = application.global;\n  }\n\n  setDpr(dpr: number) {\n    this.canvas.dpr = dpr;\n    return;\n  }\n\n  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void {\n    this.layer = layer;\n    this.window = window;\n    // 默认图层，那么直接拿window上的上下文和canvas即可\n    if (params.main) {\n      this.main = true;\n      this.context = window.getContext();\n      this.canvas = this.context.getCanvas();\n    } else {\n      this.main = false;\n      let nativeCanvas: HTMLElement;\n      if (params.canvasId) {\n        nativeCanvas = this.global.getElementById(params.canvasId);\n      }\n      if (!nativeCanvas) {\n        nativeCanvas = this.global.createCanvas({\n          width: window.width,\n          height: window.height\n        });\n      }\n      // 不是main的话，就穿透点击事件\n      if (nativeCanvas.style) {\n        nativeCanvas.style['pointer-events'] = 'none';\n      }\n      const windowContext = window.getContext();\n      const windowCanvas = windowContext.getCanvas().nativeCanvas;\n      const canvas = wrapCanvas({\n        nativeCanvas,\n        width: window.width,\n        height: window.height,\n        dpr: window.dpr,\n        id: params.canvasId,\n        canvasControled: true,\n        container: window.getContainer(),\n        x: windowCanvas.offsetLeft,\n        y: windowCanvas.offsetTop\n      });\n      canvas.applyPosition();\n      this.canvas = canvas;\n      this.context = canvas.getContext();\n    }\n  }\n\n  resize(w: number, h: number) {\n    this.canvas.resize(w, h);\n    return;\n  }\n  resizeView(w: number, h: number) {\n    return;\n  }\n\n  render(group: IGroup[], params: ILayerHandlerDrawParams, userParams?: Partial<IDrawContext>): void {\n    // 调整位置\n    if (!this.main) {\n      const windowContext = this.window.getContext();\n      const windowCanvas = windowContext.getCanvas().nativeCanvas;\n      if (windowCanvas && (this.canvas.x !== windowCanvas.offsetLeft || this.canvas.y !== windowCanvas.offsetTop)) {\n        this.canvas.x = windowCanvas.offsetLeft;\n        this.canvas.y = windowCanvas.offsetTop;\n        this.canvas.applyPosition();\n      }\n    }\n    params.renderService.render(group, {\n      context: this.context,\n      clear: params.background ?? '#ffffff',\n      ...params,\n      ...userParams\n    });\n  }\n\n  merge(layerHandlers: ILayerHandlerContribution[]) {\n    layerHandlers.forEach(l => {\n      const ctx = l.getContext();\n      const canvas = ctx.canvas.nativeCanvas;\n      this.context.drawImage(canvas, 0, 0);\n    });\n  }\n\n  prepare(dirtyBounds: IBounds, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  drawTo(target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) {\n    const context = target.getContext();\n    params.renderService.render(group, {\n      context,\n      ...params,\n      clear: params.clear ? params.background ?? '#fff' : undefined\n    });\n    return;\n  }\n\n  getContext(): IContext2d {\n    return this.context;\n  }\n\n  release() {\n    this.canvas.release();\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/contributions/layerHandler/canvas2d-contribution.ts"],"names":[],"mappings":"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","file":"canvas2d-contribution.js","sourcesContent":["import { wrapCanvas } from '../../../canvas/util';\nimport type {\n  IGlobal,\n  ICanvas,\n  IContext2d,\n  IDrawToParams,\n  IGroup,\n  ILayer,\n  ILayerHandlerContribution,\n  IWindow,\n  ILayerHandlerInitParams,\n  ILayerHandlerDrawParams,\n  IDrawContext,\n  LayerMode\n} from '../../../interface';\nimport type { IBounds } from '@visactor/vutils';\nimport { application } from '../../../application';\n\nexport class CanvasLayerHandlerContribution implements ILayerHandlerContribution {\n  layer: ILayer;\n  canvas: ICanvas;\n  context: IContext2d;\n  offscreen: boolean;\n  main: boolean;\n  window: IWindow;\n  type: LayerMode = 'static';\n  global: IGlobal;\n  // 所绑定的副layer handler\n  secondaryHandlers: ILayerHandlerContribution[];\n\n  constructor() {\n    this.offscreen = false;\n    this.global = application.global;\n  }\n\n  setDpr(dpr: number) {\n    this.canvas.dpr = dpr;\n    return;\n  }\n\n  init(layer: ILayer, window: IWindow, params: ILayerHandlerInitParams): void {\n    this.layer = layer;\n    this.window = window;\n    // 默认图层，那么直接拿window上的上下文和canvas即可\n    if (params.main) {\n      this.main = true;\n      this.context = window.getContext();\n      this.canvas = this.context.getCanvas();\n    } else {\n      this.main = false;\n      let nativeCanvas: HTMLElement;\n      if (params.canvasId) {\n        nativeCanvas = this.global.getElementById(params.canvasId);\n      }\n      if (!nativeCanvas) {\n        nativeCanvas = this.global.createCanvas({\n          id: params.canvasId,\n          width: window.width,\n          height: window.height\n        });\n      }\n      // 不是main的话，就穿透点击事件\n      if (nativeCanvas.style) {\n        nativeCanvas.style['pointer-events'] = 'none';\n      }\n      const windowContext = window.getContext();\n      const windowCanvas = windowContext.getCanvas().nativeCanvas;\n      const canvas = wrapCanvas({\n        nativeCanvas,\n        width: window.width,\n        height: window.height,\n        dpr: window.dpr,\n        id: params.canvasId,\n        canvasControled: true,\n        container: window.getContainer(),\n        x: windowCanvas.offsetLeft,\n        y: windowCanvas.offsetTop\n      });\n      canvas.applyPosition();\n      this.canvas = canvas;\n      this.context = canvas.getContext();\n    }\n  }\n\n  resize(w: number, h: number) {\n    this.canvas.resize(w, h);\n    return;\n  }\n  resizeView(w: number, h: number) {\n    return;\n  }\n\n  render(group: IGroup[], params: ILayerHandlerDrawParams, userParams?: Partial<IDrawContext>): void {\n    // 调整位置\n    if (!this.main) {\n      const windowContext = this.window.getContext();\n      const windowCanvas = windowContext.getCanvas().nativeCanvas;\n      if (windowCanvas && (this.canvas.x !== windowCanvas.offsetLeft || this.canvas.y !== windowCanvas.offsetTop)) {\n        this.canvas.x = windowCanvas.offsetLeft;\n        this.canvas.y = windowCanvas.offsetTop;\n        this.canvas.applyPosition();\n      }\n    }\n    params.renderService.render(group, {\n      context: this.context,\n      clear: params.background ?? '#ffffff',\n      ...params,\n      ...userParams\n    });\n  }\n\n  merge(layerHandlers: ILayerHandlerContribution[]) {\n    layerHandlers.forEach(l => {\n      const ctx = l.getContext();\n      const canvas = ctx.canvas.nativeCanvas;\n      this.context.drawImage(canvas, 0, 0);\n    });\n  }\n\n  prepare(dirtyBounds: IBounds, params: ILayerHandlerDrawParams) {\n    return;\n  }\n\n  drawTo(target: IWindow, group: IGroup[], params: IDrawToParams & ILayerHandlerDrawParams) {\n    const context = target.getContext();\n    params.renderService.render(group, {\n      context,\n      ...params,\n      clear: params.clear ? params.background ?? '#fff' : undefined\n    });\n    return;\n  }\n\n  getContext(): IContext2d {\n    return this.context;\n  }\n\n  release() {\n    this.canvas.release();\n  }\n}\n"]}

package/es/core/core-modules.js

@@ -21,4 +21,4 @@ export function bindCoreModules({bind: bind}) {
 }
 
 export default bindCoreModules;
-//# sourceMappingURL=core-modules.js.map
+//# sourceMappingURL=core-modules.js.map

package/es/core/global-module.js

@@ -1,3 +1 @@
-
-
 //# sourceMappingURL=global-module.js.map

package/es/core/global.js

@@ -222,4 +222,4 @@ export class DefaultGlobal extends EventListenerManager {
         return this._env || this.setEnv("browser"), this.envContribution.copyToClipBoard(text);
     }
 }
-//# sourceMappingURL=global.js.map
+//# sourceMappingURL=global.js.map

package/es/core/graphic-utils.js

@@ -162,4 +162,4 @@ export class DefaultTransformUtil {
         return this;
     }
 }
-//# sourceMappingURL=graphic-utils.js.map
+//# sourceMappingURL=graphic-utils.js.map

package/es/core/index.js

@@ -15,4 +15,4 @@ export * from "./layer-service";
 export * from "./constants";
 
 export * from "../interface/core";
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/es/core/layer-service.js

@@ -75,5 +75,4 @@ export class DefaultLayerService {
     }
 }
 
-DefaultLayerService.idprefix = "visactor_layer", DefaultLayerService.prefix_count = 0;
-//# sourceMappingURL=layer-service.js.map
+DefaultLayerService.idprefix = "visactor_layer", DefaultLayerService.prefix_count = 0;

package/es/core/layer.js

@@ -112,4 +112,4 @@ export class Layer extends Group {
         }, params)), this.afterDrawCbs.forEach((c => c(this)));
     }
 }
-//# sourceMappingURL=layer.js.map
+//# sourceMappingURL=layer.js.map

package/es/core/light.js

@@ -23,4 +23,4 @@ export class DirectionalLight {
 export const registerDirectionalLight = () => {
     Factory.registerPlugin("DirectionalLight", DirectionalLight);
 };
-//# sourceMappingURL=light.js.map
+//# sourceMappingURL=light.js.map

package/es/core/stage.js

@@ -616,4 +616,4 @@ export class Stage extends Group {
         this.renderService.reInit(), this.pickerService.reInit();
     }
 }
-//# sourceMappingURL=stage.js.map
+//# sourceMappingURL=stage.js.map

package/es/core/window.js

@@ -150,4 +150,4 @@ export class DefaultWindow extends EventListenerManager {
         return this._handler.getTopLeft(baseWindow);
     }
 }
-//# sourceMappingURL=window.js.map
+//# sourceMappingURL=window.js.map

package/es/entries/app-context.js

@@ -83,4 +83,4 @@ export class AppContext {
         };
     }
 }
-//# sourceMappingURL=app-context.js.map
+//# sourceMappingURL=app-context.js.map

package/es/entries/browser.js

@@ -33,4 +33,4 @@ export class BrowserEntry {
 export function createBrowserApp(options = {}) {
     return new BrowserEntry(options);
 }
-//# sourceMappingURL=browser.js.map
+//# sourceMappingURL=browser.js.map

package/es/entries/index.js

@@ -11,4 +11,4 @@ export * from "./miniapp";
 export * from "./runtime-installer";
 
 export { createBrowserApp as createApp } from "./browser";
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/es/entries/miniapp.js

@@ -9,4 +9,4 @@ export class MiniappEntry extends BrowserEntry {
 export function createMiniappApp(options = {}) {
     return new MiniappEntry(options);
 }
-//# sourceMappingURL=miniapp.js.map
+//# sourceMappingURL=miniapp.js.map

package/es/entries/node.js

@@ -9,4 +9,4 @@ export class NodeEntry extends BrowserEntry {
 export function createNodeApp(options = {}) {
     return new NodeEntry(options);
 }
-//# sourceMappingURL=node.js.map
+//# sourceMappingURL=node.js.map

package/es/entries/runtime-installer.js

@@ -127,4 +127,4 @@ export function installRuntimePickersToApp(app, serviceIdentifier) {
     const pickers = bindingContext.getAll(serviceIdentifier);
     app.registry.picker.clear(), registerRuntimeEntries(((key, picker) => app.registry.picker.register(key, picker)), pickers, "runtime-picker");
 }
-//# sourceMappingURL=runtime-installer.js.map
+//# sourceMappingURL=runtime-installer.js.map

package/es/entries/types.js

@@ -1,2 +1,2 @@
 export { };
-//# sourceMappingURL=types.js.map
+//# sourceMappingURL=types.js.map

package/es/event/constant.js

@@ -1,2 +1,2 @@
 export const WILDCARD = "*";
-//# sourceMappingURL=constant.js.map
+//# sourceMappingURL=constant.js.map

package/es/event/event-manager.js

@@ -299,4 +299,4 @@ export class EventManager {
         this.mappingTable = null, this.mappingState = null, this.cursorTarget = null;
     }
 }
-//# sourceMappingURL=event-manager.js.map
+//# sourceMappingURL=event-manager.js.map

package/es/event/event-system.js

@@ -212,4 +212,4 @@ export class EventSystem {
         this.manager.pauseNotify = !1;
     }
 }
-//# sourceMappingURL=event-system.js.map
+//# sourceMappingURL=event-system.js.map

package/es/event/event-target.js

@@ -12,4 +12,4 @@ export const EventTarget = {
         return this.dispatchEvent(new CustomEvent(eventName, object));
     }
 };
-//# sourceMappingURL=event-target.js.map
+//# sourceMappingURL=event-target.js.map

package/es/event/index.js

@@ -10,5 +10,4 @@ export * from "../interface/event";
 
 export * from "./util";
 
-export * from "./constant";
-//# sourceMappingURL=index.js.map
+export * from "./constant";

package/es/event/util.js

@@ -1,2 +1,2 @@
 export const clock = "object" == typeof performance && performance.now ? performance : Date;
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=util.js.map