Skip to content

Commit 3d02693

Browse files
committed
fix(core): reuse TresPointerEvent
1 parent 4877a92 commit 3d02693

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

packages/core/src/components/TresCanvas.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import {
77
WebGLRenderer,
88
} from 'three'
99
import type { App, Ref } from 'vue'
10-
import type { TresCamera, TresContextWithClock, TresObject, TresScene } from '../types/'
11-
import type { PointerEvent } from '@pmndrs/pointer-events'
10+
import type { TresCamera, TresContextWithClock, TresObject, TresPointerEvent, TresScene } from '../types'
1211
import * as THREE from 'three'
1312
1413
import {
@@ -271,13 +270,13 @@ export interface TresCanvasProps extends RendererOptions {
271270
272271
export type TresCanvasEmits = {
273272
ready: [context: TresContext]
274-
pointermissed: [event: PointerEvent<MouseEvent>]
273+
pointermissed: [event: TresPointerEvent]
275274
render: [context: TresContext]
276275
beforeLoop: [context: TresContextWithClock]
277276
loop: [context: TresContextWithClock]
278277
} & {
279278
// all pointer events are supported because they bubble up
280-
[key in TresPointerEventName]: [event: PointerEvent<MouseEvent>]
279+
[key in TresPointerEventName]: [event: TresPointerEvent]
281280
}
282281
</script>
283282

packages/core/src/composables/useEventManager/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import type { PointerEvent, PointerEventsMap } from '@pmndrs/pointer-events'
1+
import type { PointerEventsMap } from '@pmndrs/pointer-events'
22
import type { Event, Object3D, Object3DEventMap } from 'three'
33
import { forwardHtmlEvents, getVoidObject } from '@pmndrs/pointer-events'
44
import { onUnmounted, toValue } from 'vue'
55
import type { MaybeRef } from 'vue'
66
import type { TresContext } from '../useTresContextProvider'
77
import { createEventHook } from '@vueuse/core'
8+
import type { TresPointerEvent } from '../../types'
89

910
export function useEventManager({
1011
canvas,
@@ -21,7 +22,7 @@ export function useEventManager({
2122
type VoidObject = Object3D<Object3DEventMap & PointerEventsMap>
2223

2324
const voidObject = getVoidObject(scene.value) as VoidObject
24-
const pointerMissedEventHook = createEventHook<PointerEvent<MouseEvent> & Event<'click', VoidObject>>()
25+
const pointerMissedEventHook = createEventHook<TresPointerEvent & Event<'click', VoidObject>>()
2526

2627
voidObject.addEventListener('click', pointerMissedEventHook.trigger)
2728

0 commit comments

Comments
 (0)