From a3eee3ba4e700c01b5f26b963917c6aec41c1784 Mon Sep 17 00:00:00 2001 From: kirillzyusko Date: Mon, 7 Oct 2024 10:15:08 +0200 Subject: [PATCH] feat: bump react-native-keyboard-controller to 1.14.0 --- ios/Podfile.lock | 4 +- package-lock.json | 10 ++--- package.json | 2 +- ...ntroller+1.14.0+001+disable-android.patch} | 41 +++++++++++++++---- 4 files changed, 40 insertions(+), 17 deletions(-) rename patches/{react-native-keyboard-controller+1.12.7.patch => react-native-keyboard-controller+1.14.0+001+disable-android.patch} (53%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index beac64acd083..5a5c2bb90562 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1687,7 +1687,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-keyboard-controller (1.12.7): + - react-native-keyboard-controller (1.14.0): - DoubleConversion - glog - hermes-engine @@ -3178,7 +3178,7 @@ SPEC CHECKSUMS: react-native-geolocation: b9bd12beaf0ebca61a01514517ca8455bd26fa06 react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440 react-native-key-command: aae312752fcdfaa2240be9a015fc41ce54087546 - react-native-keyboard-controller: b9b2ba987e3c6f4b6534740e88d11dccc34f69dc + react-native-keyboard-controller: 17d5830f2bd6c6cad44682eb2cc13f9078eff985 react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d react-native-netinfo: fb5112b1fa754975485884ae85a3fb6a684f49d5 react-native-pager-view: 94195f1bf32e7f78359fa20057c97e632364a08b diff --git a/package-lock.json b/package-lock.json index 22385023374c..ad304f1393f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -89,7 +89,7 @@ "react-native-image-picker": "^7.0.3", "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#cb392140db4953a283590d7cf93b4d0461baa2a9", "react-native-key-command": "^1.0.8", - "react-native-keyboard-controller": "1.12.7", + "react-native-keyboard-controller": "1.14.0", "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", @@ -34592,13 +34592,13 @@ "license": "MIT" }, "node_modules/react-native-keyboard-controller": { - "version": "1.12.7", - "resolved": "https://registry.npmjs.org/react-native-keyboard-controller/-/react-native-keyboard-controller-1.12.7.tgz", - "integrity": "sha512-eccg0JtZk5n/up3I7pEg606Bo9eLsgVGtTPnmdv507AJg5UeAAMEhx93P7YXDZmwJ+38oFn3DbL7a0eIUE3Lxw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/react-native-keyboard-controller/-/react-native-keyboard-controller-1.14.0.tgz", + "integrity": "sha512-JW9k2fehFXOpvLWh1YcgyubLodg/HPi6bR11sCZB/BOawf1tnbGnqk967B8XkxDOKHH6mg+z82quCvv8ALh1rg==", "peerDependencies": { "react": "*", "react-native": "*", - "react-native-reanimated": ">=2.11.0" + "react-native-reanimated": ">=3.0.0" } }, "node_modules/react-native-launch-arguments": { diff --git a/package.json b/package.json index 1387bda002d6..12829a50e277 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "react-native-image-picker": "^7.0.3", "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#cb392140db4953a283590d7cf93b4d0461baa2a9", "react-native-key-command": "^1.0.8", - "react-native-keyboard-controller": "1.12.7", + "react-native-keyboard-controller": "1.14.0", "react-native-launch-arguments": "^4.0.2", "react-native-localize": "^2.2.6", "react-native-modal": "^13.0.0", diff --git a/patches/react-native-keyboard-controller+1.12.7.patch b/patches/react-native-keyboard-controller+1.14.0+001+disable-android.patch similarity index 53% rename from patches/react-native-keyboard-controller+1.12.7.patch rename to patches/react-native-keyboard-controller+1.14.0+001+disable-android.patch index 0ea97d3731a1..6bb62155a98c 100644 --- a/patches/react-native-keyboard-controller+1.12.7.patch +++ b/patches/react-native-keyboard-controller+1.14.0+001+disable-android.patch @@ -1,8 +1,17 @@ diff --git a/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt b/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt -index 83884d8..5d9e989 100644 +index 7ef8b36..f4d44ff 100644 --- a/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt +++ b/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt -@@ -99,12 +99,12 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R +@@ -74,7 +74,7 @@ class EdgeToEdgeReactViewGroup( + } + + override fun onConfigurationChanged(newConfig: Configuration?) { +- this.reApplyWindowInsets() ++ // this.reApplyWindowInsets() + } + // endregion + +@@ -124,12 +124,12 @@ class EdgeToEdgeReactViewGroup( } private fun goToEdgeToEdge(edgeToEdge: Boolean) { @@ -12,22 +21,24 @@ index 83884d8..5d9e989 100644 - !edgeToEdge, - ) - } -+ // reactContext.currentActivity?.let { -+ // WindowCompat.setDecorFitsSystemWindows( -+ // it.window, -+ // !edgeToEdge, -+ // ) -+ // } ++ // reactContext.currentActivity?.let { ++ // WindowCompat.setDecorFitsSystemWindows( ++ // it.window, ++ // !edgeToEdge, ++ // ) ++ // } } private fun setupKeyboardCallbacks() { -@@ -158,13 +158,13 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R +@@ -182,16 +182,16 @@ class EdgeToEdgeReactViewGroup( // region State managers private fun enable() { this.goToEdgeToEdge(true) - this.setupWindowInsets() + // this.setupWindowInsets() this.setupKeyboardCallbacks() +- modalAttachedWatcher.enable() ++ // modalAttachedWatcher.enable() } private fun disable() { @@ -35,5 +46,17 @@ index 83884d8..5d9e989 100644 - this.setupWindowInsets() + // this.setupWindowInsets() this.removeKeyboardCallbacks() +- modalAttachedWatcher.disable() ++ // modalAttachedWatcher.disable() + } + // endregion + +@@ -219,7 +219,7 @@ class EdgeToEdgeReactViewGroup( + fun forceStatusBarTranslucent(isStatusBarTranslucent: Boolean) { + if (active && this.isStatusBarTranslucent != isStatusBarTranslucent) { + this.isStatusBarTranslucent = isStatusBarTranslucent +- this.reApplyWindowInsets() ++ // this.reApplyWindowInsets() + } } // endregion