Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 60 additions & 60 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/openinula-vchart/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-vchart/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions packages/vchart-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 13 additions & 1 deletion packages/vchart/__tests__/unit/event/event-delay.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,17 @@ describe('[event] delayed input', () => {
timeStamp: 123,
target,
currentTarget: target,
defaultPrevented: true,
propagationStopped: true,
propagationImmediatelyStopped: true,
nativeEvent: {} as PointerEvent,
originalEvent: new FederatedPointerEvent(),
path: [target],
detailPath: [target],
customPayload: payload,
[payloadKey]: payload
});
input.eventPhase = input.AT_TARGET;
const coordinates = [
'layer',
'page',
Expand All @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions packages/vchart/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
22 changes: 1 addition & 21 deletions packages/vchart/src/event/event-dispatcher.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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();
}

/**
Expand Down
6 changes: 3 additions & 3 deletions tools/story-player/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Loading