feat: my增加canvasReady&reRender

antvis · Sep 26, 2024 · 4bc0ed8 · 4bc0ed8
1 parent 672c288
commit 4bc0ed8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/f-engine/src/canvas/index.ts b/packages/f-engine/src/canvas/index.ts
@@ -130,7 +130,6 @@ class Canvas<P extends CanvasProps = CanvasProps> {
       isTouchEvent,
       isMouseEvent,
       useNativeClickEvent = true,
-      onRender,
     } = props;
 
     const px2hd = isFunction(customPx2hd) ? batch2hd(customPx2hd) : defaultPx2hd;
@@ -164,8 +163,6 @@ class Canvas<P extends CanvasProps = CanvasProps> {
       isMouseEvent,
     });
 
-    onRender && canvas.addEventListener('rerender', () => onRender(canvas), { once: true });
-
     const container = canvas.getRoot();
     const { width: canvasWidth, height: canvasHeight } = canvas.getConfig();
 
@@ -238,8 +235,10 @@ class Canvas<P extends CanvasProps = CanvasProps> {
   }
 
   async render() {
-    const { canvas, vNode } = this;
+    const { canvas, vNode, props } = this;
+    const { onRender } = props;
     await canvas.ready;
+    onRender && canvas.addEventListener('rerender', () => onRender(canvas), { once: true });
     render(vNode);
   }
 

diff --git a/packages/f-my/src/index.tsx b/packages/f-my/src/index.tsx
@@ -41,6 +41,8 @@ Component({
     width: null,
     height: null,
     onError: () => {},
+    onCanvasReady: () => {},
+    onCanvasRender: () => {},
     type: '2d', // canvas 2d, 基础库 2.7 以上支持
   },
   /**
@@ -83,6 +85,8 @@ Component({
       this.setData({ id });
     },
     onCanvasReady() {
+      const { onCanvasReady } = this.props;
+      onCanvasReady && onCanvasReady();
       const { id } = this.data;
       const query = my.createSelectorQuery();
       query
@@ -149,7 +153,7 @@ Component({
       if (!width || !height) {
         return;
       }
-      const { theme, px2hd } = this.props;
+      const { theme, px2hd, onCanvasRender } = this.props;
       const children = this.props.onRender(this.props);
       const canvas = new Canvas({
         pixelRatio,
@@ -162,6 +166,7 @@ Component({
         createImage,
         requestAnimationFrame,
         cancelAnimationFrame,
+        onRender: onCanvasRender,
         // @ts-ignore
         offscreenCanvas: my.createOffscreenCanvas(),
         useNativeClickEvent: false,