Skip to content

Commit 2d28421

Browse files
authored
Merge pull request #505 from pixi-viewport/fix/pixi-v8-types-compatibility
fix: update types to match pixi v8
2 parents 402e1a4 + a64e139 commit 2d28421

File tree

2 files changed

+35
-37
lines changed

2 files changed

+35
-37
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pixi-viewport",
3-
"version": "6.0.0",
3+
"version": "6.0.1",
44
"description": "A highly configurable viewport/2D camera designed to work with pixi.js. Features include dragging, pinch-to-zoom, mouse wheel zooming, decelerated dragging, follow target, snap to point, snap to zoom, clamping, bouncing on edges, and move on mouse edges.",
55
"main": "./dist/pixi_viewport.umd.cjs",
66
"module": "./dist/pixi_viewport.js",

src/global.d.ts

+34-36
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
1-
// https://github.com/pixijs/pixijs/issues/8957
2-
3-
declare namespace GlobalMixins
1+
declare namespace PixiMixins
42
{
5-
type Viewport = import('./Viewport').Viewport;
6-
type PixiViewportClickedEvent = import('./types').ClickedEvent;
7-
type PixiViewportDragEvent = import('./types').DragEvent;
8-
type PixiViewportMovedEvent = import('./types').MovedEvent;
9-
type PixiViewportZoomedEvent = import('./types').ZoomedEvent;
10-
type PixiViewportWheelStartEvent = import('./types').WheelStartEvent;
3+
type Viewport = import('./Viewport').Viewport;
4+
type PixiViewportClickedEvent = import('./types').ClickedEvent;
5+
type PixiViewportDragEvent = import('./types').DragEvent;
6+
type PixiViewportMovedEvent = import('./types').MovedEvent;
7+
type PixiViewportZoomedEvent = import('./types').ZoomedEvent;
8+
type PixiViewportWheelStartEvent = import('./types').WheelStartEvent;
119

12-
interface DisplayObjectEvents
13-
{
14-
clicked: [PixiViewportClickedEvent]
15-
'drag-start': [PixiViewportDragEvent],
16-
'drag-end': [PixiViewportDragEvent],
17-
moved: [PixiViewportMovedEvent],
18-
zoomed: [PixiViewportZoomedEvent],
19-
'pinch-start': [Viewport],
20-
'pinch-end': [Viewport],
21-
'snap-start': [Viewport],
22-
'snap-end': [Viewport],
23-
'snap-zoom-start': [Viewport],
24-
'snap-zoom-end': [Viewport],
25-
'bounce-x-start': [Viewport],
26-
'bounce-x-end': [Viewport],
27-
'bounce-y-start': [Viewport],
28-
'bounce-y-end': [Viewport],
29-
'wheel-start': [PixiViewportWheelStartEvent],
30-
'wheel-scroll': [Viewport],
31-
'animate-end': [Viewport],
32-
'mouse-edge-start': [Viewport],
33-
'mouse-edge-end': [Viewport],
34-
'moved-end': [Viewport],
35-
'zoomed-end': [Viewport],
36-
'frame-end': [Viewport],
37-
'plugin-remove': [string],
38-
}
10+
interface ContainerEvents
11+
{
12+
clicked: [PixiViewportClickedEvent];
13+
'drag-start': [PixiViewportDragEvent];
14+
'drag-end': [PixiViewportDragEvent];
15+
moved: [PixiViewportMovedEvent];
16+
zoomed: [PixiViewportZoomedEvent];
17+
'pinch-start': [Viewport];
18+
'pinch-end': [Viewport];
19+
'snap-start': [Viewport];
20+
'snap-end': [Viewport];
21+
'snap-zoom-start': [Viewport];
22+
'snap-zoom-end': [Viewport];
23+
'bounce-x-start': [Viewport];
24+
'bounce-x-end': [Viewport];
25+
'bounce-y-start': [Viewport];
26+
'bounce-y-end': [Viewport];
27+
'wheel-start': [PixiViewportWheelStartEvent];
28+
'wheel-scroll': [Viewport];
29+
'animate-end': [Viewport];
30+
'mouse-edge-start': [Viewport];
31+
'mouse-edge-end': [Viewport];
32+
'moved-end': [Viewport];
33+
'zoomed-end': [Viewport];
34+
'frame-end': [Viewport];
35+
'plugin-remove': [string];
36+
}
3937
}

0 commit comments

Comments
 (0)