Skip to content

Commit

Permalink
Merge pull request #50325 from margelo/chore/update-keyboard-controller
Browse files Browse the repository at this point in the history
[NoQA] feat: bump react-native-keyboard-controller to 1.14.0 (to make it compliant with bridgeless mode)
  • Loading branch information
mountiny authored Oct 7, 2024
2 parents 0989dda + a3eee3b commit 3c7a539
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 17 deletions.
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand All @@ -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

0 comments on commit 3c7a539

Please sign in to comment.