From 95ccee6327f1ea08f45654c02ce29a4489f6f1c5 Mon Sep 17 00:00:00 2001
From: Carlos Garcia <fluiddot@gmail.com>
Date: Fri, 27 May 2022 17:14:35 +0200
Subject: [PATCH] [RNMobile] Bump `react-native-gesture-handler` to version
 `2.3.2` (#41337)

* Bump react-native-gesture-handler to version 2.3.2

The package reference will be updated later on, once the PRs on the fork for updating the package are merged.

* Fix RNGestureHandlerPackage import in Android

* Update block-mover test snapshot

* Update react-native-gesture-handler package to release version
---
 package-lock.json                                           | 6 +++---
 .../block-mover/test/__snapshots__/index.native.js.snap     | 4 ++++
 .../wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java   | 2 +-
 .../app/src/main/java/com/gutenberg/MainApplication.java    | 2 +-
 packages/react-native-editor/ios/Podfile.lock               | 6 +++---
 packages/react-native-editor/package.json                   | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d11ca8d655a9b..00e90e22c6302 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18223,7 +18223,7 @@
 				"jsdom-jscore-rn": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800",
 				"node-fetch": "^2.6.0",
 				"react-native": "0.66.2",
-				"react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.2.0-wp-4/react-native-gesture-handler-2.2.0-wp-4.tgz",
+				"react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-1/react-native-gesture-handler-2.3.2-wp-1.tgz",
 				"react-native-get-random-values": "1.4.0",
 				"react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
 				"react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-2/react-native-hsv-color-picker-1.0.1-wp-2.tgz",
@@ -50870,8 +50870,8 @@
 			}
 		},
 		"react-native-gesture-handler": {
-			"version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.2.0-wp-4/react-native-gesture-handler-2.2.0-wp-4.tgz",
-			"integrity": "sha512-3pHMTuMWAko1nFJYRRrdqjnEGmPKxPe7C/wRa4PZ+FCelqdXoomwMLp1Rw7q722MXpQbjxQsQplfgPL4X5KxvQ==",
+			"version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-1/react-native-gesture-handler-2.3.2-wp-1.tgz",
+			"integrity": "sha512-XKwFyoU2rsyQVVK9DhygNUsSipHBbqc5o/P/3davbRF81T7uPHwnTf/9X3Jze4eIwfiZmnRLz9rFgVxvK/1JyA==",
 			"requires": {
 				"@egjs/hammerjs": "^2.0.17",
 				"hoist-non-react-statics": "^3.3.0",
diff --git a/packages/block-editor/src/components/block-mover/test/__snapshots__/index.native.js.snap b/packages/block-editor/src/components/block-mover/test/__snapshots__/index.native.js.snap
index 79b79766caaa6..ec1b5b196d57b 100644
--- a/packages/block-editor/src/components/block-mover/test/__snapshots__/index.native.js.snap
+++ b/packages/block-editor/src/components/block-mover/test/__snapshots__/index.native.js.snap
@@ -35,6 +35,8 @@ Array [
     >
       <View
         collapsable={false}
+        handlerTag={3}
+        handlerType="LongPressGestureHandler"
         onGestureHandlerEvent={[Function]}
         onGestureHandlerStateChange={[Function]}
         style={
@@ -93,6 +95,8 @@ Array [
     >
       <View
         collapsable={false}
+        handlerTag={4}
+        handlerType="LongPressGestureHandler"
         onGestureHandlerEvent={[Function]}
         onGestureHandlerStateChange={[Function]}
         style={
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
index 86e5a6b63ce2f..3e4d06bcd935c 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
@@ -46,7 +46,7 @@
 import org.linusu.RNGetRandomValuesPackage;
 import com.reactnativecommunity.webview.RNCWebViewPackage;
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
+import com.swmansion.gesturehandler.RNGestureHandlerPackage;
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 import com.swmansion.reanimated.ReanimatedPackage;
 import com.swmansion.rnscreens.RNScreensPackage;
diff --git a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java
index d74315aba221a..b94e581a736cb 100644
--- a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java
+++ b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java
@@ -37,7 +37,7 @@
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 import com.reactnativecommunity.webview.RNCWebViewPackage;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
+import com.swmansion.gesturehandler.RNGestureHandlerPackage;
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 import com.swmansion.reanimated.ReanimatedPackage;
 import com.swmansion.rnscreens.RNScreensPackage;
diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock
index 0516c50d01d80..c374913545a87 100644
--- a/packages/react-native-editor/ios/Podfile.lock
+++ b/packages/react-native-editor/ios/Podfile.lock
@@ -304,7 +304,7 @@ PODS:
     - React-Core
   - RNCMaskedView (0.2.6):
     - React-Core
-  - RNGestureHandler (2.2.0-wp-4):
+  - RNGestureHandler (2.3.2-wp-1):
     - React-Core
   - RNReanimated (2.4.1-wp-3):
     - DoubleConversion
@@ -538,8 +538,8 @@ SPEC CHECKSUMS:
   ReactCommon: c0263c1a41509aeb94be3214fa7bc3b71eae5ef6
   RNCClipboard: 99fc8ad669a376b756fbc8098ae2fd05c0ed0668
   RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
-  RNGestureHandler: 93b98c40b9419b1a82b008b513c182fe09288d1f
-  RNReanimated: b413cc7aa3e2a740d9804cda3a9396a68f9eea7f
+  RNGestureHandler: 3b13cc25407d1cdbee33b6ae65790a55c032d2a9
+  RNReanimated: d87c75f1076bab3402d6cd0b7322be51d333d10e
   RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b
   RNSVG: 36a7359c428dcb7c6bce1cc546fbfebe069809b0
   RNTAztecView: 4d1509eb51c287d059942c311fe1ae7d445e3653
diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json
index f1df15834b67d..62732da9bbcfe 100644
--- a/packages/react-native-editor/package.json
+++ b/packages/react-native-editor/package.json
@@ -57,7 +57,7 @@
 		"jsdom-jscore-rn": "git+https://github.com/iamcco/jsdom-jscore-rn.git#a562f3d57c27c13e5bfc8cf82d496e69a3ba2800",
 		"node-fetch": "^2.6.0",
 		"react-native": "0.66.2",
-		"react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.2.0-wp-4/react-native-gesture-handler-2.2.0-wp-4.tgz",
+		"react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-1/react-native-gesture-handler-2.3.2-wp-1.tgz",
 		"react-native-get-random-values": "1.4.0",
 		"react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
 		"react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-2/react-native-hsv-color-picker-1.0.1-wp-2.tgz",