Skip to content

Commit a6b4f17

Browse files
committed
Revert "Merge pull request Expensify#47096 from margelo/fix/keyboard-avoiding-view-from-keyboard-controller-v2"
1 parent 7b4605a commit a6b4f17

File tree

5 files changed

+10
-24
lines changed

5 files changed

+10
-24
lines changed

ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ PODS:
13031303
- ReactCommon/turbomodule/bridging
13041304
- ReactCommon/turbomodule/core
13051305
- Yoga
1306-
- react-native-keyboard-controller (1.13.0):
1306+
- react-native-keyboard-controller (1.12.2):
13071307
- glog
13081308
- hermes-engine
13091309
- RCT-Folly (= 2022.05.16.00)
@@ -2565,7 +2565,7 @@ SPEC CHECKSUMS:
25652565
react-native-geolocation: 580c86eb531c0aaf7a14bc76fd2983ce47ca58aa
25662566
react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440
25672567
react-native-key-command: 28ccfa09520e7d7e30739480dea4df003493bfe8
2568-
react-native-keyboard-controller: a8cbf848d0bc0e1976a07948f1c53b8432c1246c
2568+
react-native-keyboard-controller: 47c01b0741ae5fc84e53cf282e61cfa5c2edb19b
25692569
react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
25702570
react-native-netinfo: 02d31de0e08ab043d48f2a1a8baade109d7b6ca5
25712571
react-native-pager-view: ccd4bbf9fc7effaf8f91f8dae43389844d9ef9fa

package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"react-native-image-picker": "^7.0.3",
154154
"react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#93399c6410de32966eb57085936ef6951398c2c3",
155155
"react-native-key-command": "^1.0.8",
156-
"react-native-keyboard-controller": "1.13.0",
156+
"react-native-keyboard-controller": "^1.12.2",
157157
"react-native-launch-arguments": "^4.0.2",
158158
"react-native-linear-gradient": "^2.8.1",
159159
"react-native-localize": "^2.2.6",

patches/react-native-keyboard-controller+1.13.0.patch renamed to patches/react-native-keyboard-controller+1.12.2.patch

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,12 @@ index 6e566fc..07ccb3c 100644
2828
- this.setupWindowInsets()
2929
+ // this.setupWindowInsets()
3030
this.setupKeyboardCallbacks()
31-
- modalAttachedWatcher.enable()
32-
+ // modalAttachedWatcher.enable()
3331
}
3432

3533
private fun disable() {
3634
this.goToEdgeToEdge(false)
3735
- this.setupWindowInsets()
3836
+ // this.setupWindowInsets()
3937
this.removeKeyboardCallbacks()
40-
- modalAttachedWatcher.disable()
41-
+ // modalAttachedWatcher.disable()
42-
}
43-
// endregion
44-
45-
@@ -206,7 +206,7 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
46-
fun forceStatusBarTranslucent(isStatusBarTranslucent: Boolean) {
47-
if (active && this.isStatusBarTranslucent != isStatusBarTranslucent) {
48-
this.isStatusBarTranslucent = isStatusBarTranslucent
49-
- this.setupWindowInsets()
50-
+ // this.setupWindowInsets()
51-
this.requestApplyInsetsWhenAttached()
52-
}
5338
}
39+
// endregion

src/components/KeyboardAvoidingView/index.ios.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* The KeyboardAvoidingView is only used on ios
33
*/
44
import React from 'react';
5-
import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native-keyboard-controller';
5+
import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native';
66
import type {KeyboardAvoidingViewProps} from './types';
77

88
function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {

0 commit comments

Comments
 (0)