From bb1ae89a180fe2be59a731d89b32311f91775e15 Mon Sep 17 00:00:00 2001 From: Tomasz Sapeta Date: Mon, 3 Oct 2022 10:35:05 +0200 Subject: [PATCH] [ios][android] Update react-native-gesture-handler to 2.6.2 --- CHANGELOG.md | 1 + .../gesturehandler/FlingGestureHandler.kt | 3 +- .../GestureHandlerOrchestrator.kt | 39 ++++++++++++++----- .../gesturehandler/LongPressGestureHandler.kt | 7 +++- .../NativeViewGestureHandler.kt | 3 +- .../gesturehandler/PanGestureHandler.kt | 3 +- .../gesturehandler/RNGestureHandlerPackage.kt | 8 ---- .../gesturehandler/TapGestureHandler.kt | 5 ++- .../RNGestureHandlerInteractionManager.kt | 8 +++- .../react/RNGestureHandlerModule.kt | 2 +- apps/bare-expo/ios/Podfile.lock | 4 +- apps/bare-expo/package.json | 2 +- apps/bare-sandbox/package.json | 2 +- apps/native-component-list/package.json | 2 +- apps/test-suite/package.json | 2 +- home/package.json | 2 +- ios/Podfile.lock | 4 +- .../RNGestureHandler.podspec.json | 4 +- .../RNGestureHandlerButtonComponentView.mm | 2 +- .../ios/RNGestureHandlerManager.mm | 5 --- .../RNGestureHandlerRootViewComponentView.mm | 2 +- packages/expo-stories/package.json | 2 +- packages/expo-test-runner/package.json | 12 +++--- packages/expo/bundledNativeModules.json | 2 +- yarn.lock | 10 ++--- 25 files changed, 79 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ca846fbb79c0..02abec0a5ac45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Package-specific changes not released in any SDK will be added here just before - Updated `@stripe/stripe-react-native` from `0.13.1` to `0.18.1` on iOS. ([#19055](https://github.com/expo/expo/pull/19055) by [@tsapeta](https://github.com/tsapeta)) - Updated `@shopify/flash-list` from `1.1.0` to `1.3.0`. ([#19317](https://github.com/expo/expo/pull/19317) by [@kudo](https://github.com/kudo)) +- Updated `react-native-gesture-handler` from `2.5.0` to `2.6.2`. ([#19362](https://github.com/expo/expo/pull/19362) by [@tsapeta](https://github.com/tsapeta)) ### 🛠 Breaking changes diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/FlingGestureHandler.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/FlingGestureHandler.kt index c73bc6f7d1572..5ff0dd80acf24 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/FlingGestureHandler.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/FlingGestureHandler.kt @@ -1,6 +1,7 @@ package versioned.host.exp.exponent.modules.api.components.gesturehandler import android.os.Handler +import android.os.Looper import android.view.MotionEvent class FlingGestureHandler : GestureHandler() { @@ -27,7 +28,7 @@ class FlingGestureHandler : GestureHandler() { begin() maxNumberOfPointersSimultaneously = 1 if (handler == null) { - handler = Handler() // lazy delegate? + handler = Handler(Looper.getMainLooper()) // lazy delegate? } else { handler!!.removeCallbacksAndMessages(null) } diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerOrchestrator.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerOrchestrator.kt index 861de375e7ab5..4c5333bb20212 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerOrchestrator.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/GestureHandlerOrchestrator.kt @@ -5,6 +5,7 @@ import android.graphics.PointF import android.view.MotionEvent import android.view.View import android.view.ViewGroup +import android.widget.EditText import java.util.* class GestureHandlerOrchestrator( @@ -128,6 +129,13 @@ class GestureHandlerOrchestrator( if (newState == GestureHandler.STATE_END) { // gesture has ended, we need to kill the awaiting handler otherHandler.cancel() + if (otherHandler.state == GestureHandler.STATE_END) { + // Handle edge case, where discrete gestures end immediately after activation thus + // their state is set to END and when the gesture they are waiting for activates they + // should be cancelled, however `cancel` was never sent as gestures were already in the END state. + // Send synthetic BEGAN -> CANCELLED to properly handle JS logic + otherHandler.dispatchStateChange(GestureHandler.STATE_CANCELLED, GestureHandler.STATE_BEGAN) + } otherHandler.isAwaiting = false } else { // gesture has failed recognition, we may try activating @@ -142,9 +150,12 @@ class GestureHandlerOrchestrator( } else if (prevState == GestureHandler.STATE_ACTIVE || prevState == GestureHandler.STATE_END) { if (handler.isActive) { handler.dispatchStateChange(newState, prevState) - } else if (prevState == GestureHandler.STATE_ACTIVE) { - // handle edge case where handler awaiting for another one tries to activate but finishes - // before the other would not send state change event upon ending + } else if (prevState == GestureHandler.STATE_ACTIVE && (newState == GestureHandler.STATE_CANCELLED || newState == GestureHandler.STATE_FAILED)) { + // Handle edge case where handler awaiting for another one tries to activate but finishes + // before the other would not send state change event upon ending. Note that we only want + // to do this if the newState is either CANCELLED or FAILED, if it is END we still want to + // wait for the other handler to finish as in that case synthetic events will be sent by the + // makeActive method. handler.dispatchStateChange(newState, GestureHandler.STATE_BEGAN) } } else if (prevState != GestureHandler.STATE_UNDETERMINED || newState != GestureHandler.STATE_CANCELLED) { @@ -474,14 +485,24 @@ class GestureHandlerOrchestrator( } PointerEventsConfig.BOX_NONE -> { // This view can't be the target, but its children might - if (view is ViewGroup) { - extractGestureHandlers(view, coords, pointerId).also { found -> - // A child view is handling touch, also extract handlers attached to this view - if (found) { - recordViewHandlersForPointer(view, coords, pointerId) + when (view) { + is ViewGroup -> { + extractGestureHandlers(view, coords, pointerId).also { found -> + // A child view is handling touch, also extract handlers attached to this view + if (found) { + recordViewHandlersForPointer(view, coords, pointerId) + } } } - } else false + // When has editable set to `false` getPointerEventsConfigForView returns + // `BOX_NONE` as it's `isEnabled` property is false. In this case we still want to extract + // handlers attached to the text input, as it makes sense that gestures would work on a + // non-editable TextInput. + is EditText -> { + recordViewHandlersForPointer(view, coords, pointerId) + } + else -> false + } } PointerEventsConfig.AUTO -> { // Either this view or one of its children is the target diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/LongPressGestureHandler.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/LongPressGestureHandler.kt index e8073b396a8ca..6f67d90a613a5 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/LongPressGestureHandler.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/LongPressGestureHandler.kt @@ -2,6 +2,7 @@ package versioned.host.exp.exponent.modules.api.components.gesturehandler import android.content.Context import android.os.Handler +import android.os.Looper import android.os.SystemClock import android.view.MotionEvent @@ -19,7 +20,9 @@ class LongPressGestureHandler(context: Context) : GestureHandler 0) { handler!!.postDelayed({ activate() }, minDurationMs) } else if (minDurationMs == 0L) { diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/NativeViewGestureHandler.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/NativeViewGestureHandler.kt index 19eedfc845326..b062f06f08a73 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/NativeViewGestureHandler.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/NativeViewGestureHandler.kt @@ -9,7 +9,8 @@ import com.facebook.react.views.textinput.ReactEditText class NativeViewGestureHandler : GestureHandler() { private var shouldActivateOnStart = false - private var disallowInterruption = false + var disallowInterruption = false + private set private var hook: NativeViewGestureHandlerHook = defaultHook diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PanGestureHandler.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PanGestureHandler.kt index 999f245ab80e9..f96a91a341d44 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PanGestureHandler.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/PanGestureHandler.kt @@ -2,6 +2,7 @@ package versioned.host.exp.exponent.modules.api.components.gesturehandler import android.content.Context import android.os.Handler +import android.os.Looper import android.view.MotionEvent import android.view.VelocityTracker import android.view.ViewConfiguration @@ -233,7 +234,7 @@ class PanGestureHandler(context: Context?) : GestureHandler() if (activateAfterLongPress > 0) { if (handler == null) { - handler = Handler() + handler = Handler(Looper.getMainLooper()) } handler!!.postDelayed(activateDelayed, activateAfterLongPress) } diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RNGestureHandlerPackage.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RNGestureHandlerPackage.kt index 8dbd9f55f8ed9..065f0100e825d 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RNGestureHandlerPackage.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/RNGestureHandlerPackage.kt @@ -5,7 +5,6 @@ import com.facebook.react.ReactPackage import com.facebook.react.bridge.NativeModule import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.uimanager.ViewManager -import com.facebook.soloader.SoLoader import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerModule import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.RNGestureHandlerRootViewManager @@ -13,13 +12,6 @@ import versioned.host.exp.exponent.modules.api.components.gesturehandler.react.R class RNGestureHandlerPackage : ReactPackage { override fun createNativeModules(reactContext: ReactApplicationContext): List { - if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { - // For Fabric, we load c++ native library here, this triggers gesture handler's - // Fabric component registration which is necessary in order to avoid asking users - // to manually add init calls in their application code. - // This should no longer be needed if RN's autolink mechanism has Fabric support - SoLoader.loadLibrary("rngesturehandler_modules") - } return listOf(RNGestureHandlerModule(reactContext)) } diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/TapGestureHandler.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/TapGestureHandler.kt index 78aa19c4f50b7..0800edc4ee4aa 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/TapGestureHandler.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/TapGestureHandler.kt @@ -1,6 +1,7 @@ package versioned.host.exp.exponent.modules.api.components.gesturehandler import android.os.Handler +import android.os.Looper import android.view.MotionEvent import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureUtils.getLastPointerX import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureUtils.getLastPointerY @@ -70,7 +71,7 @@ class TapGestureHandler : GestureHandler() { private fun startTap() { if (handler == null) { - handler = Handler() // TODO: lazy init (handle else branch correctly) + handler = Handler(Looper.getMainLooper()) // TODO: lazy init (handle else branch correctly) } else { handler!!.removeCallbacksAndMessages(null) } @@ -79,7 +80,7 @@ class TapGestureHandler : GestureHandler() { private fun endTap() { if (handler == null) { - handler = Handler() + handler = Handler(Looper.getMainLooper()) } else { handler!!.removeCallbacksAndMessages(null) } diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerInteractionManager.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerInteractionManager.kt index 7cb640720d657..e44719523b273 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerInteractionManager.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerInteractionManager.kt @@ -4,6 +4,7 @@ import android.util.SparseArray import com.facebook.react.bridge.ReadableMap import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandler import versioned.host.exp.exponent.modules.api.components.gesturehandler.GestureHandlerInteractionController +import versioned.host.exp.exponent.modules.api.components.gesturehandler.NativeViewGestureHandler class RNGestureHandlerInteractionManager : GestureHandlerInteractionController { private val waitForRelations = SparseArray() @@ -42,8 +43,13 @@ class RNGestureHandlerInteractionManager : GestureHandlerInteractionController { otherHandler: GestureHandler<*>, ) = false - override fun shouldHandlerBeCancelledBy(handler: GestureHandler<*>, otherHandler: GestureHandler<*>) = false + override fun shouldHandlerBeCancelledBy(handler: GestureHandler<*>, otherHandler: GestureHandler<*>): Boolean { + if (otherHandler is NativeViewGestureHandler) { + return otherHandler.disallowInterruption + } + return false + } override fun shouldRecognizeSimultaneously( handler: GestureHandler<*>, otherHandler: GestureHandler<*>, diff --git a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerModule.kt b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerModule.kt index b962aac4efb6a..890a74b4d96ea 100644 --- a/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerModule.kt +++ b/android/expoview/src/main/java/versioned/host/exp/exponent/modules/api/components/gesturehandler/react/RNGestureHandlerModule.kt @@ -426,7 +426,7 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?) @ReactMethod(isBlockingSynchronousMethod = true) fun install(): Boolean { return try { - SoLoader.loadLibrary("rngesturehandler_modules") + SoLoader.loadLibrary("gesturehandler") val jsContext = reactApplicationContext.javaScriptContextHolder decorateRuntime(jsContext.get()) true diff --git a/apps/bare-expo/ios/Podfile.lock b/apps/bare-expo/ios/Podfile.lock index e662e2d131056..9eacd3d2c2f43 100644 --- a/apps/bare-expo/ios/Podfile.lock +++ b/apps/bare-expo/ios/Podfile.lock @@ -714,7 +714,7 @@ PODS: - React-Core - RNDateTimePicker (6.2.0): - React-Core - - RNGestureHandler (2.5.0): + - RNGestureHandler (2.6.2): - React-Core - RNReanimated (2.10.0): - DoubleConversion @@ -1373,7 +1373,7 @@ SPEC CHECKSUMS: RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd RNCPicker: 0250e95ad170569a96f5b0555cdd5e65b9084dca RNDateTimePicker: 30e6733efc179d1e49d6008ea5fce42cdc9aeeca - RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 + RNGestureHandler: 4defbd70b2faf3d6761b82fa7880285241762cb0 RNReanimated: 60e291d42c77752a0f6d6f358387bdf225a87c6e RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7 RNSharedElement: eb7d506733952d58634f34c82ec17e82f557e377 diff --git a/apps/bare-expo/package.json b/apps/bare-expo/package.json index 1ab4905e168f3..9e54a141d135d 100644 --- a/apps/bare-expo/package.json +++ b/apps/bare-expo/package.json @@ -112,7 +112,7 @@ "react": "18.1.0", "react-dom": "18.0.0", "react-native": "0.70.1", - "react-native-gesture-handler": "~2.5.0", + "react-native-gesture-handler": "~2.6.2", "react-native-reanimated": "~2.10.0", "react-native-safe-area-context": "4.3.1", "react-native-screens": "~3.15.0", diff --git a/apps/bare-sandbox/package.json b/apps/bare-sandbox/package.json index b15f6be67ae62..5b9da44446fd2 100644 --- a/apps/bare-sandbox/package.json +++ b/apps/bare-sandbox/package.json @@ -18,7 +18,7 @@ "react": "18.1.0", "react-dom": "18.0.0", "react-native": "0.70.1", - "react-native-gesture-handler": "~2.5.0", + "react-native-gesture-handler": "~2.6.2", "react-native-reanimated": "~2.10.0", "react-native-screens": "~3.15.0", "react-native-web": "~0.18.9" diff --git a/apps/native-component-list/package.json b/apps/native-component-list/package.json index f96f5fdca1169..1ecfbd5e0a2f5 100644 --- a/apps/native-component-list/package.json +++ b/apps/native-component-list/package.json @@ -144,7 +144,7 @@ "react": "18.1.0", "react-dom": "18.0.0", "react-native": "0.70.1", - "react-native-gesture-handler": "~2.5.0", + "react-native-gesture-handler": "~2.6.2", "react-native-iphone-x-helper": "^1.3.0", "react-native-maps": "0.31.1", "react-native-pager-view": "5.4.24", diff --git a/apps/test-suite/package.json b/apps/test-suite/package.json index 234dbaff10e08..fc364daebab9a 100644 --- a/apps/test-suite/package.json +++ b/apps/test-suite/package.json @@ -51,7 +51,7 @@ "lodash": "^4.17.19", "react": "18.1.0", "react-native": "0.70.1", - "react-native-gesture-handler": "~2.5.0", + "react-native-gesture-handler": "~2.6.2", "react-native-safe-area-view": "^0.14.8", "sinon": "^7.1.1" }, diff --git a/home/package.json b/home/package.json index e0b729141556f..1d6e5c3f79481 100644 --- a/home/package.json +++ b/home/package.json @@ -55,7 +55,7 @@ "react": "18.1.0", "react-native": "0.70.1", "react-native-fade-in-image": "^1.6.1", - "react-native-gesture-handler": "~2.5.0", + "react-native-gesture-handler": "~2.6.2", "react-native-infinite-scroll-view": "^0.4.5", "react-native-keyboard-aware-scroll-view": "^0.9.5", "react-native-maps": "0.31.1", diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 57efc48ec8228..3aa9282aaa581 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2014,7 +2014,7 @@ PODS: - React-perflogger (= 0.70.1) - RNFlashList (1.3.0): - React-Core - - RNGestureHandler (2.5.0): + - RNGestureHandler (2.6.2): - React-Core - RNReanimated (2.9.1): - DoubleConversion @@ -3509,7 +3509,7 @@ SPEC CHECKSUMS: React-runtimeexecutor: a11d0c2e14140baf1e449264ca9168ae9ae6bbd0 ReactCommon: 7f86326b92009925c6dcf93f8e825060171c379f RNFlashList: 5116f2de2f543f01bfc30b22d5942d5af84b43df - RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 + RNGestureHandler: 4defbd70b2faf3d6761b82fa7880285241762cb0 RNReanimated: 5c8c17e26787fd8984cd5accdc70fef2ca70aafd RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7 Stripe: fb29a476e4866fec4ef22fb76207363dd32795aa diff --git a/ios/vendored/unversioned/react-native-gesture-handler/RNGestureHandler.podspec.json b/ios/vendored/unversioned/react-native-gesture-handler/RNGestureHandler.podspec.json index da8cd3f5865dd..80578f05ad105 100644 --- a/ios/vendored/unversioned/react-native-gesture-handler/RNGestureHandler.podspec.json +++ b/ios/vendored/unversioned/react-native-gesture-handler/RNGestureHandler.podspec.json @@ -1,6 +1,6 @@ { "name": "RNGestureHandler", - "version": "2.5.0", + "version": "2.6.2", "summary": "Experimental implementation of a new declarative API for gesture handling in react-native", "homepage": "https://github.com/software-mansion/react-native-gesture-handler", "license": "MIT", @@ -9,7 +9,7 @@ }, "source": { "git": "https://github.com/software-mansion/react-native-gesture-handler", - "tag": "2.5.0" + "tag": "2.6.2" }, "source_files": "ios/**/*.{h,m,mm}", "requires_arc": true, diff --git a/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerButtonComponentView.mm b/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerButtonComponentView.mm index af99949db4899..29ac1566b1282 100644 --- a/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerButtonComponentView.mm +++ b/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerButtonComponentView.mm @@ -3,13 +3,13 @@ #import "RNGestureHandlerButtonComponentView.h" #import +#import #import #import #import #import -#import "RCTFabricComponentsPlugins.h" #import "RNGestureHandlerButton.h" using namespace facebook::react; diff --git a/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerManager.mm b/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerManager.mm index 83b3d9bbc5f8e..8b99316d79f1b 100644 --- a/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerManager.mm +++ b/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerManager.mm @@ -6,12 +6,7 @@ #import #import #import - -#if __has_include() #import -#else -#import "RCTRootContentView.h" -#endif #import "RNGestureHandlerActionType.h" #import "RNGestureHandlerState.h" diff --git a/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerRootViewComponentView.mm b/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerRootViewComponentView.mm index 8423fdec12fcf..af3976c83ea1b 100644 --- a/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerRootViewComponentView.mm +++ b/ios/vendored/unversioned/react-native-gesture-handler/ios/RNGestureHandlerRootViewComponentView.mm @@ -1,6 +1,6 @@ #ifdef RN_FABRIC_ENABLED -#import "RCTFabricComponentsPlugins.h" +#import Class RNGestureHandlerRootViewCls(void) { diff --git a/packages/expo-stories/package.json b/packages/expo-stories/package.json index 0516f6ec35a3a..f51f60db638ec 100644 --- a/packages/expo-stories/package.json +++ b/packages/expo-stories/package.json @@ -30,7 +30,7 @@ "esbuild": "^0.12.15", "fs-extra": "^9.1.0", "glob": "^7.1.7", - "react-native-gesture-handler": "~2.5.0", + "react-native-gesture-handler": "~2.6.2", "react-native-safe-area-context": "4.3.1", "react-native-screens": "~3.15.0", "react-native-svg": "12.3.0", diff --git a/packages/expo-test-runner/package.json b/packages/expo-test-runner/package.json index add799a4ba550..869d18455d2d0 100644 --- a/packages/expo-test-runner/package.json +++ b/packages/expo-test-runner/package.json @@ -10,13 +10,13 @@ "expo-test-runner": "bin/expo-test-runner.js" }, "repository": { - "type": "git", - "url": "git+https://github.com/expo/expo-test-runner.git" - }, + "type": "git", + "url": "git+https://github.com/expo/expo-test-runner.git" + }, "bugs": { - "url": "https://github.com/expo/expo-test-runner/issues" - }, - "homepage": "https://github.com/expo/expo-test-runner#readme", + "url": "https://github.com/expo/expo-test-runner/issues" + }, + "homepage": "https://github.com/expo/expo-test-runner#readme", "scripts": { "build": "expo-module build", "clean": "expo-module clean", diff --git a/packages/expo/bundledNativeModules.json b/packages/expo/bundledNativeModules.json index 2206ce8d88671..8383f1ea66590 100644 --- a/packages/expo/bundledNativeModules.json +++ b/packages/expo/bundledNativeModules.json @@ -90,7 +90,7 @@ "react-native": "0.70.1", "react-native-web": "~0.18.9", "react-native-branch": "^5.4.0", - "react-native-gesture-handler": "~2.5.0", + "react-native-gesture-handler": "~2.6.2", "react-native-get-random-values": "~1.8.0", "react-native-maps": "0.31.1", "react-native-pager-view": "5.4.24", diff --git a/yarn.lock b/yarn.lock index 47bce365018be..992041d690edc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -95,7 +95,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.15.5", "@babel/core@^7.4.5", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.9.0": +"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.15.5", "@babel/core@^7.18.6", "@babel/core@^7.4.5", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.9.0": version "7.19.3" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz#2519f62a51458f43b682d61583c3810e7dcee64c" integrity sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ== @@ -17294,10 +17294,10 @@ react-native-fade-in-image@^1.6.1: react-mixin "^3.0.5" react-timer-mixin "^0.13.3" -react-native-gesture-handler@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.5.0.tgz#61385583570ed0a45a9ed142425e35f8fe8274fb" - integrity sha512-djZdcprFf08PZC332D+AeG5wcGeAPhzfCJtB3otUgOgTlvjVXmg/SLFdPJSpzLBqkRAmrC77tM79QgKbuLxkfw== +react-native-gesture-handler@~2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.6.2.tgz#f3b68d374f5dda603ff29f7df2edb39472eb97ce" + integrity sha512-Ff/WKlR8KiM1wq7UJZvIyCB+OsweewaeZk+4RDIYNGM9tvNIAXEm/MtYnLHiBXiSJjZItF/8B83gE6pVq40vIw== dependencies: "@egjs/hammerjs" "^2.0.17" hoist-non-react-statics "^3.3.0"