fix: split a path containing multiple segments into subpaths (#1430)

* fix: split a path containing multiple segments into subpaths #1429 * chore: commit changeset * fix: enable FXAA postprocessing pass to apply anti-alias #884 * fix: retrieve runtime from context instead of global
antvis · Jul 26, 2023 · 789bd4c · 789bd4c
1 parent c0f3d84
commit 789bd4c
Show file tree

Hide file tree

Showing 102 changed files with 918 additions and 569 deletions.
diff --git a/.changeset/silver-boats-promise.md b/.changeset/silver-boats-promise.md
@@ -0,0 +1,35 @@
+---
+'@antv/g-plugin-canvas-path-generator': patch
+'@antv/g-plugin-rough-canvas-renderer': patch
+'@antv/g-plugin-zdog-canvas-renderer': patch
+'@antv/g-plugin-canvaskit-renderer': patch
+'@antv/g-plugin-rough-svg-renderer': patch
+'@antv/g-plugin-zdog-svg-renderer': patch
+'@antv/g-plugin-canvas-renderer': patch
+'@antv/g-plugin-device-renderer': patch
+'@antv/g-plugin-canvas-picker': patch
+'@antv/g-plugin-html-renderer': patch
+'@antv/g-plugin-webgpu-device': patch
+'@antv/g-plugin-image-loader': patch
+'@antv/g-plugin-svg-renderer': patch
+'@antv/g-plugin-webgl-device': patch
+'@antv/g-web-animations-api': patch
+'@antv/g-plugin-dragndrop': patch
+'@antv/g-lottie-player': patch
+'@antv/g-mobile-canvas': patch
+'@antv/g-mobile-webgl': patch
+'@antv/g-camera-api': patch
+'@antv/g-components': patch
+'@antv/g-mobile-svg': patch
+'@antv/g-canvaskit': patch
+'@antv/g-pattern': patch
+'@antv/g-canvas': patch
+'@antv/g-webgpu': patch
+'@antv/g-webgl': patch
+'@antv/react-g': patch
+'@antv/g-lite': patch
+'@antv/g-math': patch
+'@antv/g-svg': patch
+---
+
+Split a path containing multiple segments into subpaths.
diff --git a/__tests__/integration/__node__tests__/webgl/circle.spec.js b/__tests__/integration/__node__tests__/webgl/circle.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/cube.spec.js b/__tests__/integration/__node__tests__/webgl/cube.spec.js
@@ -13,6 +13,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/d3-barchart.spec.js b/__tests__/integration/__node__tests__/webgl/d3-barchart.spec.js
@@ -9,6 +9,7 @@ const weatherDataset = require('../../data/weather.json');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/d3-linechart.spec.js b/__tests__/integration/__node__tests__/webgl/d3-linechart.spec.js
@@ -9,6 +9,7 @@ const weatherDataset = require('../../data/weather.json');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/d3-scatterchart.spec.js b/__tests__/integration/__node__tests__/webgl/d3-scatterchart.spec.js
@@ -9,6 +9,7 @@ const weatherDataset = require('../../data/weather.json');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/ellipse.spec.js b/__tests__/integration/__node__tests__/webgl/ellipse.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/image.spec.js b/__tests__/integration/__node__tests__/webgl/image.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/line.spec.js b/__tests__/integration/__node__tests__/webgl/line.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/marker.spec.js b/__tests__/integration/__node__tests__/webgl/marker.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/material.spec.js b/__tests__/integration/__node__tests__/webgl/material.spec.js
@@ -17,6 +17,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/path.spec.js b/__tests__/integration/__node__tests__/webgl/path.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/polygon.spec.js b/__tests__/integration/__node__tests__/webgl/polygon.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/polyline.spec.js b/__tests__/integration/__node__tests__/webgl/polyline.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/rect.spec.js b/__tests__/integration/__node__tests__/webgl/rect.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/d3-barchart.png b/__tests__/integration/__node__tests__/webgl/snapshots/d3-barchart.png
diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/text.png b/__tests__/integration/__node__tests__/webgl/snapshots/text.png
diff --git a/__tests__/integration/__node__tests__/webgl/sphere.spec.js b/__tests__/integration/__node__tests__/webgl/sphere.spec.js
@@ -15,6 +15,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/integration/__node__tests__/webgl/text.spec.js b/__tests__/integration/__node__tests__/webgl/text.spec.js
@@ -7,6 +7,7 @@ const { createPNGFromRawdata, sleep, diff } = require('../../util');
 // create a renderer, unregister plugin relative to DOM
 const renderer = new Renderer({
   targets: ['webgl1'],
+  enableFXAA: false,
 });
 const domInteractionPlugin = renderer.getPlugin('dom-interaction');
 renderer.unregisterPlugin(domInteractionPlugin);

diff --git a/__tests__/unit/css/parser/path.spec.ts b/__tests__/unit/css/parser/path.spec.ts
@@ -73,11 +73,11 @@ describe('Property Path', () => {
 
     expect(left).toStrictEqual([
       ['M', 0, 0],
-      ['C', 50, 0, 68.75, 0, 100, 0],
+      ['C', 50, 0, 100, 0, 100, 0],
     ]);
     expect(right).toStrictEqual([
       ['M', 0, 0],
-      ['C', 100, 0, 137.5, 0, 200, 0],
+      ['C', 100, 0, 200, 0, 200, 0],
     ]);
 
     mergePaths(path1, path2);

diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "jest-environment-jsdom": "^26.6.2"
   },
   "devDependencies": {
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "@commitlint/cli": "^8.3.6",
     "@commitlint/config-angular": "^9.1.2",
     "@changesets/cli": "^2.26.2",

diff --git a/packages/g-camera-api/package.json b/packages/g-camera-api/package.json
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@antv/g-lite": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "gl-matrix": "^3.4.3",
     "tslib": "^2.5.3"
   },

diff --git a/packages/g-canvas/package.json b/packages/g-canvas/package.json
@@ -48,7 +48,7 @@
     "@antv/g-plugin-dom-interaction": "workspace:*",
     "@antv/g-plugin-html-renderer": "workspace:*",
     "@antv/g-plugin-image-loader": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "tslib": "^2.5.3"
   },
   "devDependencies": {

diff --git a/packages/g-canvaskit/package.json b/packages/g-canvaskit/package.json
@@ -48,7 +48,7 @@
     "@antv/g-plugin-dom-interaction": "workspace:*",
     "@antv/g-plugin-html-renderer": "workspace:*",
     "@antv/g-plugin-image-loader": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "canvaskit-wasm": "^0.34.0",
     "tslib": "^2.5.3"
   },

diff --git a/packages/g-components/package.json b/packages/g-components/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@antv/g-lite": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "gl-matrix": "^3.4.3",
     "tslib": "^2.5.3"
   },

diff --git a/packages/g-lite/package.json b/packages/g-lite/package.json
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@antv/g-math": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "d3-color": "^1.4.0",
     "eventemitter3": "^5.0.1",
     "gl-matrix": "^3.4.3",

diff --git a/packages/g-lite/src/components/Renderable.ts b/packages/g-lite/src/components/Renderable.ts
@@ -26,9 +26,4 @@ export interface Renderable {
    * dirty rectangle flag
    */
   dirty: boolean;
-
-  /**
-   * Rendering with other renderers, eg. simple Path/Polyline should be treated as instanced Line.
-   */
-  proxyNodeName: string;
 }
diff --git a/packages/g-lite/src/dom/Element.ts b/packages/g-lite/src/dom/Element.ts
@@ -80,7 +80,6 @@ export class Element<
     renderBoundsDirty: true,
     dirtyRenderBounds: undefined,
     dirty: false,
-    proxyNodeName: undefined,
   };
 
   cullable: Cullable = {

diff --git a/packages/g-lottie-player/package.json b/packages/g-lottie-player/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@antv/g-lite": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "tslib": "^2.5.3"
   },
   "publishConfig": {

diff --git a/packages/g-math/package.json b/packages/g-math/package.json
@@ -38,7 +38,7 @@
     "watch": "rollup -c -w"
   },
   "dependencies": {
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "gl-matrix": "^3.4.3",
     "tslib": "^2.5.3"
   },

diff --git a/packages/g-mobile-canvas/package.json b/packages/g-mobile-canvas/package.json
@@ -45,7 +45,7 @@
     "@antv/g-plugin-dragndrop": "workspace:*",
     "@antv/g-plugin-image-loader": "workspace:*",
     "@antv/g-plugin-mobile-interaction": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "tslib": "^2.5.3"
   },
   "devDependencies": {

diff --git a/packages/g-mobile-svg/package.json b/packages/g-mobile-svg/package.json
@@ -43,7 +43,7 @@
     "@antv/g-plugin-mobile-interaction": "workspace:*",
     "@antv/g-plugin-svg-picker": "workspace:*",
     "@antv/g-plugin-svg-renderer": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "tslib": "^2.5.3"
   },
   "devDependencies": {

diff --git a/packages/g-mobile-webgl/package.json b/packages/g-mobile-webgl/package.json
@@ -45,7 +45,7 @@
     "@antv/g-plugin-image-loader": "workspace:*",
     "@antv/g-plugin-mobile-interaction": "workspace:*",
     "@antv/g-plugin-webgl-device": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "tslib": "^2.5.3"
   },
   "devDependencies": {

diff --git a/packages/g-pattern/package.json b/packages/g-pattern/package.json
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@antv/g-lite": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "tslib": "^2.5.3"
   },
   "publishConfig": {

diff --git a/packages/g-plugin-canvas-path-generator/package.json b/packages/g-plugin-canvas-path-generator/package.json
@@ -40,7 +40,7 @@
   "dependencies": {
     "@antv/g-lite": "workspace:*",
     "@antv/g-math": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "tslib": "^2.5.3"
   },
   "publishConfig": {

diff --git a/packages/g-plugin-canvas-picker/package.json b/packages/g-plugin-canvas-picker/package.json
@@ -42,7 +42,7 @@
     "@antv/g-math": "workspace:*",
     "@antv/g-plugin-canvas-path-generator": "workspace:*",
     "@antv/g-plugin-canvas-renderer": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "gl-matrix": "^3.4.3",
     "tslib": "^2.5.3"
   },

diff --git a/packages/g-plugin-canvas-renderer/package.json b/packages/g-plugin-canvas-renderer/package.json
@@ -42,7 +42,7 @@
     "@antv/g-math": "workspace:*",
     "@antv/g-plugin-canvas-path-generator": "workspace:*",
     "@antv/g-plugin-image-loader": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "gl-matrix": "^3.4.3",
     "tslib": "^2.5.3"
   },

diff --git a/packages/g-plugin-canvas-renderer/src/shapes/styles/Text.ts b/packages/g-plugin-canvas-renderer/src/shapes/styles/Text.ts
@@ -1,19 +1,24 @@
 import type {
   CSSRGB,
+  CanvasContext,
   DisplayObject,
+  GlobalRuntime,
   ParsedTextStyleProps,
   Rectangle,
 } from '@antv/g-lite';
-import { runtime } from '@antv/g-lite';
 import { isNil } from '@antv/util';
 import { setShadowAndFilter } from './Default';
 import type { StyleRenderer } from './interfaces';
+import { CanvasRendererPlugin } from '../../CanvasRendererPlugin';
 
 export class TextRenderer implements StyleRenderer {
   render(
     context: CanvasRenderingContext2D,
     parsedStyle: ParsedTextStyleProps,
     object: DisplayObject,
+    canvasContext: CanvasContext,
+    plugin: CanvasRendererPlugin,
+    runtime: GlobalRuntime,
   ) {
     const {
       lineWidth,

diff --git a/packages/g-plugin-canvaskit-renderer/package.json b/packages/g-plugin-canvaskit-renderer/package.json
@@ -41,7 +41,7 @@
     "@antv/g-lite": "workspace:*",
     "@antv/g-math": "workspace:*",
     "@antv/g-plugin-image-loader": "workspace:*",
-    "@antv/util": "^3.3.1",
+    "@antv/util": "^3.3.4",
     "canvaskit-wasm": "^0.34.0",
     "gl-matrix": "^3.4.3",
     "tslib": "^2.5.3"