Skip to content

Commit 741a084

Browse files
committed
refactor: merge @antv/g-plugin-html-renderer into @antv/g-lite
1 parent d115f7b commit 741a084

27 files changed

Lines changed: 14 additions & 890 deletions

File tree

__tests__/demos/plugin/html-renderer.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import { HTML } from '@antv/g';
2-
import { Plugin as HTMLRenderingPlugin } from '@antv/g-plugin-html-renderer';
1+
import { HTML, HTMLRenderer } from '@antv/g';
32
import { ExampleLayoutManager } from '../_helper/example-layout-manager';
43

54
export async function htmlRenderer(context) {
65
const { canvas, renderer } = context;
76

8-
renderer.registerPlugin(new HTMLRenderingPlugin());
7+
renderer.registerPlugin(new HTMLRenderer.Plugin());
98

109
await canvas.ready;
1110

benchmark/tsconfig.app.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@
106106
"@antv/g-mobile-canvas-element-local": [
107107
"../packages/g-mobile-canvas-element/src"
108108
],
109-
"@antv/g-plugin-html-renderer-local": [
110-
"../packages/g-plugin-html-renderer/src"
111-
],
112109
"@antv/react-g-local": ["../packages/react-g/src"],
113110
"@antv/g-mobile-svg-local": ["../packages/g-mobile-svg/src"]
114111
}

benchmark/vite.config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ export default defineConfig({
171171
__dirname,
172172
'../packages/g-mobile-canvas-element/src',
173173
),
174-
'@antv/g-plugin-html-renderer-local': path.resolve(
175-
__dirname,
176-
'../packages/g-plugin-html-renderer/src',
177-
),
178174
'@antv/react-g-local': path.resolve(__dirname, '../packages/react-g/src'),
179175
'@antv/g-mobile-svg-local': path.resolve(
180176
__dirname,

packages/g-canvas/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"@antv/g-lite": "workspace:*",
4747
"@antv/g-plugin-canvas-renderer": "workspace:*",
4848
"@antv/g-plugin-dom-interaction": "workspace:*",
49-
"@antv/g-plugin-html-renderer": "workspace:*",
5049
"@antv/g-math": "workspace:*",
5150
"@antv/util": "^3.3.5",
5251
"@babel/runtime": "^7.25.6",

packages/g-canvas/src/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import type { RendererConfig } from '@antv/g-lite';
2-
import { AbstractRenderer, ImageLoader } from '@antv/g-lite';
2+
import { AbstractRenderer, ImageLoader, HTMLRenderer } from '@antv/g-lite';
33
import * as CanvasRenderer from '@antv/g-plugin-canvas-renderer';
44
import * as DomInteraction from '@antv/g-plugin-dom-interaction';
5-
import * as HTMLRenderer from '@antv/g-plugin-html-renderer';
65
import * as CanvasPicker from './plugins/picker';
76
import * as CanvasPathGenerator from './plugins/path-generator';
87
import { ContextRegisterPlugin } from './ContextRegisterPlugin';

packages/g-canvaskit/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
"@antv/g-lite": "workspace:*",
4848
"@antv/g-plugin-canvaskit-renderer": "workspace:*",
4949
"@antv/g-plugin-dom-interaction": "workspace:*",
50-
"@antv/g-plugin-html-renderer": "workspace:*",
5150
"@antv/util": "^3.3.5",
5251
"@babel/runtime": "^7.25.6",
5352
"canvaskit-wasm": "^0.34.0",

packages/g-canvaskit/src/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import type { RendererConfig } from '@antv/g-lite';
2-
import { AbstractRenderer, ImageLoader } from '@antv/g-lite';
2+
import { AbstractRenderer, ImageLoader, HTMLRenderer } from '@antv/g-lite';
33
import { CanvasPathGenerator, CanvasPicker } from '@antv/g-canvas';
44
import * as CanvaskitRenderer from '@antv/g-plugin-canvaskit-renderer';
55
import * as DomInteraction from '@antv/g-plugin-dom-interaction';
6-
import * as HTMLRenderer from '@antv/g-plugin-html-renderer';
76
import { ContextRegisterPlugin } from './ContextRegisterPlugin';
87

98
export * from './CanvasKitContextService';

packages/g-lite/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,4 @@ export {
6767
export * from './plugins/MutationObserver';
6868
export * as ImageLoader from './plugins/image-loader';
6969
export { ImagePool, type ImageCache } from './plugins/image-loader';
70+
export * as HTMLRenderer from './plugins/html-renderer';

packages/g-plugin-html-renderer/src/HTMLRenderingPlugin.ts renamed to packages/g-lite/src/plugins/html-renderer/HTMLRenderingPlugin.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { isNil, isNumber, isString } from '@antv/util';
2+
import type { mat4, vec3 } from 'gl-matrix';
13
import {
24
DisplayObject,
35
FederatedEvent,
@@ -15,9 +17,7 @@ import {
1517
ElementEvent,
1618
isPattern,
1719
Shape,
18-
} from '@antv/g-lite';
19-
import { isNil, isNumber, isString } from '@antv/util';
20-
import type { mat4, vec3 } from 'gl-matrix';
20+
} from '../..';
2121

2222
const CANVAS_CAMERA_ID = 'g-canvas-camera';
2323

File renamed without changes.

0 commit comments

Comments
 (0)