feat: bump react-native-keyboard-controller to 1.14.0

Expensify · Oct 7, 2024 · a3eee3b · a3eee3b
1 parent 6d8e739
commit a3eee3b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git 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
diff --git 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/...t-native-keyboard-controller+1.12.7.patch → ...ntroller+1.14.0+001+disable-android.patch b/...t-native-keyboard-controller+1.12.7.patch → ...ntroller+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,28 +21,42 @@ 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() {
      this.goToEdgeToEdge(false)
 -    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