From 7397cbd128a1019341f13fcaaea08ad34dee73cb Mon Sep 17 00:00:00 2001 From: "chendaxin.tk" Date: Tue, 10 Nov 2026 11:35:07 +0800 Subject: [PATCH] fix: use VRender clone for delayed input events --- common/config/rush/pnpm-lock.yaml | 120 +++++++++--------- docs/package.json | 4 +- packages/openinula-vchart/package.json | 4 +- packages/react-vchart/package.json | 4 +- packages/vchart-extension/package.json | 8 +- .../__tests__/unit/event/event-delay.test.ts | 14 +- packages/vchart/package.json | 10 +- packages/vchart/src/event/event-dispatcher.ts | 22 +--- tools/story-player/package.json | 6 +- 9 files changed, 92 insertions(+), 100 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 37399f5f30..7bdd9fcb68 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -37,11 +37,11 @@ importers: specifier: 1.2.4-alpha.5 version: 1.2.4-alpha.5 '@visactor/vrender': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-kits': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vtable': specifier: 1.19.0-alpha.0 version: 1.19.0-alpha.0 @@ -206,11 +206,11 @@ importers: specifier: workspace:2.2.1 version: link:../vchart-extension '@visactor/vrender-core': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-kits': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vutils': specifier: ~1.0.28 version: 1.0.28 @@ -297,11 +297,11 @@ importers: specifier: workspace:2.2.1 version: link:../vchart-extension '@visactor/vrender-core': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-kits': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vutils': specifier: ~1.0.28 version: 1.0.28 @@ -532,20 +532,20 @@ importers: specifier: ~1.0.28 version: 1.0.28 '@visactor/vrender': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-animate': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-components': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-core': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-kits': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vscale': specifier: ~1.0.28 version: 1.0.28 @@ -701,17 +701,17 @@ importers: specifier: ~1.0.28 version: 1.0.28 '@visactor/vrender-animate': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-components': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-core': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-kits': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vutils': specifier: ~1.0.28 version: 1.0.28 @@ -1342,14 +1342,14 @@ importers: specifier: workspace:2.2.1 version: link:../../packages/vchart '@visactor/vrender': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-core': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vrender-kits': - specifier: 1.1.14 - version: 1.1.14 + specifier: 1.1.15 + version: 1.1.15 '@visactor/vutils': specifier: ~1.0.28 version: 1.0.28 @@ -3163,29 +3163,29 @@ packages: '@visactor/vrender-animate@1.0.0-alpha.18': resolution: {integrity: sha512-9kTtvp1ef+1t+AtUiza6A7qBQP7SmvOu3/ILGrqs/HGdZVj1XGjbYvD/X/zwKJ3LEb7gGV5fa8x95e4czTvRSA==} - '@visactor/vrender-animate@1.1.14': - resolution: {integrity: sha512-xOVDMRXAIwEJunuMs/yQsYrOLNb+woQ8c5T3mQGEqtfMX6Int9TXYMmBsQq//pi/R4E3ouaZTyKzWdZZT8S8AA==} + '@visactor/vrender-animate@1.1.15': + resolution: {integrity: sha512-Swbg0OBmU5JjdDKzL2vVSNUSb4zPGt/jbl67G1SnjmbMDVOPle+/cI6wCpzqTA/pmgcdQM48AMO7GCCtVAtDFA==} '@visactor/vrender-components@1.0.0-alpha.18': resolution: {integrity: sha512-7Euq+ZfswL74n2pgkaqZSsPxoSa5SPIGyXatN1eUrdzM2Z0kX6U0RcJg01fctvRs4op6WhcecRLqGvnHcBeb9Q==} - '@visactor/vrender-components@1.1.14': - resolution: {integrity: sha512-r5j8T7P9sYoFSNLvIhMxqR8EhpUDpEqwIHcixiqNlNBcpVnF40OA5UgpCqUoOy6MEqUhKdm10YigeKogPac35g==} + '@visactor/vrender-components@1.1.15': + resolution: {integrity: sha512-GFkl3daturDqeNQoJS6RoKnkaxwNowhaAXL0mOWF5GKSlhcZYcAUSBbvd6NQcOQrG31sETMRyQza9kFy1jctkA==} '@visactor/vrender-core@1.0.0-alpha.18': resolution: {integrity: sha512-0ihtNvCyNkOsWPFgRqowHzq0IcQgS2Wl/nPpKbVtxWKveenwlhA+ZKoQvam6VJyBY7jeNe1pROy0mJMDyVAJQw==} - '@visactor/vrender-core@1.1.14': - resolution: {integrity: sha512-OQPUbP0s009ogA4ke3y9aPLlHiy+ouFz13OYdW4yCGTB9FqSMwY0SqguZa9Ho4/VhHuB9sjebxUM3YdxHLyi2Q==} + '@visactor/vrender-core@1.1.15': + resolution: {integrity: sha512-PuvnoK00AaQobtSURFZJpqMvP43ng9Kl/VlljlqUuaOThtZf+/8rZrGQSp1HdbLgagp5m2kNC4GiYFbuyucSJg==} '@visactor/vrender-kits@1.0.0-alpha.18': resolution: {integrity: sha512-Tvolkq+4G8qiPFZo0Aj8M//Yr6jR2h8FNkFEyWM9gbQbEiTkjpmHAJOYnoSsaPtPrcMSlG4EhJSFDk6ymANHVg==} - '@visactor/vrender-kits@1.1.14': - resolution: {integrity: sha512-bxan1yF7tvD3VlfSELZy8+3pPgoBMMDHcW5AUOCxZVQuDvtex/SVX3WYHcWpxfvppBcqTz0eby1oKiHBg0oDJA==} + '@visactor/vrender-kits@1.1.15': + resolution: {integrity: sha512-BMBrc9WRFMeg3FzoerhC6DtWlB9/WQxRE/3NIT0/h4nP65bE/VCdk4+jh8CLHITNL1zJ+9t4oFtjSJhVHe331Q==} - '@visactor/vrender@1.1.14': - resolution: {integrity: sha512-h5xaeWOQNdxIGhxZ1g/8ID5MqGloAJy/ctbL3fwEbP5J4qkZCN7xzioDDNWKcxQlnIvDwegtxxckFjINaA0lFw==} + '@visactor/vrender@1.1.15': + resolution: {integrity: sha512-tB/1SEUv7ysHTB4ri5JnuA8mEeu1kjBZzCzemJ/TJiGyBoYMIBVxB2rn4qTXmQH7J9ifqV7yh2vOwHW0GGRyTA==} '@visactor/vscale@0.18.18': resolution: {integrity: sha512-iRG4kv+5Fv4KX3AxEfV95XU3I6OmF0QizyAhqHxKa7L1MaT+MRvDDk5zHWf1E8gialLbL2xDe3GnT6g/4u5jhA==} @@ -15164,9 +15164,9 @@ snapshots: '@visactor/vrender-core': 1.0.0-alpha.18 '@visactor/vutils': 1.0.4 - '@visactor/vrender-animate@1.1.14': + '@visactor/vrender-animate@1.1.15': dependencies: - '@visactor/vrender-core': 1.1.14 + '@visactor/vrender-core': 1.1.15 '@visactor/vutils': 1.0.28 '@visactor/vrender-components@1.0.0-alpha.18': @@ -15177,11 +15177,11 @@ snapshots: '@visactor/vscale': 1.0.4 '@visactor/vutils': 1.0.4 - '@visactor/vrender-components@1.1.14': + '@visactor/vrender-components@1.1.15': dependencies: - '@visactor/vrender-animate': 1.1.14 - '@visactor/vrender-core': 1.1.14 - '@visactor/vrender-kits': 1.1.14 + '@visactor/vrender-animate': 1.1.15 + '@visactor/vrender-core': 1.1.15 + '@visactor/vrender-kits': 1.1.15 '@visactor/vscale': 1.0.28 '@visactor/vutils': 1.0.28 @@ -15190,7 +15190,7 @@ snapshots: '@visactor/vutils': 1.0.4 color-convert: 2.0.1 - '@visactor/vrender-core@1.1.14': + '@visactor/vrender-core@1.1.15': dependencies: '@visactor/vutils': 1.0.28 color-convert: 2.0.1 @@ -15204,21 +15204,21 @@ snapshots: lottie-web: 5.13.0 roughjs: 4.5.2 - '@visactor/vrender-kits@1.1.14': + '@visactor/vrender-kits@1.1.15': dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 1.1.14 + '@visactor/vrender-core': 1.1.15 '@visactor/vutils': 1.0.28 gifuct-js: 2.1.2 lottie-web: 5.13.0 roughjs: 4.6.6 - '@visactor/vrender@1.1.14': + '@visactor/vrender@1.1.15': dependencies: - '@visactor/vrender-animate': 1.1.14 - '@visactor/vrender-components': 1.1.14 - '@visactor/vrender-core': 1.1.14 - '@visactor/vrender-kits': 1.1.14 + '@visactor/vrender-animate': 1.1.15 + '@visactor/vrender-components': 1.1.15 + '@visactor/vrender-core': 1.1.15 + '@visactor/vrender-kits': 1.1.15 '@visactor/vscale@0.18.18': dependencies: diff --git a/docs/package.json b/docs/package.json index 3d6bcc6a4f..86d42b9e24 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,8 +19,8 @@ "@visactor/vchart-theme": "~1.6.6", "@visactor/vmind": "1.2.4-alpha.5", "@visactor/vutils": "~1.0.28", - "@visactor/vrender": "1.1.14", - "@visactor/vrender-kits": "1.1.14", + "@visactor/vrender": "1.1.15", + "@visactor/vrender-kits": "1.1.15", "@visactor/vtable": "1.19.0-alpha.0", "@visactor/vtable-editors": "1.19.0-alpha.0", "@visactor/vtable-gantt": "1.19.0-alpha.0", diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json index 44f79fb75e..c5cd9801fb 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -31,8 +31,8 @@ "@visactor/vchart": "workspace:2.2.1", "@visactor/vchart-extension": "workspace:2.2.1", "@visactor/vutils": "~1.0.28", - "@visactor/vrender-core": "1.1.14", - "@visactor/vrender-kits": "1.1.14", + "@visactor/vrender-core": "1.1.15", + "@visactor/vrender-kits": "1.1.15", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/react-vchart/package.json b/packages/react-vchart/package.json index 4781a6417a..cdf7422990 100644 --- a/packages/react-vchart/package.json +++ b/packages/react-vchart/package.json @@ -36,8 +36,8 @@ "@visactor/vchart": "workspace:2.2.1", "@visactor/vchart-extension": "workspace:2.2.1", "@visactor/vutils": "~1.0.28", - "@visactor/vrender-core": "1.1.14", - "@visactor/vrender-kits": "1.1.14", + "@visactor/vrender-core": "1.1.15", + "@visactor/vrender-kits": "1.1.15", "react-is": "^18.2.0" }, "devDependencies": { diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index 8413406f43..468df4571a 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -28,10 +28,10 @@ "test:visual": "node scripts/visual-test.mjs" }, "dependencies": { - "@visactor/vrender-core": "1.1.14", - "@visactor/vrender-kits": "1.1.14", - "@visactor/vrender-components": "1.1.14", - "@visactor/vrender-animate": "1.1.14", + "@visactor/vrender-core": "1.1.15", + "@visactor/vrender-kits": "1.1.15", + "@visactor/vrender-components": "1.1.15", + "@visactor/vrender-animate": "1.1.15", "@visactor/vchart": "workspace:2.2.1", "@visactor/vutils": "~1.0.28", "@visactor/vdataset": "~1.0.28", diff --git a/packages/vchart/__tests__/unit/event/event-delay.test.ts b/packages/vchart/__tests__/unit/event/event-delay.test.ts index 07bdfd9289..1dfe11de69 100644 --- a/packages/vchart/__tests__/unit/event/event-delay.test.ts +++ b/packages/vchart/__tests__/unit/event/event-delay.test.ts @@ -99,6 +99,9 @@ describe('[event] delayed input', () => { timeStamp: 123, target, currentTarget: target, + defaultPrevented: true, + propagationStopped: true, + propagationImmediatelyStopped: true, nativeEvent: {} as PointerEvent, originalEvent: new FederatedPointerEvent(), path: [target], @@ -106,6 +109,7 @@ describe('[event] delayed input', () => { customPayload: payload, [payloadKey]: payload }); + input.eventPhase = input.AT_TARGET; const coordinates = [ 'layer', 'page', @@ -131,7 +135,15 @@ describe('[event] delayed input', () => { expect(saved.manager).toBe(input.manager); expect(saved.timeStamp).toBe(123); expect(saved.target).toBe(target); - expect(saved.currentTarget).toBe(target); + expect(saved.currentTarget).toBeNull(); + expect(saved.eventPhase).toBe(saved.NONE); + expect(saved.defaultPrevented).toBe(false); + expect(saved.propagationStopped).toBe(false); + expect(saved.propagationImmediatelyStopped).toBe(false); + expect(input.currentTarget).toBe(target); + expect(input.defaultPrevented).toBe(true); + expect(input.propagationStopped).toBe(true); + expect(input.propagationImmediatelyStopped).toBe(true); expect(saved.nativeEvent).toBe(input.nativeEvent); expect(saved.originalEvent).toBe(input.originalEvent); expect(saved.customPayload).toBe(payload); diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 6993856866..86b1bd5621 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -130,11 +130,11 @@ "@visactor/vscale": "~1.0.28", "@visactor/vlayouts": "~1.0.28", "@visactor/vutils-extension": "workspace:2.2.1", - "@visactor/vrender": "1.1.14", - "@visactor/vrender-core": "1.1.14", - "@visactor/vrender-kits": "1.1.14", - "@visactor/vrender-components": "1.1.14", - "@visactor/vrender-animate": "1.1.14" + "@visactor/vrender": "1.1.15", + "@visactor/vrender-core": "1.1.15", + "@visactor/vrender-kits": "1.1.15", + "@visactor/vrender-components": "1.1.15", + "@visactor/vrender-animate": "1.1.15" }, "publishConfig": { "access": "public", diff --git a/packages/vchart/src/event/event-dispatcher.ts b/packages/vchart/src/event/event-dispatcher.ts index b53b3e8421..30563f5441 100644 --- a/packages/vchart/src/event/event-dispatcher.ts +++ b/packages/vchart/src/event/event-dispatcher.ts @@ -1,6 +1,5 @@ import { Bubble } from './bubble'; import { isValid, debounce, throttle, get, isFunction } from '@visactor/vutils'; -import type { FederatedPointerEvent, FederatedWheelEvent } from '@visactor/vrender-core'; import { BASE_EVENTS, Event_Bubble_Level, @@ -376,26 +375,7 @@ export class EventDispatcher implements IEventDispatcher { return event; } - // shortcut: VRender 1.1.14 clone drops extension payloads and fails on root events; remove when both are supported. - const input = event as FederatedPointerEvent | FederatedWheelEvent; - const EventConstructor = input.constructor as new (manager: typeof input.manager) => typeof input; - const snapshot = Object.assign(new EventConstructor(input.manager), input); - for (const key of [ - 'layer', - 'page', - 'canvas', - 'viewport', - 'client', - 'movement', - 'offset', - 'global', - 'screen' - ] as const) { - snapshot[key] = { ...input[key] }; - } - snapshot.path = input.path?.slice() ?? []; - snapshot.detailPath = input.detailPath?.slice(); - return snapshot; + return event.clone(); } /** diff --git a/tools/story-player/package.json b/tools/story-player/package.json index 3f71212694..67d6594ca9 100644 --- a/tools/story-player/package.json +++ b/tools/story-player/package.json @@ -56,10 +56,10 @@ "vite": "3.2.6" }, "dependencies": { - "@visactor/vrender-core": "1.1.14", - "@visactor/vrender-kits": "1.1.14", + "@visactor/vrender-core": "1.1.15", + "@visactor/vrender-kits": "1.1.15", "@visactor/vchart": "workspace:2.2.1", - "@visactor/vrender": "1.1.14", + "@visactor/vrender": "1.1.15", "@visactor/vutils": "~1.0.28" } } \ No newline at end of file