Skip to content

Commit 93a422d

Browse files
committed
TS Strict fixes
1 parent 92707e5 commit 93a422d

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

packages/@react-aria/form/src/useFormValidation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ export function useFormValidation<T>(props: Validation<T>, state: FormValidation
6868
input.addEventListener('change', onChange);
6969
form?.addEventListener('reset', onReset);
7070
return () => {
71-
input.removeEventListener('invalid', onInvalid);
72-
input.removeEventListener('change', onChange);
71+
input!.removeEventListener('invalid', onInvalid);
72+
input!.removeEventListener('change', onChange);
7373
form?.removeEventListener('reset', onReset);
7474
};
7575
}, [ref, onInvalid, onChange, onReset, validationBehavior]);

packages/@react-aria/interactions/src/useInteractOutside.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export function useInteractOutside(props: InteractOutsideProps) {
3737
ignoreEmulatedMouseEvents: false
3838
});
3939

40-
let onPointerDown = useEffectEvent((e: PointerEvent) => {
40+
let onPointerDown = useEffectEvent((e) => {
4141
if (onInteractOutside && isValidEvent(e, ref)) {
4242
if (onInteractOutsideStart) {
4343
onInteractOutsideStart(e);

packages/@react-aria/interactions/src/usePress.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export function usePress(props: PressHookProps): PressResult {
157157
let triggerPressStart = useEffectEvent((originalEvent: EventBase, pointerType: PointerType) => {
158158
let state = ref.current;
159159
if (isDisabled || state.didFirePressStart) {
160-
return;
160+
return false;
161161
}
162162

163163
let shouldStopPropagation = true;
@@ -181,7 +181,7 @@ export function usePress(props: PressHookProps): PressResult {
181181
let triggerPressEnd = useEffectEvent((originalEvent: EventBase, pointerType: PointerType, wasPressed = true) => {
182182
let state = ref.current;
183183
if (!state.didFirePressStart) {
184-
return;
184+
return false;
185185
}
186186

187187
state.ignoreClickAfterPress = true;
@@ -214,7 +214,7 @@ export function usePress(props: PressHookProps): PressResult {
214214
let triggerPressUp = useEffectEvent((originalEvent: EventBase, pointerType: PointerType) => {
215215
let state = ref.current;
216216
if (isDisabled) {
217-
return;
217+
return false;
218218
}
219219

220220
if (onPressUp) {
@@ -231,7 +231,7 @@ export function usePress(props: PressHookProps): PressResult {
231231
let cancel = useEffectEvent((e: EventBase) => {
232232
let state = ref.current;
233233
if (state.isPressed && state.target) {
234-
if (state.isOverTarget) {
234+
if (state.isOverTarget && state.pointerType) {
235235
triggerPressEnd(createEvent(state.target, e), state.pointerType, false);
236236
}
237237
state.isPressed = false;
@@ -460,11 +460,11 @@ export function usePress(props: PressHookProps): PressResult {
460460
}
461461

462462
if (state.target && isOverTarget(e, state.target)) {
463-
if (!state.isOverTarget) {
463+
if (!state.isOverTarget && state.pointerType) {
464464
state.isOverTarget = true;
465465
triggerPressStart(createEvent(state.target, e), state.pointerType);
466466
}
467-
} else if (state.target && state.isOverTarget) {
467+
} else if (state.target && state.isOverTarget && state.pointerType) {
468468
state.isOverTarget = false;
469469
triggerPressEnd(createEvent(state.target, e), state.pointerType, false);
470470
cancelOnPointerExit(e);
@@ -473,9 +473,9 @@ export function usePress(props: PressHookProps): PressResult {
473473

474474
let onPointerUp = (e: PointerEvent) => {
475475
if (e.pointerId === state.activePointerId && state.isPressed && e.button === 0 && state.target) {
476-
if (isOverTarget(e, state.target)) {
476+
if (isOverTarget(e, state.target) && state.pointerType) {
477477
triggerPressEnd(createEvent(state.target, e), state.pointerType);
478-
} else if (state.isOverTarget) {
478+
} else if (state.isOverTarget && state.pointerType) {
479479
triggerPressEnd(createEvent(state.target, e), state.pointerType, false);
480480
}
481481

@@ -543,7 +543,7 @@ export function usePress(props: PressHookProps): PressResult {
543543
}
544544

545545
let shouldStopPropagation = true;
546-
if (state.isPressed && !state.ignoreEmulatedMouseEvents) {
546+
if (state.isPressed && !state.ignoreEmulatedMouseEvents && state.pointerType) {
547547
state.isOverTarget = true;
548548
shouldStopPropagation = triggerPressStart(e, state.pointerType);
549549
}
@@ -559,7 +559,7 @@ export function usePress(props: PressHookProps): PressResult {
559559
}
560560

561561
let shouldStopPropagation = true;
562-
if (state.isPressed && !state.ignoreEmulatedMouseEvents) {
562+
if (state.isPressed && !state.ignoreEmulatedMouseEvents && state.pointerType) {
563563
state.isOverTarget = false;
564564
shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
565565
cancelOnPointerExit(e);
@@ -594,9 +594,9 @@ export function usePress(props: PressHookProps): PressResult {
594594
return;
595595
}
596596

597-
if (state.target && isOverTarget(e, state.target)) {
597+
if (state.target && isOverTarget(e, state.target) && state.pointerType) {
598598
triggerPressEnd(createEvent(state.target, e), state.pointerType);
599-
} else if (state.target && state.isOverTarget) {
599+
} else if (state.target && state.isOverTarget && state.pointerType) {
600600
triggerPressEnd(createEvent(state.target, e), state.pointerType, false);
601601
}
602602

@@ -650,11 +650,11 @@ export function usePress(props: PressHookProps): PressResult {
650650
let touch = getTouchById(e.nativeEvent, state.activePointerId);
651651
let shouldStopPropagation = true;
652652
if (touch && isOverTarget(touch, e.currentTarget)) {
653-
if (!state.isOverTarget) {
653+
if (!state.isOverTarget && state.pointerType) {
654654
state.isOverTarget = true;
655655
shouldStopPropagation = triggerPressStart(e, state.pointerType);
656656
}
657-
} else if (state.isOverTarget) {
657+
} else if (state.isOverTarget && state.pointerType) {
658658
state.isOverTarget = false;
659659
shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
660660
cancelOnPointerExit(e);
@@ -677,10 +677,10 @@ export function usePress(props: PressHookProps): PressResult {
677677

678678
let touch = getTouchById(e.nativeEvent, state.activePointerId);
679679
let shouldStopPropagation = true;
680-
if (touch && isOverTarget(touch, e.currentTarget)) {
680+
if (touch && isOverTarget(touch, e.currentTarget) && state.pointerType) {
681681
triggerPressUp(e, state.pointerType);
682682
shouldStopPropagation = triggerPressEnd(e, state.pointerType);
683-
} else if (state.isOverTarget) {
683+
} else if (state.isOverTarget && state.pointerType) {
684684
shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
685685
}
686686

0 commit comments

Comments
 (0)