@visactor/vrender-kits 1.1.0-alpha.22 → 1.1.0-alpha.23

package/es/canvas/contributions/create-canvas-module.js

@@ -8,4 +8,4 @@ export function createModule(CanvasConstructor, ContextConstructor) {
         hasContextFactory || bindingContainer.bind(Context2dFactory).toDynamicValue((() => (params, dpr) => new ContextConstructor(params, dpr))).whenTargetNamed(ContextConstructor.env);
     };
 }
-//# sourceMappingURL=create-canvas-module.js.map
+//# sourceMappingURL=create-canvas-module.js.map

package/es/canvas/contributions/harmony/canvas.js

@@ -9,7 +9,11 @@ export class HarmonyCanvas extends BaseCanvas {
     init() {
         this._context = new HarmonyContext2d(this, this._dpr);
     }
-    resize(width, height) {}
+    resize(width, height) {
+        this.controled && (this._pixelWidth = width * this._dpr, this._pixelHeight = height * this._dpr, 
+        this._displayWidth = width, this._displayHeight = height, this._nativeCanvas.width = this._pixelWidth, 
+        this._nativeCanvas.height = this._pixelHeight, this._context.dpr = this._dpr);
+    }
     release(...params) {}
 }
 

package/es/canvas/contributions/harmony/canvas.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/canvas/contributions/harmony/canvas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,MAAM,OAAO,aAAc,SAAQ,UAAU;IAO3C,YAAY,MAAwB;QAClC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,IAAI;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,MAAc;QAClC,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,MAAW;QACpB,OAAO;IACT,CAAC;;AApBM,iBAAG,GAAY,SAAS,CAAC","file":"canvas.js","sourcesContent":["import { BaseCanvas } from '@visactor/vrender-core';\nimport type { ICanvas, CanvasConfigType, EnvType } from '@visactor/vrender-core';\nimport { HarmonyContext2d } from './context';\n\nexport class HarmonyCanvas extends BaseCanvas implements ICanvas {\n  static env: EnvType = 'harmony';\n\n  /**\n   * 通过canvas生成一个wrap对象，初始化时不会再设置canvas的属性\n   * @param params\n   */\n  constructor(params: CanvasConfigType) {\n    super(params);\n  }\n\n  init() {\n    this._context = new HarmonyContext2d(this, this._dpr);\n  }\n\n  resize(width: number, height: number): void {\n    return;\n  }\n\n  release(...params: any): void {\n    return;\n  }\n}\n"]}
+{"version":3,"sources":["../src/canvas/contributions/harmony/canvas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,MAAM,OAAO,aAAc,SAAQ,UAAU;IAO3C,YAAY,MAAwB;QAClC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;IAED,IAAI;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,MAAc;QAClC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO;SACR;QACD,IAAI,CAAC,WAAW,GAAG,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QACrC,IAAI,CAAC,YAAY,GAAG,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;QACvC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,aAAa,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;QAC9C,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,MAAW;QACpB,OAAO;IACT,CAAC;;AA9BM,iBAAG,GAAY,SAAS,CAAC","file":"canvas.js","sourcesContent":["import { BaseCanvas } from '@visactor/vrender-core';\nimport type { ICanvas, CanvasConfigType, EnvType } from '@visactor/vrender-core';\nimport { HarmonyContext2d } from './context';\n\nexport class HarmonyCanvas extends BaseCanvas implements ICanvas {\n  static env: EnvType = 'harmony';\n\n  /**\n   * 通过canvas生成一个wrap对象，初始化时不会再设置canvas的属性\n   * @param params\n   */\n  constructor(params: CanvasConfigType) {\n    super(params);\n  }\n\n  init() {\n    this._context = new HarmonyContext2d(this, this._dpr);\n  }\n\n  resize(width: number, height: number): void {\n    if (!this.controled) {\n      return;\n    }\n    this._pixelWidth = width * this._dpr;\n    this._pixelHeight = height * this._dpr;\n    this._displayWidth = width;\n    this._displayHeight = height;\n    this._nativeCanvas.width = this._pixelWidth;\n    this._nativeCanvas.height = this._pixelHeight;\n    this._context.dpr = this._dpr;\n    return;\n  }\n\n  release(...params: any): void {\n    return;\n  }\n}\n"]}

package/es/canvas/contributions/modules.js

@@ -45,4 +45,4 @@ export function loadTTCanvas(container) {
 export function loadWxCanvas(container) {
     bindWxCanvasModules(container);
 }
-//# sourceMappingURL=modules.js.map
+//# sourceMappingURL=modules.js.map

package/es/env/contributions/browser-contribution.js

@@ -238,4 +238,4 @@ export class BrowserEnvContribution extends BaseEnvContribution {
         return navigator.clipboard.writeText(text).then((() => {})).catch((err => {}));
     }
 }
-//# sourceMappingURL=browser-contribution.js.map
+//# sourceMappingURL=browser-contribution.js.map

package/es/env/contributions/canvas-wrap.js

@@ -69,4 +69,4 @@ export class CanvasWrapEnableWH {
         };
     }
 }
-//# sourceMappingURL=canvas-wrap.js.map
+//# sourceMappingURL=canvas-wrap.js.map

package/es/env/contributions/feishu-contribution.d.ts

@@ -1,20 +1,26 @@
 import { BaseEnvContribution } from '@visactor/vrender-core';
 import type { ICanvasLike, EnvType, ICreateCanvasParams, IEnvContribution, IGlobal, ITTCanvas } from '@visactor/vrender-core';
+import { type MiniAppCanvasEnvParams } from './miniapp-canvas';
+declare const tt: {
+    getSystemInfoSync?: () => {
+        pixelRatio: number;
+    };
+    createCanvasContext?: (id: string) => any;
+};
+type FeishuEnvParams = MiniAppCanvasEnvParams & {
+    tt?: typeof tt;
+    feishu?: typeof tt;
+    runtime?: typeof tt;
+};
 export declare class FeishuEnvContribution extends BaseEnvContribution implements IEnvContribution {
     type: EnvType;
     supportEvent: boolean;
     canvasMap: Map<string, ITTCanvas>;
-    freeCanvasList: ITTCanvas[];
-    canvasIdx: number;
+    private feishuEnvParams;
     constructor();
     getDynamicCanvasCount(): number;
     getStaticCanvasCount(): number;
-    configure(service: IGlobal, params: {
-        domref: any;
-        canvasIdLists: string[];
-        freeCanvasIdx: number;
-        pixelRatio?: number;
-    }): void;
+    configure(service: IGlobal, params?: FeishuEnvParams): void;
     loadImage(url: string): Promise<{
         loadState: 'success' | 'fail';
         data: HTMLImageElement | ImageData | null;
@@ -40,3 +46,4 @@ export declare class FeishuEnvContribution extends BaseEnvContribution implement
     release(...params: any): void;
     mapToCanvasPoint(event: any): any;
 }
+export {};

package/es/env/contributions/feishu-contribution.js

@@ -1,19 +1,27 @@
 import { BaseEnvContribution, rafBasedSto } from "@visactor/vrender-core";
 
-import { CanvasWrapDisableWH } from "./canvas-wrap";
+import { createCanvasWithFactory, getMiniAppCanvasOptions, wrapMiniAppContextCanvas } from "./miniapp-canvas";
 
-function makeUpCanvas(domref, canvasIdLists, canvasMap, freeCanvasIdx, freeCanvasList, pixelRatio) {
-    const dpr = null != pixelRatio ? pixelRatio : tt.getSystemInfoSync().pixelRatio;
-    canvasIdLists.forEach(((id, i) => {
-        const ctx = tt.createCanvasContext(id), canvas = new CanvasWrapDisableWH(ctx.canvas || {}, ctx, dpr, domref.width, domref.height, id);
-        ctx.canvas = canvas, canvasMap.set(id, canvas), i >= freeCanvasIdx && freeCanvasList.push(canvas);
-    }));
+const FEISHU_CANVAS_BRIDGE_ERROR = "Feishu canvas bridge is unavailable. VRender feishu env requires envParams.canvasFactory, a Stage canvas object, or a feishu/tt runtime that exposes createCanvasContext(id).";
+
+function getFeishuRuntime(params) {
+    var _a, _b, _c, _d, _e;
+    try {
+        return null !== (_c = null !== (_b = null !== (_a = null == params ? void 0 : params.feishu) && void 0 !== _a ? _a : null == params ? void 0 : params.tt) && void 0 !== _b ? _b : null == params ? void 0 : params.runtime) && void 0 !== _c ? _c : "undefined" != typeof tt ? tt : void 0;
+    } catch (_f) {
+        return null !== (_e = null !== (_d = null == params ? void 0 : params.feishu) && void 0 !== _d ? _d : null == params ? void 0 : params.tt) && void 0 !== _e ? _e : null == params ? void 0 : params.runtime;
+    }
+}
+
+function getFeishuPixelRatio(params, runtime = getFeishuRuntime(params)) {
+    var _a, _b, _c, _d;
+    return null !== (_d = null !== (_a = null == params ? void 0 : params.pixelRatio) && void 0 !== _a ? _a : null === (_c = null === (_b = null == runtime ? void 0 : runtime.getSystemInfoSync) || void 0 === _b ? void 0 : _b.call(runtime)) || void 0 === _c ? void 0 : _c.pixelRatio) && void 0 !== _d ? _d : 1;
 }
 
 export class FeishuEnvContribution extends BaseEnvContribution {
     constructor() {
         super(), this.type = "feishu", this.supportEvent = !0, this.canvasMap = new Map, 
-        this.freeCanvasList = [], this.canvasIdx = 0, this.supportsTouchEvents = !0;
+        this.feishuEnvParams = {}, this.supportsTouchEvents = !0;
         try {
             this.supportsPointerEvents = !!globalThis.PointerEvent, this.supportsMouseEvents = !!globalThis.MouseEvent;
         } catch (err) {
@@ -22,13 +30,13 @@ export class FeishuEnvContribution extends BaseEnvContribution {
         this.applyStyles = !0;
     }
     getDynamicCanvasCount() {
-        return this.freeCanvasList.length;
+        return 0;
     }
     getStaticCanvasCount() {
         return 9999;
     }
-    configure(service, params) {
-        service.env === this.type && (service.setActiveEnvContribution(this), makeUpCanvas(params.domref, params.canvasIdLists, this.canvasMap, params.freeCanvasIdx, this.freeCanvasList, params.pixelRatio));
+    configure(service, params = {}) {
+        service.env === this.type && (service.setActiveEnvContribution(this), this.feishuEnvParams = params);
     }
     loadImage(url) {
         return Promise.resolve({
@@ -40,13 +48,18 @@ export class FeishuEnvContribution extends BaseEnvContribution {
         return Promise.reject();
     }
     createCanvas(params) {
-        const result = this.freeCanvasList[this.canvasIdx] || this.freeCanvasList[this.freeCanvasList.length - 1];
-        return this.canvasIdx++, result;
+        var _a;
+        const envParams = this.feishuEnvParams, runtime = getFeishuRuntime(envParams), dpr = null !== (_a = params.dpr) && void 0 !== _a ? _a : getFeishuPixelRatio(envParams, runtime), factoryCanvas = createCanvasWithFactory(params, dpr, this.canvasMap, envParams.canvasFactory);
+        if (factoryCanvas) return factoryCanvas;
+        const options = getMiniAppCanvasOptions(params, dpr, !1);
+        if (null == options.id || "function" != typeof (null == runtime ? void 0 : runtime.createCanvasContext)) throw new Error(FEISHU_CANVAS_BRIDGE_ERROR);
+        const canvas = wrapMiniAppContextCanvas(runtime.createCanvasContext(options.id), options);
+        return this.canvasMap.set(options.id, canvas), canvas;
     }
     createOffscreenCanvas(params) {}
     releaseCanvas(canvas) {}
     getDevicePixelRatio() {
-        return tt.getSystemInfoSync().pixelRatio;
+        return getFeishuPixelRatio(this.feishuEnvParams);
     }
     getRequestAnimationFrame() {
         return function(callback) {

package/es/env/contributions/feishu-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/env/contributions/feishu-contribution.ts"],"names":[],"mappings":"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","file":"feishu-contribution.js","sourcesContent":["import { BaseEnvContribution, rafBasedSto } from '@visactor/vrender-core';\n// import { loadFeishuContributions } from '../../../kits';\nimport type {\n  ICanvasLike,\n  EnvType,\n  ICreateCanvasParams,\n  IEnvContribution,\n  IGlobal,\n  ITTCanvas\n} from '@visactor/vrender-core';\nimport { CanvasWrapDisableWH } from './canvas-wrap';\n\ndeclare const tt: {\n  getSystemInfoSync: () => { pixelRatio: number };\n  createCanvasContext: (id: string) => any;\n};\n\n// 飞书小程序canvas的wrap\nfunction makeUpCanvas(\n  domref: any,\n  canvasIdLists: string[],\n  canvasMap: Map<string, ITTCanvas>,\n  freeCanvasIdx: number,\n  freeCanvasList: ITTCanvas[],\n  pixelRatio?: number\n) {\n  const dpr = pixelRatio ?? tt.getSystemInfoSync().pixelRatio;\n\n  canvasIdLists.forEach((id, i) => {\n    // if (canvasMap.has(id)) {\n    //   return;\n    // }\n    const ctx = tt.createCanvasContext(id);\n\n    const canvas = new CanvasWrapDisableWH(ctx.canvas || {}, ctx, dpr, domref.width, domref.height, id);\n    ctx.canvas = canvas;\n    canvasMap.set(id, canvas);\n    if (i >= freeCanvasIdx) {\n      freeCanvasList.push(canvas);\n    }\n  });\n}\n\nexport class FeishuEnvContribution extends BaseEnvContribution implements IEnvContribution {\n  type: EnvType = 'feishu';\n  supportEvent: boolean = true;\n  // 所有添加进来的canvas\n  canvasMap: Map<string, ITTCanvas> = new Map();\n  // 所有可用的canvasList\n  freeCanvasList: ITTCanvas[] = [];\n  canvasIdx: number = 0;\n\n  constructor() {\n    super();\n    this.supportsTouchEvents = true;\n    try {\n      this.supportsPointerEvents = !!globalThis.PointerEvent;\n      this.supportsMouseEvents = !!globalThis.MouseEvent;\n    } catch (err) {\n      this.supportsPointerEvents = false;\n      this.supportsMouseEvents = false;\n    }\n    this.applyStyles = true;\n  }\n\n  /**\n   * 获取动态canvas的数量，offscreenCanvas或者framebuffer\n   */\n  getDynamicCanvasCount(): number {\n    return this.freeCanvasList.length;\n  }\n\n  /**\n   * 获取静态canvas的数量，纯粹canvas\n   */\n  getStaticCanvasCount(): number {\n    return 9999;\n  }\n\n  // TODO：VGrammar在小程序环境会重复调用setEnv传入canvas，所以每次configure并不会释放\n  // 这里等待后续和VGrammar沟通\n  configure(\n    service: IGlobal,\n    params: { domref: any; canvasIdLists: string[]; freeCanvasIdx: number; pixelRatio?: number }\n  ) {\n    if (service.env === this.type) {\n      service.setActiveEnvContribution(this);\n      makeUpCanvas(\n        params.domref,\n        params.canvasIdLists,\n        this.canvasMap,\n        params.freeCanvasIdx,\n        this.freeCanvasList,\n        params.pixelRatio\n      );\n\n      // loadFeishuContributions();\n    }\n  }\n\n  loadImage(url: string): Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }> {\n    return Promise.resolve({\n      data: url as unknown as HTMLImageElement,\n      loadState: 'success'\n    });\n  }\n\n  loadSvg(url: string): Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }> {\n    // 飞书小组件不支持DOMParser和URL.createObjectURL，无法解析svg字符串，可以通过url使用svg资源\n    return Promise.reject();\n  }\n\n  createCanvas(params: ICreateCanvasParams): ITTCanvas {\n    const result = this.freeCanvasList[this.canvasIdx] || this.freeCanvasList[this.freeCanvasList.length - 1];\n    this.canvasIdx++;\n    return result;\n  }\n\n  createOffscreenCanvas(params: ICreateCanvasParams) {\n    return;\n  }\n\n  releaseCanvas(canvas: ICanvasLike | string) {\n    return;\n  }\n\n  getDevicePixelRatio(): number {\n    return tt.getSystemInfoSync().pixelRatio;\n  }\n\n  getRequestAnimationFrame(): (callback: FrameRequestCallback) => number {\n    // return requestAnimationFrame;\n\n    // 飞书小组件，在云文档浏览器环境中，没有requestAnimationFrame\n    // 但是在小组件工作台环境和模拟器中正常\n    // 反馈飞书修改，目前先使用setTimeout模拟，进行测试，飞书修复后替换回requestAnimationFrame\n    // return function (callback: FrameRequestCallback) {\n    //   return setTimeout(callback, 1000 / 60, true);\n    // } as any;\n    return function (callback: FrameRequestCallback) {\n      return rafBasedSto.call(callback);\n    } as any;\n  }\n\n  getCancelAnimationFrame(): (h: number) => void {\n    return (h: number) => {\n      rafBasedSto.clear(h);\n    };\n  }\n\n  addEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | AddEventListenerOptions | undefined\n  ): void;\n  addEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | AddEventListenerOptions | undefined\n  ): void;\n  addEventListener(type: unknown, listener: unknown, options?: unknown): void {\n    return null;\n  }\n\n  removeEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | EventListenerOptions | undefined\n  ): void;\n  removeEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | EventListenerOptions | undefined\n  ): void;\n  removeEventListener(type: unknown, listener: unknown, options?: unknown): void {\n    return null;\n  }\n\n  dispatchEvent(event: any): boolean {\n    return null;\n  }\n\n  // 只能索引canvas\n  getElementById(str: string): any | null {\n    return this.canvasMap.get(str);\n  }\n\n  getRootElement(): HTMLElement | null {\n    return null;\n  }\n\n  getDocument(): Document | null {\n    return null;\n  }\n\n  release(...params: any): void {\n    return;\n  }\n\n  mapToCanvasPoint(event: any) {\n    if (event?.type?.startsWith('mouse')) {\n      return event;\n    }\n    return event;\n  }\n}\n"]}
+{"version":3,"sources":["../src/env/contributions/feishu-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAU1E,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EAEvB,wBAAwB,EACzB,MAAM,kBAAkB,CAAC;AAa1B,MAAM,0BAA0B,GAC9B,4FAA4F;IAC5F,qFAAqF,CAAC;AAExF,SAAS,gBAAgB,CAAC,MAAwB;;IAChD,IAAI;QACF,OAAO,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,mCAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,mCAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,mCAAI,CAAC,OAAO,EAAE,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;KACxG;IAAC,WAAM;QACN,OAAO,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,mCAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,mCAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC;KACxD;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAwB,EAAE,UAAe,gBAAgB,CAAC,MAAM,CAAC;;IAC5F,OAAO,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,mCAAI,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,uDAAI,0CAAE,UAAU,mCAAI,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,OAAO,qBAAsB,SAAQ,mBAAmB;IAO5D;QACE,KAAK,EAAE,CAAC;QAPV,SAAI,GAAY,QAAQ,CAAC;QACzB,iBAAY,GAAY,IAAI,CAAC;QAE7B,cAAS,GAA2B,IAAI,GAAG,EAAE,CAAC;QACtC,oBAAe,GAAoB,EAAE,CAAC;QAI5C,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI;YACF,IAAI,CAAC,qBAAqB,GAAG,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC;YACvD,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;SACpD;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;YACnC,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;SAClC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAKD,qBAAqB;QACnB,OAAO,CAAC,CAAC;IACX,CAAC;IAKD,oBAAoB;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,OAAgB,EAAE,SAA0B,EAAE;QACtD,IAAI,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC,IAAI,EAAE;YAC7B,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC;SAG/B;IACH,CAAC;IAED,SAAS,CAAC,GAAW;QAInB,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,GAAkC;YACxC,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,GAAW;QAKjB,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IAED,YAAY,CAAC,MAA2B;;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC;QACvC,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,MAAA,MAAM,CAAC,GAAG,mCAAI,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QACpG,IAAI,aAAa,EAAE;YACjB,OAAO,aAAa,CAAC;SACtB;QAED,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QAC5D,IAAI,OAAO,CAAC,EAAE,IAAI,IAAI,IAAI,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA,KAAK,UAAU,EAAE;YAC5E,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,MAAM,MAAM,GAAG,wBAAwB,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QAC1F,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,qBAAqB,CAAC,MAA2B;QAC/C,OAAO;IACT,CAAC;IAED,aAAa,CAAC,MAA4B;QACxC,OAAO;IACT,CAAC;IAED,mBAAmB;QACjB,OAAO,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACnD,CAAC;IAED,wBAAwB;QAStB,OAAO,UAAU,QAA8B;YAC7C,OAAO,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAQ,CAAC;IACX,CAAC;IAED,uBAAuB;QACrB,OAAO,CAAC,CAAS,EAAE,EAAE;YACnB,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC,CAAC;IACJ,CAAC;IAYD,gBAAgB,CAAC,IAAa,EAAE,QAAiB,EAAE,OAAiB;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAYD,mBAAmB,CAAC,IAAa,EAAE,QAAiB,EAAE,OAAiB;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,KAAU;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAGD,cAAc,CAAC,GAAW;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,GAAG,MAAW;QACpB,OAAO;IACT,CAAC;IAED,gBAAgB,CAAC,KAAU;;QACzB,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,0CAAE,UAAU,CAAC,OAAO,CAAC,EAAE;YACpC,OAAO,KAAK,CAAC;SACd;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF","file":"feishu-contribution.js","sourcesContent":["import { BaseEnvContribution, rafBasedSto } from '@visactor/vrender-core';\n// import { loadFeishuContributions } from '../../../kits';\nimport type {\n  ICanvasLike,\n  EnvType,\n  ICreateCanvasParams,\n  IEnvContribution,\n  IGlobal,\n  ITTCanvas\n} from '@visactor/vrender-core';\nimport {\n  createCanvasWithFactory,\n  getMiniAppCanvasOptions,\n  type MiniAppCanvasEnvParams,\n  wrapMiniAppContextCanvas\n} from './miniapp-canvas';\n\ndeclare const tt: {\n  getSystemInfoSync?: () => { pixelRatio: number };\n  createCanvasContext?: (id: string) => any;\n};\n\ntype FeishuEnvParams = MiniAppCanvasEnvParams & {\n  tt?: typeof tt;\n  feishu?: typeof tt;\n  runtime?: typeof tt;\n};\n\nconst FEISHU_CANVAS_BRIDGE_ERROR =\n  'Feishu canvas bridge is unavailable. VRender feishu env requires envParams.canvasFactory, ' +\n  'a Stage canvas object, or a feishu/tt runtime that exposes createCanvasContext(id).';\n\nfunction getFeishuRuntime(params?: FeishuEnvParams): any {\n  try {\n    return params?.feishu ?? params?.tt ?? params?.runtime ?? (typeof tt !== 'undefined' ? tt : undefined);\n  } catch {\n    return params?.feishu ?? params?.tt ?? params?.runtime;\n  }\n}\n\nfunction getFeishuPixelRatio(params?: FeishuEnvParams, runtime: any = getFeishuRuntime(params)): number {\n  return params?.pixelRatio ?? runtime?.getSystemInfoSync?.()?.pixelRatio ?? 1;\n}\n\nexport class FeishuEnvContribution extends BaseEnvContribution implements IEnvContribution {\n  type: EnvType = 'feishu';\n  supportEvent: boolean = true;\n  // 所有添加进来的canvas\n  canvasMap: Map<string, ITTCanvas> = new Map();\n  private feishuEnvParams: FeishuEnvParams = {};\n\n  constructor() {\n    super();\n    this.supportsTouchEvents = true;\n    try {\n      this.supportsPointerEvents = !!globalThis.PointerEvent;\n      this.supportsMouseEvents = !!globalThis.MouseEvent;\n    } catch (err) {\n      this.supportsPointerEvents = false;\n      this.supportsMouseEvents = false;\n    }\n    this.applyStyles = true;\n  }\n\n  /**\n   * 获取动态canvas的数量，offscreenCanvas或者framebuffer\n   */\n  getDynamicCanvasCount(): number {\n    return 0;\n  }\n\n  /**\n   * 获取静态canvas的数量，纯粹canvas\n   */\n  getStaticCanvasCount(): number {\n    return 9999;\n  }\n\n  configure(service: IGlobal, params: FeishuEnvParams = {}) {\n    if (service.env === this.type) {\n      service.setActiveEnvContribution(this);\n      this.feishuEnvParams = params;\n\n      // loadFeishuContributions();\n    }\n  }\n\n  loadImage(url: string): Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }> {\n    return Promise.resolve({\n      data: url as unknown as HTMLImageElement,\n      loadState: 'success'\n    });\n  }\n\n  loadSvg(url: string): Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }> {\n    // 飞书小组件不支持DOMParser和URL.createObjectURL，无法解析svg字符串，可以通过url使用svg资源\n    return Promise.reject();\n  }\n\n  createCanvas(params: ICreateCanvasParams): ITTCanvas {\n    const envParams = this.feishuEnvParams;\n    const runtime = getFeishuRuntime(envParams);\n    const dpr = params.dpr ?? getFeishuPixelRatio(envParams, runtime);\n    const factoryCanvas = createCanvasWithFactory(params, dpr, this.canvasMap, envParams.canvasFactory);\n    if (factoryCanvas) {\n      return factoryCanvas;\n    }\n\n    const options = getMiniAppCanvasOptions(params, dpr, false);\n    if (options.id == null || typeof runtime?.createCanvasContext !== 'function') {\n      throw new Error(FEISHU_CANVAS_BRIDGE_ERROR);\n    }\n\n    const canvas = wrapMiniAppContextCanvas(runtime.createCanvasContext(options.id), options);\n    this.canvasMap.set(options.id, canvas);\n    return canvas;\n  }\n\n  createOffscreenCanvas(params: ICreateCanvasParams) {\n    return;\n  }\n\n  releaseCanvas(canvas: ICanvasLike | string) {\n    return;\n  }\n\n  getDevicePixelRatio(): number {\n    return getFeishuPixelRatio(this.feishuEnvParams);\n  }\n\n  getRequestAnimationFrame(): (callback: FrameRequestCallback) => number {\n    // return requestAnimationFrame;\n\n    // 飞书小组件，在云文档浏览器环境中，没有requestAnimationFrame\n    // 但是在小组件工作台环境和模拟器中正常\n    // 反馈飞书修改，目前先使用setTimeout模拟，进行测试，飞书修复后替换回requestAnimationFrame\n    // return function (callback: FrameRequestCallback) {\n    //   return setTimeout(callback, 1000 / 60, true);\n    // } as any;\n    return function (callback: FrameRequestCallback) {\n      return rafBasedSto.call(callback);\n    } as any;\n  }\n\n  getCancelAnimationFrame(): (h: number) => void {\n    return (h: number) => {\n      rafBasedSto.clear(h);\n    };\n  }\n\n  addEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | AddEventListenerOptions | undefined\n  ): void;\n  addEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | AddEventListenerOptions | undefined\n  ): void;\n  addEventListener(type: unknown, listener: unknown, options?: unknown): void {\n    return null;\n  }\n\n  removeEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | EventListenerOptions | undefined\n  ): void;\n  removeEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | EventListenerOptions | undefined\n  ): void;\n  removeEventListener(type: unknown, listener: unknown, options?: unknown): void {\n    return null;\n  }\n\n  dispatchEvent(event: any): boolean {\n    return null;\n  }\n\n  // 只能索引canvas\n  getElementById(str: string): any | null {\n    return this.canvasMap.get(str);\n  }\n\n  getRootElement(): HTMLElement | null {\n    return null;\n  }\n\n  getDocument(): Document | null {\n    return null;\n  }\n\n  release(...params: any): void {\n    return;\n  }\n\n  mapToCanvasPoint(event: any) {\n    if (event?.type?.startsWith('mouse')) {\n      return event;\n    }\n    return event;\n  }\n}\n"]}

package/es/env/contributions/harmony-contribution.d.ts

@@ -1,17 +1,35 @@
 import { BaseEnvContribution, RafBasedSTO } from '@visactor/vrender-core';
 import type { ICanvasLike, EnvType, ICreateCanvasParams, IEnvContribution, IGlobal, ILynxCanvas } from '@visactor/vrender-core';
+type HarmonyCanvasFactoryOptions = {
+    id: string;
+    width: number;
+    height: number;
+    dpr: number;
+    offscreen: boolean;
+};
+type HarmonyCanvasFactory = (options: HarmonyCanvasFactoryOptions) => any;
+type HarmonyRuntime = Partial<{
+    createCanvas: (options: HarmonyCanvasFactoryOptions) => any;
+    createOffscreenCanvas: (options: HarmonyCanvasFactoryOptions) => any;
+    createImage: (src: string) => any;
+}>;
+type HarmonyEnvParams = {
+    pixelRatio?: number;
+    harmony?: HarmonyRuntime;
+    runtime?: HarmonyRuntime;
+    canvasFactory?: HarmonyCanvasFactory;
+};
 export declare class HarmonyEnvContribution extends BaseEnvContribution implements IEnvContribution {
     type: EnvType;
     supportEvent: boolean;
     rafSTO: RafBasedSTO;
+    canvasMap: Map<string, ILynxCanvas>;
+    freeCanvasList: ILynxCanvas[];
+    canvasIdx: number;
+    private harmonyRuntime?;
+    private harmonyEnvParams?;
     constructor();
-    configure(service: IGlobal, params: {
-        domref: any;
-        canvasIdLists: string[];
-        freeCanvasIdx: number;
-        offscreen?: boolean;
-        pixelRatio?: number;
-    }): void;
+    configure(service: IGlobal, params?: HarmonyEnvParams): void;
     getDynamicCanvasCount(): number;
     getStaticCanvasCount(): number;
     loadImage(url: string): Promise<{
@@ -39,3 +57,4 @@ export declare class HarmonyEnvContribution extends BaseEnvContribution implemen
     getDocument(): Document | null;
     release(...params: any): void;
 }
+export {};

package/es/env/contributions/harmony-contribution.js

@@ -1,25 +1,100 @@
 import { BaseEnvContribution, RafBasedSTO } from "@visactor/vrender-core";
 
-import { CanvasWrapDisableWH } from "./canvas-wrap";
+import { CanvasWrapEnableWH } from "./canvas-wrap";
 
-function createCanvas(width, height, id) {
-    const _c = new OffscreenCanvas(width, height), context = _c.getContext("2d");
-    return new CanvasWrapDisableWH({
+const HARMONY_CANVAS_BRIDGE_ERROR = "Harmony canvas bridge is unavailable. VRender Harmony env requires envParams.canvasFactory or a Harmony runtime that exposes a global createCanvas/createOffscreenCanvas capability.", HARMONY_CANVAS_SIZE_ERROR = "Harmony canvas size is unavailable. Pass stage width/height when creating a Harmony stage canvas.";
+
+function isValidCoordinate(value) {
+    return "number" == typeof value && Number.isFinite(value);
+}
+
+function pickCoordinate(...values) {
+    for (let i = 0; i < values.length; i++) if (isValidCoordinate(values[i])) return values[i];
+}
+
+function getPrimaryTouch(event) {
+    var _a, _b, _c;
+    return null !== (_b = null === (_a = null == event ? void 0 : event.changedTouches) || void 0 === _a ? void 0 : _a[0]) && void 0 !== _b ? _b : null === (_c = null == event ? void 0 : event.touches) || void 0 === _c ? void 0 : _c[0];
+}
+
+function getHarmonyEventPoint(event) {
+    const touch = getPrimaryTouch(event), x = pickCoordinate(null == event ? void 0 : event.x, null == event ? void 0 : event.offsetX, null == event ? void 0 : event.clientX, null == event ? void 0 : event.pageX, null == touch ? void 0 : touch.x, null == touch ? void 0 : touch.offsetX, null == touch ? void 0 : touch.clientX, null == touch ? void 0 : touch.pageX), y = pickCoordinate(null == event ? void 0 : event.y, null == event ? void 0 : event.offsetY, null == event ? void 0 : event.clientY, null == event ? void 0 : event.pageY, null == touch ? void 0 : touch.y, null == touch ? void 0 : touch.offsetY, null == touch ? void 0 : touch.clientY, null == touch ? void 0 : touch.pageY);
+    return null == x || null == y ? null : {
+        x: x,
+        y: y
+    };
+}
+
+function getHarmonyRuntime(params) {
+    var _a;
+    return null !== (_a = null == params ? void 0 : params.harmony) && void 0 !== _a ? _a : null == params ? void 0 : params.runtime;
+}
+
+function getHarmonyPixelRatio(params) {
+    var _a;
+    return null !== (_a = null == params ? void 0 : params.pixelRatio) && void 0 !== _a ? _a : 1;
+}
+
+function getCanvasSize(width, height) {
+    if (!isValidCoordinate(width) || !isValidCoordinate(height)) throw new Error(HARMONY_CANVAS_SIZE_ERROR);
+    return {
+        width: width,
+        height: height
+    };
+}
+
+function getGlobalOffscreenCanvasCtor() {
+    try {
+        return "undefined" != typeof OffscreenCanvas ? OffscreenCanvas : void 0;
+    } catch (err) {
+        return;
+    }
+}
+
+function createFallbackOffscreenCanvas(width, height) {
+    const OffscreenCanvasCtor = getGlobalOffscreenCanvasCtor();
+    return "function" != typeof OffscreenCanvasCtor ? null : new OffscreenCanvasCtor(width, height);
+}
+
+function wrapHarmonyNativeCanvas(nativeCanvas, id, width, height, dpr) {
+    var _a, _b, _c;
+    nativeCanvas.width = width * dpr, nativeCanvas.height = height * dpr;
+    const context = null !== (_b = null === (_a = nativeCanvas.getContext) || void 0 === _a ? void 0 : _a.call(nativeCanvas, "2d")) && void 0 !== _b ? _b : null === (_c = nativeCanvas.getContext) || void 0 === _c ? void 0 : _c.call(nativeCanvas);
+    if (!context) throw new Error(HARMONY_CANVAS_BRIDGE_ERROR);
+    return "function" != typeof nativeCanvas.getBoundingClientRect && (nativeCanvas.getBoundingClientRect = () => ({
+        width: width,
+        height: height
+    })), new CanvasWrapEnableWH(nativeCanvas, context, dpr, width, height, id);
+}
+
+function createHarmonyNativeCanvas(id, width, height, dpr, offscreen, params, runtime) {
+    const options = {
+        id: id,
         width: width,
         height: height,
-        context: context,
-        _c: _c,
-        getBoundingClientRect: () => ({
-            width: width,
-            height: height
-        }),
-        getContext: () => context
-    }, context, 1, width, height, id);
+        dpr: dpr,
+        offscreen: offscreen
+    };
+    if (params.canvasFactory) return params.canvasFactory(options);
+    if (offscreen && "function" == typeof (null == runtime ? void 0 : runtime.createOffscreenCanvas)) {
+        const canvas = runtime.createOffscreenCanvas(options);
+        if (canvas) return canvas;
+    }
+    if (!offscreen && "function" == typeof (null == runtime ? void 0 : runtime.createCanvas)) {
+        const canvas = runtime.createCanvas(options);
+        if (canvas) return canvas;
+    }
+    if (offscreen) {
+        const canvas = createFallbackOffscreenCanvas(width * dpr, height * dpr);
+        if (canvas) return canvas;
+    }
+    throw new Error(HARMONY_CANVAS_BRIDGE_ERROR);
 }
 
 export class HarmonyEnvContribution extends BaseEnvContribution {
     constructor() {
-        super(), this.type = "harmony", this.supportEvent = !0, this.supportsTouchEvents = !0;
+        super(), this.type = "harmony", this.supportEvent = !0, this.canvasMap = new Map, 
+        this.freeCanvasList = [], this.canvasIdx = 0, this.supportsTouchEvents = !0;
         try {
             this.supportsPointerEvents = !!globalThis.PointerEvent, this.supportsMouseEvents = !!globalThis.MouseEvent;
         } catch (err) {
@@ -27,8 +102,9 @@ export class HarmonyEnvContribution extends BaseEnvContribution {
         }
         this.applyStyles = !0, this.rafSTO = new RafBasedSTO(0);
     }
-    configure(service, params) {
-        service.env === this.type && service.setActiveEnvContribution(this);
+    configure(service, params = {}) {
+        service.env === this.type && (service.setActiveEnvContribution(this), this.harmonyEnvParams = params, 
+        this.harmonyRuntime = getHarmonyRuntime(params));
     }
     getDynamicCanvasCount() {
         return 9999;
@@ -36,17 +112,51 @@ export class HarmonyEnvContribution extends BaseEnvContribution {
     getStaticCanvasCount() {
         return 9999;
     }
-    loadImage(url) {}
+    loadImage(url) {
+        var _a;
+        if ("function" != typeof (null === (_a = this.harmonyRuntime) || void 0 === _a ? void 0 : _a.createImage)) return Promise.resolve({
+            data: null,
+            loadState: "fail"
+        });
+        const img = this.harmonyRuntime.createImage(url);
+        return new Promise((resolve => {
+            img.onload = () => {
+                resolve({
+                    data: img,
+                    loadState: "success"
+                });
+            }, img.onerror = () => {
+                resolve({
+                    data: null,
+                    loadState: "fail"
+                });
+            };
+        }));
+    }
     loadSvg(url) {
-        return Promise.reject();
+        return Promise.resolve({
+            data: null,
+            loadState: "fail"
+        });
     }
     createCanvas(params) {
-        return createCanvas(params.width, params.height, params.id);
+        var _a, _b;
+        const envParams = null !== (_a = this.harmonyEnvParams) && void 0 !== _a ? _a : {}, runtime = getHarmonyRuntime(envParams), dpr = null !== (_b = params.dpr) && void 0 !== _b ? _b : getHarmonyPixelRatio(envParams), size = getCanvasSize(params.width, params.height);
+        if (null != params.id) {
+            const id = String(params.id), existing = this.canvasMap.get(id);
+            if (existing) return existing;
+            const canvas = wrapHarmonyNativeCanvas(createHarmonyNativeCanvas(id, size.width, size.height, dpr, !1, envParams, runtime), id, size.width, size.height, dpr);
+            return this.canvasMap.set(id, canvas), canvas;
+        }
+        const result = this.freeCanvasList[this.canvasIdx] || this.freeCanvasList[this.freeCanvasList.length - 1];
+        if (this.canvasIdx++, result) return result;
+        const id = Math.random().toString(), canvas = wrapHarmonyNativeCanvas(createHarmonyNativeCanvas(id, size.width, size.height, dpr, !0, envParams, runtime), id, size.width, size.height, dpr);
+        return this.canvasMap.set(id, canvas), this.freeCanvasList.push(canvas), canvas;
     }
     createOffscreenCanvas(params) {}
     releaseCanvas(canvas) {}
     getDevicePixelRatio() {
-        return 1;
+        return getHarmonyPixelRatio(this.harmonyEnvParams);
     }
     getRequestAnimationFrame() {
         return callback => this.rafSTO.call(callback);
@@ -58,8 +168,7 @@ export class HarmonyEnvContribution extends BaseEnvContribution {
     }
     mapToCanvasPoint(event) {
         var _a;
-        return null === (_a = null == event ? void 0 : event.type) || void 0 === _a || _a.startsWith("mouse"), 
-        event;
+        return null !== (_a = getHarmonyEventPoint(event)) && void 0 !== _a ? _a : event;
     }
     addEventListener(type, listener, options) {
         return null;
@@ -71,7 +180,8 @@ export class HarmonyEnvContribution extends BaseEnvContribution {
         return null;
     }
     getElementById(str) {
-        return null;
+        var _a;
+        return null !== (_a = this.canvasMap.get(str)) && void 0 !== _a ? _a : null;
     }
     getRootElement() {
         return null;

package/es/env/contributions/harmony-contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/env/contributions/harmony-contribution.ts"],"names":[],"mappings":"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","file":"harmony-contribution.js","sourcesContent":["import { BaseEnvContribution, RafBasedSTO } from '@visactor/vrender-core';\n// import { loadFeishuContributions } from '../../../kits';\nimport type {\n  ICanvasLike,\n  EnvType,\n  ICreateCanvasParams,\n  IEnvContribution,\n  IGlobal,\n  ILynxCanvas\n} from '@visactor/vrender-core';\nimport { CanvasWrapDisableWH, CanvasWrapEnableWH } from './canvas-wrap';\n\nfunction createCanvas(width: number, height: number, id?: string) {\n  // const context = new (OffscreenCanvasRenderingContext2D as any)(width, height);\n  // 浏览器debug\n  const _c = new OffscreenCanvas(width, height);\n  const context = _c.getContext('2d');\n\n  const nativeCanvas = {\n    width,\n    height,\n    context,\n    _c,\n    getBoundingClientRect() {\n      return {\n        width,\n        height\n      };\n    },\n    getContext() {\n      return context;\n    }\n  };\n  return new CanvasWrapDisableWH(nativeCanvas, context, 1, width, height, id);\n}\n\nexport class HarmonyEnvContribution extends BaseEnvContribution implements IEnvContribution {\n  type: EnvType = 'harmony';\n  supportEvent: boolean = true;\n  rafSTO: RafBasedSTO;\n\n  constructor() {\n    super();\n    this.supportsTouchEvents = true;\n    try {\n      this.supportsPointerEvents = !!globalThis.PointerEvent;\n      this.supportsMouseEvents = !!globalThis.MouseEvent;\n    } catch (err) {\n      this.supportsPointerEvents = false;\n      this.supportsMouseEvents = false;\n    }\n    this.applyStyles = true;\n    this.rafSTO = new RafBasedSTO(0);\n  }\n\n  // TODO：VGrammar在小程序环境会重复调用setEnv传入canvas，所以每次configure并不会释放\n  // 这里等待后续和VGrammar沟通\n  configure(\n    service: IGlobal,\n    params: { domref: any; canvasIdLists: string[]; freeCanvasIdx: number; offscreen?: boolean; pixelRatio?: number }\n  ) {\n    if (service.env === this.type) {\n      service.setActiveEnvContribution(this);\n\n      // loadFeishuContributions();\n    }\n  }\n  /**\n   * 获取动态canvas的数量，offscreenCanvas或者framebuffer\n   */\n  getDynamicCanvasCount(): number {\n    return 9999;\n  }\n\n  /**\n   * 获取静态canvas的数量，纯粹canvas\n   */\n  getStaticCanvasCount(): number {\n    return 9999;\n  }\n\n  loadImage(url: string): Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }> {\n    return;\n  }\n\n  loadSvg(url: string): Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }> {\n    // 飞书小组件不支持DOMParser和URL.createObjectURL，无法解析svg字符串，可以通过url使用svg资源\n    return Promise.reject();\n  }\n\n  createCanvas(params: ICreateCanvasParams): ILynxCanvas {\n    return createCanvas(params.width, params.height, params.id);\n  }\n\n  createOffscreenCanvas(params: ICreateCanvasParams) {\n    return;\n  }\n\n  releaseCanvas(canvas: ICanvasLike | string) {\n    return;\n  }\n\n  getDevicePixelRatio(): number {\n    return 1;\n  }\n\n  getRequestAnimationFrame(): (callback: FrameRequestCallback) => number {\n    // return requestAnimationFrame;\n\n    // 飞书小组件，在云文档浏览器环境中，没有requestAnimationFrame\n    // 但是在小组件工作台环境和模拟器中正常\n    // 反馈飞书修改，目前先使用setTimeout模拟，进行测试，飞书修复后替换回requestAnimationFrame\n    // return function (callback: FrameRequestCallback) {\n    //   return setTimeout(callback, 1000 / 60, true);\n    // } as any;\n    return (callback: FrameRequestCallback) => {\n      return this.rafSTO.call(callback);\n    };\n  }\n\n  getCancelAnimationFrame(): (h: number) => void {\n    return (h: number) => {\n      this.rafSTO.clear(h);\n    };\n  }\n\n  mapToCanvasPoint(event: any) {\n    if (event?.type?.startsWith('mouse')) {\n      return event;\n    }\n    return event;\n  }\n\n  addEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | AddEventListenerOptions | undefined\n  ): void;\n  addEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | AddEventListenerOptions | undefined\n  ): void;\n  addEventListener(type: unknown, listener: unknown, options?: unknown): void {\n    return null;\n  }\n\n  removeEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | EventListenerOptions | undefined\n  ): void;\n  removeEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | EventListenerOptions | undefined\n  ): void;\n  removeEventListener(type: unknown, listener: unknown, options?: unknown): void {\n    return null;\n  }\n\n  dispatchEvent(event: any): boolean {\n    return null;\n  }\n\n  // 只能索引canvas\n  getElementById(str: string): any | null {\n    return null;\n  }\n\n  getRootElement(): HTMLElement | null {\n    return null;\n  }\n\n  getDocument(): Document | null {\n    return null;\n  }\n\n  release(...params: any): void {\n    return;\n  }\n}\n"]}
+{"version":3,"sources":["../src/env/contributions/harmony-contribution.ts"],"names":[],"mappings":"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","file":"harmony-contribution.js","sourcesContent":["import { BaseEnvContribution, RafBasedSTO } from '@visactor/vrender-core';\n// import { loadFeishuContributions } from '../../../kits';\nimport type {\n  ICanvasLike,\n  EnvType,\n  ICreateCanvasParams,\n  IEnvContribution,\n  IGlobal,\n  ILynxCanvas\n} from '@visactor/vrender-core';\nimport { CanvasWrapEnableWH } from './canvas-wrap';\n\ntype HarmonyCanvasFactoryOptions = {\n  id: string;\n  width: number;\n  height: number;\n  dpr: number;\n  offscreen: boolean;\n};\n\ntype HarmonyCanvasFactory = (options: HarmonyCanvasFactoryOptions) => any;\n\ntype HarmonyRuntime = Partial<{\n  createCanvas: (options: HarmonyCanvasFactoryOptions) => any;\n  createOffscreenCanvas: (options: HarmonyCanvasFactoryOptions) => any;\n  createImage: (src: string) => any;\n}>;\n\ntype HarmonyEnvParams = {\n  pixelRatio?: number;\n  harmony?: HarmonyRuntime;\n  runtime?: HarmonyRuntime;\n  canvasFactory?: HarmonyCanvasFactory;\n};\n\nconst HARMONY_CANVAS_BRIDGE_ERROR =\n  'Harmony canvas bridge is unavailable. VRender Harmony env requires envParams.canvasFactory ' +\n  'or a Harmony runtime that exposes a global createCanvas/createOffscreenCanvas capability.';\nconst HARMONY_CANVAS_SIZE_ERROR =\n  'Harmony canvas size is unavailable. Pass stage width/height when creating a Harmony stage canvas.';\n\nfunction isValidCoordinate(value: unknown): value is number {\n  return typeof value === 'number' && Number.isFinite(value);\n}\n\nfunction pickCoordinate(...values: unknown[]): number | undefined {\n  for (let i = 0; i < values.length; i++) {\n    if (isValidCoordinate(values[i])) {\n      return values[i] as number;\n    }\n  }\n  return undefined;\n}\n\nfunction getPrimaryTouch(event: any) {\n  return event?.changedTouches?.[0] ?? event?.touches?.[0];\n}\n\nfunction getHarmonyEventPoint(event: any) {\n  const touch = getPrimaryTouch(event);\n  const x = pickCoordinate(\n    event?.x,\n    event?.offsetX,\n    event?.clientX,\n    event?.pageX,\n    touch?.x,\n    touch?.offsetX,\n    touch?.clientX,\n    touch?.pageX\n  );\n  const y = pickCoordinate(\n    event?.y,\n    event?.offsetY,\n    event?.clientY,\n    event?.pageY,\n    touch?.y,\n    touch?.offsetY,\n    touch?.clientY,\n    touch?.pageY\n  );\n\n  return x == null || y == null ? null : { x, y };\n}\n\nfunction getHarmonyRuntime(params?: HarmonyEnvParams): HarmonyRuntime | undefined {\n  return params?.harmony ?? params?.runtime;\n}\n\nfunction getHarmonyPixelRatio(params?: HarmonyEnvParams): number {\n  return params?.pixelRatio ?? 1;\n}\n\nfunction getCanvasSize(width?: number, height?: number) {\n  if (!isValidCoordinate(width) || !isValidCoordinate(height)) {\n    throw new Error(HARMONY_CANVAS_SIZE_ERROR);\n  }\n  return { width, height };\n}\n\nfunction getGlobalOffscreenCanvasCtor() {\n  try {\n    return typeof OffscreenCanvas !== 'undefined' ? OffscreenCanvas : undefined;\n  } catch (err) {\n    return undefined;\n  }\n}\n\nfunction createFallbackOffscreenCanvas(width: number, height: number) {\n  const OffscreenCanvasCtor = getGlobalOffscreenCanvasCtor();\n  if (typeof OffscreenCanvasCtor !== 'function') {\n    return null;\n  }\n  return new OffscreenCanvasCtor(width, height);\n}\n\nfunction wrapHarmonyNativeCanvas(nativeCanvas: any, id: string, width: number, height: number, dpr: number) {\n  nativeCanvas.width = width * dpr;\n  nativeCanvas.height = height * dpr;\n  const context = nativeCanvas.getContext?.('2d') ?? nativeCanvas.getContext?.();\n  if (!context) {\n    throw new Error(HARMONY_CANVAS_BRIDGE_ERROR);\n  }\n  if (typeof nativeCanvas.getBoundingClientRect !== 'function') {\n    nativeCanvas.getBoundingClientRect = () => ({\n      width,\n      height\n    });\n  }\n  return new CanvasWrapEnableWH(nativeCanvas, context, dpr, width, height, id);\n}\n\nfunction createHarmonyNativeCanvas(\n  id: string,\n  width: number,\n  height: number,\n  dpr: number,\n  offscreen: boolean,\n  params: HarmonyEnvParams,\n  runtime?: HarmonyRuntime\n) {\n  const options = {\n    id,\n    width,\n    height,\n    dpr,\n    offscreen\n  };\n\n  if (params.canvasFactory) {\n    return params.canvasFactory(options);\n  }\n\n  if (offscreen && typeof runtime?.createOffscreenCanvas === 'function') {\n    const canvas = runtime.createOffscreenCanvas(options);\n    if (canvas) {\n      return canvas;\n    }\n  }\n\n  if (!offscreen && typeof runtime?.createCanvas === 'function') {\n    const canvas = runtime.createCanvas(options);\n    if (canvas) {\n      return canvas;\n    }\n  }\n\n  if (offscreen) {\n    const canvas = createFallbackOffscreenCanvas(width * dpr, height * dpr);\n    if (canvas) {\n      return canvas;\n    }\n  }\n\n  throw new Error(HARMONY_CANVAS_BRIDGE_ERROR);\n}\n\nexport class HarmonyEnvContribution extends BaseEnvContribution implements IEnvContribution {\n  type: EnvType = 'harmony';\n  supportEvent: boolean = true;\n  rafSTO: RafBasedSTO;\n  canvasMap: Map<string, ILynxCanvas> = new Map();\n  freeCanvasList: ILynxCanvas[] = [];\n  canvasIdx: number = 0;\n  private harmonyRuntime?: HarmonyRuntime;\n  private harmonyEnvParams?: HarmonyEnvParams;\n\n  constructor() {\n    super();\n    this.supportsTouchEvents = true;\n    try {\n      this.supportsPointerEvents = !!globalThis.PointerEvent;\n      this.supportsMouseEvents = !!globalThis.MouseEvent;\n    } catch (err) {\n      this.supportsPointerEvents = false;\n      this.supportsMouseEvents = false;\n    }\n    this.applyStyles = true;\n    this.rafSTO = new RafBasedSTO(0);\n  }\n\n  // TODO：VGrammar在小程序环境会重复调用setEnv传入canvas，所以每次configure并不会释放\n  // 这里等待后续和VGrammar沟通\n  configure(service: IGlobal, params: HarmonyEnvParams = {}) {\n    if (service.env === this.type) {\n      service.setActiveEnvContribution(this);\n      this.harmonyEnvParams = params;\n      this.harmonyRuntime = getHarmonyRuntime(params);\n\n      // loadFeishuContributions();\n    }\n  }\n  /**\n   * 获取动态canvas的数量，offscreenCanvas或者framebuffer\n   */\n  getDynamicCanvasCount(): number {\n    return 9999;\n  }\n\n  /**\n   * 获取静态canvas的数量，纯粹canvas\n   */\n  getStaticCanvasCount(): number {\n    return 9999;\n  }\n\n  loadImage(url: string): Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }> {\n    if (typeof this.harmonyRuntime?.createImage !== 'function') {\n      return Promise.resolve({\n        data: null,\n        loadState: 'fail'\n      });\n    }\n    const img = this.harmonyRuntime.createImage(url);\n    return new Promise(resolve => {\n      img.onload = () => {\n        resolve({\n          data: img,\n          loadState: 'success'\n        });\n      };\n      img.onerror = () => {\n        resolve({\n          data: null,\n          loadState: 'fail'\n        });\n      };\n    });\n  }\n\n  loadSvg(url: string): Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }> {\n    return Promise.resolve({\n      data: null,\n      loadState: 'fail'\n    });\n  }\n\n  createCanvas(params: ICreateCanvasParams): ILynxCanvas {\n    const envParams = this.harmonyEnvParams ?? {};\n    const runtime = getHarmonyRuntime(envParams);\n    const dpr = params.dpr ?? getHarmonyPixelRatio(envParams);\n    const size = getCanvasSize(params.width, params.height);\n\n    if (params.id != null) {\n      const id = String(params.id);\n      const existing = this.canvasMap.get(id);\n      if (existing) {\n        return existing;\n      }\n      const nativeCanvas = createHarmonyNativeCanvas(id, size.width, size.height, dpr, false, envParams, runtime);\n      const canvas = wrapHarmonyNativeCanvas(nativeCanvas, id, size.width, size.height, dpr);\n      this.canvasMap.set(id, canvas);\n      return canvas;\n    }\n\n    const result = this.freeCanvasList[this.canvasIdx] || this.freeCanvasList[this.freeCanvasList.length - 1];\n    this.canvasIdx++;\n    if (result) {\n      return result;\n    }\n\n    const id = Math.random().toString();\n    const nativeCanvas = createHarmonyNativeCanvas(id, size.width, size.height, dpr, true, envParams, runtime);\n    const canvas = wrapHarmonyNativeCanvas(nativeCanvas, id, size.width, size.height, dpr);\n    this.canvasMap.set(id, canvas);\n    this.freeCanvasList.push(canvas);\n    return canvas;\n  }\n\n  createOffscreenCanvas(params: ICreateCanvasParams) {\n    return;\n  }\n\n  releaseCanvas(canvas: ICanvasLike | string) {\n    return;\n  }\n\n  getDevicePixelRatio(): number {\n    return getHarmonyPixelRatio(this.harmonyEnvParams);\n  }\n\n  getRequestAnimationFrame(): (callback: FrameRequestCallback) => number {\n    // return requestAnimationFrame;\n\n    // 飞书小组件，在云文档浏览器环境中，没有requestAnimationFrame\n    // 但是在小组件工作台环境和模拟器中正常\n    // 反馈飞书修改，目前先使用setTimeout模拟，进行测试，飞书修复后替换回requestAnimationFrame\n    // return function (callback: FrameRequestCallback) {\n    //   return setTimeout(callback, 1000 / 60, true);\n    // } as any;\n    return (callback: FrameRequestCallback) => {\n      return this.rafSTO.call(callback);\n    };\n  }\n\n  getCancelAnimationFrame(): (h: number) => void {\n    return (h: number) => {\n      this.rafSTO.clear(h);\n    };\n  }\n\n  mapToCanvasPoint(event: any) {\n    return getHarmonyEventPoint(event) ?? event;\n  }\n\n  addEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | AddEventListenerOptions | undefined\n  ): void;\n  addEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | AddEventListenerOptions | undefined\n  ): void;\n  addEventListener(type: unknown, listener: unknown, options?: unknown): void {\n    return null;\n  }\n\n  removeEventListener<K extends keyof DocumentEventMap>(\n    type: K,\n    listener: (this: Document, ev: DocumentEventMap[K]) => any,\n    options?: boolean | EventListenerOptions | undefined\n  ): void;\n  removeEventListener(\n    type: string,\n    listener: EventListenerOrEventListenerObject,\n    options?: boolean | EventListenerOptions | undefined\n  ): void;\n  removeEventListener(type: unknown, listener: unknown, options?: unknown): void {\n    return null;\n  }\n\n  dispatchEvent(event: any): boolean {\n    return null;\n  }\n\n  // 只能索引canvas\n  getElementById(str: string): any | null {\n    return this.canvasMap.get(str) ?? null;\n  }\n\n  getRootElement(): HTMLElement | null {\n    return null;\n  }\n\n  getDocument(): Document | null {\n    return null;\n  }\n\n  release(...params: any): void {\n    return;\n  }\n}\n"]}

package/es/env/contributions/lynx-contribution.d.ts

@@ -23,10 +23,6 @@ type LynxCanvasFactoryOptions = {
 };
 type LynxCanvasFactory = (options: LynxCanvasFactoryOptions) => any;
 type LynxEnvParams = {
-    domref?: any;
-    canvasIdLists?: string[];
-    freeCanvasIdx?: number;
-    offscreen?: boolean;
     pixelRatio?: number;
     lynx?: LynxRuntime;
     runtime?: LynxRuntime;

package/es/env/contributions/lynx-contribution.js

@@ -79,12 +79,11 @@ function createBoundLynxCanvas(id, runtime) {
     return null;
 }
 
-function getCanvasSize(domref, width, height) {
-    const resolvedWidth = null != width ? width : null == domref ? void 0 : domref.width, resolvedHeight = null != height ? height : null == domref ? void 0 : domref.height;
-    if (!isValidCoordinate(resolvedWidth) || !isValidCoordinate(resolvedHeight)) throw new Error(LYNX_CANVAS_SIZE_ERROR);
+function getCanvasSize(width, height) {
+    if (!isValidCoordinate(width) || !isValidCoordinate(height)) throw new Error(LYNX_CANVAS_SIZE_ERROR);
     return {
-        width: resolvedWidth,
-        height: resolvedHeight
+        width: width,
+        height: height
     };
 }
 
@@ -111,19 +110,6 @@ function createLynxNativeCanvas(id, width, height, dpr, offscreen, params, runti
     throw new Error(LYNX_CANVAS_BRIDGE_ERROR);
 }
 
-function makeUpCanvas(params = {}, canvasMap, freeCanvasList) {
-    const runtime = getLynxRuntime(params), {domref: domref, canvasIdLists: canvasIdLists = [], freeCanvasIdx: freeCanvasIdx = 0} = params, offscreen = !!params.offscreen, dpr = getLynxPixelRatio(params, runtime);
-    if (canvasIdLists.forEach(((id, i) => {
-        const size = getCanvasSize(domref), canvas = wrapLynxNativeCanvas(createLynxNativeCanvas(id, size.width, size.height, dpr, offscreen, params, runtime), id, size.width, size.height, dpr);
-        canvasMap.set(id, canvas), i > freeCanvasIdx && freeCanvasList.push(canvas);
-    })), !freeCanvasList.length && domref && "function" == typeof (null == runtime ? void 0 : runtime.createOffscreenCanvas)) {
-        const size = getCanvasSize(domref), _canvas = runtime.createOffscreenCanvas();
-        _canvas.width = size.width * dpr, _canvas.height = size.height * dpr;
-        const ctx = _canvas.getContext("2d"), id = Math.random().toString(), canvas = new CanvasWrapEnableWH(_canvas, ctx, dpr, size.width, size.height, id);
-        canvasMap.set(id, canvas), freeCanvasList.push(canvas);
-    }
-}
-
 export function createImageElement(src, isSvg = !1, runtime = getGlobalLynxRuntime()) {
     if (isSvg) return Promise.reject();
     if ("function" != typeof (null == runtime ? void 0 : runtime.createImage)) return Promise.reject(new Error("Lynx image bridge is unavailable."));
@@ -150,7 +136,7 @@ export class LynxEnvContribution extends BaseEnvContribution {
     }
     configure(service, params = {}) {
         service.env === this.type && (service.setActiveEnvContribution(this), this.lynxEnvParams = params, 
-        this.lynxRuntime = getLynxRuntime(params), makeUpCanvas(params, this.canvasMap, this.freeCanvasList));
+        this.lynxRuntime = getLynxRuntime(params));
     }
     getDynamicCanvasCount() {
         return this.freeCanvasList.length;
@@ -178,12 +164,12 @@ export class LynxEnvContribution extends BaseEnvContribution {
         if (null != params.id) {
             const id = String(params.id), existing = this.canvasMap.get(id);
             if (existing) return existing;
-            const envParams = null !== (_a = this.lynxEnvParams) && void 0 !== _a ? _a : {}, runtime = getLynxRuntime(envParams), dpr = null !== (_b = params.dpr) && void 0 !== _b ? _b : getLynxPixelRatio(envParams, runtime), size = getCanvasSize(envParams.domref, params.width, params.height), canvas = wrapLynxNativeCanvas(createLynxNativeCanvas(id, size.width, size.height, dpr, !1, envParams, runtime), id, size.width, size.height, dpr);
+            const envParams = null !== (_a = this.lynxEnvParams) && void 0 !== _a ? _a : {}, runtime = getLynxRuntime(envParams), dpr = null !== (_b = params.dpr) && void 0 !== _b ? _b : getLynxPixelRatio(envParams, runtime), size = getCanvasSize(params.width, params.height), canvas = wrapLynxNativeCanvas(createLynxNativeCanvas(id, size.width, size.height, dpr, !1, envParams, runtime), id, size.width, size.height, dpr);
             return this.canvasMap.set(id, canvas), canvas;
         }
         const result = this.freeCanvasList[this.canvasIdx] || this.freeCanvasList[this.freeCanvasList.length - 1];
         if (this.canvasIdx++, result) return result;
-        const envParams = null !== (_c = this.lynxEnvParams) && void 0 !== _c ? _c : {}, runtime = getLynxRuntime(envParams), dpr = null !== (_d = params.dpr) && void 0 !== _d ? _d : getLynxPixelRatio(envParams, runtime), size = getCanvasSize(envParams.domref, params.width, params.height), id = Math.random().toString(), canvas = wrapLynxNativeCanvas(createLynxNativeCanvas(id, size.width, size.height, dpr, !0, envParams, runtime), id, size.width, size.height, dpr);
+        const envParams = null !== (_c = this.lynxEnvParams) && void 0 !== _c ? _c : {}, runtime = getLynxRuntime(envParams), dpr = null !== (_d = params.dpr) && void 0 !== _d ? _d : getLynxPixelRatio(envParams, runtime), size = getCanvasSize(params.width, params.height), id = Math.random().toString(), canvas = wrapLynxNativeCanvas(createLynxNativeCanvas(id, size.width, size.height, dpr, !0, envParams, runtime), id, size.width, size.height, dpr);
         return this.canvasMap.set(id, canvas), this.freeCanvasList.push(canvas), canvas;
     }
     createOffscreenCanvas(params) {}