Skip to content

Commit cc3b639

Browse files
committed
fixed cyclic dependency
1 parent fb7af53 commit cc3b639

File tree

6 files changed

+16
-17
lines changed

6 files changed

+16
-17
lines changed

packages/react-native-gesture-handler/src/handlers/GestureHandlerEventPayload.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { StylusData } from '../web/interfaces';
1+
import { StylusData } from './gestureHandlerCommon';
22

33
export type FlingGestureHandlerEventPayload = {
44
x: number;

packages/react-native-gesture-handler/src/handlers/gestureHandlerCommon.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,14 @@ export type GestureTouchEvent = {
165165
pointerType: PointerType;
166166
};
167167

168+
export interface StylusData {
169+
tiltX: number;
170+
tiltY: number;
171+
azimuthAngle: number;
172+
altitudeAngle: number;
173+
pressure: number;
174+
}
175+
168176
export type GestureUpdateEvent<GestureEventPayloadT = Record<string, unknown>> =
169177
GestureEventPayload & GestureEventPayloadT;
170178

packages/react-native-gesture-handler/src/web/handlers/HoverGestureHandler.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { State } from '../../State';
2-
import { AdaptedEvent, StylusData } from '../interfaces';
2+
import { AdaptedEvent } from '../interfaces';
33
import GestureHandlerOrchestrator from '../tools/GestureHandlerOrchestrator';
44
import GestureHandler from './GestureHandler';
5+
import { StylusData } from '../../handlers/gestureHandlerCommon';
56

67
export default class HoverGestureHandler extends GestureHandler {
78
private stylusData: StylusData | undefined;

packages/react-native-gesture-handler/src/web/handlers/PanGestureHandler.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { State } from '../../State';
22
import { DEFAULT_TOUCH_SLOP } from '../constants';
3-
import { AdaptedEvent, Config, StylusData, WheelDevice } from '../interfaces';
3+
import { AdaptedEvent, Config, WheelDevice } from '../interfaces';
4+
import { StylusData } from '../../handlers/gestureHandlerCommon';
45

56
import GestureHandler from './GestureHandler';
67

packages/react-native-gesture-handler/src/web/interfaces.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {
33
ActiveCursor,
44
MouseButton,
55
TouchAction,
6+
StylusData,
67
} from '../handlers/gestureHandlerCommon';
78
import { Directions } from '../Directions';
89
import { PointerType } from '../PointerType';
@@ -107,14 +108,6 @@ export interface PropsRef {
107108
onGestureHandlerTouchEvent?: (e: any) => void;
108109
}
109110

110-
export interface StylusData {
111-
tiltX: number;
112-
tiltY: number;
113-
azimuthAngle: number;
114-
altitudeAngle: number;
115-
pressure: number;
116-
}
117-
118111
export interface AdaptedEvent {
119112
x: number;
120113
y: number;

packages/react-native-gesture-handler/src/web/utils.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import { PointerType } from '../PointerType';
2-
import type {
3-
GestureHandlerRef,
4-
Point,
5-
StylusData,
6-
SVGRef,
7-
} from './interfaces';
2+
import type { GestureHandlerRef, Point, SVGRef } from './interfaces';
3+
import { StylusData } from '../handlers/gestureHandlerCommon';
84

95
export function isPointerInBounds(view: HTMLElement, { x, y }: Point): boolean {
106
const rect: DOMRect = view.getBoundingClientRect();

0 commit comments

Comments
 (0)