@tamagui/core 3.0.0-beta.1648.1 → 3.0.0-beta.1670.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/native.cjs CHANGED
@@ -11416,8 +11416,8 @@ function getEventPointerId(e) {
11416
11416
  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;
11417
11417
  return pointerId == null || Number.isNaN(pointerId) ? null : Number(pointerId);
11418
11418
  }
11419
- var _;
11420
- var pressState = (_ = (_globalThis = globalThis)[_PRESS_STATE_KEY = PRESS_STATE_KEY]) !== null && _ !== void 0 ? _ : _globalThis[_PRESS_STATE_KEY] = {
11419
+ var _$1;
11420
+ var pressState = (_$1 = (_globalThis = globalThis)[_PRESS_STATE_KEY = PRESS_STATE_KEY]) !== null && _$1 !== void 0 ? _$1 : _globalThis[_PRESS_STATE_KEY] = {
11421
11421
  owner: null,
11422
11422
  ownerId: null,
11423
11423
  ownerSource: null,
@@ -11637,7 +11637,12 @@ function hasSafeAreaSetup() {
11637
11637
  }
11638
11638
  //#endregion
11639
11639
  //#region ../native/dist/esm/nativeMenuContext.native.js
11640
- var NativeMenuContext = (0, react.createContext)(false);
11640
+ var _g;
11641
+ var _KEY;
11642
+ var KEY = "__tamagui_native_menu_context__";
11643
+ var g = globalThis;
11644
+ var _;
11645
+ var NativeMenuContext = (_ = (_g = g)[_KEY = KEY]) !== null && _ !== void 0 ? _ : _g[_KEY] = (0, react.createContext)(false);
11641
11646
  //#endregion
11642
11647
  //#region ../web/dist/esm/helpers/resolveSafeAreaVariable.native.js
11643
11648
  function resolveSafeAreaVariable(name) {
@@ -13662,30 +13667,54 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
13662
13667
  if (isUsingRNGH) {
13663
13668
  var callbacksRef = (0, react.useRef)(isUsingRNGH ? {} : null);
13664
13669
  var gestureRef = (0, react.useRef)(null);
13670
+ var longPressTimerRef = (0, react.useRef)(null);
13671
+ var longPressedRef = (0, react.useRef)(false);
13672
+ var clearLongPress = function() {
13673
+ if (longPressTimerRef.current) clearTimeout(longPressTimerRef.current);
13674
+ longPressTimerRef.current = null;
13675
+ };
13676
+ react.default.useEffect(function() {
13677
+ return clearLongPress;
13678
+ }, []);
13665
13679
  var pressActiveRef = (0, react.useRef)(false);
13666
13680
  var beginPress = function(e) {
13667
13681
  var _callbacksRef_current_onPressIn, _callbacksRef_current;
13668
13682
  if (pressActiveRef.current) return;
13669
13683
  pressActiveRef.current = true;
13684
+ if (isInsideNativeMenu) {
13685
+ clearLongPress();
13686
+ longPressedRef.current = false;
13687
+ if (callbacksRef.current.onLongPress) {
13688
+ var _callbacksRef_current_delayLongPress;
13689
+ longPressTimerRef.current = setTimeout(function() {
13690
+ var _callbacksRef_current_onLongPress, _callbacksRef_current2;
13691
+ longPressTimerRef.current = null;
13692
+ longPressedRef.current = true;
13693
+ (_callbacksRef_current_onLongPress = (_callbacksRef_current2 = callbacksRef.current).onLongPress) === null || _callbacksRef_current_onLongPress === void 0 || _callbacksRef_current_onLongPress.call(_callbacksRef_current2, e !== null && e !== void 0 ? e : {});
13694
+ }, (_callbacksRef_current_delayLongPress = callbacksRef.current.delayLongPress) !== null && _callbacksRef_current_delayLongPress !== void 0 ? _callbacksRef_current_delayLongPress : 500);
13695
+ }
13696
+ }
13670
13697
  (_callbacksRef_current_onPressIn = (_callbacksRef_current = callbacksRef.current).onPressIn) === null || _callbacksRef_current_onPressIn === void 0 || _callbacksRef_current_onPressIn.call(_callbacksRef_current, e !== null && e !== void 0 ? e : {});
13671
13698
  };
13672
13699
  var endPress = function(e) {
13673
13700
  var firePress = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
13674
13701
  var _callbacksRef_current_onPress, _callbacksRef_current, _callbacksRef_current_onPressOut, _callbacksRef_current1;
13702
+ clearLongPress();
13675
13703
  if (!pressActiveRef.current) return;
13676
13704
  pressActiveRef.current = false;
13677
- if (firePress) (_callbacksRef_current_onPress = (_callbacksRef_current = callbacksRef.current).onPress) === null || _callbacksRef_current_onPress === void 0 || _callbacksRef_current_onPress.call(_callbacksRef_current, e !== null && e !== void 0 ? e : {});
13705
+ if (firePress && !longPressedRef.current) (_callbacksRef_current_onPress = (_callbacksRef_current = callbacksRef.current).onPress) === null || _callbacksRef_current_onPress === void 0 || _callbacksRef_current_onPress.call(_callbacksRef_current, e !== null && e !== void 0 ? e : {});
13678
13706
  (_callbacksRef_current_onPressOut = (_callbacksRef_current1 = callbacksRef.current).onPressOut) === null || _callbacksRef_current_onPressOut === void 0 || _callbacksRef_current_onPressOut.call(_callbacksRef_current1, e !== null && e !== void 0 ? e : {});
13679
13707
  };
13680
- useMainThreadPressEvents(events, viewProps, Boolean(hasRealPressEvents || !isInsideNativeMenu && getIsAndroid() && hasPressEvents), debugName);
13708
+ useMainThreadPressEvents(events, viewProps, Boolean(!isInsideNativeMenu && (hasRealPressEvents || getIsAndroid() && hasPressEvents)), debugName);
13681
13709
  if (everEnabled) {
13682
13710
  callbacksRef.current = hasPressEvents ? {
13683
13711
  onPressIn: events.onPressIn,
13684
13712
  onPressOut: events.onPressOut,
13685
13713
  onPress: events.onPress,
13686
- onLongPress: events.onLongPress
13714
+ onLongPress: events.onLongPress,
13715
+ delayLongPress: events.delayLongPress
13687
13716
  } : {};
13688
- if (hasRealPressEvents) {
13717
+ if (hasRealPressEvents && !isInsideNativeMenu) {
13689
13718
  endPress();
13690
13719
  gestureRef.current = null;
13691
13720
  return null;
@@ -17850,7 +17879,7 @@ function createComponent(staticConfig) {
17850
17879
  });
17851
17880
  }
17852
17881
  }
17853
- content = wrapWithGestureDetector(content, pressGesture, stateRef, isHOC, !isHOC && Component && typeof Component !== "string", hasRealPressEvents);
17882
+ content = wrapWithGestureDetector(content, pressGesture, stateRef, isHOC, !isHOC && Component && typeof Component !== "string", hasRealPressEvents && !isInsideNativeMenu);
17854
17883
  var ResetPresence = (animationDriver === null || animationDriver === void 0 ? void 0 : animationDriver.isStub) ? void 0 : animationDriver === null || animationDriver === void 0 ? void 0 : animationDriver.ResetPresence;
17855
17884
  var needsReset = Boolean(!asChild && splitStyles && !isHOC && ResetPresence && willBeAnimated && (hasEnterStyle || presenceState));
17856
17885
  var hasEverReset = stateRef.current.hasEverResetPresence;
@@ -1583,8 +1583,8 @@ function getEventPointerId(e) {
1583
1583
  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;
1584
1584
  return pointerId == null || Number.isNaN(pointerId) ? null : Number(pointerId);
1585
1585
  }
1586
- var _;
1587
- var pressState = (_ = (_globalThis = globalThis)[_PRESS_STATE_KEY = PRESS_STATE_KEY]) !== null && _ !== void 0 ? _ : _globalThis[_PRESS_STATE_KEY] = {
1586
+ var _$1;
1587
+ var pressState = (_$1 = (_globalThis = globalThis)[_PRESS_STATE_KEY = PRESS_STATE_KEY]) !== null && _$1 !== void 0 ? _$1 : _globalThis[_PRESS_STATE_KEY] = {
1588
1588
  owner: null,
1589
1589
  ownerId: null,
1590
1590
  ownerSource: null,
@@ -1804,7 +1804,12 @@ function hasSafeAreaSetup() {
1804
1804
  }
1805
1805
  //#endregion
1806
1806
  //#region ../native/dist/esm/nativeMenuContext.native.js
1807
- var NativeMenuContext = (0, react.createContext)(false);
1807
+ var _g;
1808
+ var _KEY;
1809
+ var KEY = "__tamagui_native_menu_context__";
1810
+ var g = globalThis;
1811
+ var _;
1812
+ var NativeMenuContext = (_ = (_g = g)[_KEY = KEY]) !== null && _ !== void 0 ? _ : _g[_KEY] = (0, react.createContext)(false);
1808
1813
  //#endregion
1809
1814
  //#region ../web/dist/esm/helpers/resolveSafeAreaVariable.native.js
1810
1815
  var didWarnMissingSetup = false;
@@ -3937,30 +3942,54 @@ function useEvents(events, viewProps, stateRef, staticConfig, isHOC, isInsideNat
3937
3942
  if (isUsingRNGH) {
3938
3943
  var callbacksRef = (0, react.useRef)(isUsingRNGH ? {} : null);
3939
3944
  var gestureRef = (0, react.useRef)(null);
3945
+ var longPressTimerRef = (0, react.useRef)(null);
3946
+ var longPressedRef = (0, react.useRef)(false);
3947
+ var clearLongPress = function() {
3948
+ if (longPressTimerRef.current) clearTimeout(longPressTimerRef.current);
3949
+ longPressTimerRef.current = null;
3950
+ };
3951
+ react.default.useEffect(function() {
3952
+ return clearLongPress;
3953
+ }, []);
3940
3954
  var pressActiveRef = (0, react.useRef)(false);
3941
3955
  var beginPress = function(e) {
3942
3956
  var _callbacksRef_current_onPressIn, _callbacksRef_current;
3943
3957
  if (pressActiveRef.current) return;
3944
3958
  pressActiveRef.current = true;
3959
+ if (isInsideNativeMenu) {
3960
+ clearLongPress();
3961
+ longPressedRef.current = false;
3962
+ if (callbacksRef.current.onLongPress) {
3963
+ var _callbacksRef_current_delayLongPress;
3964
+ longPressTimerRef.current = setTimeout(function() {
3965
+ var _callbacksRef_current_onLongPress, _callbacksRef_current2;
3966
+ longPressTimerRef.current = null;
3967
+ longPressedRef.current = true;
3968
+ (_callbacksRef_current_onLongPress = (_callbacksRef_current2 = callbacksRef.current).onLongPress) === null || _callbacksRef_current_onLongPress === void 0 || _callbacksRef_current_onLongPress.call(_callbacksRef_current2, e !== null && e !== void 0 ? e : {});
3969
+ }, (_callbacksRef_current_delayLongPress = callbacksRef.current.delayLongPress) !== null && _callbacksRef_current_delayLongPress !== void 0 ? _callbacksRef_current_delayLongPress : 500);
3970
+ }
3971
+ }
3945
3972
  (_callbacksRef_current_onPressIn = (_callbacksRef_current = callbacksRef.current).onPressIn) === null || _callbacksRef_current_onPressIn === void 0 || _callbacksRef_current_onPressIn.call(_callbacksRef_current, e !== null && e !== void 0 ? e : {});
3946
3973
  };
3947
3974
  var endPress = function(e) {
3948
3975
  var firePress = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
3949
3976
  var _callbacksRef_current_onPress, _callbacksRef_current, _callbacksRef_current_onPressOut, _callbacksRef_current1;
3977
+ clearLongPress();
3950
3978
  if (!pressActiveRef.current) return;
3951
3979
  pressActiveRef.current = false;
3952
- if (firePress) (_callbacksRef_current_onPress = (_callbacksRef_current = callbacksRef.current).onPress) === null || _callbacksRef_current_onPress === void 0 || _callbacksRef_current_onPress.call(_callbacksRef_current, e !== null && e !== void 0 ? e : {});
3980
+ if (firePress && !longPressedRef.current) (_callbacksRef_current_onPress = (_callbacksRef_current = callbacksRef.current).onPress) === null || _callbacksRef_current_onPress === void 0 || _callbacksRef_current_onPress.call(_callbacksRef_current, e !== null && e !== void 0 ? e : {});
3953
3981
  (_callbacksRef_current_onPressOut = (_callbacksRef_current1 = callbacksRef.current).onPressOut) === null || _callbacksRef_current_onPressOut === void 0 || _callbacksRef_current_onPressOut.call(_callbacksRef_current1, e !== null && e !== void 0 ? e : {});
3954
3982
  };
3955
- useMainThreadPressEvents(events, viewProps, Boolean(hasRealPressEvents || !isInsideNativeMenu && getIsAndroid() && hasPressEvents), debugName);
3983
+ useMainThreadPressEvents(events, viewProps, Boolean(!isInsideNativeMenu && (hasRealPressEvents || getIsAndroid() && hasPressEvents)), debugName);
3956
3984
  if (everEnabled) {
3957
3985
  callbacksRef.current = hasPressEvents ? {
3958
3986
  onPressIn: events.onPressIn,
3959
3987
  onPressOut: events.onPressOut,
3960
3988
  onPress: events.onPress,
3961
- onLongPress: events.onLongPress
3989
+ onLongPress: events.onLongPress,
3990
+ delayLongPress: events.delayLongPress
3962
3991
  } : {};
3963
- if (hasRealPressEvents) {
3992
+ if (hasRealPressEvents && !isInsideNativeMenu) {
3964
3993
  endPress();
3965
3994
  gestureRef.current = null;
3966
3995
  return null;
@@ -8952,7 +8981,7 @@ ${banner}
8952
8981
  }
8953
8982
  if (globalThis.process.env.NODE_ENV === "development" && time$1) time$1`use-children`;
8954
8983
  }
8955
- content = wrapWithGestureDetector(content, pressGesture, stateRef, isHOC, !isHOC && Component && typeof Component !== "string", hasRealPressEvents);
8984
+ content = wrapWithGestureDetector(content, pressGesture, stateRef, isHOC, !isHOC && Component && typeof Component !== "string", hasRealPressEvents && !isInsideNativeMenu);
8956
8985
  var ResetPresence = (animationDriver === null || animationDriver === void 0 ? void 0 : animationDriver.isStub) ? void 0 : animationDriver === null || animationDriver === void 0 ? void 0 : animationDriver.ResetPresence;
8957
8986
  var needsReset = Boolean(!asChild && splitStyles && !isHOC && ResetPresence && willBeAnimated && (hasEnterStyle || presenceState));
8958
8987
  var hasEverReset = stateRef.current.hasEverResetPresence;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/core",
3
- "version": "3.0.0-beta.1648.1",
3
+ "version": "3.0.0-beta.1670.1",
4
4
  "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
5
5
  "license": "MIT",
6
6
  "author": {
@@ -137,19 +137,19 @@
137
137
  "clean:build": "tamagui-build clean:build"
138
138
  },
139
139
  "dependencies": {
140
- "@tamagui/compose-refs": "3.0.0-beta.1648.1",
141
- "@tamagui/constants": "3.0.0-beta.1648.1",
142
- "@tamagui/helpers": "3.0.0-beta.1648.1",
143
- "@tamagui/react-native-media-driver": "3.0.0-beta.1648.1",
144
- "@tamagui/react-native-use-pressable": "3.0.0-beta.1648.1",
145
- "@tamagui/use-element-layout": "3.0.0-beta.1648.1",
146
- "@tamagui/use-event": "3.0.0-beta.1648.1",
147
- "@tamagui/web": "3.0.0-beta.1648.1"
140
+ "@tamagui/compose-refs": "3.0.0-beta.1670.1",
141
+ "@tamagui/constants": "3.0.0-beta.1670.1",
142
+ "@tamagui/helpers": "3.0.0-beta.1670.1",
143
+ "@tamagui/react-native-media-driver": "3.0.0-beta.1670.1",
144
+ "@tamagui/react-native-use-pressable": "3.0.0-beta.1670.1",
145
+ "@tamagui/use-element-layout": "3.0.0-beta.1670.1",
146
+ "@tamagui/use-event": "3.0.0-beta.1670.1",
147
+ "@tamagui/web": "3.0.0-beta.1670.1"
148
148
  },
149
149
  "devDependencies": {
150
- "@tamagui/build": "3.0.0-beta.1648.1",
151
- "@tamagui/native-bundle": "3.0.0-beta.1648.1",
152
- "@tamagui/react-native-web-lite": "3.0.0-beta.1648.1",
150
+ "@tamagui/build": "3.0.0-beta.1670.1",
151
+ "@tamagui/native-bundle": "3.0.0-beta.1670.1",
152
+ "@tamagui/react-native-web-lite": "3.0.0-beta.1670.1",
153
153
  "@testing-library/react": "^16.1.0",
154
154
  "csstype": "^3.0.10",
155
155
  "react": "19.2.3",
@@ -160,5 +160,5 @@
160
160
  "peerDependencies": {
161
161
  "react": ">=19"
162
162
  },
163
- "releaseSourceCommit": "302078aa9222bfff888df41f1679e1179a20b18a"
163
+ "releaseSourceCommit": "23b9b37ef498bb7ebe306138c1d635a807db8ac1"
164
164
  }