@react-aria/interactions 3.21.2 → 3.22.0

package/dist/useScrollWheel.main.js.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;;AAAA;;;;;;;;;;CAUC;;AAYM,SAAS,yCAAe,KAAuB,EAAE,GAA2B;IACjF,IAAI,YAAC,QAAQ,cAAE,UAAU,EAAC,GAAG;IAC7B,IAAI,kBAAkB,CAAA,GAAA,wBAAU,EAAE,CAAC;QACjC,+DAA+D;QAC/D,IAAI,EAAE,OAAO,EACX;QAGF,0BAA0B;QAC1B,EAAE,cAAc;QAChB,EAAE,eAAe;QAEjB,IAAI,UACF,SAAS;YAAC,QAAQ,EAAE,MAAM;YAAE,QAAQ,EAAE,MAAM;QAAA;IAEhD,GAAG;QAAC;KAAS;IAEb,CAAA,GAAA,8BAAO,EAAE,KAAK,SAAS,aAAa,YAAY;AAClD","sources":["packages/@react-aria/interactions/src/useScrollWheel.ts"],"sourcesContent":["/*\n * Copyright 2021 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {RefObject, useCallback} from 'react';\nimport {ScrollEvents} from '@react-types/shared';\nimport {useEvent} from '@react-aria/utils';\n\nexport interface ScrollWheelProps extends ScrollEvents {\n  /** Whether the scroll listener should be disabled. */\n  isDisabled?: boolean\n}\n\n// scroll wheel needs to be added not passively so it's cancelable, small helper hook to remember that\nexport function useScrollWheel(props: ScrollWheelProps, ref: RefObject<HTMLElement>): void {\n  let {onScroll, isDisabled} = props;\n  let onScrollHandler = useCallback((e) => {\n    // If the ctrlKey is pressed, this is a zoom event, do nothing.\n    if (e.ctrlKey) {\n      return;\n    }\n\n    // stop scrolling the page\n    e.preventDefault();\n    e.stopPropagation();\n\n    if (onScroll) {\n      onScroll({deltaX: e.deltaX, deltaY: e.deltaY});\n    }\n  }, [onScroll]);\n\n  useEvent(ref, 'wheel', isDisabled ? undefined : onScrollHandler);\n}\n"],"names":[],"version":3,"file":"useScrollWheel.main.js.map"}
+{"mappings":";;;;;;;;;AAAA;;;;;;;;;;CAUC;;AAYM,SAAS,yCAAe,KAAuB,EAAE,GAAkC;IACxF,IAAI,YAAC,QAAQ,cAAE,UAAU,EAAC,GAAG;IAC7B,IAAI,kBAAkB,CAAA,GAAA,wBAAU,EAAE,CAAC;QACjC,+DAA+D;QAC/D,IAAI,EAAE,OAAO,EACX;QAGF,0BAA0B;QAC1B,EAAE,cAAc;QAChB,EAAE,eAAe;QAEjB,IAAI,UACF,SAAS;YAAC,QAAQ,EAAE,MAAM;YAAE,QAAQ,EAAE,MAAM;QAAA;IAEhD,GAAG;QAAC;KAAS;IAEb,CAAA,GAAA,8BAAO,EAAE,KAAK,SAAS,aAAa,YAAY;AAClD","sources":["packages/@react-aria/interactions/src/useScrollWheel.ts"],"sourcesContent":["/*\n * Copyright 2021 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {RefObject, ScrollEvents} from '@react-types/shared';\nimport {useCallback} from 'react';\nimport {useEvent} from '@react-aria/utils';\n\nexport interface ScrollWheelProps extends ScrollEvents {\n  /** Whether the scroll listener should be disabled. */\n  isDisabled?: boolean\n}\n\n// scroll wheel needs to be added not passively so it's cancelable, small helper hook to remember that\nexport function useScrollWheel(props: ScrollWheelProps, ref: RefObject<HTMLElement | null>): void {\n  let {onScroll, isDisabled} = props;\n  let onScrollHandler = useCallback((e) => {\n    // If the ctrlKey is pressed, this is a zoom event, do nothing.\n    if (e.ctrlKey) {\n      return;\n    }\n\n    // stop scrolling the page\n    e.preventDefault();\n    e.stopPropagation();\n\n    if (onScroll) {\n      onScroll({deltaX: e.deltaX, deltaY: e.deltaY});\n    }\n  }, [onScroll]);\n\n  useEvent(ref, 'wheel', isDisabled ? undefined : onScrollHandler);\n}\n"],"names":[],"version":3,"file":"useScrollWheel.main.js.map"}

package/dist/useScrollWheel.mjs

@@ -28,9 +28,9 @@ function $7d0a636d7a4dcefd$export$2123ff2b87c81ca(props, ref) {
     }, [
         onScroll
     ]);
-    (0, $nrdL2$useEvent)(ref, "wheel", isDisabled ? undefined : onScrollHandler);
+    (0, $nrdL2$useEvent)(ref, 'wheel', isDisabled ? undefined : onScrollHandler);
 }
 
 
 export {$7d0a636d7a4dcefd$export$2123ff2b87c81ca as useScrollWheel};
-//# sourceMappingURL=useScrollWheel.mjs.map
+//# sourceMappingURL=useScrollWheel.module.js.map

package/dist/useScrollWheel.module.js

@@ -28,7 +28,7 @@ function $7d0a636d7a4dcefd$export$2123ff2b87c81ca(props, ref) {
     }, [
         onScroll
     ]);
-    (0, $nrdL2$useEvent)(ref, "wheel", isDisabled ? undefined : onScrollHandler);
+    (0, $nrdL2$useEvent)(ref, 'wheel', isDisabled ? undefined : onScrollHandler);
 }
 
 

package/dist/useScrollWheel.module.js.map

@@ -1 +1 @@
-{"mappings":";;;AAAA;;;;;;;;;;CAUC;;AAYM,SAAS,yCAAe,KAAuB,EAAE,GAA2B;IACjF,IAAI,YAAC,QAAQ,cAAE,UAAU,EAAC,GAAG;IAC7B,IAAI,kBAAkB,CAAA,GAAA,kBAAU,EAAE,CAAC;QACjC,+DAA+D;QAC/D,IAAI,EAAE,OAAO,EACX;QAGF,0BAA0B;QAC1B,EAAE,cAAc;QAChB,EAAE,eAAe;QAEjB,IAAI,UACF,SAAS;YAAC,QAAQ,EAAE,MAAM;YAAE,QAAQ,EAAE,MAAM;QAAA;IAEhD,GAAG;QAAC;KAAS;IAEb,CAAA,GAAA,eAAO,EAAE,KAAK,SAAS,aAAa,YAAY;AAClD","sources":["packages/@react-aria/interactions/src/useScrollWheel.ts"],"sourcesContent":["/*\n * Copyright 2021 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {RefObject, useCallback} from 'react';\nimport {ScrollEvents} from '@react-types/shared';\nimport {useEvent} from '@react-aria/utils';\n\nexport interface ScrollWheelProps extends ScrollEvents {\n  /** Whether the scroll listener should be disabled. */\n  isDisabled?: boolean\n}\n\n// scroll wheel needs to be added not passively so it's cancelable, small helper hook to remember that\nexport function useScrollWheel(props: ScrollWheelProps, ref: RefObject<HTMLElement>): void {\n  let {onScroll, isDisabled} = props;\n  let onScrollHandler = useCallback((e) => {\n    // If the ctrlKey is pressed, this is a zoom event, do nothing.\n    if (e.ctrlKey) {\n      return;\n    }\n\n    // stop scrolling the page\n    e.preventDefault();\n    e.stopPropagation();\n\n    if (onScroll) {\n      onScroll({deltaX: e.deltaX, deltaY: e.deltaY});\n    }\n  }, [onScroll]);\n\n  useEvent(ref, 'wheel', isDisabled ? undefined : onScrollHandler);\n}\n"],"names":[],"version":3,"file":"useScrollWheel.module.js.map"}
+{"mappings":";;;AAAA;;;;;;;;;;CAUC;;AAYM,SAAS,yCAAe,KAAuB,EAAE,GAAkC;IACxF,IAAI,YAAC,QAAQ,cAAE,UAAU,EAAC,GAAG;IAC7B,IAAI,kBAAkB,CAAA,GAAA,kBAAU,EAAE,CAAC;QACjC,+DAA+D;QAC/D,IAAI,EAAE,OAAO,EACX;QAGF,0BAA0B;QAC1B,EAAE,cAAc;QAChB,EAAE,eAAe;QAEjB,IAAI,UACF,SAAS;YAAC,QAAQ,EAAE,MAAM;YAAE,QAAQ,EAAE,MAAM;QAAA;IAEhD,GAAG;QAAC;KAAS;IAEb,CAAA,GAAA,eAAO,EAAE,KAAK,SAAS,aAAa,YAAY;AAClD","sources":["packages/@react-aria/interactions/src/useScrollWheel.ts"],"sourcesContent":["/*\n * Copyright 2021 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {RefObject, ScrollEvents} from '@react-types/shared';\nimport {useCallback} from 'react';\nimport {useEvent} from '@react-aria/utils';\n\nexport interface ScrollWheelProps extends ScrollEvents {\n  /** Whether the scroll listener should be disabled. */\n  isDisabled?: boolean\n}\n\n// scroll wheel needs to be added not passively so it's cancelable, small helper hook to remember that\nexport function useScrollWheel(props: ScrollWheelProps, ref: RefObject<HTMLElement | null>): void {\n  let {onScroll, isDisabled} = props;\n  let onScrollHandler = useCallback((e) => {\n    // If the ctrlKey is pressed, this is a zoom event, do nothing.\n    if (e.ctrlKey) {\n      return;\n    }\n\n    // stop scrolling the page\n    e.preventDefault();\n    e.stopPropagation();\n\n    if (onScroll) {\n      onScroll({deltaX: e.deltaX, deltaY: e.deltaY});\n    }\n  }, [onScroll]);\n\n  useEvent(ref, 'wheel', isDisabled ? undefined : onScrollHandler);\n}\n"],"names":[],"version":3,"file":"useScrollWheel.module.js.map"}

package/dist/utils.main.js

@@ -80,14 +80,14 @@ function $625cf83917e112ad$export$715c682d09d639cc(onBlur) {
             let onBlurHandler = (e)=>{
                 stateRef.current.isFocused = false;
                 if (target.disabled) // For backward compatibility, dispatch a (fake) React synthetic event.
-                dispatchBlur(new $625cf83917e112ad$export$905e7fc544a71f36("blur", e));
+                dispatchBlur(new $625cf83917e112ad$export$905e7fc544a71f36('blur', e));
                 // We no longer need the MutationObserver once the target is blurred.
                 if (stateRef.current.observer) {
                     stateRef.current.observer.disconnect();
                     stateRef.current.observer = null;
                 }
             };
-            target.addEventListener("focusout", onBlurHandler, {
+            target.addEventListener('focusout', onBlurHandler, {
                 once: true
             });
             stateRef.current.observer = new MutationObserver(()=>{
@@ -95,10 +95,10 @@ function $625cf83917e112ad$export$715c682d09d639cc(onBlur) {
                     var _stateRef_current_observer;
                     (_stateRef_current_observer = stateRef.current.observer) === null || _stateRef_current_observer === void 0 ? void 0 : _stateRef_current_observer.disconnect();
                     let relatedTargetEl = target === document.activeElement ? null : document.activeElement;
-                    target.dispatchEvent(new FocusEvent("blur", {
+                    target.dispatchEvent(new FocusEvent('blur', {
                         relatedTarget: relatedTargetEl
                     }));
-                    target.dispatchEvent(new FocusEvent("focusout", {
+                    target.dispatchEvent(new FocusEvent('focusout', {
                         bubbles: true,
                         relatedTarget: relatedTargetEl
                     }));
@@ -107,7 +107,7 @@ function $625cf83917e112ad$export$715c682d09d639cc(onBlur) {
             stateRef.current.observer.observe(target, {
                 attributes: true,
                 attributeFilter: [
-                    "disabled"
+                    'disabled'
                 ]
             });
         }

package/dist/utils.mjs

@@ -74,14 +74,14 @@ function $8a9cb279dc87e130$export$715c682d09d639cc(onBlur) {
             let onBlurHandler = (e)=>{
                 stateRef.current.isFocused = false;
                 if (target.disabled) // For backward compatibility, dispatch a (fake) React synthetic event.
-                dispatchBlur(new $8a9cb279dc87e130$export$905e7fc544a71f36("blur", e));
+                dispatchBlur(new $8a9cb279dc87e130$export$905e7fc544a71f36('blur', e));
                 // We no longer need the MutationObserver once the target is blurred.
                 if (stateRef.current.observer) {
                     stateRef.current.observer.disconnect();
                     stateRef.current.observer = null;
                 }
             };
-            target.addEventListener("focusout", onBlurHandler, {
+            target.addEventListener('focusout', onBlurHandler, {
                 once: true
             });
             stateRef.current.observer = new MutationObserver(()=>{
@@ -89,10 +89,10 @@ function $8a9cb279dc87e130$export$715c682d09d639cc(onBlur) {
                     var _stateRef_current_observer;
                     (_stateRef_current_observer = stateRef.current.observer) === null || _stateRef_current_observer === void 0 ? void 0 : _stateRef_current_observer.disconnect();
                     let relatedTargetEl = target === document.activeElement ? null : document.activeElement;
-                    target.dispatchEvent(new FocusEvent("blur", {
+                    target.dispatchEvent(new FocusEvent('blur', {
                         relatedTarget: relatedTargetEl
                     }));
-                    target.dispatchEvent(new FocusEvent("focusout", {
+                    target.dispatchEvent(new FocusEvent('focusout', {
                         bubbles: true,
                         relatedTarget: relatedTargetEl
                     }));
@@ -101,7 +101,7 @@ function $8a9cb279dc87e130$export$715c682d09d639cc(onBlur) {
             stateRef.current.observer.observe(target, {
                 attributes: true,
                 attributeFilter: [
-                    "disabled"
+                    'disabled'
                 ]
             });
         }
@@ -112,4 +112,4 @@ function $8a9cb279dc87e130$export$715c682d09d639cc(onBlur) {
 
 
 export {$8a9cb279dc87e130$export$905e7fc544a71f36 as SyntheticFocusEvent, $8a9cb279dc87e130$export$715c682d09d639cc as useSyntheticBlurEvent};
-//# sourceMappingURL=utils.mjs.map
+//# sourceMappingURL=utils.module.js.map

package/dist/utils.module.js

@@ -74,14 +74,14 @@ function $8a9cb279dc87e130$export$715c682d09d639cc(onBlur) {
             let onBlurHandler = (e)=>{
                 stateRef.current.isFocused = false;
                 if (target.disabled) // For backward compatibility, dispatch a (fake) React synthetic event.
-                dispatchBlur(new $8a9cb279dc87e130$export$905e7fc544a71f36("blur", e));
+                dispatchBlur(new $8a9cb279dc87e130$export$905e7fc544a71f36('blur', e));
                 // We no longer need the MutationObserver once the target is blurred.
                 if (stateRef.current.observer) {
                     stateRef.current.observer.disconnect();
                     stateRef.current.observer = null;
                 }
             };
-            target.addEventListener("focusout", onBlurHandler, {
+            target.addEventListener('focusout', onBlurHandler, {
                 once: true
             });
             stateRef.current.observer = new MutationObserver(()=>{
@@ -89,10 +89,10 @@ function $8a9cb279dc87e130$export$715c682d09d639cc(onBlur) {
                     var _stateRef_current_observer;
                     (_stateRef_current_observer = stateRef.current.observer) === null || _stateRef_current_observer === void 0 ? void 0 : _stateRef_current_observer.disconnect();
                     let relatedTargetEl = target === document.activeElement ? null : document.activeElement;
-                    target.dispatchEvent(new FocusEvent("blur", {
+                    target.dispatchEvent(new FocusEvent('blur', {
                         relatedTarget: relatedTargetEl
                     }));
-                    target.dispatchEvent(new FocusEvent("focusout", {
+                    target.dispatchEvent(new FocusEvent('focusout', {
                         bubbles: true,
                         relatedTarget: relatedTargetEl
                     }));
@@ -101,7 +101,7 @@ function $8a9cb279dc87e130$export$715c682d09d639cc(onBlur) {
             stateRef.current.observer.observe(target, {
                 attributes: true,
                 attributeFilter: [
-                    "disabled"
+                    'disabled'
                 ]
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-aria/interactions",
-  "version": "3.21.2",
+  "version": "3.22.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "dist/main.js",
@@ -22,16 +22,16 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/ssr": "^3.9.3",
-    "@react-aria/utils": "^3.24.0",
-    "@react-types/shared": "^3.23.0",
+    "@react-aria/ssr": "^3.9.5",
+    "@react-aria/utils": "^3.25.0",
+    "@react-types/shared": "^3.24.0",
     "@swc/helpers": "^0.5.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f645f29edc1322153fd60af4640cbcab1d992dbd"
+  "gitHead": "86d80e3216bc32e75108831cf3a5a720bc849206"
 }

package/src/DOMPropsContext.ts

@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {DOMAttributes} from '@react-types/shared';
+import {DOMAttributes, RefObject} from '@react-types/shared';
 import {mergeProps, useSyncRef} from '@react-aria/utils';
-import React, {MutableRefObject, RefObject, useContext} from 'react';
+import React, {MutableRefObject, useContext} from 'react';
 
 interface DOMPropsResponderProps extends DOMAttributes {
-  ref?: RefObject<Element>
+  ref?: RefObject<Element | null>
 }
 
 interface IDOMPropsResponderContext extends DOMAttributes {

package/src/useDOMPropsResponder.ts

@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {RefObject} from 'react';
+import {RefObject} from '@react-types/shared';
 import {useDOMPropsResponderContext} from './DOMPropsContext';
 
-export function useDOMPropsResponder(domRef: RefObject<Element>) {
+export function useDOMPropsResponder(domRef: RefObject<Element | null>) {
 
   let domProps = useDOMPropsResponderContext({ref: domRef}) || {};
 

package/src/useHover.ts

@@ -204,4 +204,3 @@ export function useHover(props: HoverProps): HoverResult {
     isHovered
   };
 }
-

package/src/useInteractOutside.ts

@@ -16,10 +16,11 @@
 // See https://github.com/facebook/react/tree/cc7c1aece46a6b69b41958d731e0fd27c94bfc6c/packages/react-interactions
 
 import {getOwnerDocument, useEffectEvent} from '@react-aria/utils';
-import {RefObject, useEffect, useRef} from 'react';
+import {RefObject} from '@react-types/shared';
+import {useEffect, useRef} from 'react';
 
 export interface InteractOutsideProps {
-  ref: RefObject<Element>,
+  ref: RefObject<Element | null>,
   onInteractOutside?: (e: PointerEvent) => void,
   onInteractOutsideStart?: (e: PointerEvent) => void,
   /** Whether the interact outside events should be disabled. */

package/src/useLongPress.ts

@@ -63,7 +63,7 @@ export function useLongPress(props: LongPressProps): LongPressResult {
     accessibilityDescription
   } = props;
 
-  const timeRef = useRef<ReturnType<typeof setTimeout> | undefined>();
+  const timeRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
   let {addGlobalListener, removeGlobalListener} = useGlobalListeners();
 
   let {pressProps} = usePress({

package/src/usePress.ts

@@ -17,9 +17,9 @@
 
 import {chain, focusWithoutScrolling, getOwnerDocument, getOwnerWindow, isMac, isVirtualClick, isVirtualPointerEvent, mergeProps, openLink, useEffectEvent, useGlobalListeners, useSyncRef} from '@react-aria/utils';
 import {disableTextSelection, restoreTextSelection} from './textSelection';
-import {DOMAttributes, FocusableElement, PressEvent as IPressEvent, PointerType, PressEvents} from '@react-types/shared';
+import {DOMAttributes, FocusableElement, PressEvent as IPressEvent, PointerType, PressEvents, RefObject} from '@react-types/shared';
 import {PressResponderContext} from './context';
-import {RefObject, useContext, useEffect, useMemo, useRef, useState} from 'react';
+import {TouchEvent as RTouchEvent, useContext, useEffect, useMemo, useRef, useState} from 'react';
 
 export interface PressProps extends PressEvents {
   /** Whether the target is in a controlled press state (e.g. an overlay it triggers is open). */
@@ -41,7 +41,7 @@ export interface PressProps extends PressEvents {
 
 export interface PressHookProps extends PressProps {
   /** A ref to the target element. */
-  ref?: RefObject<Element>
+  ref?: RefObject<Element | null>
 }
 
 interface PressState {
@@ -63,7 +63,10 @@ interface EventBase {
   shiftKey: boolean,
   ctrlKey: boolean,
   metaKey: boolean,
-  altKey: boolean
+  altKey: boolean,
+  clientX?: number,
+  clientY?: number,
+  targetTouches?: Array<{clientX?: number, clientY?: number}>
 }
 
 export interface PressResult {
@@ -94,9 +97,28 @@ class PressEvent implements IPressEvent {
   ctrlKey: boolean;
   metaKey: boolean;
   altKey: boolean;
+  x: number;
+  y: number;
   #shouldStopPropagation = true;
 
-  constructor(type: IPressEvent['type'], pointerType: PointerType, originalEvent: EventBase) {
+  constructor(type: IPressEvent['type'], pointerType: PointerType, originalEvent: EventBase, state?: PressState) {
+    let currentTarget = state?.target ?? originalEvent.currentTarget;
+    const rect: DOMRect | undefined = (currentTarget as Element)?.getBoundingClientRect();
+    let x, y = 0;
+    let clientX, clientY: number | null = null;
+    if (originalEvent.clientX != null && originalEvent.clientY != null) {
+      clientX = originalEvent.clientX;
+      clientY = originalEvent.clientY;
+    }
+    if (rect) {
+      if (clientX != null && clientY != null) {
+        x = clientX - rect.left;
+        y = clientY - rect.top;
+      } else {
+        x = rect.width / 2;
+        y = rect.height / 2;
+      }
+    }
     this.type = type;
     this.pointerType = pointerType;
     this.target = originalEvent.currentTarget as Element;
@@ -104,6 +126,8 @@ class PressEvent implements IPressEvent {
     this.metaKey = originalEvent.metaKey;
     this.ctrlKey = originalEvent.ctrlKey;
     this.altKey = originalEvent.altKey;
+    this.x = x;
+    this.y = y;
   }
 
   continuePropagation() {
@@ -628,7 +652,7 @@ export function usePress(props: PressHookProps): PressResult {
           disableTextSelection(state.target);
         }
 
-        let shouldStopPropagation = triggerPressStart(e, state.pointerType);
+        let shouldStopPropagation = triggerPressStart(createTouchEvent(state.target, e), state.pointerType);
         if (shouldStopPropagation) {
           e.stopPropagation();
         }
@@ -651,12 +675,12 @@ export function usePress(props: PressHookProps): PressResult {
         if (touch && isOverTarget(touch, e.currentTarget)) {
           if (!state.isOverTarget && state.pointerType != null) {
             state.isOverTarget = true;
-            shouldStopPropagation = triggerPressStart(e, state.pointerType);
+            shouldStopPropagation = triggerPressStart(createTouchEvent(state.target!, e), state.pointerType);
           }
         } else if (state.isOverTarget && state.pointerType != null) {
           state.isOverTarget = false;
-          shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
-          cancelOnPointerExit(e);
+          shouldStopPropagation = triggerPressEnd(createTouchEvent(state.target!, e), state.pointerType, false);
+          cancelOnPointerExit(createTouchEvent(state.target!, e));
         }
 
         if (shouldStopPropagation) {
@@ -677,10 +701,10 @@ export function usePress(props: PressHookProps): PressResult {
         let touch = getTouchById(e.nativeEvent, state.activePointerId);
         let shouldStopPropagation = true;
         if (touch && isOverTarget(touch, e.currentTarget) && state.pointerType != null) {
-          triggerPressUp(e, state.pointerType);
-          shouldStopPropagation = triggerPressEnd(e, state.pointerType);
+          triggerPressUp(createTouchEvent(state.target!, e), state.pointerType);
+          shouldStopPropagation = triggerPressEnd(createTouchEvent(state.target!, e), state.pointerType);
         } else if (state.isOverTarget && state.pointerType != null) {
-          shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
+          shouldStopPropagation = triggerPressEnd(createTouchEvent(state.target!, e), state.pointerType, false);
         }
 
         if (shouldStopPropagation) {
@@ -704,7 +728,7 @@ export function usePress(props: PressHookProps): PressResult {
 
         e.stopPropagation();
         if (state.isPressed) {
-          cancel(e);
+          cancel(createTouchEvent(state.target!, e));
         }
       };
 
@@ -802,13 +826,35 @@ function getTouchById(
   return null;
 }
 
+function createTouchEvent(target: FocusableElement, e: RTouchEvent<FocusableElement>): EventBase {
+  let clientX = 0;
+  let clientY = 0;
+  if (e.targetTouches && e.targetTouches.length === 1) {
+    clientX = e.targetTouches[0].clientX;
+    clientY = e.targetTouches[0].clientY;
+  }
+  return {
+    currentTarget: target,
+    shiftKey: e.shiftKey,
+    ctrlKey: e.ctrlKey,
+    metaKey: e.metaKey,
+    altKey: e.altKey,
+    clientX,
+    clientY
+  };
+}
+
 function createEvent(target: FocusableElement, e: EventBase): EventBase {
+  let clientX = e.clientX;
+  let clientY = e.clientY;
   return {
     currentTarget: target,
     shiftKey: e.shiftKey,
     ctrlKey: e.ctrlKey,
     metaKey: e.metaKey,
-    altKey: e.altKey
+    altKey: e.altKey,
+    clientX,
+    clientY
   };
 }
 

package/src/useScrollWheel.ts

@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {RefObject, useCallback} from 'react';
-import {ScrollEvents} from '@react-types/shared';
+import {RefObject, ScrollEvents} from '@react-types/shared';
+import {useCallback} from 'react';
 import {useEvent} from '@react-aria/utils';
 
 export interface ScrollWheelProps extends ScrollEvents {
@@ -20,7 +20,7 @@ export interface ScrollWheelProps extends ScrollEvents {
 }
 
 // scroll wheel needs to be added not passively so it's cancelable, small helper hook to remember that
-export function useScrollWheel(props: ScrollWheelProps, ref: RefObject<HTMLElement>): void {
+export function useScrollWheel(props: ScrollWheelProps, ref: RefObject<HTMLElement | null>): void {
   let {onScroll, isDisabled} = props;
   let onScrollHandler = useCallback((e) => {
     // If the ctrlKey is pressed, this is a zoom event, do nothing.