Release (#1613)

* Fix 1610 (#1611) * fix: setup native html map per canvas instead of global singleton #1610 * chore: commit changeset * chore(release): bump version (#1612) 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 · Dec 11, 2023 · f9512fe · f9512fe
1 parent e193ff2
commit f9512fe
Show file tree

Hide file tree

Showing 101 changed files with 530 additions and 57 deletions.
diff --git a/__tests__/demos/bugfix/1610.ts b/__tests__/demos/bugfix/1610.ts
@@ -0,0 +1,53 @@
+import { Canvas, Circle, HTML } from '../../../packages/g';
+import { Renderer as CanvasRenderer } from '../../../packages/g-canvas';
+
+export async function html(context) {
+  const { canvas, container } = context;
+  await canvas.ready;
+  canvas.resize(320, 320);
+
+  const $div2 = document.createElement('div');
+  $div2.id = 'div2';
+  container.appendChild($div2);
+  const canvasRenderer2 = new CanvasRenderer();
+  const canvas2 = new Canvas({
+    container: $div2,
+    width: 320,
+    height: 320,
+    renderer: canvasRenderer2,
+  });
+
+  const circle1 = new Circle({
+    style: {
+      cx: 100,
+      cy: 100,
+      r: 50,
+      fill: 'red',
+      cursor: 'pointer',
+    },
+  });
+  canvas.appendChild(circle1);
+  const circle2 = new Circle({
+    style: {
+      cx: 100,
+      cy: 100,
+      r: 50,
+      fill: 'green',
+      cursor: 'pointer',
+    },
+  });
+  canvas2.appendChild(circle2);
+
+  const html = new HTML({
+    id: 'html1',
+    style: {
+      x: 200,
+      y: 100,
+      width: 100,
+      height: 100,
+      innerHTML: 'canvas1',
+      // pointerEvents: 'none',
+    },
+  });
+  canvas.appendChild(html);
+}
diff --git a/__tests__/demos/bugfix/index.ts b/__tests__/demos/bugfix/index.ts
@@ -0,0 +1 @@
+export { html } from './1610';
diff --git a/__tests__/main.ts b/__tests__/main.ts
@@ -12,6 +12,7 @@ import * as animation from './demos/animation';
 import * as d3 from './demos/d3';
 import * as plugin from './demos/plugin';
 import * as hammerjs from './demos/hammerjs';
+import * as bugfix from './demos/bugfix';
 
 const tests = {
   ...createSpecRender(namespace(basic2d, '2d')),
@@ -20,6 +21,7 @@ const tests = {
   ...createSpecRender(namespace(d3, 'd3')),
   ...createSpecRender(namespace(plugin, 'plugin')),
   ...createSpecRender(namespace(hammerjs, 'hammerjs')),
+  ...createSpecRender(namespace(bugfix, 'bugfix')),
 };
 
 const renderers = {
@@ -130,7 +132,7 @@ function createOption(key) {
   const option = document.createElement('option');
   option.value = key;
   option.textContent = key;
-  if (key === (window['DEFAULT_RENDERER'] || 'svg')) {
+  if (key === (window['DEFAULT_RENDERER'] || 'canvas')) {
     option.selected = true;
   }
   return option;
@@ -180,7 +182,7 @@ function createSpecRender(object) {
       // @ts-ignore
       window.__g_instances__ = [canvas];
 
-      await generate({ canvas, renderer });
+      await generate({ canvas, renderer, container: $div });
 
       container.append($div);
     };

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.21
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-lite@1.2.20
+
 ## 1.2.20
 
 ### 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.20",
+  "version": "1.2.21",
   "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.25
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-plugin-html-renderer@1.9.23
+    -   @antv/g-lite@1.2.20
+    -   @antv/g-plugin-canvas-path-generator@1.3.20
+    -   @antv/g-plugin-canvas-picker@1.10.22
+    -   @antv/g-plugin-canvas-renderer@1.9.22
+    -   @antv/g-plugin-dom-interaction@1.9.20
+    -   @antv/g-plugin-image-loader@1.3.20
+
 ## 1.11.24
 
 ### 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.24",
+  "version": "1.11.25",
   "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.25
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-plugin-html-renderer@1.9.23
+    -   @antv/g-lite@1.2.20
+    -   @antv/g-plugin-canvas-path-generator@1.3.20
+    -   @antv/g-plugin-canvas-picker@1.10.22
+    -   @antv/g-plugin-canvaskit-renderer@1.3.21
+    -   @antv/g-plugin-dom-interaction@1.9.20
+    -   @antv/g-plugin-image-loader@1.3.20
+
 ## 0.10.24
 
 ### 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.24",
+  "version": "0.10.25",
   "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.20
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-lite@1.2.20
+
 ## 1.9.19
 
 ### 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.19",
+  "version": "1.9.20",
   "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.20
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-lite@1.2.20
+
 ## 1.2.19
 
 ### 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.19",
+  "version": "1.2.20",
   "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.23
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-lite@1.2.20
+
 ## 2.2.22
 
 ### 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.22",
+  "version": "2.2.23",
   "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.20
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-lite@1.2.20
+
 ## 0.7.19
 
 ### 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.19",
+  "version": "0.7.20",
   "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.20
+
+### Patch Changes
+
+-   ce11b242: Setup native html map per canvas instead of global singleton.
+
 ## 1.2.19
 
 ### 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.19",
+  "version": "1.2.20",
   "description": "A core module for rendering engine implements DOM API.",
   "keywords": [
     "antv",

diff --git a/packages/g-lite/src/global-runtime.ts b/packages/g-lite/src/global-runtime.ts
@@ -25,7 +25,6 @@ import {
   CSSPropertyTransformOrigin,
   CSSPropertyZIndex,
 } from './css/properties';
-import type { HTML } from './display-objects';
 import type {
   GeometryAABBUpdater,
   SceneGraphSelector,
@@ -67,7 +66,6 @@ export interface GlobalRuntime {
   >;
   globalThis: any;
   enableCSSParsing: boolean;
-  nativeHTMLMap: WeakMap<HTMLElement, HTML>;
 
   /**
    * Enable using dataset property.
@@ -165,8 +163,6 @@ runtime.EasingFunction = null;
 
 runtime.offscreenCanvasCreator = new OffscreenCanvasCreator();
 
-runtime.nativeHTMLMap = new WeakMap();
-
 runtime.sceneGraphSelector = new DefaultSceneGraphSelector();
 
 runtime.sceneGraphService = new DefaultSceneGraphService(runtime);

diff --git a/packages/g-lite/src/services/EventService.ts b/packages/g-lite/src/services/EventService.ts
@@ -49,6 +49,11 @@ export class EventService {
 
   private emitter = new EventEmitter();
 
+  /**
+   * Store HTML elements in current canvas.
+   */
+  nativeHTMLMap = new WeakMap<HTMLElement, HTML>();
+
   cursor: Cursor | null = 'default';
 
   private mappingTable: Record<
@@ -735,7 +740,7 @@ export class EventService {
   private getExistedHTML(event: FederatedEvent): HTML {
     if (event.nativeEvent.composedPath) {
       for (const eventTarget of event.nativeEvent.composedPath() as HTMLElement[]) {
-        const existed = this.globalRuntime.nativeHTMLMap.get(eventTarget);
+        const existed = this.nativeHTMLMap.get(eventTarget);
         if (existed) {
           return existed;
         }

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.20
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-lite@1.2.20
+
 ## 0.2.19
 
 ### 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.19",
+  "version": "0.2.20",
   "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.20
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-lite@1.2.20
+
 ## 0.8.19
 
 ### 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.19",
+  "version": "0.8.20",
   "description": "Create a CanvasLike element from existed context in mobile environment",
   "keywords": [
     "antv",

diff --git a/packages/g-mobile-canvas/CHANGELOG.md b/packages/g-mobile-canvas/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @antv/g-mobile-canvas
 
+## 0.11.13
+
+### Patch Changes
+
+-   Updated dependencies [ce11b242]
+    -   @antv/g-lite@1.2.20
+    -   @antv/g-plugin-canvas-path-generator@1.3.20
+    -   @antv/g-plugin-canvas-picker@1.10.22
+    -   @antv/g-plugin-canvas-renderer@1.9.22
+    -   @antv/g-plugin-dragndrop@1.8.20
+    -   @antv/g-plugin-gesture@1.2.8
+    -   @antv/g-plugin-image-loader@1.3.20
+    -   @antv/g-plugin-mobile-interaction@0.9.20
+
 ## 0.11.12
 
 ### Patch Changes

diff --git a/packages/g-mobile-canvas/package.json b/packages/g-mobile-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-mobile-canvas",
-  "version": "0.11.12",
+  "version": "0.11.13",
   "description": "A renderer implemented with Canvas2D API in mobile environment",
   "keywords": [
     "antv",