diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4c1ede673a79..297269156d06 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1303,7 +1303,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-keyboard-controller (1.13.0): + - react-native-keyboard-controller (1.12.2): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -2565,7 +2565,7 @@ SPEC CHECKSUMS: react-native-geolocation: 580c86eb531c0aaf7a14bc76fd2983ce47ca58aa react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440 react-native-key-command: 28ccfa09520e7d7e30739480dea4df003493bfe8 - react-native-keyboard-controller: a8cbf848d0bc0e1976a07948f1c53b8432c1246c + react-native-keyboard-controller: 47c01b0741ae5fc84e53cf282e61cfa5c2edb19b react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d react-native-netinfo: 02d31de0e08ab043d48f2a1a8baade109d7b6ca5 react-native-pager-view: ccd4bbf9fc7effaf8f91f8dae43389844d9ef9fa diff --git a/package-lock.json b/package-lock.json index 59f36001c1db..b01b8b8fbcff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,7 +97,7 @@ "react-native-image-picker": "^7.0.3", "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#93399c6410de32966eb57085936ef6951398c2c3", "react-native-key-command": "^1.0.8", - "react-native-keyboard-controller": "1.13.0", + "react-native-keyboard-controller": "^1.12.2", "react-native-launch-arguments": "^4.0.2", "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", @@ -37482,13 +37482,13 @@ "license": "MIT" }, "node_modules/react-native-keyboard-controller": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/react-native-keyboard-controller/-/react-native-keyboard-controller-1.13.0.tgz", - "integrity": "sha512-bMRx94Mt+HOkh6WRkShYgbszUcF+S9OWYHUT+DhFK9/nm1AxmDoMQKorDdb4XUXJgxrDe2k46fx4eAA6BZm/wA==", + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/react-native-keyboard-controller/-/react-native-keyboard-controller-1.12.2.tgz", + "integrity": "sha512-10Sy0+neSHGJxOmOxrUJR8TQznnrQ+jTFQtM1PP6YnblNQeAw1eOa+lO6YLGenRr5WuNSMZbks/3Ay0e2yMKLw==", "peerDependencies": { "react": "*", "react-native": "*", - "react-native-reanimated": ">=3.0.0" + "react-native-reanimated": ">=2.3.0" } }, "node_modules/react-native-launch-arguments": { diff --git a/package.json b/package.json index e285e68eed77..8800563ab4f1 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "react-native-image-picker": "^7.0.3", "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#93399c6410de32966eb57085936ef6951398c2c3", "react-native-key-command": "^1.0.8", - "react-native-keyboard-controller": "1.13.0", + "react-native-keyboard-controller": "^1.12.2", "react-native-launch-arguments": "^4.0.2", "react-native-linear-gradient": "^2.8.1", "react-native-localize": "^2.2.6", diff --git a/patches/react-native-keyboard-controller+1.13.0.patch b/patches/react-native-keyboard-controller+1.12.2.patch similarity index 57% rename from patches/react-native-keyboard-controller+1.13.0.patch rename to patches/react-native-keyboard-controller+1.12.2.patch index b376c9a5c022..3c8034354481 100644 --- a/patches/react-native-keyboard-controller+1.13.0.patch +++ b/patches/react-native-keyboard-controller+1.12.2.patch @@ -1,8 +1,8 @@ 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 6e566fc..07ccb3c 100644 +index 83884d8..5d9e989 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 -@@ -117,12 +117,12 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R +@@ -99,12 +99,12 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R } private fun goToEdgeToEdge(edgeToEdge: Boolean) { @@ -12,24 +12,22 @@ index 6e566fc..07ccb3c 100644 - !edgeToEdge, - ) - } -+ // reactContext.currentActivity?.let { -+ // WindowCompat.setDecorFitsSystemWindows( -+ // it.window, -+ // !edgeToEdge, -+ // ) -+ // } ++ // reactContext.currentActivity?.let { ++ // WindowCompat.setDecorFitsSystemWindows( ++ // it.window, ++ // !edgeToEdge, ++ // ) ++ // } } private fun setupKeyboardCallbacks() { -@@ -169,16 +169,16 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R +@@ -158,13 +158,13 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R // region State managers private fun enable() { this.goToEdgeToEdge(true) - this.setupWindowInsets() + // this.setupWindowInsets() this.setupKeyboardCallbacks() -- modalAttachedWatcher.enable() -+ // modalAttachedWatcher.enable() } private fun disable() { @@ -37,17 +35,5 @@ index 6e566fc..07ccb3c 100644 - this.setupWindowInsets() + // this.setupWindowInsets() this.removeKeyboardCallbacks() -- modalAttachedWatcher.disable() -+ // modalAttachedWatcher.disable() - } - // endregion - -@@ -206,7 +206,7 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R - fun forceStatusBarTranslucent(isStatusBarTranslucent: Boolean) { - if (active && this.isStatusBarTranslucent != isStatusBarTranslucent) { - this.isStatusBarTranslucent = isStatusBarTranslucent -- this.setupWindowInsets() -+ // this.setupWindowInsets() - this.requestApplyInsetsWhenAttached() - } } + // endregion \ No newline at end of file diff --git a/src/components/KeyboardAvoidingView/index.ios.tsx b/src/components/KeyboardAvoidingView/index.ios.tsx index 68cfa73e90b5..171210eab7ac 100644 --- a/src/components/KeyboardAvoidingView/index.ios.tsx +++ b/src/components/KeyboardAvoidingView/index.ios.tsx @@ -2,7 +2,7 @@ * The KeyboardAvoidingView is only used on ios */ import React from 'react'; -import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native-keyboard-controller'; +import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native'; import type {KeyboardAvoidingViewProps} from './types'; function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {