Skip to content

Commit 0fa41b4

Browse files
mountinyOSBotify
authored andcommitted
Merge pull request #53384 from margelo/fix/fallback-to-current-focus-activity-on-android-keyboard-controller
(cherry picked from commit cb0613c) (CP triggered by puneetlath)
1 parent dbeefcb commit 0fa41b4

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/utils/keyboard.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
import {KeyboardController, KeyboardEvents} from 'react-native-keyboard-controller';
1+
import {Keyboard} from 'react-native';
22

33
let isVisible = false;
44

5-
KeyboardEvents.addListener('keyboardDidHide', () => {
5+
Keyboard.addListener('keyboardDidHide', () => {
66
isVisible = false;
77
});
88

9-
KeyboardEvents.addListener('keyboardDidShow', () => {
9+
Keyboard.addListener('keyboardDidShow', () => {
1010
isVisible = true;
1111
});
1212

13-
// starting from react-native-keyboard-controller@1.15+ we can use `KeyboardController.dismiss()` directly
1413
const dismiss = (): Promise<void> => {
1514
return new Promise((resolve) => {
1615
if (!isVisible) {
@@ -19,12 +18,12 @@ const dismiss = (): Promise<void> => {
1918
return;
2019
}
2120

22-
const subscription = KeyboardEvents.addListener('keyboardDidHide', () => {
21+
const subscription = Keyboard.addListener('keyboardDidHide', () => {
2322
resolve(undefined);
2423
subscription.remove();
2524
});
2625

27-
KeyboardController.dismiss();
26+
Keyboard.dismiss();
2827
});
2928
};
3029

0 commit comments

Comments
 (0)