fix: skip filling on text

antvis · May 23, 2024 · 8afcc49 · 8afcc49
1 parent edf26f6
commit 8afcc49
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/__tests__/demos/2d/transform-text.ts b/__tests__/demos/2d/transform-text.ts
@@ -1,4 +1,4 @@
-import { Circle, Text, runtime } from '../../../packages/g';
+import { Circle, Text } from '../../../packages/g';
 
 export async function transformText(context) {
   const { canvas } = context;

diff --git a/packages/g-plugin-canvas-renderer/src/shapes/styles/Default.ts b/packages/g-plugin-canvas-renderer/src/shapes/styles/Default.ts
@@ -278,12 +278,14 @@ export function applyFill(
   plugin: CanvasRendererPlugin,
   runtime: GlobalRuntime,
   imagePool: ImagePool,
+  skipFill = false,
 ) {
   if (Array.isArray(fill)) {
     fill.forEach((gradient) => {
       context.fillStyle = getColor(gradient, object, context, imagePool);
-
-      fillRule ? context.fill(fillRule) : context.fill();
+      if (!skipFill) {
+        fillRule ? context.fill(fillRule) : context.fill();
+      }
     });
   } else {
     if (isPattern(fill)) {
@@ -297,7 +299,9 @@ export function applyFill(
         imagePool,
       );
     }
-    fillRule ? context.fill(fillRule) : context.fill();
+    if (!skipFill) {
+      fillRule ? context.fill(fillRule) : context.fill();
+    }
   }
 }
 
@@ -309,11 +313,14 @@ export function applyStroke(
   plugin: CanvasRendererPlugin,
   runtime: GlobalRuntime,
   imagePool: ImagePool,
+  skipStroke = false,
 ) {
   if (Array.isArray(stroke)) {
     stroke.forEach((gradient) => {
       context.strokeStyle = getColor(gradient, object, context, imagePool);
-      context.stroke();
+      if (!skipStroke) {
+        context.stroke();
+      }
     });
   } else {
     if (isPattern(stroke)) {
@@ -327,6 +334,8 @@ export function applyStroke(
         imagePool,
       );
     }
-    context.stroke();
+    if (!skipStroke) {
+      context.stroke();
+    }
   }
 }
diff --git a/packages/g-plugin-canvas-renderer/src/shapes/styles/Text.ts b/packages/g-plugin-canvas-renderer/src/shapes/styles/Text.ts
@@ -285,6 +285,7 @@ export class TextRenderer implements StyleRenderer {
       plugin,
       runtime,
       this.imagePool,
+      true,
     );
 
     let currentGlobalAlpha: number;
@@ -319,6 +320,7 @@ export class TextRenderer implements StyleRenderer {
       plugin,
       runtime,
       this.imagePool,
+      true,
     );
 
     let currentGlobalAlpha: number;