@hanzogui/native 7.0.0 → 7.3.1

package/dist/cjs/gestureState.cjs

@@ -36,16 +36,22 @@ const state = (0, import_globalState.createGlobalState)(`gesture`, {
 });
 let pressGestureDebugId = 0;
 let externalPressDebugId = 0;
+function getEventPointerId(e) {
+  const pointerId = e?.pointerId ?? e?.pointer?.id ?? e?.event?.pointerId ?? e?.event?.pointer?.id ?? e?.nativeEvent?.pointerId ?? e?.nativeEvent?.id ?? e?.event?.nativeEvent?.pointerId ?? e?.event?.nativeEvent?.id ?? null;
+  return pointerId == null || Number.isNaN(pointerId) ? null : Number(pointerId);
+}
 const pressState = {
   owner: null,
   ownerId: null,
   ownerSource: null,
+  ownerPointerId: null,
   timestamp: 0
 };
 function resetPressOwner() {
   pressState.owner = null;
   pressState.ownerId = null;
   pressState.ownerSource = null;
+  pressState.ownerPointerId = null;
   pressState.timestamp = 0;
 }
 function resetStaleOwner(now, debugName) {
@@ -58,8 +64,6 @@ function claimExternalPressOwnership(debugName) {
   resetStaleOwner(now, debugName);
   const token = {};
   const ownerId = ++externalPressDebugId;
-  const previousOwnerId = pressState.ownerId;
-  const previousOwnerSource = pressState.ownerSource;
   pressState.owner = token;
   pressState.ownerId = ownerId;
   pressState.ownerSource = "external";
@@ -94,62 +98,78 @@ function getGestureHandler() {
       const longPressDuration = config.delayLongPress ?? 500;
       const myToken = {};
       const myDebugId = ++pressGestureDebugId;
-      const GRACE_PERIOD_MS = process.env.TAMAGUI_RNGH_PRESS_DELAY ? +process.env.TAMAGUI_RNGH_PRESS_DELAY : 24;
-      const tryClaimOwnership = () => {
+      let didLongPress = false;
+      let didPressIn = false;
+      let pressInTimer = null;
+      const GRACE_PERIOD_MS = process.env.GUI_RNGH_PRESS_DELAY ? +process.env.GUI_RNGH_PRESS_DELAY : 24;
+      const tryClaimOwnership = e => {
         const now = Date.now();
         resetStaleOwner(now, config.debugName);
-        const withinGrace = now - pressState.timestamp < GRACE_PERIOD_MS;
-        const previousOwnerId = pressState.ownerId;
-        const previousOwnerSource = pressState.ownerSource;
-        if (pressState.owner === null || withinGrace && pressState.ownerSource !== "external") {
+        const currentPointerId = getEventPointerId(e);
+        const isSameTouchPointer = currentPointerId == null || pressState.ownerPointerId == null || pressState.ownerPointerId === currentPointerId;
+        if (pressState.owner === null || pressState.ownerSource === "internal" && isSameTouchPointer) {
           pressState.owner = myToken;
           pressState.ownerId = myDebugId;
           pressState.ownerSource = "internal";
+          pressState.ownerPointerId = currentPointerId;
           pressState.timestamp = now;
         }
         return pressState.owner === myToken;
       };
       const isOwner = () => pressState.owner === myToken;
       const releaseOwnership = () => {
+        if (pressInTimer) {
+          clearTimeout(pressInTimer);
+          pressInTimer = null;
+        }
         if (pressState.owner === myToken) {
           resetPressOwner();
         }
       };
-      const tap = Gesture.Tap().runOnJS(true).maxDuration(1e4).onBegin(e => {
-        tryClaimOwnership();
-        setTimeout(() => {
+      const firePressIn = e => {
+        if (!didPressIn && isOwner()) {
+          didPressIn = true;
+          config.onPressIn?.(e);
+        }
+      };
+      const schedulePressIn = e => {
+        if (pressInTimer) {
+          clearTimeout(pressInTimer);
+        }
+        pressInTimer = setTimeout(() => {
+          pressInTimer = null;
           if (isOwner()) {
-            config.onPressIn?.(e);
+            firePressIn(e);
           }
         }, GRACE_PERIOD_MS + 1);
+      };
+      const tap = Gesture.Tap().runOnJS(true).maxDuration(1e4).onBegin(e => {
+        didLongPress = false;
+        didPressIn = false;
+        tryClaimOwnership(e);
+        schedulePressIn(e);
       }).onEnd(e => {
-        if (isOwner()) {
+        if (isOwner() && !didLongPress) {
+          firePressIn(e);
           config.onPress?.(e);
         }
       }).onFinalize(e => {
         if (isOwner()) {
           config.onPressOut?.(e);
           releaseOwnership();
+        } else if (didPressIn) {
+          didPressIn = false;
+          config.onPressOut?.(e);
         }
       });
       if (config.hitSlop) tap.hitSlop(config.hitSlop);
       if (!config.onLongPress) return tap;
-      const longPress = Gesture.LongPress().runOnJS(true).minDuration(longPressDuration).onBegin(e => {
-        tryClaimOwnership();
-        setTimeout(() => {
-          if (isOwner()) {
-            config.onPressIn?.(e);
-          }
-        }, GRACE_PERIOD_MS + 1);
-      }).onStart(e => {
+      const longPress = Gesture.LongPress().runOnJS(true).minDuration(longPressDuration).onStart(e => {
+        didLongPress = true;
         if (isOwner()) {
+          firePressIn(e);
           config.onLongPress?.(e);
         }
-      }).onFinalize(e => {
-        if (isOwner()) {
-          config.onPressOut?.(e);
-          releaseOwnership();
-        }
       });
       if (config.hitSlop) longPress.hitSlop(config.hitSlop);
       return Gesture.Exclusive(longPress, tap);

package/dist/cjs/gestureState.native.js

@@ -38,16 +38,24 @@ var state = (0, import_globalState.createGlobalState)(`gesture`, {
 });
 var pressGestureDebugId = 0;
 var externalPressDebugId = 0;
+function getEventPointerId(e) {
+  var _e_pointer, _e_event, _e_event_pointer, _e_event1, _e_nativeEvent, _e_nativeEvent1, _e_event_nativeEvent, _e_event2, _e_event_nativeEvent1, _e_event3;
+  var _e_pointerId, _ref, _ref1, _ref2, _ref3, _ref4, _ref5, _ref6;
+  var pointerId = (_ref6 = (_ref5 = (_ref4 = (_ref3 = (_ref2 = (_ref1 = (_ref = (_e_pointerId = e === null || e === void 0 ? void 0 : e.pointerId) !== null && _e_pointerId !== void 0 ? _e_pointerId : e === null || e === void 0 ? void 0 : (_e_pointer = e.pointer) === null || _e_pointer === void 0 ? void 0 : _e_pointer.id) !== null && _ref !== void 0 ? _ref : e === null || e === void 0 ? void 0 : (_e_event = e.event) === null || _e_event === void 0 ? void 0 : _e_event.pointerId) !== null && _ref1 !== void 0 ? _ref1 : e === null || e === void 0 ? void 0 : (_e_event1 = e.event) === null || _e_event1 === void 0 ? void 0 : (_e_event_pointer = _e_event1.pointer) === null || _e_event_pointer === void 0 ? void 0 : _e_event_pointer.id) !== null && _ref2 !== void 0 ? _ref2 : e === null || e === void 0 ? void 0 : (_e_nativeEvent = e.nativeEvent) === null || _e_nativeEvent === void 0 ? void 0 : _e_nativeEvent.pointerId) !== null && _ref3 !== void 0 ? _ref3 : e === null || e === void 0 ? void 0 : (_e_nativeEvent1 = e.nativeEvent) === null || _e_nativeEvent1 === void 0 ? void 0 : _e_nativeEvent1.id) !== null && _ref4 !== void 0 ? _ref4 : e === null || e === void 0 ? void 0 : (_e_event2 = e.event) === null || _e_event2 === void 0 ? void 0 : (_e_event_nativeEvent = _e_event2.nativeEvent) === null || _e_event_nativeEvent === void 0 ? void 0 : _e_event_nativeEvent.pointerId) !== null && _ref5 !== void 0 ? _ref5 : e === null || e === void 0 ? void 0 : (_e_event3 = e.event) === null || _e_event3 === void 0 ? void 0 : (_e_event_nativeEvent1 = _e_event3.nativeEvent) === null || _e_event_nativeEvent1 === void 0 ? void 0 : _e_event_nativeEvent1.id) !== null && _ref6 !== void 0 ? _ref6 : null;
+  return pointerId == null || Number.isNaN(pointerId) ? null : Number(pointerId);
+}
 var pressState = {
   owner: null,
   ownerId: null,
   ownerSource: null,
+  ownerPointerId: null,
   timestamp: 0
 };
 function resetPressOwner() {
   pressState.owner = null;
   pressState.ownerId = null;
   pressState.ownerSource = null;
+  pressState.ownerPointerId = null;
   pressState.timestamp = 0;
 }
 function resetStaleOwner(now, debugName) {
@@ -60,8 +68,6 @@ function claimExternalPressOwnership(debugName) {
   resetStaleOwner(now, debugName);
   var token = {};
   var ownerId = ++externalPressDebugId;
-  var previousOwnerId = pressState.ownerId;
-  var previousOwnerSource = pressState.ownerSource;
   pressState.owner = token;
   pressState.ownerId = ownerId;
   pressState.ownerSource = "external";
@@ -97,17 +103,20 @@ function getGestureHandler() {
       var longPressDuration = (_config_delayLongPress = config.delayLongPress) !== null && _config_delayLongPress !== void 0 ? _config_delayLongPress : 500;
       var myToken = {};
       var myDebugId = ++pressGestureDebugId;
-      var GRACE_PERIOD_MS = process.env.TAMAGUI_RNGH_PRESS_DELAY ? +process.env.TAMAGUI_RNGH_PRESS_DELAY : 24;
-      var tryClaimOwnership = function () {
+      var didLongPress = false;
+      var didPressIn = false;
+      var pressInTimer = null;
+      var GRACE_PERIOD_MS = process.env.GUI_RNGH_PRESS_DELAY ? +process.env.GUI_RNGH_PRESS_DELAY : 24;
+      var tryClaimOwnership = function (e) {
         var now = Date.now();
         resetStaleOwner(now, config.debugName);
-        var withinGrace = now - pressState.timestamp < GRACE_PERIOD_MS;
-        var previousOwnerId = pressState.ownerId;
-        var previousOwnerSource = pressState.ownerSource;
-        if (pressState.owner === null || withinGrace && pressState.ownerSource !== "external") {
+        var currentPointerId = getEventPointerId(e);
+        var isSameTouchPointer = currentPointerId == null || pressState.ownerPointerId == null || pressState.ownerPointerId === currentPointerId;
+        if (pressState.owner === null || pressState.ownerSource === "internal" && isSameTouchPointer) {
           pressState.owner = myToken;
           pressState.ownerId = myDebugId;
           pressState.ownerSource = "internal";
+          pressState.ownerPointerId = currentPointerId;
           pressState.timestamp = now;
         }
         return pressState.owner === myToken;
@@ -116,21 +125,41 @@ function getGestureHandler() {
         return pressState.owner === myToken;
       };
       var releaseOwnership = function () {
+        if (pressInTimer) {
+          clearTimeout(pressInTimer);
+          pressInTimer = null;
+        }
         if (pressState.owner === myToken) {
           resetPressOwner();
         }
       };
-      var tap = Gesture.Tap().runOnJS(true).maxDuration(1e4).onBegin(function (e) {
-        tryClaimOwnership();
-        setTimeout(function () {
+      var firePressIn = function (e) {
+        if (!didPressIn && isOwner()) {
+          var _config_onPressIn;
+          didPressIn = true;
+          (_config_onPressIn = config.onPressIn) === null || _config_onPressIn === void 0 ? void 0 : _config_onPressIn.call(config, e);
+        }
+      };
+      var schedulePressIn = function (e) {
+        if (pressInTimer) {
+          clearTimeout(pressInTimer);
+        }
+        pressInTimer = setTimeout(function () {
+          pressInTimer = null;
           if (isOwner()) {
-            var _config_onPressIn;
-            (_config_onPressIn = config.onPressIn) === null || _config_onPressIn === void 0 ? void 0 : _config_onPressIn.call(config, e);
+            firePressIn(e);
           }
         }, GRACE_PERIOD_MS + 1);
+      };
+      var tap = Gesture.Tap().runOnJS(true).maxDuration(1e4).onBegin(function (e) {
+        didLongPress = false;
+        didPressIn = false;
+        tryClaimOwnership(e);
+        schedulePressIn(e);
       }).onEnd(function (e) {
-        if (isOwner()) {
+        if (isOwner() && !didLongPress) {
           var _config_onPress;
+          firePressIn(e);
           (_config_onPress = config.onPress) === null || _config_onPress === void 0 ? void 0 : _config_onPress.call(config, e);
         }
       }).onFinalize(function (e) {
@@ -138,29 +167,21 @@ function getGestureHandler() {
           var _config_onPressOut;
           (_config_onPressOut = config.onPressOut) === null || _config_onPressOut === void 0 ? void 0 : _config_onPressOut.call(config, e);
           releaseOwnership();
+        } else if (didPressIn) {
+          var _config_onPressOut1;
+          didPressIn = false;
+          (_config_onPressOut1 = config.onPressOut) === null || _config_onPressOut1 === void 0 ? void 0 : _config_onPressOut1.call(config, e);
         }
       });
       if (config.hitSlop) tap.hitSlop(config.hitSlop);
       if (!config.onLongPress) return tap;
-      var longPress = Gesture.LongPress().runOnJS(true).minDuration(longPressDuration).onBegin(function (e) {
-        tryClaimOwnership();
-        setTimeout(function () {
-          if (isOwner()) {
-            var _config_onPressIn;
-            (_config_onPressIn = config.onPressIn) === null || _config_onPressIn === void 0 ? void 0 : _config_onPressIn.call(config, e);
-          }
-        }, GRACE_PERIOD_MS + 1);
-      }).onStart(function (e) {
+      var longPress = Gesture.LongPress().runOnJS(true).minDuration(longPressDuration).onStart(function (e) {
+        didLongPress = true;
         if (isOwner()) {
           var _config_onLongPress;
+          firePressIn(e);
           (_config_onLongPress = config.onLongPress) === null || _config_onLongPress === void 0 ? void 0 : _config_onLongPress.call(config, e);
         }
-      }).onFinalize(function (e) {
-        if (isOwner()) {
-          var _config_onPressOut;
-          (_config_onPressOut = config.onPressOut) === null || _config_onPressOut === void 0 ? void 0 : _config_onPressOut.call(config, e);
-          releaseOwnership();
-        }
       });
       if (config.hitSlop) longPress.hitSlop(config.hitSlop);
       return Gesture.Exclusive(longPress, tap);

package/dist/cjs/gestureState.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","gestureState_exports","__export","claimExternalPressOwnership","getGestureHandler","releaseExternalPressOwnership","module","exports","import_globalState","require","state","createGlobalState","enabled","Gesture","GestureDetector","ScrollView","pressGestureDebugId","externalPressDebugId","pressState","owner","ownerId","ownerSource","timestamp","resetPressOwner","resetStaleOwner","now","debugName","Date","token","previousOwnerId","previousOwnerSource","isEnabled","get","set","updates","Object","assign","disable","createPressGesture","config","_config_delayLongPress","longPressDuration","delayLongPress","myToken","myDebugId","GRACE_PERIOD_MS","process","env","TAMAGUI_RNGH_PRESS_DELAY","tryClaimOwnership","withinGrace","isOwner","releaseOwnership","tap","Tap","runOnJS","maxDuration","onBegin","e","setTimeout","_config_onPressIn","onPressIn","call","onEnd","_config_onPress","onPress","onFinalize","_config_onPressOut","onPressOut","hitSlop","onLongPress","longPress","LongPress","minDuration","onStart","_config_onLongPress"],"sources":["../../src/gestureState.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","gestureState_exports","__export","claimExternalPressOwnership","getGestureHandler","releaseExternalPressOwnership","module","exports","import_globalState","require","state","createGlobalState","enabled","Gesture","GestureDetector","ScrollView","pressGestureDebugId","externalPressDebugId","getEventPointerId","e","_e_pointer","_e_event","_e_event_pointer","_e_event1","_e_nativeEvent","_e_nativeEvent1","_e_event_nativeEvent","_e_event2","_e_event_nativeEvent1","_e_event3","_e_pointerId","_ref","_ref1","_ref2","_ref3","_ref4","_ref5","_ref6","pointerId","pointer","id","event","nativeEvent","Number","isNaN","pressState","owner","ownerId","ownerSource","ownerPointerId","timestamp","resetPressOwner","resetStaleOwner","now","debugName","Date","token","isEnabled","get","set","updates","Object","assign","disable","createPressGesture","config","_config_delayLongPress","longPressDuration","delayLongPress","myToken","myDebugId","didLongPress","didPressIn","pressInTimer","GRACE_PERIOD_MS","process","env","GUI_RNGH_PRESS_DELAY","tryClaimOwnership","currentPointerId","isSameTouchPointer","isOwner","releaseOwnership","clearTimeout","firePressIn","_config_onPressIn","onPressIn","call","schedulePressIn","setTimeout","tap","Tap","runOnJS","maxDuration","onBegin","onEnd","_config_onPress","onPress","onFinalize","_config_onPressOut","onPressOut","_config_onPressOut1","hitSlop","onLongPress","longPress","LongPress","minDuration","onStart"],"sources":["../../src/gestureState.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/setup-gesture-handler.cjs

@@ -39,8 +39,8 @@ function setupGestureHandler(config) {
   if (config) {
     currentConfig = config;
   }
-  const isFirstRun = !g.__tamagui_native_gesture_setup_complete;
-  g.__tamagui_native_gesture_setup_complete = true;
+  const isFirstRun = !g.__gui_native_gesture_setup_complete;
+  g.__gui_native_gesture_setup_complete = true;
   try {
     const rngh = require("react-native-gesture-handler");
     const {
@@ -55,7 +55,7 @@ function setupGestureHandler(config) {
         GestureDetector,
         ScrollView: ScrollView || null
       });
-      g.__tamagui_sheet_gesture_state__ = {
+      g.__gui_sheet_gesture_state__ = {
         enabled: currentConfig.sheet !== false,
         Gesture,
         GestureDetector,

package/dist/cjs/setup-gesture-handler.native.js

@@ -41,8 +41,8 @@ function setupGestureHandler(config) {
   if (config) {
     currentConfig = config;
   }
-  var isFirstRun = !g.__tamagui_native_gesture_setup_complete;
-  g.__tamagui_native_gesture_setup_complete = true;
+  var isFirstRun = !g.__gui_native_gesture_setup_complete;
+  g.__gui_native_gesture_setup_complete = true;
   try {
     var rngh = require("react-native-gesture-handler");
     var {
@@ -57,7 +57,7 @@ function setupGestureHandler(config) {
         GestureDetector,
         ScrollView: ScrollView || null
       });
-      g.__tamagui_sheet_gesture_state__ = {
+      g.__gui_sheet_gesture_state__ = {
         enabled: currentConfig.sheet !== false,
         Gesture,
         GestureDetector,

package/dist/cjs/setup-gesture-handler.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","setup_gesture_handler_exports","__export","getGestureHandlerConfig","setupGestureHandler","module","exports","import_gestureState","require","currentConfig","pressEvents","sheet","config","g","globalThis","isFirstRun","__tamagui_native_gesture_setup_complete","rngh","Gesture","GestureDetector","ScrollView","getGestureHandler","set","enabled","__tamagui_sheet_gesture_state__","e"],"sources":["../../src/setup-gesture-handler.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,6BAAA;AAAAC,QAAA,CAAAD,6BAAA;EAAAE,uBAAA,EAAAA,CAAA,KAAAA,uBAAA;EAAAC,mBAAA,EAAAA,CAAA,KAAAA;AAAA;AAmBAC,MAAA,CAAAC,OAAA,GAAAV,YAAkC,CAAAK,6BAAA;AASlC,IAAIM,mBAAsC,GAAAC,OAAA;AAAA,IACxCC,aAAa;EACbC,WAAO;EACTC,KAAA;AAEO;AACL,SAAOR,wBAAA;EACT,OAAAM,aAAA;AAEO;AACL,SAAML,mBAAIA,CAAAQ,MAAA;EAGV,IAAIC,CAAA,GAAAC,UAAQ;EACV,IAAAF,MAAA;IACFH,aAAA,GAAAG,MAAA;EAGA;EACA,IAAEG,UAAA,IAAAF,CAAA,CAAAG,uCAA0C;EAE5CH,CAAA,CAAAG,uCAAI;EAEF;IACA,IAAAC,IAAQ,GAAAT,OAAS,+BAAgC;IAEjD,IAAI;MAAAU,OAAA;MAAWC,eAAA;MAAiBC;IAAA,IAAAH,IAAA;IAE9B,IAAAC,OAAA,IAAAC,eAAA;MAAwB,EACtB,EAAAZ,mBAAS,CAAAc,iBAA8B,IAAAC,GAAA;QACvCC,OAAA,EAAAd,aAAA,CAAAC,WAAA;QACAQ,OAAA;QACAC,eAAY;QACbC,UAAA,EAAAA,UAAA;MAGD,EAAE;MAAkCP,CAAA,CAClCW,+BAAuB,GAAU;QACjCD,OAAA,EAAAd,aAAA,CAAAE,KAAA;QACAO,OAAA;QACAC,eAAY;QACdC,UAAA,EAAAA,UAAA;MACF;IACF;EAEA,SAAAK,CAAA,GACF;AAGA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","setup_gesture_handler_exports","__export","getGestureHandlerConfig","setupGestureHandler","module","exports","import_gestureState","require","currentConfig","pressEvents","sheet","config","g","globalThis","isFirstRun","__gui_native_gesture_setup_complete","rngh","Gesture","GestureDetector","ScrollView","getGestureHandler","set","enabled","__gui_sheet_gesture_state__","e"],"sources":["../../src/setup-gesture-handler.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,6BAAA;AAAAC,QAAA,CAAAD,6BAAA;EAAAE,uBAAA,EAAAA,CAAA,KAAAA,uBAAA;EAAAC,mBAAA,EAAAA,CAAA,KAAAA;AAAA;AAmBAC,MAAA,CAAAC,OAAA,GAAAV,YAAkC,CAAAK,6BAAA;AASlC,IAAIM,mBAAsC,GAAAC,OAAA;AAAA,IACxCC,aAAa;EACbC,WAAO;EACTC,KAAA;AAEO;AACL,SAAOR,wBAAA;EACT,OAAAM,aAAA;AAEO;AACL,SAAML,mBAAIA,CAAAQ,MAAA;EAGV,IAAIC,CAAA,GAAAC,UAAQ;EACV,IAAAF,MAAA;IACFH,aAAA,GAAAG,MAAA;EAGA;EACA,IAAEG,UAAA,IAAAF,CAAA,CAAAG,mCAAsC;EAExCH,CAAA,CAAAG,mCAAI;EAEF;IACA,IAAAC,IAAQ,GAAAT,OAAS,+BAAgC;IAEjD,IAAI;MAAAU,OAAA;MAAWC,eAAA;MAAiBC;IAAA,IAAAH,IAAA;IAE9B,IAAAC,OAAA,IAAAC,eAAA;MAAwB,EACtB,EAAAZ,mBAAS,CAAAc,iBAA8B,IAAAC,GAAA;QACvCC,OAAA,EAAAd,aAAA,CAAAC,WAAA;QACAQ,OAAA;QACAC,eAAY;QACbC,UAAA,EAAAA,UAAA;MAGD,EAAE;MAA8BP,CAAA,CAC9BW,2BAAuB;QACvBD,OAAA,EAAAd,aAAA,CAAAE,KAAA;QACAO,OAAA;QACAC,eAAY;QACdC,UAAA,EAAAA,UAAA;MACF;IACF;EAEA,SAAAK,CAAA,GACF;AAGA","ignoreList":[]}

package/dist/cjs/setup-safe-area.cjs

@@ -1,28 +1,3 @@
-var import_safeAreaState = require("./safeAreaState.cjs");
-function setup() {
-  if (true) {
-    return;
-  }
-  const g = globalThis;
-  if (g.__gui_native_safe_area_setup_complete) {
-    return;
-  }
-  g.__gui_native_safe_area_setup_complete = true;
-  try {
-    const safeAreaContext = require("react-native-safe-area-context");
-    const {
-      useSafeAreaInsets,
-      useSafeAreaFrame,
-      initialWindowMetrics
-    } = safeAreaContext;
-    if (useSafeAreaInsets) {
-      (0, import_safeAreaState.getSafeArea)().set({
-        enabled: true,
-        useSafeAreaInsets,
-        useSafeAreaFrame: useSafeAreaFrame || null,
-        initialMetrics: initialWindowMetrics || null
-      });
-    }
-  } catch {}
-}
+require("./safeAreaState.cjs");
+function setup() {}
 setup();

package/dist/cjs/setup-safe-area.native.js

@@ -2,29 +2,21 @@
 
 var import_safeAreaState = require("./safeAreaState.native.js");
 function setup() {
-  if (false) {
-    return;
-  }
   var g = globalThis;
-  if (g.__gui_native_safe_area_setup_complete) {
-    return;
-  }
+  if (g.__gui_native_safe_area_setup_complete) return;
   g.__gui_native_safe_area_setup_complete = true;
   try {
-    var safeAreaContext = require("react-native-safe-area-context");
     var {
       useSafeAreaInsets,
       useSafeAreaFrame,
       initialWindowMetrics
-    } = safeAreaContext;
-    if (useSafeAreaInsets) {
-      (0, import_safeAreaState.getSafeArea)().set({
-        enabled: true,
-        useSafeAreaInsets,
-        useSafeAreaFrame: useSafeAreaFrame || null,
-        initialMetrics: initialWindowMetrics || null
-      });
-    }
+    } = require("react-native-safe-area-context");
+    if (useSafeAreaInsets) (0, import_safeAreaState.getSafeArea)().set({
+      enabled: true,
+      useSafeAreaInsets,
+      useSafeAreaFrame: useSafeAreaFrame || null,
+      initialMetrics: initialWindowMetrics || null
+    });
   } catch (e) {}
 }
 setup();

package/dist/cjs/setup-safe-area.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["import_safeAreaState","require","setup","g","globalThis","__gui_native_safe_area_setup_complete","safeAreaContext","useSafeAreaInsets","useSafeAreaFrame","initialWindowMetrics","getSafeArea","set","enabled","initialMetrics","e"],"sources":["../../src/setup-safe-area.ts"],"sourcesContent":[null],"mappings":"AAwBA;;AAEA,IAAAA,oBAAiB,GAAAC,OAAA;AAEf,SAAIC,KAAqCA,CAAA;EACvC;IACF;EAEA;EACA,IAAIC,CAAA,GAAEC,UAAA;EACJ,IAAAD,CAAA,CAAAE,qCAAA;IACF;EACA;EAEAF,CAAA,CAAAE,qCAAI;EACF;IACA,IAAAC,eAAQ,GAAAL,OAAmB,iCAAkB;IAE7C,IAAI;MAAAM,iBAAmB;MAAAC,gBAAA;MAAAC;IAAA,IAAAH,eAAA;IACrB,IAAAC,iBAAA;MAAkB,EAChB,EAAAP,oBAAS,CAAAU,WAAA,IAAAC,GAAA;QACTC,OAAA;QACAL,iBAAA;QACAC,gBAAgB,EAAAA,gBAAA,QAAwB;QACzCK,cAAA,EAAAJ,oBAAA;MACH;IACF;EAEA,SAAAK,CAAA,GACF;AAEA","ignoreList":[]}
+{"version":3,"names":["import_safeAreaState","require","setup","g","globalThis","__gui_native_safe_area_setup_complete","useSafeAreaInsets","useSafeAreaFrame","initialWindowMetrics","getSafeArea","set","enabled","initialMetrics","e"],"sources":["../../src/setup-safe-area.ts"],"sourcesContent":[null],"mappings":"AAwBA;;AAEA,IAAAA,oBAAiB,GAAAC,OAAA;AAEf,SAAIC,KAAQA,CAAA;EACV,IAAAC,CAAA,GAAAC,UAAA;EAAA,IACFD,CAAA,CAAAE,qCAAA;EAEAF,CAAA,CAAAE,qCAAU;EACV;IACE;MAAAC,iBAAA;MAAAC,gBAAA;MAAAC;IAAA,IAAAP,OAAA;IACF,IAAAK,iBAAA,MAAAN,oBAAA,CAAAS,WAAA,IAAAC,GAAA;MACAC,OAAE;MAEFL,iBAAI;MACFC,gBAAM,EAAAA,gBAA0B;MAChCK,cAAQ,EAAAJ,oBAAmB;IAE3B;EACE,SAAAK,CAAA;AAAkB;AACPX,KAAA","ignoreList":[]}

package/dist/esm/PressBoundary.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","View","claimExternalPressOwnership","releaseExternalPressOwnership","jsx","composeFirst","ours","theirs","args","composeLast","PressBoundary","forwardRef","PressBoundary2","enabled","stopPropagation","debugName","onTouchStart","onTouchEnd","onTouchCancel","onResponderGrant","onResponderRelease","onResponderTerminate","props","forwardedRef","tokenRef","useRef","isEnabled","claim","useCallback","current","release","useEffect","ref"],"sources":["../../src/PressBoundary.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,IAAA,QAA4B;AACrC,SACEC,2BAAA,EACAC,6BAAA,QAEK;AA+DH,SAAAC,GAAA;AAnDJ,SAASC,aAAiDC,IAAA,EAASC,MAAA,EAAY;EAC7E,OAAO,IAAIC,IAAA,KAAwB;IACjCF,IAAA,CAAK,GAAGE,IAAI;IACZD,MAAA,GAAS,GAAGC,IAAI;EAClB;AACF;AAEA,SAASC,YAAgDF,MAAA,EAAuBD,IAAA,EAAS;EACvF,OAAO,IAAIE,IAAA,KAAwB;IACjCD,MAAA,GAAS,GAAGC,IAAI;IAChBF,IAAA,CAAK,GAAGE,IAAI;EACd;AACF;AAEO,MAAME,aAAA,GAETV,KAAA,CAAMW,UAAA,CAAqC,SAASC,eACtD;EACEC,OAAA;EACAC,eAAA;EACAC,SAAA;EACAC,YAAA;EACAC,UAAA;EACAC,aAAA;EACAC,gBAAA;EACAC,kBAAA;EACAC,oBAAA;EACA,GAAGC;AACL,GACAC,YAAA,EACA;EACA,MAAMC,QAAA,GAAWxB,KAAA,CAAMyB,MAAA,CAA2C,IAAI;EACtE,MAAMC,SAAA,GAAYb,OAAA,IAAWC,eAAA,IAAmB;EAEhD,MAAMa,KAAA,GAAQ3B,KAAA,CAAM4B,WAAA,CAAY,MAAY;IAC1C,IAAI,CAACF,SAAA,EAAW;IAChB,IAAIF,QAAA,CAASK,OAAA,EAAS;MACpB1B,6BAAA,CAA8BqB,QAAA,CAASK,OAAA,EAASd,SAAS;IAC3D;IACAS,QAAA,CAASK,OAAA,GAAU3B,2BAAA,CAA4Ba,SAAS;EAC1D,GAAG,CAACA,SAAA,EAAWW,SAAS,CAAC;EAEzB,MAAMI,OAAA,GAAU9B,KAAA,CAAM4B,WAAA,CAAY,MAAY;IAC5C,IAAI,CAACJ,QAAA,CAASK,OAAA,EAAS;IACvB1B,6BAAA,CAA8BqB,QAAA,CAASK,OAAA,EAASd,SAAS;IACzDS,QAAA,CAASK,OAAA,GAAU;EACrB,GAAG,CAACd,SAAS,CAAC;EAEdf,KAAA,CAAM+B,SAAA,CAAU,MAAMD,OAAA,EAAS,CAACA,OAAO,CAAC;EAExC,OACE,eAAA1B,GAAA,CAACH,IAAA;IACC+B,GAAA,EAAKT,YAAA;IACJ,GAAGD,KAAA;IACJN,YAAA,EAAcX,YAAA,CAAasB,KAAA,EAAOX,YAAY;IAC9CC,UAAA,EAAYR,WAAA,CAAYQ,UAAA,EAAYa,OAAO;IAC3CZ,aAAA,EAAeT,WAAA,CAAYS,aAAA,EAAeY,OAAO;IACjDX,gBAAA,EAAkBd,YAAA,CAAasB,KAAA,EAAOR,gBAAgB;IACtDC,kBAAA,EAAoBX,WAAA,CAAYW,kBAAA,EAAoBU,OAAO;IAC3DT,oBAAA,EAAsBZ,WAAA,CAAYY,oBAAA,EAAsBS,OAAO;EAAA,CACjE;AAEJ,CAAC","ignoreList":[]}
+{"version":3,"names":["React","View","claimExternalPressOwnership","releaseExternalPressOwnership","jsx","composeFirst","ours","theirs","args","composeLast","PressBoundary","forwardRef","PressBoundary2","enabled","stopPropagation","debugName","onTouchStart","onTouchEnd","onTouchCancel","onResponderGrant","onResponderRelease","onResponderTerminate","props","forwardedRef","tokenRef","useRef","isEnabled","claim","useCallback","current","release","useEffect","ref"],"sources":["../../src/PressBoundary.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,IAAA,QAA4B;AACrC,SACEC,2BAAA,EACAC,6BAAA,QAEK;AA+DH,SAAAC,GAAA;AAnDJ,SAASC,aAAiDC,IAAA,EAASC,MAAA,EAAY;EAC7E,OAAO,IAAIC,IAAA,KAAwB;IACjCF,IAAA,CAAK,GAAGE,IAAI;IACZD,MAAA,GAAS,GAAGC,IAAI;EAClB;AACF;AAEA,SAASC,YAAgDF,MAAA,EAAuBD,IAAA,EAAS;EACvF,OAAO,IAAIE,IAAA,KAAwB;IACjCD,MAAA,GAAS,GAAGC,IAAI;IAChBF,IAAA,CAAK,GAAGE,IAAI;EACd;AACF;AAEO,MAAME,aAAA,GAETV,KAAA,CAAMW,UAAA,CAAqC,SAASC,cAAAF,CACtD;EACEG,OAAA;EACAC,eAAA;EACAC,SAAA;EACAC,YAAA;EACAC,UAAA;EACAC,aAAA;EACAC,gBAAA;EACAC,kBAAA;EACAC,oBAAA;EACA,GAAGC;AACL,GACAC,YAAA,EACA;EACA,MAAMC,QAAA,GAAWxB,KAAA,CAAMyB,MAAA,CAA2C,IAAI;EACtE,MAAMC,SAAA,GAAYb,OAAA,IAAWC,eAAA,IAAmB;EAEhD,MAAMa,KAAA,GAAQ3B,KAAA,CAAM4B,WAAA,CAAY,MAAY;IAC1C,IAAI,CAACF,SAAA,EAAW;IAChB,IAAIF,QAAA,CAASK,OAAA,EAAS;MACpB1B,6BAAA,CAA8BqB,QAAA,CAASK,OAAA,EAASd,SAAS;IAC3D;IACAS,QAAA,CAASK,OAAA,GAAU3B,2BAAA,CAA4Ba,SAAS;EAC1D,GAAG,CAACA,SAAA,EAAWW,SAAS,CAAC;EAEzB,MAAMI,OAAA,GAAU9B,KAAA,CAAM4B,WAAA,CAAY,MAAY;IAC5C,IAAI,CAACJ,QAAA,CAASK,OAAA,EAAS;IACvB1B,6BAAA,CAA8BqB,QAAA,CAASK,OAAA,EAASd,SAAS;IACzDS,QAAA,CAASK,OAAA,GAAU;EACrB,GAAG,CAACd,SAAS,CAAC;EAEdf,KAAA,CAAM+B,SAAA,CAAU,MAAMD,OAAA,EAAS,CAACA,OAAO,CAAC;EAExC,OACE,eAAA1B,GAAA,CAACH,IAAA;IACC+B,GAAA,EAAKT,YAAA;IACJ,GAAGD,KAAA;IACJN,YAAA,EAAcX,YAAA,CAAasB,KAAA,EAAOX,YAAY;IAC9CC,UAAA,EAAYR,WAAA,CAAYQ,UAAA,EAAYa,OAAO;IAC3CZ,aAAA,EAAeT,WAAA,CAAYS,aAAA,EAAeY,OAAO;IACjDX,gBAAA,EAAkBd,YAAA,CAAasB,KAAA,EAAOR,gBAAgB;IACtDC,kBAAA,EAAoBX,WAAA,CAAYW,kBAAA,EAAoBU,OAAO;IAC3DT,oBAAA,EAAsBZ,WAAA,CAAYY,oBAAA,EAAsBS,OAAO;EAAA,CACjE;AAEJ,CAAC","ignoreList":[]}

package/dist/esm/gestureState.mjs

@@ -7,16 +7,22 @@ const state = createGlobalState(`gesture`, {
 });
 let pressGestureDebugId = 0;
 let externalPressDebugId = 0;
+function getEventPointerId(e) {
+  const pointerId = e?.pointerId ?? e?.pointer?.id ?? e?.event?.pointerId ?? e?.event?.pointer?.id ?? e?.nativeEvent?.pointerId ?? e?.nativeEvent?.id ?? e?.event?.nativeEvent?.pointerId ?? e?.event?.nativeEvent?.id ?? null;
+  return pointerId == null || Number.isNaN(pointerId) ? null : Number(pointerId);
+}
 const pressState = {
   owner: null,
   ownerId: null,
   ownerSource: null,
+  ownerPointerId: null,
   timestamp: 0
 };
 function resetPressOwner() {
   pressState.owner = null;
   pressState.ownerId = null;
   pressState.ownerSource = null;
+  pressState.ownerPointerId = null;
   pressState.timestamp = 0;
 }
 function resetStaleOwner(now, debugName) {
@@ -29,8 +35,6 @@ function claimExternalPressOwnership(debugName) {
   resetStaleOwner(now, debugName);
   const token = {};
   const ownerId = ++externalPressDebugId;
-  const previousOwnerId = pressState.ownerId;
-  const previousOwnerSource = pressState.ownerSource;
   pressState.owner = token;
   pressState.ownerId = ownerId;
   pressState.ownerSource = "external";
@@ -65,62 +69,78 @@ function getGestureHandler() {
       const longPressDuration = config.delayLongPress ?? 500;
       const myToken = {};
       const myDebugId = ++pressGestureDebugId;
-      const GRACE_PERIOD_MS = process.env.TAMAGUI_RNGH_PRESS_DELAY ? +process.env.TAMAGUI_RNGH_PRESS_DELAY : 24;
-      const tryClaimOwnership = () => {
+      let didLongPress = false;
+      let didPressIn = false;
+      let pressInTimer = null;
+      const GRACE_PERIOD_MS = process.env.GUI_RNGH_PRESS_DELAY ? +process.env.GUI_RNGH_PRESS_DELAY : 24;
+      const tryClaimOwnership = e => {
         const now = Date.now();
         resetStaleOwner(now, config.debugName);
-        const withinGrace = now - pressState.timestamp < GRACE_PERIOD_MS;
-        const previousOwnerId = pressState.ownerId;
-        const previousOwnerSource = pressState.ownerSource;
-        if (pressState.owner === null || withinGrace && pressState.ownerSource !== "external") {
+        const currentPointerId = getEventPointerId(e);
+        const isSameTouchPointer = currentPointerId == null || pressState.ownerPointerId == null || pressState.ownerPointerId === currentPointerId;
+        if (pressState.owner === null || pressState.ownerSource === "internal" && isSameTouchPointer) {
           pressState.owner = myToken;
           pressState.ownerId = myDebugId;
           pressState.ownerSource = "internal";
+          pressState.ownerPointerId = currentPointerId;
           pressState.timestamp = now;
         }
         return pressState.owner === myToken;
       };
       const isOwner = () => pressState.owner === myToken;
       const releaseOwnership = () => {
+        if (pressInTimer) {
+          clearTimeout(pressInTimer);
+          pressInTimer = null;
+        }
         if (pressState.owner === myToken) {
           resetPressOwner();
         }
       };
-      const tap = Gesture.Tap().runOnJS(true).maxDuration(1e4).onBegin(e => {
-        tryClaimOwnership();
-        setTimeout(() => {
+      const firePressIn = e => {
+        if (!didPressIn && isOwner()) {
+          didPressIn = true;
+          config.onPressIn?.(e);
+        }
+      };
+      const schedulePressIn = e => {
+        if (pressInTimer) {
+          clearTimeout(pressInTimer);
+        }
+        pressInTimer = setTimeout(() => {
+          pressInTimer = null;
           if (isOwner()) {
-            config.onPressIn?.(e);
+            firePressIn(e);
           }
         }, GRACE_PERIOD_MS + 1);
+      };
+      const tap = Gesture.Tap().runOnJS(true).maxDuration(1e4).onBegin(e => {
+        didLongPress = false;
+        didPressIn = false;
+        tryClaimOwnership(e);
+        schedulePressIn(e);
       }).onEnd(e => {
-        if (isOwner()) {
+        if (isOwner() && !didLongPress) {
+          firePressIn(e);
           config.onPress?.(e);
         }
       }).onFinalize(e => {
         if (isOwner()) {
           config.onPressOut?.(e);
           releaseOwnership();
+        } else if (didPressIn) {
+          didPressIn = false;
+          config.onPressOut?.(e);
         }
       });
       if (config.hitSlop) tap.hitSlop(config.hitSlop);
       if (!config.onLongPress) return tap;
-      const longPress = Gesture.LongPress().runOnJS(true).minDuration(longPressDuration).onBegin(e => {
-        tryClaimOwnership();
-        setTimeout(() => {
-          if (isOwner()) {
-            config.onPressIn?.(e);
-          }
-        }, GRACE_PERIOD_MS + 1);
-      }).onStart(e => {
+      const longPress = Gesture.LongPress().runOnJS(true).minDuration(longPressDuration).onStart(e => {
+        didLongPress = true;
         if (isOwner()) {
+          firePressIn(e);
           config.onLongPress?.(e);
         }
-      }).onFinalize(e => {
-        if (isOwner()) {
-          config.onPressOut?.(e);
-          releaseOwnership();
-        }
       });
       if (config.hitSlop) longPress.hitSlop(config.hitSlop);
       return Gesture.Exclusive(longPress, tap);