@react-aria/interactions - npm Package Compare versions

Comparing version 3.0.0-nightly.2947 to 3.0.0-nightly.2952

dist/usePress.main.js

@@ -55,3 +55,3 @@ var $f7e14e656343df57$exports = require("./textSelection.main.js");
     }
-    constructor(type, pointerType, originalEvent){
+    constructor(type, pointerType, originalEvent, state){
         (0, $bBqCQ$swchelperscjs_class_private_field_initcjs._)(this, $0294ea432cd92340$var$_shouldStopPropagation, {
@@ -62,2 +62,20 @@ writable: true,
         (0, $bBqCQ$swchelperscjs_class_private_field_setcjs._)(this, $0294ea432cd92340$var$_shouldStopPropagation, true);
+        var _state_target;
+        let currentTarget = (_state_target = state === null || state === void 0 ? void 0 : state.target) !== null && _state_target !== void 0 ? _state_target : originalEvent.currentTarget;
+        const rect = currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.getBoundingClientRect();
+        let x, y = 0;
+        let clientX, clientY = 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;
@@ -70,2 +88,4 @@ this.pointerType = pointerType;
         this.altKey = originalEvent.altKey;
+        this.x = x;
+        this.y = y;
     }
@@ -395,3 +415,3 @@ }
                 if (!allowTextSelectionOnPress) (0, $f7e14e656343df57$exports.disableTextSelection)(state.target);
-                let shouldStopPropagation = triggerPressStart(e, state.pointerType);
+                let shouldStopPropagation = triggerPressStart($0294ea432cd92340$var$createTouchEvent(state.target, e), state.pointerType);
                 if (shouldStopPropagation) e.stopPropagation();
@@ -411,8 +431,8 @@ addGlobalListener((0, $bBqCQ$reactariautils.getOwnerWindow)(e.currentTarget), 'scroll', onScroll, true);
                         state.isOverTarget = true;
-                        shouldStopPropagation = triggerPressStart(e, state.pointerType);
+                        shouldStopPropagation = triggerPressStart($0294ea432cd92340$var$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($0294ea432cd92340$var$createTouchEvent(state.target, e), state.pointerType, false);
+                    cancelOnPointerExit($0294ea432cd92340$var$createTouchEvent(state.target, e));
                 }
@@ -430,5 +450,5 @@ if (shouldStopPropagation) e.stopPropagation();
                 if (touch && $0294ea432cd92340$var$isOverTarget(touch, e.currentTarget) && state.pointerType != null) {
-                    triggerPressUp(e, state.pointerType);
-                    shouldStopPropagation = triggerPressEnd(e, state.pointerType);
-                } else if (state.isOverTarget && state.pointerType != null) shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
+                    triggerPressUp($0294ea432cd92340$var$createTouchEvent(state.target, e), state.pointerType);
+                    shouldStopPropagation = triggerPressEnd($0294ea432cd92340$var$createTouchEvent(state.target, e), state.pointerType);
+                } else if (state.isOverTarget && state.pointerType != null) shouldStopPropagation = triggerPressEnd($0294ea432cd92340$var$createTouchEvent(state.target, e), state.pointerType, false);
                 if (shouldStopPropagation) e.stopPropagation();
@@ -445,3 +465,3 @@ state.isPressed = false;
                 e.stopPropagation();
-                if (state.isPressed) cancel(e);
+                if (state.isPressed) cancel($0294ea432cd92340$var$createTouchEvent(state.target, e));
             };
@@ -516,3 +536,22 @@ let onScroll = (e)=>{
 }
+function $0294ea432cd92340$var$createTouchEvent(target, e) {
+    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: clientX,
+        clientY: clientY
+    };
+}
 function $0294ea432cd92340$var$createEvent(target, e) {
+    let clientX = e.clientX;
+    let clientY = e.clientY;
     return {
@@ -523,3 +562,5 @@ currentTarget: target,
         metaKey: e.metaKey,
-        altKey: e.altKey
+        altKey: e.altKey,
+        clientX: clientX,
+        clientY: clientY
     };
@@ -526,0 +567,0 @@ }

dist/usePress.module.js

@@ -49,3 +49,3 @@ import {disableTextSelection as $14c0b72509d70225$export$16a4697467175487, restoreTextSelection as $14c0b72509d70225$export$b0d6fa1ab32e3295} from "./textSelection.module.js";
     }
-    constructor(type, pointerType, originalEvent){
+    constructor(type, pointerType, originalEvent, state){
         (0, $7mdmh$_1)(this, $f6c31cce2adf654f$var$_shouldStopPropagation, {
@@ -56,2 +56,20 @@ writable: true,
         (0, $7mdmh$_2)(this, $f6c31cce2adf654f$var$_shouldStopPropagation, true);
+        var _state_target;
+        let currentTarget = (_state_target = state === null || state === void 0 ? void 0 : state.target) !== null && _state_target !== void 0 ? _state_target : originalEvent.currentTarget;
+        const rect = currentTarget === null || currentTarget === void 0 ? void 0 : currentTarget.getBoundingClientRect();
+        let x, y = 0;
+        let clientX, clientY = 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;
@@ -64,2 +82,4 @@ this.pointerType = pointerType;
         this.altKey = originalEvent.altKey;
+        this.x = x;
+        this.y = y;
     }
@@ -389,3 +409,3 @@ }
                 if (!allowTextSelectionOnPress) (0, $14c0b72509d70225$export$16a4697467175487)(state.target);
-                let shouldStopPropagation = triggerPressStart(e, state.pointerType);
+                let shouldStopPropagation = triggerPressStart($f6c31cce2adf654f$var$createTouchEvent(state.target, e), state.pointerType);
                 if (shouldStopPropagation) e.stopPropagation();
@@ -405,8 +425,8 @@ addGlobalListener((0, $7mdmh$getOwnerWindow)(e.currentTarget), 'scroll', onScroll, true);
                         state.isOverTarget = true;
-                        shouldStopPropagation = triggerPressStart(e, state.pointerType);
+                        shouldStopPropagation = triggerPressStart($f6c31cce2adf654f$var$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($f6c31cce2adf654f$var$createTouchEvent(state.target, e), state.pointerType, false);
+                    cancelOnPointerExit($f6c31cce2adf654f$var$createTouchEvent(state.target, e));
                 }
@@ -424,5 +444,5 @@ if (shouldStopPropagation) e.stopPropagation();
                 if (touch && $f6c31cce2adf654f$var$isOverTarget(touch, e.currentTarget) && state.pointerType != null) {
-                    triggerPressUp(e, state.pointerType);
-                    shouldStopPropagation = triggerPressEnd(e, state.pointerType);
-                } else if (state.isOverTarget && state.pointerType != null) shouldStopPropagation = triggerPressEnd(e, state.pointerType, false);
+                    triggerPressUp($f6c31cce2adf654f$var$createTouchEvent(state.target, e), state.pointerType);
+                    shouldStopPropagation = triggerPressEnd($f6c31cce2adf654f$var$createTouchEvent(state.target, e), state.pointerType);
+                } else if (state.isOverTarget && state.pointerType != null) shouldStopPropagation = triggerPressEnd($f6c31cce2adf654f$var$createTouchEvent(state.target, e), state.pointerType, false);
                 if (shouldStopPropagation) e.stopPropagation();
@@ -439,3 +459,3 @@ state.isPressed = false;
                 e.stopPropagation();
-                if (state.isPressed) cancel(e);
+                if (state.isPressed) cancel($f6c31cce2adf654f$var$createTouchEvent(state.target, e));
             };
@@ -510,3 +530,22 @@ let onScroll = (e)=>{
 }
+function $f6c31cce2adf654f$var$createTouchEvent(target, e) {
+    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: clientX,
+        clientY: clientY
+    };
+}
 function $f6c31cce2adf654f$var$createEvent(target, e) {
+    let clientX = e.clientX;
+    let clientY = e.clientY;
     return {
@@ -517,3 +556,5 @@ currentTarget: target,
         metaKey: e.metaKey,
-        altKey: e.altKey
+        altKey: e.altKey,
+        clientX: clientX,
+        clientY: clientY
     };
@@ -520,0 +561,0 @@ }

package.json

 {
   "name": "@react-aria/interactions",
-  "version": "3.0.0-nightly.2947+23c5ba142",
+  "version": "3.0.0-nightly.2952+10bac541a",
   "description": "Spectrum UI components in React",
@@ -25,5 +25,5 @@ "license": "Apache-2.0",
   "dependencies": {
-    "@react-aria/ssr": "3.9.5-nightly.4659+23c5ba142",
-    "@react-aria/utils": "3.0.0-nightly.2947+23c5ba142",
-    "@react-types/shared": "3.0.0-nightly.2947+23c5ba142",
+    "@react-aria/ssr": "3.9.5-nightly.4664+10bac541a",
+    "@react-aria/utils": "3.0.0-nightly.2952+10bac541a",
+    "@react-types/shared": "3.0.0-nightly.2952+10bac541a",
     "@swc/helpers": "^0.5.0"
@@ -37,3 +37,3 @@ },
   },
-  "gitHead": "23c5ba142e0faad80ab33d6d3c66c5bdafebf5d2"
+  "gitHead": "10bac541a2a5c666b443fe70f313455a405a5c77"
 }

src/useHover.ts

@@ -207,2 +207,1 @@ /*
 }
-

src/usePress.ts

@@ -22,3 +22,3 @@ /*
 import {PressResponderContext} from './context';
-import {RefObject, useContext, useEffect, useMemo, useRef, useState} from 'react';
+import {RefObject, TouchEvent as RTouchEvent, useContext, useEffect, useMemo, useRef, useState} from 'react';
 
@@ -67,3 +67,6 @@ export interface PressProps extends PressEvents {
   metaKey: boolean,
-  altKey: boolean
+  altKey: boolean,
+  clientX?: number,
+  clientY?: number,
+  targetTouches?: Array<{clientX?: number, clientY?: number}>
 }
@@ -99,5 +102,24 @@
   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;
@@ -110,2 +132,4 @@ this.pointerType = pointerType;
     this.altKey = originalEvent.altKey;
+    this.x = x;
+    this.y = y;
   }
@@ -635,3 +659,3 @@
 
-        let shouldStopPropagation = triggerPressStart(e, state.pointerType);
+        let shouldStopPropagation = triggerPressStart(createTouchEvent(state.target, e), state.pointerType);
         if (shouldStopPropagation) {
@@ -659,8 +683,8 @@ e.stopPropagation();
             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));
         }
@@ -686,6 +710,6 @@
         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);
         }
@@ -714,3 +738,3 @@
         if (state.isPressed) {
-          cancel(e);
+          cancel(createTouchEvent(state.target!, e));
         }
@@ -813,3 +837,23 @@ };
 
+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 {
@@ -820,3 +864,5 @@ currentTarget: target,
     metaKey: e.metaKey,
-    altKey: e.altKey
+    altKey: e.altKey,
+    clientX,
+    clientY
   };
@@ -823,0 +869,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Manifest confusion

Supply chain risk

This package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Manifest confusion

Supply chain risk

This package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

717646

increased by1.81%

Lines of code

8357

increased by2.05%

Dependency changes

• Updated@react-aria/ssr@3.9.5-nightly.4664+10bac541a

• Updated@react-aria/utils@3.0.0-nightly.2952+10bac541a

• Updated@react-types/shared@3.0.0-nightly.2952+10bac541a