Release (#1640)

* fix: clippath's bounds should be copied before intersection #1636 (#1637) * fix: clippath's bounds should be copied before intersection #1636 * chore: commit changeset * chore: update playwright * chore: update playwright * chore: update playwright * chore: install deps first * chore: install deps first * chore(release): bump version (#1639) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
antvis · Mar 18, 2024 · 0bb1bbe · 0bb1bbe
1 parent a43c19a
commit 0bb1bbe
Show file tree

Hide file tree

Showing 102 changed files with 504 additions and 66 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,12 +25,12 @@ jobs:
           node-version: 16
           cache: 'pnpm'
 
-      - name: Install Playwright browsers
-        run: npx playwright install --with-deps
-
       - name: Install dependencies
         run: pnpm install
 
+      - name: Install Playwright browsers
+        run: npx playwright install --with-deps
+
       - name: Build
         run: pnpm build
 

diff --git a/__tests__/demos/bugfix/1636.ts b/__tests__/demos/bugfix/1636.ts
@@ -0,0 +1,48 @@
+import { Image, Group, Rect } from '../../../packages/g';
+
+export async function image(context) {
+  const { canvas } = context;
+  await canvas.ready;
+
+  const rect = new Rect({
+    style: {
+      x: 0,
+      y: 0,
+      width: 600,
+      height: 600,
+    },
+  });
+  const group = new Group({
+    style: {
+      clipPath: rect,
+    },
+  });
+  canvas.appendChild(group);
+
+  const img = new window.Image();
+  img.onload = () => {
+    const image = new Image({
+      style: {
+        x: 0,
+        y: 0,
+        width: 100,
+        height: 100,
+        img,
+      },
+    });
+    const image2 = new Image({
+      style: {
+        x: 50,
+        y: 0,
+        width: 100,
+        height: 100,
+        img,
+      },
+    });
+    group.appendChild(image);
+    group.appendChild(image2);
+  };
+  img.src =
+    'https://gw.alipayobjects.com/mdn/rms_6ae20b/afts/img/A*_aqoS73Se3sAAAAAAAAAAAAAARQnAQ';
+  img.crossOrigin = 'anonymous';
+}
diff --git a/__tests__/demos/bugfix/index.ts b/__tests__/demos/bugfix/index.ts
@@ -1 +1,2 @@
 export { html } from './1610';
+export { image } from './1636';
diff --git a/__tests__/main.ts b/__tests__/main.ts
@@ -1,5 +1,5 @@
 import * as lil from 'lil-gui';
-import { Canvas, CanvasEvent } from '../packages/g';
+import { runtime, Canvas, CanvasEvent } from '../packages/g';
 import { Renderer as CanvasRenderer } from '../packages/g-canvas';
 import { Renderer as CanvaskitRenderer } from '../packages/g-canvaskit';
 import { Renderer as SVGRenderer } from '../packages/g-svg';
@@ -16,6 +16,8 @@ import * as hammerjs from './demos/hammerjs';
 import * as lottie from './demos/lottie';
 import * as bugfix from './demos/bugfix';
 
+runtime.enableCSSParsing = false;
+
 const tests = {
   ...createSpecRender(namespace(basic2d, '2d')),
   ...createSpecRender(namespace(basic3d, '3d')),

diff --git a/__tests__/unit/abstract-renderer.spec.ts b/__tests__/unit/abstract-renderer.spec.ts
@@ -10,6 +10,7 @@ describe('Abstract renderer', () => {
       enableCulling: false,
       enableDirtyRectangleRendering: true,
       enableDirtyRectangleRenderingDebug: false,
+      enableSizeAttenuation: true,
     });
 
     renderer.setConfig({ enableAutoRendering: false });
@@ -19,6 +20,7 @@ describe('Abstract renderer', () => {
       enableCulling: false,
       enableDirtyRectangleRendering: true,
       enableDirtyRectangleRenderingDebug: false,
+      enableSizeAttenuation: true,
     });
 
     expect(renderer.getPlugins().length).toBe(0);

diff --git a/jest.config.js b/jest.config.js
@@ -42,7 +42,7 @@ module.exports = {
     '<rootDir>/__tests__/unit/*.spec.+(ts|tsx|js)',
   ],
   testPathIgnorePatterns: process.env.CI
-    ? ['<rootDir>/__tests__/unit/g-gesture']
+    ? ['<rootDir>/__tests__/unit/g-gesture', '<rootDir>/__tests__/main.ts']
     : ['<rootDir>/__tests__/unit/g-gesture'],
   preset: 'ts-jest',
   transform: {

diff --git a/packages/g-camera-api/CHANGELOG.md b/packages/g-camera-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-camera-api
 
+## 1.2.24
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+
 ## 1.2.23
 
 ### Patch Changes

diff --git a/packages/g-camera-api/package.json b/packages/g-camera-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-camera-api",
-  "version": "1.2.23",
+  "version": "1.2.24",
   "description": "A simple implementation of Camera API.",
   "keywords": [
     "antv",

diff --git a/packages/g-canvas/CHANGELOG.md b/packages/g-canvas/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @antv/g-canvas
 
+## 1.11.28
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+    -   @antv/g-plugin-canvas-path-generator@1.3.23
+    -   @antv/g-plugin-canvas-picker@1.10.25
+    -   @antv/g-plugin-canvas-renderer@1.9.25
+    -   @antv/g-plugin-dom-interaction@1.9.23
+    -   @antv/g-plugin-html-renderer@1.9.26
+    -   @antv/g-plugin-image-loader@1.3.23
+
 ## 1.11.27
 
 ### Patch Changes

diff --git a/packages/g-canvas/package.json b/packages/g-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-canvas",
-  "version": "1.11.27",
+  "version": "1.11.28",
   "description": "A renderer implemented by Canvas 2D API",
   "keywords": [
     "antv",

diff --git a/packages/g-canvaskit/CHANGELOG.md b/packages/g-canvaskit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @antv/g-canvaskit
 
+## 0.10.28
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+    -   @antv/g-plugin-canvas-path-generator@1.3.23
+    -   @antv/g-plugin-canvas-picker@1.10.25
+    -   @antv/g-plugin-canvaskit-renderer@1.3.24
+    -   @antv/g-plugin-dom-interaction@1.9.23
+    -   @antv/g-plugin-html-renderer@1.9.26
+    -   @antv/g-plugin-image-loader@1.3.23
+
 ## 0.10.27
 
 ### Patch Changes

diff --git a/packages/g-canvaskit/package.json b/packages/g-canvaskit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-canvaskit",
-  "version": "0.10.27",
+  "version": "0.10.28",
   "description": "A renderer implemented by CanvasKit",
   "keywords": [
     "antv",

diff --git a/packages/g-components/CHANGELOG.md b/packages/g-components/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-components
 
+## 1.9.23
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+
 ## 1.9.22
 
 ### Patch Changes

diff --git a/packages/g-components/package.json b/packages/g-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-components",
-  "version": "1.9.22",
+  "version": "1.9.23",
   "description": "Components for g",
   "keywords": [
     "antv",

diff --git a/packages/g-dom-mutation-observer-api/CHANGELOG.md b/packages/g-dom-mutation-observer-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-dom-mutation-observer-api
 
+## 1.2.23
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+
 ## 1.2.22
 
 ### Patch Changes

diff --git a/packages/g-dom-mutation-observer-api/package.json b/packages/g-dom-mutation-observer-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-dom-mutation-observer-api",
-  "version": "1.2.22",
+  "version": "1.2.23",
   "description": "A simple implementation of DOM MutationObserver API.",
   "keywords": [
     "antv",

diff --git a/packages/g-gesture/CHANGELOG.md b/packages/g-gesture/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-gesture
 
+## 2.2.26
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+
 ## 2.2.25
 
 ### Patch Changes

diff --git a/packages/g-gesture/package.json b/packages/g-gesture/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-gesture",
-  "version": "2.2.25",
+  "version": "2.2.26",
   "description": "G Gesture",
   "keywords": [
     "antv",

diff --git a/packages/g-image-exporter/CHANGELOG.md b/packages/g-image-exporter/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-image-exporter
 
+## 0.7.23
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+
 ## 0.7.22
 
 ### Patch Changes

diff --git a/packages/g-image-exporter/package.json b/packages/g-image-exporter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-image-exporter",
-  "version": "0.7.22",
+  "version": "0.7.23",
   "description": "A image exporter for G using DOM API",
   "keywords": [
     "antv",

diff --git a/packages/g-lite/CHANGELOG.md b/packages/g-lite/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @antv/g-lite
 
+## 1.2.23
+
+### Patch Changes
+
+-   1d25bf84: ClipPath should be copied first before calculate intersection bounds.
+
 ## 1.2.22
 
 ### Patch Changes

diff --git a/packages/g-lite/package.json b/packages/g-lite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-lite",
-  "version": "1.2.22",
+  "version": "1.2.23",
   "description": "A core module for rendering engine implements DOM API.",
   "keywords": [
     "antv",

diff --git a/packages/g-lite/src/services/SceneGraphService.ts b/packages/g-lite/src/services/SceneGraphService.ts
@@ -849,35 +849,29 @@ export class DefaultSceneGraphService implements SceneGraphService {
       }
     });
 
+    if (!aabb) {
+      aabb = new AABB();
+    }
+
     if (render) {
       // FIXME: account for clip path
       const clipped = findClosestClipPathTarget(element as DisplayObject);
       if (clipped) {
         // use bounds under world space
         const clipPathBounds = clipped.parsedStyle.clipPath.getBounds(render);
         if (!aabb) {
-          aabb = clipPathBounds;
+          aabb.update(clipPathBounds.center, clipPathBounds.halfExtents);
         } else if (clipPathBounds) {
           aabb = clipPathBounds.intersection(aabb);
         }
       }
     }
 
-    if (!aabb) {
-      aabb = new AABB();
-    }
-
-    if (aabb) {
-      if (render) {
-        renderable.renderBounds = aabb;
-      } else {
-        renderable.bounds = aabb;
-      }
-    }
-
     if (render) {
+      renderable.renderBounds = aabb;
       renderable.renderBoundsDirty = false;
     } else {
+      renderable.bounds = aabb;
       renderable.boundsDirty = false;
     }
 

diff --git a/packages/g-lite/src/services/aabb/RectUpdater.ts b/packages/g-lite/src/services/aabb/RectUpdater.ts
@@ -1,5 +1,10 @@
 import { isString } from '@antv/util';
-import type { Group, Image, ParsedImageStyleProps, Rect } from '../../display-objects';
+import type {
+  Group,
+  Image,
+  ParsedImageStyleProps,
+  Rect,
+} from '../../display-objects';
 import type { GeometryAABBUpdater } from './interfaces';
 export class RectUpdater implements GeometryAABBUpdater<ParsedImageStyleProps> {
   update(parsedStyle: ParsedImageStyleProps, object: Image | Rect | Group) {

diff --git a/packages/g-lottie-player/CHANGELOG.md b/packages/g-lottie-player/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-lottie-player
 
+## 0.2.23
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+
 ## 0.2.22
 
 ### Patch Changes

diff --git a/packages/g-lottie-player/package.json b/packages/g-lottie-player/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-lottie-player",
-  "version": "0.2.22",
+  "version": "0.2.23",
   "description": "A lottie player for G",
   "keywords": [
     "antv",

diff --git a/packages/g-mobile-canvas-element/CHANGELOG.md b/packages/g-mobile-canvas-element/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-mobile-canvas-element
 
+## 0.8.23
+
+### Patch Changes
+
+-   Updated dependencies [1d25bf84]
+    -   @antv/g-lite@1.2.23
+
 ## 0.8.22
 
 ### Patch Changes

diff --git a/packages/g-mobile-canvas-element/package.json b/packages/g-mobile-canvas-element/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-mobile-canvas-element",
-  "version": "0.8.22",
+  "version": "0.8.23",
   "description": "Create a CanvasLike element from existed context in mobile environment",
   "keywords": [
     "antv",
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export { html } from './1610';
		export { image } from './1636';